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

WorkingRobot · Jun 20, 2024 · 06e0ecf · 06e0ecf
1 parent 1cbcc77
commit 06e0ecf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 34 deletions.
diff --git a/Craftimizer/Craftimizer.csproj b/Craftimizer/Craftimizer.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Authors>Asriel Camora</Authors>
-    <Version>2.4.3.0</Version>
+    <Version>2.4.2.0</Version>
     <PackageProjectUrl>https://github.com/WorkingRobot/craftimizer.git</PackageProjectUrl>
     <Configurations>Debug;Release</Configurations>
   </PropertyGroup>

diff --git a/Craftimizer/Utils/PopulateConverter.cs b/Craftimizer/Utils/PopulateConverter.cs
diff --git a/Simulator/Actions/BaseAction.cs b/Simulator/Actions/BaseAction.cs
@@ -69,20 +69,19 @@ public virtual void Use(Simulator s)
         s.ReduceCP(CPCost(s));
         s.ReduceDurability(DurabilityCost);
 
-        if (s.Durability > 0)
+        if (IncreasesStepCount)
         {
-            if (s.HasEffect(EffectType.Manipulation))
-                s.RestoreDurability(5);
-        }
+            if (s.Durability > 0)
+                if (s.HasEffect(EffectType.Manipulation))
+                    s.RestoreDurability(5);
 
-        if (IncreasesStepCount)
             s.IncreaseStepCount();
 
+            s.ActiveEffects.DecrementDuration();
+        }
+
         s.ActionStates.MutateState(this);
         s.ActionCount++;
-
-        if (IncreasesStepCount)
-            s.ActiveEffects.DecrementDuration();
     }
 
     public virtual void UseSuccess(Simulator s)

diff --git a/Simulator/Actions/Manipulation.cs b/Simulator/Actions/Manipulation.cs
@@ -18,8 +18,7 @@ public override void Use(Simulator s)
 
         s.ActionStates.MutateState(this);
         s.ActionCount++;
-
-        if (IncreasesStepCount)
-            s.ActiveEffects.DecrementDuration();
+
+        s.ActiveEffects.DecrementDuration();
     }
 }