diff --git a/MrBigsock/Assets/Code/Core/Abilities/Base/AbilityEntity.cs b/MrBigsock/Assets/Code/Core/Abilities/Base/AbilityEntity.cs index 474e5a34a95a9b17cffab793cca29015444ceabf..bdb968d64c3a3d68ccf2e4aa70a71bf5bdc08ff2 100644 --- a/MrBigsock/Assets/Code/Core/Abilities/Base/AbilityEntity.cs +++ b/MrBigsock/Assets/Code/Core/Abilities/Base/AbilityEntity.cs @@ -24,12 +24,14 @@ namespace BigSock { public List<KeyCode> Keys { get; } + // Indicates whether or not the ability is charging. + public bool IsCharging => ChargeStarted > 0; // The time this ability has been charging. public float ChargeTime => Time.time - ChargeStarted; // The percent of maximum time the ability has charged for. - public float ChargePercent => (Ability.FireType == FireType.Charge && ChargeStarted > 0) + public float ChargePercent => (Ability.FireType == FireType.Charge && IsCharging) ? Math.Clamp(ChargeTime / Ability.MaxCharge, 0, 1) : 0;