refactor: Remove all remaining unit parallel arrays

ChapterMaster.yyp

@@ -753,7 +753,6 @@
     {"id":{"name":"scr_autosave","path":"scripts/scr_autosave/scr_autosave.yy",},},
     {"id":{"name":"scr_battle_allies","path":"scripts/scr_battle_allies/scr_battle_allies.yy",},},
     {"id":{"name":"scr_battle_sort","path":"scripts/scr_battle_sort/scr_battle_sort.yy",},},
-    {"id":{"name":"scr_bionics_count","path":"scripts/scr_bionics_count/scr_bionics_count.yy",},},
     {"id":{"name":"scr_boarding_actions","path":"scripts/scr_boarding_actions/scr_boarding_actions.yy",},},
     {"id":{"name":"scr_bolt","path":"scripts/scr_bolt/scr_bolt.yy",},},
     {"id":{"name":"scr_bomb_world","path":"scripts/scr_bomb_world/scr_bomb_world.yy",},},
@@ -857,15 +856,12 @@
     {"id":{"name":"scr_manage_task_selector","path":"scripts/scr_manage_task_selector/scr_manage_task_selector.yy",},},
     {"id":{"name":"scr_management","path":"scripts/scr_management/scr_management.yy",},},
     {"id":{"name":"scr_map_and_warp_functions","path":"scripts/scr_map_and_warp_functions/scr_map_and_warp_functions.yy",},},
-    {"id":{"name":"scr_marine_count","path":"scripts/scr_marine_count/scr_marine_count.yy",},},
     {"id":{"name":"scr_marine_struct","path":"scripts/scr_marine_struct/scr_marine_struct.yy",},},
-    {"id":{"name":"scr_master_loc","path":"scripts/scr_master_loc/scr_master_loc.yy",},},
     {"id":{"name":"scr_max_marine","path":"scripts/scr_max_marine/scr_max_marine.yy",},},
     {"id":{"name":"scr_mechanicus_missions","path":"scripts/scr_mechanicus_missions/scr_mechanicus_missions.yy",},},
     {"id":{"name":"scr_mission_eta","path":"scripts/scr_mission_eta/scr_mission_eta.yy",},},
     {"id":{"name":"scr_mission_functions","path":"scripts/scr_mission_functions/scr_mission_functions.yy",},},
     {"id":{"name":"scr_mission_reward","path":"scripts/scr_mission_reward/scr_mission_reward.yy",},},
-    {"id":{"name":"scr_move_unit_info","path":"scripts/scr_move_unit_info/scr_move_unit_info.yy",},},
     {"id":{"name":"scr_necron_tombs","path":"scripts/scr_necron_tombs/scr_necron_tombs.yy",},},
     {"id":{"name":"scr_ork_fleet_functions","path":"scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.yy",},},
     {"id":{"name":"scr_ork_planet_functions","path":"scripts/scr_ork_planet_functions/scr_ork_planet_functions.yy",},},
@@ -894,7 +890,6 @@
     {"id":{"name":"scr_recent","path":"scripts/scr_recent/scr_recent.yy",},},
     {"id":{"name":"scr_recruit_data","path":"scripts/scr_recruit_data/scr_recruit_data.yy",},},
     {"id":{"name":"scr_reequip_units","path":"scripts/scr_reequip_units/scr_reequip_units.yy",},},
-    {"id":{"name":"scr_restart_variables","path":"scripts/scr_restart_variables/scr_restart_variables.yy",},},
     {"id":{"name":"scr_return_ship","path":"scripts/scr_return_ship/scr_return_ship.yy",},},
     {"id":{"name":"scr_role_count","path":"scripts/scr_role_count/scr_role_count.yy",},},
     {"id":{"name":"scr_role_setup","path":"scripts/scr_role_setup/scr_role_setup.yy",},},
