diff --git a/scripts/_test/scripts/cheats/cheat_quest.rs2 b/scripts/_test/scripts/cheats/cheat_quest.rs2 index 824ea3b6f..408099c53 100644 --- a/scripts/_test/scripts/cheats/cheat_quest.rs2 +++ b/scripts/_test/scripts/cheats/cheat_quest.rs2 @@ -472,3 +472,24 @@ return; ~update_questlist; mes("All quests have been reset."); return; + +//regicide +[debugproc,spkm] +settimer(spawn_kings_messenger, 10); + +//temple of ikov +[debugproc,iku] +if (p_finduid(uid) = false) { return; } +%ikov = calc(%ikov + 10); +~send_quest_progress(questlist:ikov, %ikov, ^ikov_completed_armadyl); +mes("Ikov stage increased to "); + +[debugproc,ikd] +if (p_finduid(uid) = false) { return; } +%ikov = calc(%ikov - 10); +~send_quest_progress(questlist:ikov, %ikov, ^ikov_completed_armadyl); +mes("Ikov stage decreased to "); + +//elemental workshop +[debugproc,tew] +queue(elemental_workshop_quest_complete, 0, 0); diff --git a/scripts/_test/scripts/debug/debug_others.rs2 b/scripts/_test/scripts/debug/debug_others.rs2 index 182911de1..e5909df31 100644 --- a/scripts/_test/scripts/debug/debug_others.rs2 +++ b/scripts/_test/scripts/debug/debug_others.rs2 @@ -16,3 +16,21 @@ if (p_finduid(uid) = true) { [debugproc,members] mes("Your membership status is: "); + +//maze random +[debugproc,maze] +if (p_finduid(uid) = false) { + return; +} +def_coord $coord = enum(int, coord, macro_maze_teleports, random(enum_getoutputcount(macro_maze_teleports))); +%xplamp = 100; +%macro_event_target_coord = coord; +p_telejump($coord); +~chatnpc_specific("Mysterious Old Man", macro_mysterious_old_man, "You need to reach the maze centre,|then you'll be returned to where you were."); // Split line as per https://imgur.com/riCliBA +mes("You need to reach the maze centre, then you'll be returned to where you were."); + +[debugproc,mazeend] +if (p_finduid(uid) = false) { + return; +} +p_telejump(0_45_71_30_32); diff --git a/scripts/macro events/scripts/general/macro_event_maze.rs2 b/scripts/macro events/scripts/general/macro_event_maze.rs2 index dd763ff2f..f1399323b 100644 --- a/scripts/macro events/scripts/general/macro_event_maze.rs2 +++ b/scripts/macro events/scripts/general/macro_event_maze.rs2 @@ -78,23 +78,6 @@ if_close; [oploc1,loc_3636] // Open chest search option ~mesbox("Awww, it's empty!"); -[debugproc,maze] -if (p_finduid(uid) = false) { - return; -} -def_coord $coord = enum(int, coord, macro_maze_teleports, random(enum_getoutputcount(macro_maze_teleports))); -%xplamp = 100; -%macro_event_target_coord = coord; -p_telejump($coord); -~chatnpc_specific("Mysterious Old Man", macro_mysterious_old_man, "You need to reach the maze centre,|then you'll be returned to where you were."); // Split line as per https://imgur.com/riCliBA -mes("You need to reach the maze centre, then you'll be returned to where you were."); - -[debugproc,mazeend] -if (p_finduid(uid) = false) { - return; -} -p_telejump(0_45_71_30_32); - [proc,macro_maze_open_chest](loc $other_chest) p_arrivedelay; anim(human_openchest, 0); diff --git a/scripts/quests/quest_elemental_workshop/scripts/quest_elemental_workshop.rs2 b/scripts/quests/quest_elemental_workshop/scripts/quest_elemental_workshop.rs2 index 2348c64d6..2770999c3 100644 --- a/scripts/quests/quest_elemental_workshop/scripts/quest_elemental_workshop.rs2 +++ b/scripts/quests/quest_elemental_workshop/scripts/quest_elemental_workshop.rs2 @@ -276,6 +276,3 @@ stat_advance(smithing, 50000); session_log(^log_adventure, "Quest complete: Elemental Workshop"); // todo: find image for proof on sizing ~send_quest_complete(questlist:elemental_workshop, elemental_shield, 250, ^elemental_workshop_questpoints, "You have completed the\\nElemental Workshop Quest!"); - -[debugproc,tew] -queue(elemental_workshop_quest_complete, 0, 0); diff --git a/scripts/quests/quest_ikov/scripts/ikov_journal.rs2 b/scripts/quests/quest_ikov/scripts/ikov_journal.rs2 index dbb24e54f..d1f965fa5 100644 --- a/scripts/quests/quest_ikov/scripts/ikov_journal.rs2 +++ b/scripts/quests/quest_ikov/scripts/ikov_journal.rs2 @@ -1,14 +1,3 @@ -[debugproc,iku] -if (p_finduid(uid) = false) { return; } -%ikov = calc(%ikov + 10); -~send_quest_progress(questlist:ikov, %ikov, ^ikov_completed_armadyl); -mes("Ikov stage increased to "); -[debugproc,ikd] -if (p_finduid(uid) = false) { return; } -%ikov = calc(%ikov - 10); -~send_quest_progress(questlist:ikov, %ikov, ^ikov_completed_armadyl); -mes("Ikov stage decreased to "); - [if_button,questlist:ikov] //TODO: Figure out proper line breaks (Engine change to split_init/get?) //sources: diff --git a/scripts/quests/quest_regicide/scripts/regicide_kings_messenger.rs2 b/scripts/quests/quest_regicide/scripts/regicide_kings_messenger.rs2 index f87a718bc..73a28d569 100644 --- a/scripts/quests/quest_regicide/scripts/regicide_kings_messenger.rs2 +++ b/scripts/quests/quest_regicide/scripts/regicide_kings_messenger.rs2 @@ -35,6 +35,3 @@ if(uid = %npc_aggressive_player & %upass = ^upass_complete & %regicide_quest = 0 @kings_messenger_dialogue; } ~chatnpc("I have no business with you."); - -[debugproc,spkm] -settimer(spawn_kings_messenger, 10); \ No newline at end of file