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

my HEAD hurts and the SFX is TOO LOUD

Browse source
This commit is contained in:
Sylvia 2026-04-26 21:49:57 -07:00
parent a3321d361c
commit d4ebf0ca61
41 changed files with 1465 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Assets/Scripts/Entities/MarisaAbilityHandler.cs
View file

@ -6,7 +6,7 @@ using UnityEngine.InputSystem;
public class MarisaAbilityHandler : MonoBehaviour
{
[SerializeField] private PlayerInput inputHandler;
[SerializeField] private Marisa thisPlayer;
public Marisa thisPlayer;
[Header("Abilities")] //maybe have to make them public for when you're changing out abilities
public List<PlayerAbility> abilities = new();
@ -18,17 +18,11 @@ public class MarisaAbilityHandler : MonoBehaviour
public AbilityHotbarIcon[] hotbarIcons;
//this is getting ridiculous
private void Awake()
{
SetupAbilities();
}
private void Start()
{
hotbarIcons = FindObjectsByType<AbilityHotbarIcon>(FindObjectsSortMode.InstanceID);
if (AbilitySceneTransfer.instance.savedAbilities.Count > 0)
if (hotbarIcons[0] != null) //bad
{
LevelSwitcher.instance.SetupScene();
SetupAbilities();
}
}
@ -57,22 +51,18 @@ public class MarisaAbilityHandler : MonoBehaviour
if (inputHandler.actions["MainAttack"].inProgress)
{
abilityInstances[0].TryAbility();
hotbarIcons[0].UpdateCooldown();
}
else if (inputHandler.actions["SecondaryAttack"].inProgress)
{
abilityInstances[1].TryAbility();
hotbarIcons[1].UpdateCooldown();
}
else if (inputHandler.actions["SpellA"].inProgress)
{
abilityInstances[2].TryAbility();
hotbarIcons[2].UpdateCooldown();
}
else if (inputHandler.actions["SpellB"].inProgress)
{
abilityInstances[3].TryAbility();
hotbarIcons[3].UpdateCooldown();
}
}
}