@@ -921,7 +916,6 @@
     {"id":{"name":"scr_squads","path":"scripts/scr_squads/scr_squads.yy",},},
     {"id":{"name":"scr_star_ownership","path":"scripts/scr_star_ownership/scr_star_ownership.yy",},},
     {"id":{"name":"scr_star_travel_algorithm","path":"scripts/scr_star_travel_algorithm/scr_star_travel_algorithm.yy",},},
-    {"id":{"name":"scr_start_allow","path":"scripts/scr_start_allow/scr_start_allow.yy",},},
     {"id":{"name":"scr_start_load","path":"scripts/scr_start_load/scr_start_load.yy",},},
     {"id":{"name":"scr_string_functions","path":"scripts/scr_string_functions/scr_string_functions.yy",},},
     {"id":{"name":"scr_struct_functions","path":"scripts/scr_struct_functions/scr_struct_functions.yy",},},
@@ -957,8 +951,8 @@
     {"id":{"name":"scr_vehicle_order","path":"scripts/scr_vehicle_order/scr_vehicle_order.yy",},},
     {"id":{"name":"scr_void_click","path":"scripts/scr_void_click/scr_void_click.yy",},},
     {"id":{"name":"scr_wait_and_execute","path":"scripts/scr_wait_and_execute/scr_wait_and_execute.yy",},},
-    {"id":{"name":"SectorHandler","path":"scripts/SectorHandler/SectorHandler.yy",},},
     {"id":{"name":"scr_zoom","path":"scripts/scr_zoom/scr_zoom.yy",},},
+    {"id":{"name":"SectorHandler","path":"scripts/SectorHandler/SectorHandler.yy",},},
     {"id":{"name":"Set","path":"scripts/Set/Set.yy",},},
     {"id":{"name":"SettingsManager","path":"scripts/SettingsManager/SettingsManager.yy",},},
     {"id":{"name":"TooltipBuilder","path":"scripts/TooltipBuilder/TooltipBuilder.yy",},},

datafiles/data/unit_stats.json

@@ -108,7 +108,7 @@
             45,
             4
         ],
