Don't tick Manipulation when action doesn't increase step count

2024-06-19 23:12:30 -07:00
parent 1cbcc77643
commit 06e0ecf209
4 changed files with 11 additions and 35 deletions
@@ -69,20 +69,19 @@ public abstract class BaseAction(
        s.ReduceCP(CPCost(s));
        s.ReduceDurability(DurabilityCost);

-        if (s.Durability > 0)
-        {
-            if (s.HasEffect(EffectType.Manipulation))
-                s.RestoreDurability(5);
-        }
-
        if (IncreasesStepCount)
+        {
+            if (s.Durability > 0)
+                if (s.HasEffect(EffectType.Manipulation))
+                    s.RestoreDurability(5);
+
            s.IncreaseStepCount();

+            s.ActiveEffects.DecrementDuration();
+        }
+
        s.ActionStates.MutateState(this);
        s.ActionCount++;
-
-        if (IncreasesStepCount)
-            s.ActiveEffects.DecrementDuration();
    }

    public virtual void UseSuccess(Simulator s)
@@ -18,8 +18,7 @@ internal sealed class Manipulation() : BaseBuffAction(

        s.ActionStates.MutateState(this);
        s.ActionCount++;
-
-        if (IncreasesStepCount)
-            s.ActiveEffects.DecrementDuration();
+        
+        s.ActiveEffects.DecrementDuration();
    }
 }