diff --git a/objects/obj_controller/Create_0.gml b/objects/obj_controller/Create_0.gml index d35758bb07..8fd2afa8a1 100644 --- a/objects/obj_controller/Create_0.gml +++ b/objects/obj_controller/Create_0.gml @@ -1444,7 +1444,7 @@ loyalty=100; loyalty_hidden=100;// Updated when inquisitors do an inspection // ** Sets up gene seed ** gene_seed=20; -if (string_count("Sieged",obj_ini.strin2)>0) then gene_seed=floor(random_range(250,400)); +if (scr_has_disadv("Sieged")) then gene_seed = floor(random_range(250, 400)); if (global.chapter_name=="Lamenters") then gene_seed=30; if (global.chapter_name=="Soul Drinkers") then gene_seed=60; diff --git a/scripts/scr_creation/scr_creation.gml b/scripts/scr_creation/scr_creation.gml index 5c392aaa72..0d150b31e4 100644 --- a/scripts/scr_creation/scr_creation.gml +++ b/scripts/scr_creation/scr_creation.gml @@ -77,33 +77,33 @@ function scr_creation(argument0) { disposition[3]-=(6-cooperation); disposition[2]-=(6-cooperation)*2; } - + //TODO encode this logic into advantage/disadvantage structs to be more maintainable and less hardcoded var ahuh,k;ahuh=0;k=0; - repeat(4){k+=1;if (adv[k]="Crafters") then ahuh=1;} + repeat(8){k+=1;if (adv[k]="Crafters") then ahuh=1;} if (ahuh=1) then disposition[3]+=2;ahuh=0;k=0; - repeat(4){k+=1;if (adv[k]="Tech-Brothers") then ahuh=1;} + repeat(8){k+=1;if (adv[k]="Tech-Brothers") then ahuh=1;} if (ahuh=1) then disposition[3]+=10;ahuh=0;k=0; - repeat(4){k+=1;if (adv[k]="Psyker Intolerant") then ahuh=1;} + repeat(8){k+=1;if (adv[k]="Psyker Intolerant") then ahuh=1;} if (ahuh=1) then disposition[4]+=5;ahuh=0;k=0; - repeat(4){k+=1;if (adv[k]="Daemon Binders") then ahuh=1;} + repeat(8){k+=1;if (adv[k]="Daemon Binders") then ahuh=1;} if (ahuh=1) then disposition[3]-=8;ahuh=0;k=0; - repeat(4){k+=1;if (adv[k]="Sieged") then ahuh=1;} + repeat(8){k+=1;if (adv[k]="Sieged") then ahuh=1;} if (ahuh=1) then disposition[6]+=5;ahuh=0;k=0; - repeat(4){k+=1;if (adv[k]="Suspicious") then ahuh=1;} + repeat(8){k+=1;if (adv[k]="Suspicious") then ahuh=1;} if (ahuh=1) then disposition[4]-=15;ahuh=0;k=0; - repeat(4){k+=1;if (adv[k]="Tech-Heresy") then ahuh=1;} + repeat(8){k+=1;if (adv[k]="Tech-Heresy") then ahuh=1;} if (ahuh=1) then disposition[3]-=8;ahuh=0;k=0; - repeat(4){k+=1;if (adv[k]="Psyker Abundance") then ahuh=1;} + repeat(8){k+=1;if (adv[k]="Psyker Abundance") then ahuh=1;} if (ahuh=1) then disposition[4]-=4;ahuh=0;k=0; - repeat(4){k+=1;if (dis[k]="Tolerant") then ahuh=1;} + repeat(8){k+=1;if (dis[k]="Tolerant") then ahuh=1;} if (ahuh=1){ disposition[1]-=5;disposition[2]-=5;disposition[4]-=5; disposition[3]-=5;disposition[5]-=5;disposition[6]-=5;