From aee2071ad4cd7d7be9d9bc4ea00b627281fce172 Mon Sep 17 00:00:00 2001
From: DodoBirb <roanvanelven@gmail.com>
Date: Fri, 17 Feb 2023 16:22:53 +1100
Subject: [PATCH] Fixed fusion damage scaling, added save cooldown to non-exp

---
 Export_Code/gml_Object_oControl_Step_0.gml | 5 +----
 Export_Code/gml_Script_damage_player.gml   | 6 +++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Export_Code/gml_Object_oControl_Step_0.gml b/Export_Code/gml_Object_oControl_Step_0.gml
index 7d6e0b0..a9b0b8e 100644
--- 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--
diff --git a/Export_Code/gml_Script_damage_player.gml b/Export_Code/gml_Script_damage_player.gml
index bc77ea9..18ef946 100644
--- 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)
 {