refactor: Thinking with refs

Broken

Author: MCPO-Spartan-117

scripts/scr_add_man/scr_add_man.gml

@@ -250,8 +250,8 @@ function scr_add_man(man_role, target_company, spawn_exp, spawn_name, corruption
 				}
 			}			
 		}
-        struct_set(UUID_marine, unit.UUID, unit)
-        obj_ini.TTRPG[target_company][good] = UUID_marine[$ unit.UUID];
+        set_unit(unit.UUID, unit);
+        obj_ini.TTRPG[target_company][good] = unit;
 		unit.add_exp(spawn_exp);
 		unit.allocate_unit_to_fresh_spawn(home_spot);
 		unit.update_role(man_role);	

scripts/scr_company_order/scr_company_order.gml

@@ -36,7 +36,7 @@ function temp_marine_variables(co, unit_num){
 		array_push(temp_mobi,mobi[co][unit_num]);
 		array_push(temp_spe,spe[co][unit_num]);
 		array_push(temp_god,god[co][unit_num]);
-        array_push(temp_UUID, TTRPG[co][unit_num].UUID);
+        array_push(temp_struct, TTRPG[co][unit_num]);
 		scr_wipe_unit(co,unit_num);
 }
 function sort_all_companies(){
@@ -74,7 +74,7 @@ function scr_company_order(company) {
     temp_age=[];
     temp_spe=[];
     temp_god=[];
-    temp_UUID=[];
+    temp_struct=[];
 
 
 	/*takes a template of a role, required role number and if there are enough 
@@ -328,6 +328,9 @@ function scr_company_order(company) {
 
 	// Return here
 	for (i=0;i<array_length(temp_name);i++){
+            unit = temp_struct[i];
+            unit.company = co;
+            unit.marine_number = i;
 	        race[co][i]=temp_race[i];
 	        loc[co][i]=temp_loc[i];
 	        name[co][i]=temp_name[i];
@@ -340,10 +343,7 @@ function scr_company_order(company) {
 	        age[co][i]=temp_age[i];
 	        spe[co][i]=temp_spe[i];
 	        god[co][i]=temp_god[i];
-			obj_ini.TTRPG[co][i] = obj_ini.UUID_marine[$ temp_UUID[i]];
-			unit = fetch_unit([co, i]);
-			unit.company = co;
-			unit.marine_number = i;
+            obj_ini.TTRPG[co][i] = unit;
 			unit.movement_after_math();
 	}
 /*	i=0;repeat(300){i+=1;

scripts/scr_initialize_custom/scr_initialize_custom.gml

@@ -3256,19 +3256,18 @@ function add_veh_to_company(name, company, slot, wep1, wep2, wep3, upgrade, acce
 /// Use "" if you want to set weapons and gear via squad layouts.
 /// "default" will set it to the value in the default slot for the given role, see `load_default_gear`
 function add_unit_to_company(ttrpg_name, company, slot, role_name, role_id, wep1="default", wep2="default", gear="default", mobi="default", armour="default"){
-    var _marine_ttrpg = new TTRPG_stats("chapter", company, slot, ttrpg_name);
-    struct_set(INI_UUNITROOT, _marine_ttrpg.UUID, _marine_ttrpg)
+    var spawn_unit = new TTRPG_stats("chapter", company, slot, ttrpg_name);
+    set_unit(spawn_unit.UUID, spawn_unit);
 
     // log_message($"adding unit to company ttrpg_name {ttrpg_name}, company {company}, slot {slot}, role_name {role_name}, role_id {role_id}")
-    obj_ini.TTRPG[company][slot] = obj_ini.UUID_marine[$ _marine_ttrpg.UUID];
+    obj_ini.TTRPG[company][slot] = spawn_unit;
 	obj_ini.race[company][slot] = 1;
 	obj_ini.loc[company][slot] = obj_ini.home_name;
 	obj_ini.role[company][slot] = role_name;
 
 	if(obj_ini.name[company][slot] == ""){
 		obj_ini.name[company][slot] = global.name_generator.generate_space_marine_name();
 	}
-	var spawn_unit = fetch_unit(_marine_ttrpg.UUID);
 
 	if(wep1 != ""){
 		if(wep1 == "default"){

scripts/scr_marine_struct/scr_marine_struct.gml

@@ -2296,6 +2296,26 @@ function fetch_unit(funit) {
     if (!is_string(funit)) {
         return obj_ini.TTRPG[funit[0]][funit[1]];
     } else {
-        return INI_UUNITROOT[$ funit];
+        return struct_get(INI_UUNITROOT, funit);
     }
 }
+
+/// @param {<String>} funit where unit is a hash of a UUID
+/// @returns {Struct.TTRPG_stats} unit
+function fetch_unit_from_hash(funit) {
+    gml_pragma("forceinline");
+    return struct_get_from_hash(INI_UUNITROOT, funit);
+}
+
+/// @param {<String>} funit where unit is a UUID
+function set_unit(funit, fdata) {
+    gml_pragma("forceinline");
+    struct_set(INI_UUNITROOT, funit, fdata);
+}
+
+/// @param {<String>} funit where unit is a hash of a UUID
+/// @param {<Any>} fdata data for variable
+function set_unit_from_hash(funit, fdata) {
+    gml_pragma("forceinline");
+    struct_set_from_hash(INI_UUNITROOT, funit, fdata);
+}

scripts/scr_move_unit_info/scr_move_unit_info.gml

@@ -19,8 +19,7 @@ function scr_move_unit_info(start_company,end_company, start_slot, end_slot, eva
         obj_ini.god[end_company][end_slot]=obj_ini.god[start_company][start_slot];
         obj_ini.age[end_company][end_slot]=obj_ini.age[start_company][start_slot];
         obj_ini.mobi[end_company][end_slot]=obj_ini.mobi[start_company][start_slot];
-        obj_ini.TTRPG[end_company][end_slot] = new TTRPG_stats("chapter", end_company, end_slot, "blank"); // create new empty unit structure
-        obj_ini.TTRPG[end_company][end_slot] = obj_ini.TTRPG[start_company][start_slot];                //load in originoal marine data
+        obj_ini.TTRPG[end_company][end_slot] = unit; //load in originoal marine data
         obj_ini.TTRPG[end_company][end_slot].company = end_company;
         obj_ini.TTRPG[end_company][end_slot].marine_number = end_slot;
 

scripts/scr_player_fleet_functions/scr_player_fleet_functions.gml

@@ -122,28 +122,28 @@ function merge_player_fleets(main_fleet, merge_fleet) {
 }
 
 function move_ship_between_player_fleets(out_fleet, in_fleet, fUUID) {
-    var fUUID_hash = variable_get_hash(fUUID);
+    var _UUID_hash = variable_get_hash(fUUID);
     var _class = player_ships_class(fUUID);
     switch _class {
     case "capital":
-        struct_set_from_hash(in_fleet.capital, _fUUID_hash, out_fleet.capital[$ fUUID]);
-        in_fleet.capital_number--;
+        struct_set_from_hash(in_fleet.capital, _UUID_hash, struct_get_from_hash(out_fleet.capital, _UUID_hash));
+        in_fleet.capital_number++;
 
-        struct_remove_from_hash(out_fleet.capital, _fUUID_hash);
+        struct_remove_from_hash(out_fleet.capital, _UUID_hash);
         out_fleet.capital_number--;
         break;
     case "frigate":
-        struct_set_from_hash(in_fleet.frigate, _fUUID_hash, out_fleet.frigate[$ fUUID]);
-        in_fleet.frigate_number--;
+        struct_set_from_hash(in_fleet.frigate, _UUID_hash, struct_get_from_hash(out_fleet.frigate, _UUID_hash));
+        in_fleet.frigate_number++;
 
-        struct_remove_from_hash(out_fleet.frigate, _fUUID_hash);
+        struct_remove_from_hash(out_fleet.frigate, _UUID_hash);
         out_fleet.frigate_number--;
         break;
     case "escort":
-        struct_set_from_hash(in_fleet.escort, _fUUID_hash, out_fleet.escort[$ fUUID]);
-        in_fleet.escort_number--;
+        struct_set_from_hash(in_fleet.escort, _UUID_hash, struct_get_from_hash(out_fleet.escort, _UUID_hash));
+        in_fleet.escort_number++;
 
-        struct_remove_from_hash(out_fleet.escort, _fUUID_hash);
+        struct_remove_from_hash(out_fleet.escort, _UUID_hash);
         out_fleet.escort_number--;
         break;
     }

scripts/scr_player_ship_functions/scr_player_ship_functions.gml

@@ -2,7 +2,12 @@
 #macro USHIPROOT UUID_ship
 function fetch_ship(fUUID) {
     gml_pragma("forceinline");
-    return INI_USHIPROOT[$ fUUID];
+    return struct_get(INI_USHIPROOT, fUUID);
+}
+
+function fetch_ship_from_hash(fUUID_hash) {
+    gml_pragma("forceinline");
+    return struct_get_from_hash(INI_USHIPROOT, fUUID_hash);
 }
 
 function return_lost_ships_chance(){
@@ -262,7 +267,7 @@ function new_player_ship(type, start_loc = "home", new_name = "") {
     var _ship_UUIDs = struct_get_names(INI_USHIPROOT);
     var _ship_count = array_length(_ship_UUIDs);
     for (var i = 0; i < _ship_count; i++) {
-        array_push(_ship_names, INI_USHIPROOT[$ _ship_UUIDs[i]].name)
+        array_push(_ship_names, fetch_ship(_ship_UUIDs[i]).name);
     }
 
     if (new_name != "") {
@@ -412,9 +417,9 @@ function new_player_ship(type, start_loc = "home", new_name = "") {
     }
     _ship.health.hp = _ship.health.maxhp;
 
-    struct_set(USHIPROOT, _ship.UUID, _ship)
+    struct_set(USHIPROOT, _ship.UUID, _ship);
 
-    return INI_USHIPROOT[$ _ship.UUID];
+    return _ship;
 }
 
 function ship_class_name(UUID) {