diff --git a/Server/src/main/content/region/misthalin/lumbridge/quest/therestlessghost/RestlessGhostNPCDialogue.kt b/Server/src/main/content/region/misthalin/lumbridge/quest/therestlessghost/RestlessGhostNPCDialogue.kt index 7fdf5b242..355ed584d 100644 --- a/Server/src/main/content/region/misthalin/lumbridge/quest/therestlessghost/RestlessGhostNPCDialogue.kt +++ b/Server/src/main/content/region/misthalin/lumbridge/quest/therestlessghost/RestlessGhostNPCDialogue.kt @@ -30,42 +30,44 @@ class RestlessGhostNPCDialogueFile : DialogueLabeller() { exec { player, npc -> if (!inEquipment(player, Items.GHOSTSPEAK_AMULET_552)) { - npc(ChatAnim.HALF_GUILTY, "Wooo wooo wooooo!") - goto("no_amulet_opts") + loadLabel(player, "woo") } else { when (getQuestStage(player, Quests.THE_RESTLESS_GHOST)) { 20 -> { - goto("not_very_good") + loadLabel(player, "not_very_good") } - 30 -> { - goto("finding_my_skull") - } - else -> { - npc("Fine, thanks") - end() + 30, 40 -> { + loadLabel(player, "finding_my_skull") } } } } + npc("Fine, thanks.") + label("finding_my_skull") { npc("How are you doing finding my skull?") exec { player, npc -> if (inInventory(player, Items.GHOSTS_SKULL_553)) { - player(FacialExpression.FRIENDLY, "I have found it!") - npc(FacialExpression.HAPPY, "Hurrah! Now I can stop being a ghost! You just need", "to put it on my coffin there, and I will be free!") - + loadLabel(player, "found_it") } else { - player(FacialExpression.HALF_GUILTY, "Sorry, I can't find it at the moment.") - npc(FacialExpression.HALF_GUILTY, "Ah well. Keep on looking.") - npc(FacialExpression.HALF_GUILTY, "I'm pretty sure it's somewhere in the tower south-west", "from here. There's a lot of levels to the tower, though. I", "suppose it might take a little while to find.") - + loadLabel(player, "not_found_it") } - end() } } + label("found_it") { + player(FacialExpression.FRIENDLY, "I have found it!") + npc(FacialExpression.HAPPY, "Hurrah! Now I can stop being a ghost! You just need", "to put it on my coffin there, and I will be free!") + } + + label("not_found_it") { + player(FacialExpression.HALF_GUILTY, "Sorry, I can't find it at the moment.") + npc(FacialExpression.HALF_GUILTY, "Ah well. Keep on looking.") + npc(FacialExpression.HALF_GUILTY, "I'm pretty sure it's somewhere in the tower south-west", "from here. There's a lot of levels to the tower, though. I", "suppose it might take a little while to find.") + } + label("not_very_good") { npc(FacialExpression.HALF_GUILTY, "Not very good actually.") player(FacialExpression.HALF_GUILTY, "What's the problem then?") @@ -77,20 +79,24 @@ class RestlessGhostNPCDialogueFile : DialogueLabeller() { npc(FacialExpression.HALF_GUILTY, "Well, to be honest... I'm not sure.") player(FacialExpression.HALF_GUILTY, "I've been told a certain task may need to be completed", "so you can rest in peace.") npc(FacialExpression.HALF_GUILTY, "I should think it is probably because a warlock has come", "along and stolen my skull. If you look inside my coffin", "there, you'll find my corpse without a head on it.") - player("FacialExpression.HALF_GUILTY, Do you know where this warlock might be now?") + player(FacialExpression.HALF_GUILTY, "Do you know where this warlock might be now?") npc(FacialExpression.HALF_GUILTY, "I think it was one of the warlocks who lives in the big", "tower by the sea south-west from here.") player(FacialExpression.HALF_GUILTY, "Ok. I will try and get the skull back for you, then you", "can rest in peace.") exec { player, npc -> setQuestStage(player, Quests.THE_RESTLESS_GHOST, 30) - goto("great_relief") + loadLabel(player, "great_relief") } } label("great_relief") { npc(FacialExpression.HALF_GUILTY, "Ooh, thank you. That would be such a great relief!") npc(FacialExpression.HALF_GUILTY, "It is so dull being a ghost...") - end() + } + + label("woo") { + npc(ChatAnim.HALF_GUILTY, "Wooo wooo wooooo!") + goto("no_amulet_opts") } label("no_amulet_opts") { @@ -118,8 +124,6 @@ class RestlessGhostNPCDialogueFile : DialogueLabeller() { npc(FacialExpression.HALF_GUILTY, "WOOOOOOOOO!") player(FacialExpression.HALF_GUILTY, "Never mind.") - - end() } label("thats_interesting") { @@ -134,8 +138,6 @@ class RestlessGhostNPCDialogueFile : DialogueLabeller() { player(FacialExpression.HALF_GUILTY, "Goodbye. Thanks for the chat.") npc(FacialExpression.HALF_GUILTY, "Wooo wooo?") - - end() } label("find_treasure") { @@ -147,8 +149,6 @@ class RestlessGhostNPCDialogueFile : DialogueLabeller() { npc(FacialExpression.HALF_GUILTY, "WOOOOOOOOO!") player(FacialExpression.HALF_GUILTY, "Never mind.") - - end() } }