Reduced damage dealt to frozen players

3 years ago · e72eb2e585
parent 4e4ebdd189
commit e72eb2e585
2 changed files with 7 additions and 0 deletions
--- a/Export_Code/gml_Object_oCharacter_Collision_440.gml
+++ b/Export_Code/gml_Object_oCharacter_Collision_440.gml
@ -2,6 +2,8 @@ if (other.sax != global.sax && state != IDLE && state != SAVING && state != SAVI
 {
    if other.smissile
        other.damage = 50
+    if (global.playerFreeze > 0)
+        other.damage *= 0.8
    event_user(2)
    if (!global.spectator)
        global.showHealthIndicatorsTimer = 900
--- a/Export_Code/gml_Object_oClient_Other_68.gml
+++ b/Export_Code/gml_Object_oClient_Other_68.gml
@ -430,6 +430,11 @@ switch type_event
                            }
                            if (checkDamage == 100)
                                checkDamage = 50
+                            if checkMissile
+                            {
+                                if (global.playerFreeze > 0)
+                                    checkDamage *= 0.8
+                            }
                            if ((!canbehit) || state == IDLE || (state == SAVING && state == SAVINGFX) || state == SAVINGSHIPFX || state == SAVINGSHIP || state == ELEVATOR || state == GFELEVATOR)
                                checkDamage = 0
                            if ((!global.frozenNormally) && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR)