From 39518426350d4030a287367be538bd4d440aa59d Mon Sep 17 00:00:00 2001 From: Ceikry Date: Sat, 28 Mar 2020 06:56:21 -0500 Subject: [PATCH] closes #226 --- .../plugin/activity/mta/TelekineticGrabSpell.java | 6 ++++++ Server/src/plugin/dialogue/DrOnglewipDialogue.java | 12 ++++++------ Server/src/plugin/dialogue/TakiDwarfDialogue.java | 8 ++++---- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Server/src/plugin/activity/mta/TelekineticGrabSpell.java b/Server/src/plugin/activity/mta/TelekineticGrabSpell.java index 41d55a43f..2f9cfc356 100644 --- a/Server/src/plugin/activity/mta/TelekineticGrabSpell.java +++ b/Server/src/plugin/activity/mta/TelekineticGrabSpell.java @@ -3,10 +3,12 @@ package plugin.activity.mta; import org.crandor.game.content.global.action.PickupHandler; import org.crandor.game.content.skill.free.magic.MagicSpell; import org.crandor.game.content.skill.free.magic.Runes; +import org.crandor.game.interaction.SpecialGroundItems; import org.crandor.game.node.Node; import org.crandor.game.node.entity.Entity; import org.crandor.game.node.entity.combat.equipment.SpellType; import org.crandor.game.node.entity.impl.Projectile; +import org.crandor.game.node.entity.npc.NPC; import org.crandor.game.node.entity.player.Player; import org.crandor.game.node.entity.player.link.SpellBookManager.SpellBook; import org.crandor.game.node.entity.player.link.audio.Audio; @@ -128,6 +130,10 @@ public final class TelekineticGrabSpell extends MagicSpell { player.getPacketDispatch().sendMessage("Too late!"); return true; } + if (g == SpecialGroundItems.AHAB_BEER.asGroundItem()){ + player.getDialogueInterpreter().open(2692, new NPC(2692), true); + return true; + } if (player == null) { return true; } diff --git a/Server/src/plugin/dialogue/DrOnglewipDialogue.java b/Server/src/plugin/dialogue/DrOnglewipDialogue.java index 4fbc7f779..afa6419ed 100644 --- a/Server/src/plugin/dialogue/DrOnglewipDialogue.java +++ b/Server/src/plugin/dialogue/DrOnglewipDialogue.java @@ -39,7 +39,7 @@ public final class DrOnglewipDialogue extends DialoguePlugin { @Override public boolean open(Object... args) { npc = (NPC) args[0]; - interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Do you live here too?"); + interpreter.sendDialogues(player, FacialExpression.OSRS_NORMAL, "Do you live here too?"); stage = 0; return true; } @@ -48,23 +48,23 @@ public final class DrOnglewipDialogue extends DialoguePlugin { public boolean handle(int interfaceId, int buttonId) { switch (stage) { case 0: - interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Oh no, I come from Gnome Stronghold. I've been", "sent here by King Narnode to learn about human", "magics."); + interpreter.sendDialogues(npc, FacialExpression.OSRS_NORMAL, "Oh no, I come from Gnome Stronghold. I've been", "sent here by King Narnode to learn about human", "magics."); stage = 1; break; case 1: - interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "So where's this Gnome Stronghold?"); + interpreter.sendDialogues(player, FacialExpression.OSRS_NORMAL, "So where's this Gnome Stronghold?"); stage = 2; break; case 2: - interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "It's in the North West of the continent - a long way", "away. You should visit us there some time. The food's", "great, and the company's delightful."); + interpreter.sendDialogues(npc, FacialExpression.OSRS_NORMAL, "It's in the North West of the continent - a long way", "away. You should visit us there some time. The food's", "great, and the company's delightful."); stage = 3; break; case 3: - interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "I'll try and make time for it. Sounds like a nice place."); + interpreter.sendDialogues(player, FacialExpression.OSRS_NORMAL, "I'll try and make time for it. Sounds like a nice place."); stage = 4; break; case 4: - interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Well, it's full of gnomes. How much nicer could it be?"); + interpreter.sendDialogues(npc, FacialExpression.OSRS_NORMAL, "Well, it's full of gnomes. How much nicer could it be?"); stage = 5; break; case 5: diff --git a/Server/src/plugin/dialogue/TakiDwarfDialogue.java b/Server/src/plugin/dialogue/TakiDwarfDialogue.java index a5fe54041..a4f8c8be8 100644 --- a/Server/src/plugin/dialogue/TakiDwarfDialogue.java +++ b/Server/src/plugin/dialogue/TakiDwarfDialogue.java @@ -31,15 +31,15 @@ public class TakiDwarfDialogue extends DialoguePlugin { switch (stage) { case 0: - interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Hi little fellow."); + interpreter.sendDialogues(player, FacialExpression.OSRS_NORMAL, "Hi little fellow."); stage = 1; break; case 1: - interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "What did you just say to me!?"); + interpreter.sendDialogues(npc, FacialExpression.OSRS_NORMAL, "What did you just say to me!?"); stage = 2; break; case 2: - interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Arrr! nothing, nothing at all.."); + interpreter.sendDialogues(player, FacialExpression.OSRS_NORMAL, "Arrr! nothing, nothing at all.."); stage = 3; break; case 3: @@ -59,7 +59,7 @@ public class TakiDwarfDialogue extends DialoguePlugin { @Override public boolean open(Object... args) { npc = (NPC) args[0]; - interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Arrr!"); + interpreter.sendDialogues(npc, FacialExpression.OSRS_NORMAL, "Arrr!"); stage = 0; return true; }