Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions objects/obj_event/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -321,10 +321,10 @@ if (ticked=1){// Select a random marine and have them perform an action


if (attend_corrupted[ide]=0){
if (array_contains(obj_ini.artifact_tags[obj_controller.fest_display], "Chaos")){
if (array_contains(obj_ini.artifact_tags[obj_controller.fest_display], "chaos")){
unit.corruption+=choose(1,2,3,4);
}
if (array_contains(obj_ini.artifact_tags[obj_controller.fest_display], "Daemon")){
if (array_contains(obj_ini.artifact_tags[obj_controller.fest_display], "daemonic")){
unit.corruption+=choose(6,7,8,9);
}
attend_corrupted[ide]=1;
Expand Down
2 changes: 1 addition & 1 deletion objects/obj_popup/Draw_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@ try {
}

unit = obj_ini.TTRPG[target_comp][obj_controller.ide[i]];
if (arti.has_tag("Daemonic") || arti.has_tag("Chaos")) {
if (arti.has_tag("daemonic") || arti.has_tag("chaos")) {
unit.corruption += irandom(10 + 2);
if (unit.role() == "Chapter Master") {
dwarn = true;
Expand Down
4 changes: 2 additions & 2 deletions objects/obj_popup/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -403,10 +403,10 @@ try {
repeat (700) {
ide += 1;
if ((attend_corrupted[ide] == 0) && (attend_id[ide] > 0)) {
if (string_count("Chaos", obj_ini.artifact_tags[obj_controller.fest_display]) > 0) {
if (string_count("chaos", obj_ini.artifact_tags[obj_controller.fest_display]) > 0) {
obj_ini.TTRPG[attend_co[ide], attend_id[ide]].corruption += choose(1, 2, 3, 4);
}
if (string_count("Daem", obj_ini.artifact_tags[obj_controller.fest_display]) > 0) {
if (string_count("daemonic", obj_ini.artifact_tags[obj_controller.fest_display]) > 0) {
obj_ini.TTRPG[attend_co[ide], attend_id[ide]].corruption += choose(6, 7, 8, 9);
}
attend_corrupted[ide] = 1;
Expand Down
4 changes: 2 additions & 2 deletions scripts/scr_arti_descr/scr_arti_descr.gml
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ function scr_arti_descr() {
}

if (has_tag("MINOR")){other_data+="It is more crude and utilitarian than one might expect from an artifact.";}
if (has_tag("Chaos")){p4="It bears the taint of Chaos.";}
if (has_tag("Daemonic")){p4="It is infested with a Daemonic entity.";}
if (has_tag("chaos")){p4="It bears the taint of Chaos.";}
if (has_tag("daemonic")){p4="It is infested with a Daemonic entity.";}

final_description+=mission_data;
if (basic_asthetic!="") then final_description+=$" {basic_asthetic}";
Expand Down