Resetting Escape Ability #157
Conversation
Added ReduceCooldownAmount to BaseUsable's constructor default value is 0f. It can be used if we want to reduce cooldown based on any condition. It's only used in EscapeSpecial for now. Also added HasDurability to BaseUsable and than override this in both AmmoWeapon and BladeWeapon. Main reason i did this is BladeWeapon.CanUse() is also looking for HumanState.Idle and this disables blade weapon to use escape special. Escape Special has 300s cooldown, 50f ReduceCooldownAmount and its unable to use at start.
Escaping from titan makes its arm disabled
| public int UsesLeft; | ||
| public int MaxUses; | ||
| public bool IsActive; | ||
| public string Name; | ||
| protected float _lastUseTime = -1000f; | ||
| protected BaseCharacter _owner; | ||
|
|
||
| public BaseUseable(BaseCharacter owner, float cooldown = 0f, int maxUses = -1) | ||
| public BaseUseable(BaseCharacter owner, float cooldown = 0f, float _reduceCooldownAmount =0f,int maxUses = -1) |
There was a problem hiding this comment.
use regular field naming convention: "reduceCooldownAmount = 0, int maxUses = -1"
| public int UsesLeft; | ||
| public int MaxUses; | ||
| public bool IsActive; | ||
| public string Name; | ||
| protected float _lastUseTime = -1000f; | ||
| protected BaseCharacter _owner; | ||
|
|
||
| public BaseUseable(BaseCharacter owner, float cooldown = 0f, int maxUses = -1) |
There was a problem hiding this comment.
Since you are changing the BaseUseable here, this will affect all specials, is this intended?
| @@ -1163,6 +1165,10 @@ public override void OnHit(BaseHitbox hitbox, object victim, Collider collider, | |||
| } | |||
|
|
|||
| } | |||
| if (GetCurrentSpecial() is EscapeSpecial || GetCurrentSpecial() is ShifterTransformSpecial) | |||
There was a problem hiding this comment.
Since we are tying special logic to certain specials, this should be handled either using OOP principles so that all specials of a new special type called BaseChargeOnkillSpecial implement this logic so that adding new ones doesn't require going and changing this random if statement.
| @@ -2515,7 +2520,15 @@ public void SetSpecial(string special) | |||
| Special = HumanSpecials.GetSpecialUseable(this, special); | |||
| ((InGameMenu)UIManager.CurrentMenu).HUDBottomHandler.SetSpecialIcon(HumanSpecials.GetSpecialIcon(special)); | |||
| } | |||
|
|
|||
| public BaseUseable GetCurrentSpecial() | |||
There was a problem hiding this comment.
Special is exposed as a public property, you should reference it as this.Special or human.Special, please remove this.
| { | ||
| return Special; | ||
| } | ||
| public void ReduceSpecialCooldown() |
There was a problem hiding this comment.
Just call this.Special.ReduceCooldown() or human.Special.ReduceCooldown()
| @@ -1,6 +1,12 @@ | |||
| using Effects; | |||
| using Codice.CM.Client.Differences.Graphic; | |||
There was a problem hiding this comment.
A lot of these imports do not look used, please remove them
| using UnityEngine; | ||
| using static UnityEngine.GraphicsBuffer; |
There was a problem hiding this comment.
This one in particular is really weird, did auto import add the static field here?
There was a problem hiding this comment.
Didn't change those, will remove
| if (human.Weapon is APGWeapon) | ||
| { | ||
| //var gunInfo = CharacterData.HumanWeaponInfo["APG"]; | ||
| //float minRange = gunInfo["MinRange"].AsFloat; |
| } | ||
| UsesLeft = -1; | ||
| Cooldown = 300; |
There was a problem hiding this comment.
Cooldown should be implemented so that there is a
Cooldown variable for the max cooldown and an internal one
_currentCooldown
This way we dont have magic numbers randomly littered throughout the code.
If someone changes the cooldown at the top, they now need to search the codebase for all references to it bc of this change. Please avoid this at all costs. I do not want to come off as rude but this was the bane of my existence working on RRC and I hate it with a passion.
| using UI; | ||
| using UnityEngine; | ||
| using Utility; | ||
| using static UnityEngine.GraphicsBuffer; |
| @@ -75,5 +78,21 @@ protected override void Activate() | |||
| human.HumanCache.APGHit.Activate(0f, 0.1f); | |||
| ((InGameMenu)UIManager.CurrentMenu).HUDBottomHandler.ShootAPG(); | |||
| } | |||
| public object[] GetSettings() | |||
There was a problem hiding this comment.
Please just expose each of these individual settings as props.
If they have the be calculated at runtime, use lambda notation
public float ThatFirstValueBelow => midpoint + direction * height * 0.5f;
This is heavily preferred to creating a new object everytime you need to reference some basic settings.
| @@ -169,7 +169,10 @@ int KillTitansInRadius(float radius) | |||
| ((InGameCamera)SceneLoader.CurrentCamera).TakeSnapshot(titan.BaseTitanCache.Neck.position, damage); | |||
| titan.GetHit(_owner, damage, "Thunderspear", collider.name); | |||
| } | |||
|
|
|||
| if(((Human)_owner).GetCurrentSpecial() is EscapeSpecial || ((Human)_owner).GetCurrentSpecial() is ShifterTransformSpecial) | |||
There was a problem hiding this comment.
Again magic list of specials that this applies to, this should be generic somewhere else so that we don't have duplicate code.
| @@ -16,7 +16,7 @@ abstract class BaseUseable | |||
| protected float _lastUseTime = -1000f; | |||
| protected BaseCharacter _owner; | |||
|
|
|||
| public BaseUseable(BaseCharacter owner, float cooldown = 0f, int maxUses = -1) | |||
| public BaseUseable(BaseCharacter owner, float cooldown = 0f,int maxUses = -1) | |||
There was a problem hiding this comment.
please fix the missing space here
Added ReduceCooldownAmount to BaseUsable's constructor default value is 0f. It can be used if we want to reduce cooldown based on any condition. It's only used in EscapeSpecial for now. Also added HasDurability to BaseUsable and than override this in both AmmoWeapon and BladeWeapon. Main reason i did this is BladeWeapon.CanUse() is also looking for HumanState.Idle and this disables blade weapon to use escape special. Escape Special has 300s cooldown, 50f ReduceCooldownAmount and its unable to use at start.