Skip to content

fix: Daemon artifact ship battle crash and a tip about destroying #699

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
EttyKitty merged 3 commits into from
Apr 6, 2025
Merged

fix: Daemon artifact ship battle crash and a tip about destroying #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32c2443
fix: Daemon artifact ship battle crash
EttyKitty Apr 6, 2025
b5a9a6e
Small description addition, about the mechanic
EttyKitty Apr 6, 2025
c149a7c
Update scripts/scr_arti_descr/scr_arti_descr.gml
EttyKitty Apr 6, 2025
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 scripts/scr_arti_descr/scr_arti_descr.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 to materialize.";}

final_description+=mission_data;
if (basic_asthetic!="") then final_description+=$" {basic_asthetic}";
Expand Down
2 changes: 1 addition & 1 deletion scripts/scr_ship_battle/scr_ship_battle.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down