Fixed fusion damage scaling, added save cooldown to non-exp

3 years ago · aee2071ad4
parent 8d8c420fcf
commit aee2071ad4
2 changed files with 4 additions and 7 deletions
--- a/Export_Code/gml_Object_oControl_Step_0.gml
+++ b/Export_Code/gml_Object_oControl_Step_0.gml
@ -207,10 +207,7 @@ if (global.scannerSpeed <= 0)

 }
 if (global.showHealthIndicatorsTimer == 1)
-{
-    if global.experimental
-        global.saveStationCooldown = 1800
-}
+    global.saveStationCooldown = 1200
 if (global.showHealthIndicatorsTimer > 0)
 {
    global.showHealthIndicatorsTimer--
--- a/Export_Code/gml_Script_damage_player.gml
+++ b/Export_Code/gml_Script_damage_player.gml
@ -12,14 +12,14 @@ if global.multiDamageCollision
    }
    if global.sax
    {
-        global.damageMult = (1 + (1.5 * (metcount / 41)))
+        global.damageMult = (1 + (1.5 * (metcount / global.MetCount)))
+        if (global.damageMult > 2.5)
+            global.damageMult = 2.5
        if (global.currentsuit == 2 && global.juggActive)
            global.ignoreKnockback = 1
    }
 }
 experimentalExtraSAXDamageMultiplier = 1
-if global.experimental
-    experimentalExtraSAXDamageMultiplier = 1.25
 damage_taken = 0
 if (global.currentsuit == 0 || argument3 == 1)
 {