spawning bugs

Adeptus-Dominus · Dec 31, 2024 · 5e0e8be · 5e0e8be
1 parent 6afa0f9
commit 5e0e8be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/scripts/scr_add_man/scr_add_man.gml b/scripts/scr_add_man/scr_add_man.gml
@@ -229,7 +229,7 @@ function scr_add_man(man_role, target_company, spawn_exp, spawn_name, corruption
 			unit = new TTRPG_stats("chapter", target_company, good, "scout", other_data);
 			unit.corruption = corruption
 			unit.roll_age(); // Age here
-			unit.alter_unit_equipment(_gear);
+			unit.alter_equipment(_gear);
 			marines += 1;
 
 			if (!other_gear) {

diff --git a/scripts/scr_marine_struct/scr_marine_struct.gml b/scripts/scr_marine_struct/scr_marine_struct.gml
@@ -1603,7 +1603,11 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data={})
 			} else {
 				location_type =  location_types.ship; //marine is on ship
 				location_id = ship_location; //ship array position
-				location_name = obj_ini.ship_location[location_id]; //location of ship
+				if (location_id<array_length(obj_ini.ship_location)){
+					location_name = obj_ini.ship_location[location_id]; //location of ship
+				} else {
+					location_name = location_name = obj_ini.loc[company][marine_number];
+				}
 			}
 			return [location_type,location_id ,location_name];
 		};