advanceInternal is now called with the ship's timeflow as a multiplier

scardwell15 · Aug 7, 2023 · 75146ff · 75146ff
1 parent 91ec4a8
commit 75146ff
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/combatactivators.version b/combatactivators.version
@@ -6,6 +6,6 @@
     {
         "major":1,
         "minor":1,
-        "patch":0
+        "patch":1
     }
 }
diff --git a/jars/CombatActivators.jar b/jars/CombatActivators.jar
diff --git a/mod_info.json b/mod_info.json
@@ -3,7 +3,7 @@
     "name": "Combat Activators",
     "author": "President Matt Damon",
     "utility": "true",
-    "version": { "major":"1", "minor": "1", "patch": "0" },
+    "version": { "major":"1", "minor": "1", "patch": "1" },
     "description": "Abilities that can be activated during combat.",
     "gameVersion": "0.96a",
     "jars":["jars/CombatActivators.jar"],

diff --git a/src/activators/ActivatorManager.kt b/src/activators/ActivatorManager.kt
@@ -44,7 +44,7 @@ object ActivatorManager {
         for (ship in ships) {
             getActivators(ship)?.forEach {
                 if (!Global.getCombatEngine().isPaused) {
-                    it.advanceInternal(amount)
+                    it.advanceInternal(amount * ship.mutableStats.timeMult.modifiedValue)
                 }
 
                 it.advanceEveryFrame()