Skip to content

fix: Modern disadv check and 4 to 8 loop increase #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 12, 2024
Merged

fix: Modern disadv check and 4 to 8 loop increase #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f3582c
fix: check with scr_has_disadv() and 4 to 8 loop increase
EttyKitty Nov 12, 2024
b316bd7
Update scripts/scr_creation/scr_creation.gml
EttyKitty Nov 12, 2024
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
2 changes: 1 addition & 1 deletion objects/obj_controller/Create_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
20 changes: 10 additions & 10 deletions scripts/scr_creation/scr_creation.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down