Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions scripts/scr_company_order/scr_company_order.gml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//stashes varibles for marine reordering
function temp_marine_variables(co, unit_num){
var unit = TTRPG[co][unit_num];
var unit = fetch_unit([co, unit_num]);
if (unit.squad != "none"){
var squad_member;
var found = false;
Expand Down Expand Up @@ -36,6 +36,7 @@ function temp_marine_variables(co, unit_num){
}

function scr_company_order(company) {
try_and_report_loop("company order", function(company){

// company : company number
// This sorts and crunches the marine variables for the company
Expand Down Expand Up @@ -291,7 +292,7 @@ function scr_company_order(company) {
age[co][i]=temp_age[i];
spe[co][i]=temp_spe[i];
god[co][i]=temp_god[i];
unit = TTRPG[co][i];
unit = fetch_unit([co, i]);
unit.load_json_data(json_parse(temp_struct[i]))
unit.company = co;
unit.marine_number = i;
Expand All @@ -313,6 +314,7 @@ function scr_company_order(company) {
}
}
}*/
},company);

}

Expand Down