Fixed beam damage inconsistency

4 years ago · 9b65a1f9e1
parent 4ace9efbed
commit 9b65a1f9e1
2 changed files with 4 additions and 6 deletions
--- a/Export_Code/gml_Object_oCharacter_Collision_439.gml
+++ b/Export_Code/gml_Object_oCharacter_Collision_439.gml
@ -1,7 +1,5 @@
 if (other.sax != global.sax && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)
 {
-    if (global.playerFreeze > 0)
-        other.damage /= 2
    event_user(2)
    if (!global.spectator)
        global.showHealthIndicatorsTimer = 900
--- a/Export_Code/gml_Script_shoot_beam_receive.gml
+++ b/Export_Code/gml_Script_shoot_beam_receive.gml
@ -82,13 +82,13 @@ repeat beams
    beam.damage = 5
    beam.chargebeam = 0
    if wbeam
-        beam.damage *= 0.6
+        beam.damage *= 1.5
    if ibeam
-        beam.damage *= 1
-    if sbeam
        beam.damage *= 1.5
+    if sbeam
+        beam.damage *= 0.8
    if pbeam
-        beam.damage *= 1
+        beam.damage *= 1.2
    if (argument3 >= 1)
    {
        beam.damage *= 3