-        "base_group": "skitarii",
+        "base_group": "eldar",
         "charisma": [
             20,
             2
@@ -152,7 +152,7 @@
         "wisdom": [
             50,
             3
-        ]
+        ],
     },
     "flash_git": {
         "ballistic_skill": [

docs/ARCHITECTURE.md

@@ -36,7 +36,6 @@ Get a random marine with filter
 /// if no marine is available with give parameters returns "none"
 function scr_random_marine(role, exp_req, search_params="none")
 /// @example - finding a random chaplain candidate
-random_marine=scr_random_marine([obj_ini.role[100][8],obj_ini.role[100][18],obj_ini.role[100][10],obj_ini.role[100][9]],60,{"stat":[["piety", 35, "more"],["charisma", 30, "more"]]});
 ```
 
 ## Visual and draw functions

objects/obj_controller/Alarm_5.gml

@@ -82,11 +82,12 @@ try {
         if (recruit_name[i] == "") {
             continue;
         }
+        var _recruit_role = obj_ini.player_role_data[eROLE.SCOUT]
         if (recruit_distance[i] <= 0) {
             recruit_training[i] -= 1;
         }
         if (recruit_training[i] <= 0) {
-            scr_add_man(obj_ini.role[100][12], 10, recruit_exp[i], recruit_name[i], recruit_corruption[i], false, "default", recruit_data[i]);
+            scr_add_man(_recruit_role.role, 10, recruit_exp[i], recruit_name[i], recruit_corruption[i], false, "default", recruit_data[i]);
             if (recruit_first == "") {
                 recruit_first = recruit_name[i];
             }
@@ -106,9 +107,9 @@ try {
         scr_company_order(10);
     }
     if (recruits_finished == 1) {
-        scr_alert("green", "recruitment", $"{obj_ini.role[100][12]} {recruit_first} has joined X Company.", 0, 0);
+        scr_alert("green", "recruitment", $"{_recruit_role.role} {recruit_first} has joined X Company.", 0, 0);
     } else if (recruits_finished > 1) {
-        scr_alert("green", "recruitment", $"{recruits_finished}x {obj_ini.role[100][12]} have joined X Company.", 0, 0);
+        scr_alert("green", "recruitment", $"{recruits_finished}x {_recruit_role.role} have joined X Company.", 0, 0);
     }
 
     recruits = total_recruits;
@@ -476,12 +477,12 @@ try {
         scr_loyalty("Xeno Associate", "+");
     }
 
-    var loyalty_counter = scr_role_count(obj_ini.role[100][15], "");
+    var loyalty_counter = scr_role_count(obj_ini.player_role_data[eROLE.APOTHECARY].role, "");
     if (loyalty_counter == 0) {
         scr_loyalty("Lack of Apothecary", "+");
     }
 
-    loyalty_counter = scr_role_count(obj_ini.role[100][14], "");
+    loyalty_counter = scr_role_count(obj_ini.player_role_data[eROLE.CHAPLAIN].role, "");
     if (loyalty_counter == 0) {
         scr_loyalty("Undevout", "+");
     }
@@ -580,12 +581,12 @@ try {
     if ((fest_scheduled > 0) && (fest_repeats > 0)) {
         var cm_present = false;
         fest_repeats--;
-        var lock = scr_master_loc();
+        var _cm = chapter_master.get_struct();
 
-        if ((fest_sid > 0) && (obj_ini.ship[fest_sid] == lock)) {
+        if (fest_sid != -1 & fest_sid == _cm.ship_location) {
             cm_present = true;
         }
-        if ((fest_wid > 0) && (string(fest_star) + "." + string(fest_wid) == lock)) {
+        if (fest_wid > 0 && _cm.is_at_location(fest_star, fest_wid)) {
             cm_present = true;
         }
 

objects/obj_controller/Alarm_6.gml

@@ -32,45 +32,45 @@ if ((menu == eMENU.MANAGE) && (managing > 0)) {
             // sets up count for the marines
             if (man[f] == "man") {
                 manz += 1;
-                if (unit.role() == obj_ini.role[100][5]) {
+                if (unit.role() == obj_ini.player_role_data[eROLE.CAPTAIN].role) {
                     cap += 1;
-                } else if (unit.role() == obj_ini.role[100][15]) {
+                } else if (unit.role() == obj_ini.player_role_data[eROLE.APOTHECARY].role) {
                     apo += 1;
-                } else if (unit.role() == obj_ini.role[100][14]) {
+                } else if (unit.role() == obj_ini.player_role_data[eROLE.CHAPLAIN].role) {
                     chap += 1;
-                } else if (unit.role() == obj_ini.role[100][17]) {
+                } else if (unit.role() == obj_ini.player_role_data[eROLE.LIBRARIAN].role) {
                     lib += 1;
-                } else if (unit.role() == obj_ini.role[100][16]) {
+                } else if (unit.role() == obj_ini.player_role_data[eROLE.TECHMARINE].role) {
                     tech += 1;
-                } else if (unit.role() == obj_ini.role[100][6]) {
+                } else if (unit.role() == obj_ini.player_role_data[eROLE.DREADNOUGHT].role) {
                     drea += 1;
-                } else if (unit.role() == $"Venerable {obj_ini.role[100][6]}") {
+                } else if (unit.role() == $"Venerable {obj_ini.player_role_data[eROLE.DREADNOUGHT].role}") {
                     vdrea += 1;
-                } else if (unit.role() == obj_ini.role[100][11]) {
+                } else if (unit.role() == obj_ini.player_role_data[eROLE.ANCIENT].role) {
                     bear += 1;
-                } else if (unit.role() == obj_ini.role[100][8]) {
+                } else if (unit.role() == obj_ini.player_role_data[eROLE.TACTICAL].role) {
                     tct += 1;
-                } else if (unit.role() == obj_ini.role[100][10]) {
+                } else if (unit.role() == obj_ini.player_role_data[eROLE.ASSAULT].role) {
                     assa += 1;
-                } else if (unit.role() == obj_ini.role[100][9]) {
+                } else if (unit.role() == obj_ini.player_role_data[eROLE.DEVASTATOR].role) {
                     dev += 1;
-                } else if (unit.role() == obj_ini.role[100][12]) {
+                } else if (unit.role() == obj_ini.player_role_data[eROLE.SCOUT].role) {
                     sco += 1;
-                } else if (unit.role() == obj_ini.role[100][2]) {
+                } else if (unit.role() == obj_ini.player_role_data[eROLE.HONOURGUARD].role) {
                     hon += 1;
-                } else if (unit.role() == obj_ini.role[100][3]) {
+                } else if (unit.role() == obj_ini.player_role_data[eROLE.VETERAN].role) {
                     ve += 1;
-                } else if (unit.role() == obj_ini.role[100][4]) {
+                } else if (unit.role() == obj_ini.player_role_data[eROLE.TERMINATOR].role) {
                     ter += 1;
-                } else if (unit.role() == obj_ini.role[100][18]) {
+                } else if (unit.role() == obj_ini.player_role_data[eROLE.SERGEANT].role) {
                     sgt++;
-                } else if (unit.role() == obj_ini.role[100][19]) {
+                } else if (unit.role() == obj_ini.player_role_data[eROLE.VETERANSERGEANT].role) {
                     vet_sgt++;
                 } else if (unit.role() == "Codiciery") {
                     codi += 1;
                 } else if (unit.role() == "Lexicanum") {
                     lexi += 1;
-                } else if (unit.role() == obj_ini.role[100][eROLE.ANCIENT]) {
+                } else if (unit.role() == obj_ini.player_role_data[eROLE.ANCIENT].role) {
                     champ += 1;
                 }
             }
@@ -100,35 +100,35 @@ if ((menu == eMENU.MANAGE) && (managing > 0)) {
     selecting_dudes = "";
     // Infantry text
     if (cap > 0) {
-        selecting_dudes += string(cap) + " " + string(obj_ini.role[100][5]);
+        selecting_dudes += string(cap) + " " + string(obj_ini.player_role_data[eROLE.CAPTAIN].role);
         if (cap > 1) {
             selecting_dudes += "s";
         }
         selecting_dudes += ", ";
     }
     if (chap > 0) {
-        selecting_dudes += string(chap) + " " + string(obj_ini.role[100][14]);
+        selecting_dudes += string(chap) + " " + string(obj_ini.player_role_data[eROLE.CHAPLAIN].role);
         if (chap > 1) {
             selecting_dudes += "s";
         }
         selecting_dudes += ", ";
     }
     if (champ > 0) {
-        selecting_dudes += $"{champ} {obj_ini.role[100][eROLE.ANCIENT]}";
+        selecting_dudes += $"{champ} {obj_ini.player_role_data[eROLE.ANCIENT].role}";
         if (chap > 1) {
             selecting_dudes += "s";
         }
         selecting_dudes += ", ";
     }
     if (apo > 0) {
-        selecting_dudes += string(apo) + " " + string(obj_ini.role[100][15]);
+        selecting_dudes += string(apo) + " " + string(obj_ini.player_role_data[eROLE.APOTHECARY].role);
         if (apo > 1) {
             selecting_dudes += "s";
         }
         selecting_dudes += ", ";
     }
     if (lib > 0) {
-        selecting_dudes += string(lib) + " " + string(obj_ini.role[100][17]);
+        selecting_dudes += string(lib) + " " + string(obj_ini.player_role_data[eROLE.LIBRARIAN].role);
         if (lib > 1) {
             selecting_dudes += "s";
         }
@@ -149,21 +149,21 @@ if ((menu == eMENU.MANAGE) && (managing > 0)) {
         selecting_dudes += ", ";
     }
     if (bear > 0) {
-        selecting_dudes += string(bear) + " " + string(obj_ini.role[100][11]);
+        selecting_dudes += string(bear) + " " + string(obj_ini.player_role_data[eROLE.ANCIENT].role);
         if (bear > 1) {
             selecting_dudes += "s";
         }
         selecting_dudes += ", ";
     }
     if (hon > 0) {
-        selecting_dudes += string(hon) + " " + string(obj_ini.role[100][2]);
+        selecting_dudes += string(hon) + " " + string(obj_ini.player_role_data[eROLE.HONOURGUARD].role);
         if (hon > 1) {
             selecting_dudes += "s";
         }
         selecting_dudes += ", ";
     }
     if (tech > 0) {
-        selecting_dudes += string(tech) + " " + string(obj_ini.role[100][16]);
+        selecting_dudes += string(tech) + " " + string(obj_ini.player_role_data[eROLE.TECHMARINE].role);
         if (tech > 1) {
             selecting_dudes += "s";
         }
@@ -177,56 +177,56 @@ if ((menu == eMENU.MANAGE) && (managing > 0)) {
         selecting_dudes += ", ";
     }
     if (ve > 0) {
-        selecting_dudes += string(ve) + " " + string(obj_ini.role[100][3]);
+        selecting_dudes += string(ve) + " " + string(obj_ini.player_role_data[eROLE.VETERAN].role);
         if (ve > 1) {
             selecting_dudes += "s";
         }
         selecting_dudes += ", ";
     }
     if (tct > 0) {
-        selecting_dudes += string(tct) + " " + string(obj_ini.role[100][8]);
+        selecting_dudes += string(tct) + " " + string(obj_ini.player_role_data[eROLE.TACTICAL].role);
         if (tct > 1) {
             selecting_dudes += "s";
         }
         selecting_dudes += ", ";
     }
     if (dev > 0) {
-        selecting_dudes += string(dev) + " " + string(obj_ini.role[100][9]);
+        selecting_dudes += string(dev) + " " + string(obj_ini.player_role_data[eROLE.DEVASTATOR].role);
         if (dev > 1) {
             selecting_dudes += "s";
         }
         selecting_dudes += ", ";
     }
     if (assa > 0) {
-        selecting_dudes += string(assa) + " " + string(obj_ini.role[100][eROLE.ASSAULT]);
+        selecting_dudes += string(assa) + " " + string(obj_ini.player_role_data[eROLE.ASSAULT].role);
         if (sgt > 1) {
             selecting_dudes += "s";
         }
         selecting_dudes += ", ";
     }
     if (sco > 0) {
-        selecting_dudes += string(sco) + " " + string(obj_ini.role[100][12]);
+        selecting_dudes += string(sco) + " " + string(obj_ini.player_role_data[eROLE.SCOUT].role);
         if (sco > 1) {
             selecting_dudes += "s";
         }
         selecting_dudes += ", ";
     }
     if (drea > 0) {
-        selecting_dudes += string(drea) + " " + string(obj_ini.role[100][6]);
+        selecting_dudes += string(drea) + " " + string(obj_ini.player_role_data[eROLE.DREADNOUGHT].role);
         if (drea > 1) {
             selecting_dudes += "s";
         }
         selecting_dudes += ", ";
     }
     if (sgt > 0) {
-        selecting_dudes += string(sgt) + " " + string(obj_ini.role[100][18]);
+        selecting_dudes += string(sgt) + " " + string(obj_ini.player_role_data[eROLE.SERGEANT].role);
         if (sgt > 1) {
             selecting_dudes += "s";
         }
         selecting_dudes += ", ";
     }
     if (vet_sgt > 0) {
-        selecting_dudes += string(vet_sgt) + " " + string(obj_ini.role[100][19]);
+        selecting_dudes += string(vet_sgt) + " " + string(obj_ini.player_role_data[eROLE.VETERANSERGEANT].role);
         if (vet_sgt > 1) {
             selecting_dudes += "s";
         }