myondev/MarisaMagicalStudy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

the scarlet police have me at gun point

Browse source
This commit is contained in:
Sylvia 2026-03-06 02:22:51 -08:00
parent b964c9b617
commit d6da52fd69
54 changed files with 674 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assets/Scripts/Abilities/PlayerAbilities/FireBullet.cs
View file

@ -25,6 +25,8 @@ public class FireBullet : PlayerAbility
{
newProjectile.transform.position += new Vector3(Random.Range(-offset.x, offset.x), Random.Range(-offset.y, offset.y));
}
newProjectile.owner = thisPlayer;
newProjectile.pierceAmount = pierceAmount;
newProjectile.damage = power;
newProjectile.speed = projectileSpeed;

2
Assets/Scripts/Abilities/PlayerAbilities/Laser.cs
View file

@ -55,7 +55,7 @@ public class Laser : PlayerAbility
enemyList.Remove(enemy);
continue;
}
enemy.TakeDamage(power);
enemy.TakeDamage(power, thisPlayer);
}
currentDebounce = damageDebounceTime;
}

2
Assets/Scripts/Abilities/PlayerAbilities/NondirectionalLaser.cs
View file

@ -37,7 +37,7 @@ public class NondirectionalLaser : Laser
enemyList.Remove(enemy);
continue;
}
enemy.TakeDamage(power);
enemy.TakeDamage(power, thisPlayer);
}
currentDebounce = damageDebounceTime;
}

14
Assets/Scripts/Abilities/PlayerAbilities/PlayerAbility.cs
View file

@ -10,13 +10,23 @@ public class PlayerAbility : MonoBehaviour
public Marisa thisPlayer;
[Header("Cooldown")]
public bool canCooldown = true;
public float baseCooldown;
public float cooldown;
public float currentCooldown;
[Header("Stats")]
[Header("Stats")]
public float basePower;
public float power;
public float baseProjectileCount;
public float projectileCount;
public Dictionary<AbilityUpgrade, int> attachedUpgrades = new();
private void Start()
{
cooldown = baseCooldown;
power = basePower;
projectileCount = baseProjectileCount;
}
public void TryAbility()
{
if (currentCooldown <= 0 && canCooldown)