From ed23d4a547ebbc839f0ddadab7e4a73add4a9be4 Mon Sep 17 00:00:00 2001
From: Nelsonh <Humes101@gmail.com>
Date: Sat, 9 Nov 2024 11:52:31 +0000
Subject: [PATCH] fix old methods for marine incapacitation increasing health

---
 objects/obj_pnunit/Alarm_4.gml                | 2 +-
 scripts/scr_clean/scr_clean.gml               | 4 ++--
 scripts/scr_perils_table/scr_perils_table.gml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/objects/obj_pnunit/Alarm_4.gml b/objects/obj_pnunit/Alarm_4.gml
index acc040423d..595a4a6e9f 100644
--- a/objects/obj_pnunit/Alarm_4.gml
+++ b/objects/obj_pnunit/Alarm_4.gml
@@ -7,7 +7,7 @@ for (var i=0;i<array_length(unit_struct);i++){
     if (!is_struct(unit))then continue;
     if (marine_type[i]!="") and (unit.hp()<-3000) and (obj_ncombat.defeat=0){
         marine_dead[i]=0;
-        unit.add_or_sub_health(5000);
+        //unit.add_or_sub_health(5000);
     }// For incapitated
     
     if (ally[i]=false){
diff --git a/scripts/scr_clean/scr_clean.gml b/scripts/scr_clean/scr_clean.gml
index a22197afa5..2e7d62c30b 100644
--- a/scripts/scr_clean/scr_clean.gml
+++ b/scripts/scr_clean/scr_clean.gml
@@ -123,11 +123,11 @@ function scr_clean(target_object, target_is_infantry, hostile_shots, hostile_dam
                     minus = round(minus * (1 - damage_resistance));
                 }
                 if (minus < 0 && hostile_weapon == "Fleshborer") minus = 1.5;
-                if (hostile_weapon == "Web Spinner") {
+                /* if (hostile_weapon == "Web Spinner") {
                     var webr = floor(random(100)) + 1;
                     var chunk = max(10, 62 - (marine_ac[marine_index] * 2));
                     minus = (webr <= chunk) ? 5000 : 0;
-                }
+                } */
                 marine.add_or_sub_health(-minus);
 
                 // Check if marine is dead
diff --git a/scripts/scr_perils_table/scr_perils_table.gml b/scripts/scr_perils_table/scr_perils_table.gml
index 4964f97fb8..69c205ef0b 100644
--- a/scripts/scr_perils_table/scr_perils_table.gml
+++ b/scripts/scr_perils_table/scr_perils_table.gml
@@ -14,7 +14,7 @@ function scr_perils_table(peril_roll, unit, psy_discipline, power_name, unit_id,
 		}],
 		[31, function(peril_roll, unit, psy_discipline, power_name, unit_id, book_powers){
 			//TODO figure out a better way of making a marine unconcious/incapacitated
-			unit.add_or_sub_health(-5000);
+			//unit.add_or_sub_health(-5000);
 		    var flavour_text2="Psychic backlash knocks him out entirely, incapacitating the marine.";
 		    return flavour_text2;
 		}],