Skip to content

Commit

Permalink
fix: Misplaced broken trait check
Browse files Browse the repository at this point in the history
It was crashing the game on load.
  • Loading branch information
EttyKitty committed Jan 5, 2025
1 parent ec535b5 commit d74291c
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions objects/obj_controller/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,6 @@ faction_status[eFACTION.Ecclesiarchy]="Allied";
faction_leader[eFACTION.Eldar]=global.name_generator.generate_eldar_name(2);
faction_title[6]="Farseer";
faction_status[eFACTION.Eldar]="Antagonism";// If disposition = 0 then instead set it to "Antagonism"
if (scr_has_adv("Enemy: Eldar")) then faction_status[eFACTION.Eldar]="War";
// Orkz faction
faction_leader[eFACTION.Ork]=global.name_generator.generate_ork_name();
faction_title[7]="Warboss";
Expand Down Expand Up @@ -1282,14 +1281,17 @@ other1_disposition=0;
other1="";
// ** Sets up bonuses once chapter is created **
if (instance_exists(obj_ini)){
// Tolerant trait
if (global.load==0 && scr_has_disadv("Tolerant")){
obj_controller.disposition[6]+=5;
obj_controller.disposition[7]+=5;
obj_controller.disposition[8]+=10;
}
// General setup
if (global.load==0){
// Tolerant trait
if (scr_has_disadv("Tolerant")) {
obj_controller.disposition[6]+=5;
obj_controller.disposition[7]+=5;
obj_controller.disposition[8]+=10;
}
if (scr_has_adv("Enemy: Eldar")) {
faction_status[eFACTION.Eldar]="War";
}
// Founding Chapter STC Bonuses here
if (global.chapter_name=="Salamanders"){
stc_wargear=4;
Expand Down

0 comments on commit d74291c

Please sign in to comment.