Constitution tests

Author: EttyKitty

objects/obj_ncombat/Alarm_5.gml

@@ -32,7 +32,10 @@ if (obj_ncombat.defeat == 0) {
         var _column_id = _candidate.column_id;
         var _unit_id = _candidate.id;
         var _unit = _candidate.unit;
-        _unit.update_health(roll_personal_dice(1, 10, "high", _unit));
+        var _constitution_test_mod = _unit.hp() * -1;
+        var _constitution_test = global.character_tester.standard_test(_unit, "constitution", _constitution_test_mod);
+
+        _unit.update_health(_constitution_test[1]);
         _column_id.marine_dead[_unit_id] = false;
         unit_recovery_score -= 1;
         units_saved += 1;

objects/obj_pnunit/Alarm_4.gml

@@ -51,15 +51,15 @@ for (var i=0;i<array_length(unit_struct);i++){
                 obj_ncombat.vehicle_recovery_score += skill_level;
                 obj_ncombat.techmarines_alive++;
             }
-        } else if (marine_dead[i] == 1) and (unit.hp()>-25) and (marine_type[i]!="") and ((obj_ncombat.dropping+obj_ncombat.defeat)!=2){
-            var rand1, survival;
-            onceh=0;
-            survival=40;
-            if (obj_ncombat.membrane=1) then survival-=20;
-            rand1=floor(random(100))+1;
-            skill_level = irandom(unit.luck);
-            rand1-=skill_level;
-            if (rand1<=survival) and (marine_dead[i]!=2){
+        } else if (marine_dead[i] == 1) and (marine_type[i]!="") and ((obj_ncombat.dropping+obj_ncombat.defeat)!=2){
+            var survival_mod = unit.luck * -1;
+            if (obj_ncombat.membrane == 1) {
+                survival_mod += 20;
+            } 
+            survival_mod += unit.hp() * -1;
+
+            var survival_test = global.character_tester.standard_test(unit, "constitution", survival_mod);
+            if (survival_test[0]) {
                 // show_message(string(marine_type[i])+" mans up#Roll: "+string(rand1)+"#Needed: "+string(survival)+"-");
                 marine_dead[i]=0;
                 //unit.update_health(2);