Skip to content
This repository was archived by the owner on Oct 14, 2025. It is now read-only.

Commit b9add89

Browse files
authored
chore: Cleanup quest completions (#1746)
* chore: Cleanup quest completions * fix: whitespace * fix: Inadvertent arena QP on sea slug * fix: Indio says using an extra arg isn't a good idea, here's a workaround * fix: add comment * fix: Watchtower doesn't queue updating quest points
1 parent f5d2fd6 commit b9add89

9 files changed

Lines changed: 104 additions & 258 deletions

File tree

data/src/scripts/_test/scripts/cheats/cheat_quest.rs2

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -265,12 +265,12 @@ if (p_finduid(uid) = true) {
265265
case 51 : %ball_progress = 0;
266266
case default : mes("Quest not found.");
267267
}
268-
~update_quests;
268+
~update_questpoints;
269+
~update_questlist;
269270
}
270271
}
271272
}
272273

273-
// New label to complete all quests
274274
[label,complete_all_quests]
275275

276276
def_int $arrav_choice = ~p_choice2_header("Black Arm Gang.", 0, "Phoenix Gang.", 1, "Choose a gang for Shield of Arrav:");
@@ -302,9 +302,9 @@ queue(itexam_complete, 0);
302302
queue(druid_quest_complete, 0, npc_uid);
303303
}
304304
queue(mcannon_complete, 0);
305+
// Complete all blast spells and levers, gauntlet choice unselected
306+
%crest_spells_levers_gauntlets = calc(pow(2, ^crest_south_lever) - 1);
305307
queue(crest_complete, 0);
306-
// Complete all blast spells and levers, gauntlet choice unselected
307-
%crest_spells_levers_gauntlets = calc(pow(2, ^crest_south_lever) - 1);
308308
queue(arena_quest_complete, 0);
309309
queue(fishingcompo_quest_complete, 0);
310310
queue(fluffs_complete, 0);
@@ -320,7 +320,7 @@ queue(murder_quest_complete, 0);
320320
queue(itgronigen_quest_complete, 0);
321321
queue(quest_elena_complete, 0);
322322
queue(scorpcatcher_quest_complete, 0);
323-
%seaslug_progress = ^seaslug_complete;
323+
%seaslug_progress = ^seaslug_complete;
324324
%questpoints = add(%questpoints, ^seaslug_questpoints);
325325
inv_add(inv, bigoysterpearls, 1);
326326
stat_advance(fishing, 71750);
@@ -330,12 +330,12 @@ queue(zombiequeen_quest_complete, 0);
330330
queue(tree_quest_complete, 0);
331331
queue(totem_quest_complete, 0);
332332
queue(upass_quest_complete, 0);
333-
queue(itwatchtower_quest_complete, 0);
334-
%itwatchtower_progress = ^itwatchtower_complete;
333+
%itwatchtower_progress = ^itwatchtower_complete;
335334
// Rewards are given before quest completion, so give here
336335
stat_advance(magic, 153000);
337336
inv_add(inv, coins, 5000);
338337
inv_add(inv, watchtowerspell, 1);
338+
queue(itwatchtower_quest_complete, 0);
339339
queue(waterfall_quest_complete, 0);
340340
queue(ball_quest_complete, 0);
341341

@@ -368,14 +368,12 @@ if ($ikov_choice = 0) {
368368
if (npc_find(0_42_52_34_45, radimus_erkle, 20, 0) = true) {
369369
@radimus_training;
370370
}
371-
372-
~update_quests;
371+
~update_questlist;
373372
mes("All quests have been completed.");
374373
return;
375374

376375
// New label to reset all quests
377376
[label,reset_all_quests]
378-
379377
%blackknight_progress = 0;
380378
%cook_progress = 0;
381379
%demon_progress = 0;
@@ -463,7 +461,7 @@ return;
463461
%waterfall_golrie_and_puzzle = 0;
464462
%waterfall_progress = 0;
465463
%ball_progress = 0;
466-
464+
~update_questpoints;
465+
~update_questlist;
467466
mes("All quests have been reset.");
468-
~update_quests;
469467
return;

0 commit comments

Comments
 (0)