Minor gene-seed recovery alteration and string improvments

Author: EttyKitty

objects/obj_ncombat/Alarm_5.gml

@@ -80,7 +80,6 @@ if (obj_ncombat.defeat == 0) {
                 _column_id.veh_hp[_vehicle_id] = roll_dice(1, 10, "high");
                 _column_id.veh_dead[_vehicle_id] = false;
                 vehicles_saved_count++;
-                vehicle_deaths--;
 
                 if (!struct_exists(obj_ncombat.vehicles_saved_counts, _vehicle_type)) {
                     obj_ncombat.vehicles_saved_counts[$ _vehicle_type] = 1;
@@ -96,7 +95,6 @@ if (obj_ncombat.defeat == 0) {
             _column_id.veh_dead[_vehicle_id] = false;
             vehicle_recovery_score -= _candidate.priority;
             vehicles_saved_count++;
-            vehicle_deaths--;
 
             if (!struct_exists(obj_ncombat.vehicles_saved_counts, _vehicle_type)) {
                 obj_ncombat.vehicles_saved_counts[$ _vehicle_type] = 1;
@@ -114,8 +112,9 @@ with (obj_pnunit) {
 }
 
 var _total_deaths = final_marine_deaths + final_command_deaths;
-if (_total_deaths > 0 || injured > 0 || units_saved_count > 0) {
-    newline = $"{_total_deaths + injured + units_saved_count}x units were critically injured.";
+var _total_injured = _total_deaths + injured + units_saved_count;
+if (_total_injured > 0) {
+    newline = $"{string_plural_count("unit", _total_injured)} {smart_verb("was", _total_injured)} critically injured.";
     newline_color = "red";
 	scr_newtext();
 
@@ -130,7 +129,7 @@ if (_total_deaths > 0 || injured > 0 || units_saved_count > 0) {
             _units_saved_string += smart_delimeter_sign(_unit_roles, i, false);
         }
 
-        newline = $"{units_saved_count}x were saved by the {string_plural(roles[eROLE.Apothecary], apothecaries_alive)}. ({_units_saved_string})";
+        newline = $"{units_saved_count}x {smart_verb("was", units_saved_count)} saved by the {string_plural(roles[eROLE.Apothecary], apothecaries_alive)}. ({_units_saved_string})";
         scr_newtext();
     }
 
@@ -156,7 +155,7 @@ if (_total_deaths > 0 || injured > 0 || units_saved_count > 0) {
     }
 
     newline = " ";
-        scr_newtext();
+    scr_newtext();
 }
 
 
@@ -166,31 +165,27 @@ if (ground_mission){
 	}
 };
 
-seed_saved = (min(seed_max, apothecaries_alive * 40));
-if (obj_ini.doomed) then seed_saved=0;
-if (seed_saved>0) then obj_controller.gene_seed+=seed_saved;
+if (seed_lost > 0) {
+    if (obj_ini.doomed) {
+        newline = $"Chapter mutation prevents retrieving gene-seed. {seed_lost} gene-seed lost.";
+        scr_newtext();
+    } else if (!apothecaries_alive) {
+        newline = $"No able-bodied {roles[eROLE.Apothecary]}. {seed_lost} gene-seed lost.";
+        scr_newtext();
+    } else {
+        seed_saved = min(seed_harvestable, apothecaries_alive * 40);
+        newline = $"{seed_saved} gene-seed was recovered; {seed_lost - seed_harvestable} was lost due damage; {seed_harvestable - seed_saved} was left to rot;";
+        scr_newtext();
+    }
 
-if (obj_ini.doomed && !apothecaries_alive){
-    part3=$"Chapter Mutation prevents retrieving Gene-Seed.  {seed_max} Gene-Seed lost.";
-    newline=part3;
-    scr_newtext();
-    newline=" ";
-    scr_newtext();
-}else if (!apothecaries_alive && !obj_ini.doomed){
-    part3=$"No able-bodied {roles[eROLE.Apothecary]}.  {seed_max} Gene-Seed lost.";
-    newline=part3;scr_newtext();
-    newline=" ";scr_newtext();
-}else if (apothecaries_alive>0 && final_marine_deaths+final_command_deaths>0 && !obj_ini.doomed){
-    part3=$"Gene-Seed Recovered: {seed_saved}(";
-    part3 += seed_saved ? $"{round((seed_saved/seed_max)*100)}" : "0";
-    part3 += "%)";
-    newline=part3;
-    scr_newtext();
-    newline=" ";
+    if (seed_saved > 0) {
+        obj_controller.gene_seed += seed_saved;
+    }
+
+    newline = " ";
     scr_newtext();
 }
 
-
 if (red_thirst>2){
     var voodoo="";
 
@@ -207,9 +202,9 @@ newline = " ";
 scr_newtext();
 
 
-
-if (vehicles_saved_count > 0 || vehicle_deaths > 0) {
-	newline = $"{string_plural_count("Vehicle", vehicle_deaths + vehicles_saved_count)} were critically damaged during battle.";
+var _total_damaged_count = vehicle_deaths + vehicles_saved_count;
+if (_total_damaged_count > 0) {
+	newline = $"{string_plural_count("vehicle", _total_damaged_count)} {smart_verb("was", _total_damaged_count)} critically damaged during battle.";
     newline_color="red";
     scr_newtext();
 
@@ -224,24 +219,24 @@ if (vehicles_saved_count > 0 || vehicle_deaths > 0) {
             _vehicles_saved_string += smart_delimeter_sign(_vehicle_types, i, false);
         }
 
-        newline = $"{string_plural(roles[eROLE.Techmarine], techmarines_alive)} were able to restore {vehicles_saved_count}. ({_vehicles_saved_string})";
+        newline = $"{string_plural(roles[eROLE.Techmarine], techmarines_alive)} {smart_verb("was", techmarines_alive)} able to restore {vehicles_saved_count}. ({_vehicles_saved_string})";
         scr_newtext();
     }
 
     if (vehicle_deaths > 0) {
         var _vehicles_lost_string = "";
-    var _vehicle_types = struct_get_names(vehicles_lost_counts);
+        var _vehicle_types = struct_get_names(vehicles_lost_counts);
 
-    for (var i = 0; i < array_length(_vehicle_types); i++) {
-        var _vehicle_type = _vehicle_types[i];
-        var _lost_count = vehicles_lost_counts[$ _vehicle_type];
+        for (var i = 0; i < array_length(_vehicle_types); i++) {
+            var _vehicle_type = _vehicle_types[i];
+            var _lost_count = vehicles_lost_counts[$ _vehicle_type];
             _vehicles_lost_string += $"{string_plural_count(_vehicle_type, _lost_count)}";
             _vehicles_lost_string += smart_delimeter_sign(_vehicle_types, i, false);
         }
 
-        newline += $"{vehicle_deaths} were lost forever. ({_vehicles_lost_string})";
-    newline_color="red";
-    scr_newtext();
+        newline += $"{vehicle_deaths} {smart_verb("was", vehicle_deaths)} lost forever. ({_vehicles_lost_string})";
+        newline_color="red";
+        scr_newtext();
     }
 
     newline = " ";
@@ -915,7 +910,7 @@ if (endline=0){
 if (defeat=1){
 	player_forces=0;
 	if (ground_mission){
-		obj_ground_mission.recoverable_gene_seed = seed_max;
+		obj_ground_mission.recoverable_gene_seed = seed_lost;
 	}
 
 }

objects/obj_ncombat/Create_0.gml

@@ -146,7 +146,8 @@ vehicle_recovery_score=0;
 injured=0;
 command_injured=0;
 seed_saved=0;
-seed_max=0;
+seed_lost=0;
+seed_harvestable=0;
 units_saved_count=0;
 units_saved_counts={};
 vehicles_saved_counts={};

objects/obj_p_assra/Alarm_0.gml

@@ -6,7 +6,7 @@ for (o=0;o<array_length(origin.board_co);o++){
     i=origin.board_id[o];
     unit = fetch_unit([co, i]);
     if (unit.hp()<=-15) and (obj_ini.race[co][i]=1) and (unit.name()!=""){
-        var seed_max=0;
+        var seed_lost=0;
         if (apothecary<=0){
             if (unit.IsSpecialist("standard")){
                 obj_fleet.fallen_command+=1;
@@ -17,8 +17,8 @@ for (o=0;o<array_length(origin.board_co);o++){
             if (apothecary_had>0){
                 if (unit.base_group=="astartes"){
                     var age=obj_ini.age[co][i];
-                    if (age<=((obj_controller.millenium*1000)+obj_controller.year)-10) and (obj_ini.zygote=0) then seed_max+=1;
-                    if (age<=((obj_controller.millenium*1000)+obj_controller.year)-5) then seed_max+=1;
+                    if (age<=((obj_controller.millenium*1000)+obj_controller.year)-10) and (obj_ini.zygote=0) then seed_lost+=1;
+                    if (age<=((obj_controller.millenium*1000)+obj_controller.year)-5) then seed_lost+=1;
                 }
             }
 
@@ -31,7 +31,7 @@ for (o=0;o<array_length(origin.board_co);o++){
 
             scr_kill_unit(co,i)
 
-            if (obj_fleet.capital+obj_fleet.frigate+obj_fleet.escort>0) then obj_controller.gene_seed+=seed_max;
+            if (obj_fleet.capital+obj_fleet.frigate+obj_fleet.escort>0) then obj_controller.gene_seed+=seed_lost;
         }else if (apothecary>0){
             unit.add_or_sub_health(irandom_range(9,14));
             apothecary-=0.5;

scripts/scr_after_combat/scr_after_combat.gml

@@ -201,22 +201,24 @@ function after_battle_part2() {
             if (obj_ini.race[marine_co[i], marine_id[i]] == 1) {
                 var _birthday = obj_ini.age[marine_co[i], marine_id[i]];
                 var _current_year = (obj_controller.millenium * 1000) + obj_controller.year;
-                var _harvestable_seed = 0;
-                var _total_seed = 0;
+                var _seed_harvestable = 0;
+                var _seed_lost = 0;
 
                 if (_birthday <= (_current_year - 10) && obj_ini.zygote == 0) {
-                    _total_seed++;
-                    if (irandom_range(1, 20) > 1) {
-                        _harvestable_seed++;
+                    _seed_lost++;
+                    if (irandom_range(1, 10) > 1) {
+                        _seed_harvestable++;
                     }
                 }
                 if (_birthday <= (_current_year - 5)) {
-                    _total_seed++;
-                    if (irandom_range(1, 20) > 1) {
-                        _harvestable_seed++;
+                    _seed_lost++;
+                    if (irandom_range(1, 10) > 1) {
+                        _seed_harvestable++;
                     }
                 }
-                obj_ncombat.seed_max += _total_seed;
+
+                obj_ncombat.seed_harvestable += _seed_harvestable;
+                obj_ncombat.seed_lost += _seed_lost;
             }
 
             var last=0;

scripts/scr_roster/scr_roster.gml

@@ -226,7 +226,7 @@ function Roster() constructor{
         var _roster_types = struct_get_names(possible_local_roster);
         for (var i=0;i<array_length(_roster_types);i++){
             var _roster_type_name = _roster_types[i];
-            var _roster_type_count = selected_roster[$_roster_type_name];
+            var _roster_type_count = possible_local_roster[$_roster_type_name];
 
             roster_local_string += $"{string_plural_count(_roster_type_name, _roster_type_count)}";
             roster_local_string += smart_delimeter_sign(_roster_types, i, false);

scripts/scr_string_functions/scr_string_functions.gml

@@ -281,3 +281,32 @@ function base64_encode_advanced(input_string) {
 
     return _encoded_string;
 }
+
+/// @param {string} _verb The verb to be transformed (e.g., "was", "is", "has", etc.).
+/// @param {number} _variable A value determining singular (1) or plural (any value other than 1).
+/// @returns {string}
+function smart_verb(_verb, _variable) {
+    var _result = _verb;
+
+    if (_variable != 1) {
+        switch (_verb) {
+            case "was":
+                _result = "were";
+                break;
+            case "is":
+                _result = "are";
+                break;
+            case "has":
+                _result = "have";
+                break;
+            case "do":
+                _result = "do";
+                break;
+            default:
+                _result = _verb;
+                break;
+        }
+    }
+
+    return _result;
+}