Skip to content

fix: Condemnor bolter #489

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
OH296 merged 4 commits into from
Feb 18, 2025
Merged

fix: Condemnor bolter #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ba5170
Condemnor bolter fix
Blogaugis Feb 17, 2025
e510ad0
Update scripts/scr_trade/scr_trade.gml
EttyKitty Feb 18, 2025
558e6b8
Update objects/obj_controller/Mouse_50.gml
EttyKitty Feb 18, 2025
1eccc96
Update scr_trade_add.gml
EttyKitty Feb 18, 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
26 changes: 14 additions & 12 deletions objects/obj_controller/Mouse_50.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,18 +364,20 @@ if (menu==20) and (diplomacy>0) or ((diplomacy<-5) and (diplomacy>-6)) and (cool
// Inquisition trade goods
if (diplomacy==4){
cooldown=8;
trade_theirs[1]="Condemnor Boltgun";
trade_theirs[2]="Hellrifle";
trade_theirs[3]="Incinerator";
trade_theirs[4]="Crusader";
trade_theirs[5]="Exterminatus";
trade_theirs[6]="Cyclonic Torpedo";
trade_disp[1]=20;
trade_disp[2]=30;
trade_disp[3]=20;
trade_disp[4]=25;
trade_disp[5]=40;
trade_disp[6]=60;
// TODO: Condemnor Boltgun trade is temporarily disabled due to crashes as the item doesn't exist in other parts of the game.
// To re-enable: Implement the Condemnor Boltgun item in the game's inventory, equipment, and combat systems.
// trade_theirs[1]="Condemnor Boltgun";
trade_theirs[1]="Hellrifle";
trade_theirs[2]="Incinerator";
trade_theirs[3]="Crusader";
trade_theirs[4]="Exterminatus";
trade_theirs[5]="Cyclonic Torpedo";
// trade_disp[1]=20;
trade_disp[1]=30;
trade_disp[2]=20;
trade_disp[3]=25;
trade_disp[4]=40;
trade_disp[5]=60;
}
// Ecclesiarchy trade goods
if (diplomacy==5){
Expand Down
4 changes: 3 additions & 1 deletion scripts/scr_trade/scr_trade.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ function scr_trade(argument0) {
if (trade_take[i]="Skitarii") then their_worth+=trade_tnum[i]*15;
if (trade_take[i]="Techpriest") then their_worth+=trade_tnum[i]*150;

if (trade_take[i]="Condemnor Boltgun") then their_worth+=trade_tnum[i]*15;
// TODO: Condemnor Boltgun trade is temporarily disabled due to crashes as the item doesn't exist in other parts of the game.
// To re-enable: Implement the Condemnor Boltgun item in the game's inventory, equipment, and combat systems.
// if (trade_take[i]="Condemnor Boltgun") then their_worth+=trade_tnum[i]*15;
if (trade_take[i]="Hellrifle") then their_worth+=trade_tnum[i]*20;
if (trade_take[i]="Incinerator") then their_worth+=trade_tnum[i]*20;
if (trade_take[i]="Crusader") then their_worth+=trade_tnum[i]*20;
Expand Down
4 changes: 3 additions & 1 deletion scripts/scr_trade_add/scr_trade_add.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ function scr_trade_add(argument0) {
if (string_count("Useful Info",woj)>1){trade_tnum[thinz]=0;tomp1=0;trade_take[thinz]="";}
}

if (argument0="Condemnor Boltgun"){get_diag_integer("Condemnor Boltguns wanted?",20,"t"+string(thinz),"Condemnor Boltgun");}
// TODO: Condemnor Boltgun trade dialog disabled due to weapon being temporarily removed.
// Re-enable when the weapon is properly implemented.
// if (argument0="Condemnor Boltgun"){get_diag_integer("Condemnor Boltguns wanted?",20,"t"+string(thinz),"Condemnor Boltgun");}
if (argument0="Hellrifle"){get_diag_integer("Hellrifles wanted?",3,"t"+string(thinz),"Hellrifle");}
if (argument0="Incinerator"){get_diag_integer("Incinerators wanted?",10,"t"+string(thinz),"Incinerator");}
if (argument0="Crusader"){get_diag_integer("Crusaders wanted?",5,"t"+string(thinz),"Crusader");}
Expand Down