From 6708039fe43eff21ff1f8975c9d834ad0dbd1ce3 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Fri, 27 Mar 2020 23:39:52 -0500 Subject: [PATCH] closes #222 #227 --- Server/src/plugin/dialogue/MissSchismDialogue.java | 8 ++++++-- Server/src/plugin/interaction/item/EmptyOptionPlugin.java | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Server/src/plugin/dialogue/MissSchismDialogue.java b/Server/src/plugin/dialogue/MissSchismDialogue.java index e0e22ac23..0cb1d1bcd 100644 --- a/Server/src/plugin/dialogue/MissSchismDialogue.java +++ b/Server/src/plugin/dialogue/MissSchismDialogue.java @@ -156,8 +156,12 @@ public final class MissSchismDialogue extends DialoguePlugin { stage = 23; break; case 23: - interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Well, now that I've cleared the vampire out of the manor,", "I guess you won't have to mutch trouble turning it into a", "museum."); - stage = 24; + if(player.getQuestRepository().isComplete("Vampire Slayer")) { + interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Well, now that I've cleared the vampire out of the manor,", "I guess you won't have to mutch trouble turning it into a", "museum."); + stage = 24; + } else { + end(); + } break; case 24: interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "That's all very well dear, but no vampire was ever going to", "stop me making it a museum."); diff --git a/Server/src/plugin/interaction/item/EmptyOptionPlugin.java b/Server/src/plugin/interaction/item/EmptyOptionPlugin.java index 001e1862e..3a7414ff8 100644 --- a/Server/src/plugin/interaction/item/EmptyOptionPlugin.java +++ b/Server/src/plugin/interaction/item/EmptyOptionPlugin.java @@ -26,6 +26,11 @@ public final class EmptyOptionPlugin extends OptionHandler { @Override public boolean handle(Player player, Node node, String option) { + if(node.getId() == 2329){ + player.getInventory().remove(new Item(2329)); + player.getInventory().add(new Item(2313)); + } + Consumable consumable = Consumables.forConsumable(((Item) node)); if (consumable == null) { String name = node.getName().toLowerCase();