Skip to content

Commit 821f24f

Browse files
committed
fix: obliterated disadvantage
1 parent e1e9fd3 commit 821f24f

File tree

2 files changed

+35
-2
lines changed

2 files changed

+35
-2
lines changed

objects/obj_controller/Create_0.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1461,7 +1461,7 @@ loyalty_hidden=100;// Updated when inquisitors do an inspection
14611461
// ** Sets up gene seed **
14621462
gene_seed=20;
14631463
if scr_has_disadv("Sieged") then gene_seed=floor(random_range(250,400));
1464-
if scr_has_disadv("Obliterated") then gene_seed=floor(random_range(50,200));
1464+
if scr_has_disadv("Obliterated") then gene_seed=floor(random_range(300,500));
14651465
if scr_has_disadv("Serpents Delight") then gene_seed=floor(random_range(50,250));
14661466
if scr_has_disadv("Enduring Angels") then gene_seed=floor(random_range(50,250));
14671467
if (global.chapter_name=="Lamenters") then gene_seed=30;

scripts/scr_initialize_custom/scr_initialize_custom.gml

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3229,11 +3229,14 @@ function scr_initialize_custom() {
32293229
}
32303230

32313231
if(scr_has_disadv("Sieged")){
3232+
scr_add_item("Servo-arm", 4);
3233+
scr_add_item(wep1[defaults_slot, eROLE.Techmarine], 4);
3234+
scr_add_item(wep2[defaults_slot, eROLE.Techmarine], 4);
32323235
scr_add_item("Narthecium", 4);
32333236
scr_add_item(wep1[defaults_slot, eROLE.Apothecary], 4);
32343237
scr_add_item(wep2[defaults_slot, eROLE.Apothecary], 4);
32353238
scr_add_item("Psychic Hood", 4);
3236-
scr_add_item("Force Staff", 4);
3239+
scr_add_item("Force Staff", 4); // These more or less cover the librarians
32373240
scr_add_item("Plasma Pistol", 4);
32383241
scr_add_item("Company Standard", 4);
32393242

@@ -3252,6 +3255,8 @@ function scr_initialize_custom() {
32523255
scr_add_item("Lascannon", 40);
32533256
scr_add_item("Power Sword", 12);
32543257
scr_add_item("Rosarius", 4);
3258+
scr_add_item(wep1[defaults_slot, eROLE.Chaplain], 4);
3259+
scr_add_item(wep2[defaults_slot, eROLE.Chaplain], 4); // With Crozius arcanum added, we want to add these
32553260
}
32563261
if (!scr_has_disadv("Sieged")) {
32573262
scr_add_item("Dreadnought", 6);
@@ -3262,6 +3267,34 @@ function scr_initialize_custom() {
32623267
scr_add_item("Close Combat Weapon", 4);
32633268
}
32643269

3270+
if(scr_has_disadv("Obliterated")){
3271+
scr_add_item("Servo-arm", 5);
3272+
scr_add_item(wep1[defaults_slot, eROLE.Techmarine], 5);
3273+
scr_add_item(wep2[defaults_slot, eROLE.Techmarine], 5);
3274+
scr_add_item("Narthecium", 5);
3275+
scr_add_item(wep1[defaults_slot, eROLE.Apothecary], 5);
3276+
scr_add_item(wep2[defaults_slot, eROLE.Apothecary], 5);
3277+
scr_add_item("Psychic Hood", 5);
3278+
scr_add_item("Force Staff", 5); // These more or less cover the librarians
3279+
scr_add_item("Plasma Pistol", 5);
3280+
scr_add_item("Company Standard", 5);
3281+
3282+
// Pretend that if crafters, terminator armor gets lost/stolen?
3283+
3284+
scr_add_item("MK7 Aquila", 200);
3285+
scr_add_item("Scout Armour", 100);
3286+
scr_add_item("Bolter", 200);
3287+
scr_add_item("Chainsword", 200);
3288+
scr_add_item("Jump Pack", 100);
3289+
scr_add_item("Bolt Pistol", 100);
3290+
scr_add_item("Heavy Bolter", 50);
3291+
scr_add_item("Lascannon", 50);
3292+
scr_add_item("Power Sword", 15);
3293+
scr_add_item("Rosarius", 5);
3294+
scr_add_item(wep1[defaults_slot, eROLE.Chaplain], 5);
3295+
scr_add_item(wep2[defaults_slot, eROLE.Chaplain], 5); // With crozius arcanum added, we want to add these
3296+
}
3297+
32653298
// man_size+=80;// bikes
32663299

32673300

0 commit comments

Comments
 (0)