From d74291c492a4ef3ed330b43cd93a7b1b2582095b Mon Sep 17 00:00:00 2001
From: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
Date: Sun, 5 Jan 2025 12:47:37 +0300
Subject: [PATCH] fix: Misplaced broken trait check

It was crashing the game on load.
---
 objects/obj_controller/Create_0.gml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml
index 38ad5da81..5462e2898 100644
--- a/objects/obj_controller/Create_0.gml
+++ b/objects/obj_controller/Create_0.gml
@@ -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";
@@ -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;