From 32c244398b2000080ac2ee3dff726b649d49ee31 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 6 Apr 2025 23:39:50 +0300 Subject: [PATCH 1/3] fix: Daemon artifact ship battle crash --- scripts/scr_ship_battle/scr_ship_battle.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_ship_battle/scr_ship_battle.gml b/scripts/scr_ship_battle/scr_ship_battle.gml index a9a46e750e..d6a9bebe89 100644 --- a/scripts/scr_ship_battle/scr_ship_battle.gml +++ b/scripts/scr_ship_battle/scr_ship_battle.gml @@ -139,7 +139,7 @@ function scr_ship_battle(target_ship_id, cooridor_width) { } } - if ((unit.role() == obj_ini.role[100][5]) || (unit.role() == obj_ini.role[100][11]) || (obj_ncombat.role[cooh, va] == obj_ini.role[100][7])) { + if ((unit.role() == obj_ini.role[100][5]) || (unit.role() == obj_ini.role[100][11]) || (unit.role() == obj_ini.role[100][7])) { if (unit.role() == obj_ini.role[100][5]) { obj_ncombat.captains += 1; if (obj_ncombat.big_mofo > 5) { From b5a9a6e1ec3a87e2751cceae0265493159ac7ec3 Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 6 Apr 2025 23:41:24 +0300 Subject: [PATCH 2/3] Small description addition, about the mechanic --- scripts/scr_arti_descr/scr_arti_descr.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_arti_descr/scr_arti_descr.gml b/scripts/scr_arti_descr/scr_arti_descr.gml index e13c659304..d32f8ee8e0 100644 --- a/scripts/scr_arti_descr/scr_arti_descr.gml +++ b/scripts/scr_arti_descr/scr_arti_descr.gml @@ -146,7 +146,7 @@ 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("daemonic")){p4="It is infested with a Daemonic entity. Destroying it, may cause the entity materialize.";} final_description+=mission_data; if (basic_asthetic!="") then final_description+=$" {basic_asthetic}"; From c149a7c1a0fa12c69421c6b6e99a6cf05de028ad Mon Sep 17 00:00:00 2001 From: EttyKitty <20323032+EttyKitty@users.noreply.github.com> Date: Sun, 6 Apr 2025 23:47:58 +0300 Subject: [PATCH 3/3] Update scripts/scr_arti_descr/scr_arti_descr.gml Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- scripts/scr_arti_descr/scr_arti_descr.gml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/scr_arti_descr/scr_arti_descr.gml b/scripts/scr_arti_descr/scr_arti_descr.gml index d32f8ee8e0..7df5255a86 100644 --- a/scripts/scr_arti_descr/scr_arti_descr.gml +++ b/scripts/scr_arti_descr/scr_arti_descr.gml @@ -146,7 +146,7 @@ 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. Destroying it, may cause the entity materialize.";} + if (has_tag("daemonic")){p4="It is infested with a Daemonic entity. Destroying it, may cause the entity to materialize.";} final_description+=mission_data; if (basic_asthetic!="") then final_description+=$" {basic_asthetic}";