From f60e166d6e170734497863ab37357cf302bdfa06 Mon Sep 17 00:00:00 2001
From: Ceikry <ironceikry@gmail.com>
Date: Thu, 18 Mar 2021 01:15:55 -0500
Subject: [PATCH] Some bugfixes + tree spirit reimplmentation

---
 .../drilldemon/SeargentDamienDialogue.kt      |  1 +
 .../content/dialogue/DukeHoracioDialogue.kt   |  2 +-
 .../object/EnchantedValleyListeners.kt        | 47 +++++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 Server/src/main/kotlin/rs09/game/interaction/object/EnchantedValleyListeners.kt

diff --git a/Server/src/main/kotlin/rs09/game/content/ame/events/drilldemon/SeargentDamienDialogue.kt b/Server/src/main/kotlin/rs09/game/content/ame/events/drilldemon/SeargentDamienDialogue.kt
index 114e2a396..89f5dceda 100644
--- a/Server/src/main/kotlin/rs09/game/content/ame/events/drilldemon/SeargentDamienDialogue.kt
+++ b/Server/src/main/kotlin/rs09/game/content/ame/events/drilldemon/SeargentDamienDialogue.kt
@@ -43,6 +43,7 @@ class SeargentDamienDialogue(val isCorrect: Boolean = false) : DialogueFile() {
                         stage = END_DIALOGUE
                     }
                     2 -> {
+                        end()
                         player!!.antiMacroHandler.event?.terminate()
                         stage = END_DIALOGUE
                     }
diff --git a/Server/src/main/kotlin/rs09/game/content/dialogue/DukeHoracioDialogue.kt b/Server/src/main/kotlin/rs09/game/content/dialogue/DukeHoracioDialogue.kt
index 859ce605e..531248f29 100644
--- a/Server/src/main/kotlin/rs09/game/content/dialogue/DukeHoracioDialogue.kt
+++ b/Server/src/main/kotlin/rs09/game/content/dialogue/DukeHoracioDialogue.kt
@@ -24,7 +24,7 @@ class DukeHoracioDialogue(player: Player? = null) : DialoguePlugin(player) {
 
     override fun open(vararg args: Any): Boolean {
         npc = args[0] as NPC
-        if (player.questRepository.getQuest("Dragon Slayer").getStage(player) == 100 && !player.inventory.containsItem(DragonSlayer.SHIELD) && !player.bank.containsItem(DragonSlayer.SHIELD) || !player.questRepository.getQuest("Dragon Slayer").isStarted(player) && !player.questRepository.getQuest("Dragon Slayer").isCompleted(player)) {
+        if ((player.questRepository.getQuest("Dragon Slayer").getStage(player) == 100 && !player.inventory.containsItem(DragonSlayer.SHIELD) && !player.bank.containsItem(DragonSlayer.SHIELD) )|| (player.questRepository.getQuest("Dragon Slayer").isStarted(player) && !player.questRepository.getQuest("Dragon Slayer").isCompleted(player))) {
             addOption("Dragon Slayer", DukeHoracioDSDialogue(player.questRepository.getStage("Dragon Slayer")))
         }
         if (!player.questRepository.isComplete("Lost Tribe") && player.questRepository.getQuest("Lost Tribe").isStarted(player)) {
diff --git a/Server/src/main/kotlin/rs09/game/interaction/object/EnchantedValleyListeners.kt b/Server/src/main/kotlin/rs09/game/interaction/object/EnchantedValleyListeners.kt
new file mode 100644
index 000000000..8e18ff9bf
--- /dev/null
+++ b/Server/src/main/kotlin/rs09/game/interaction/object/EnchantedValleyListeners.kt
@@ -0,0 +1,47 @@
+package rs09.game.interaction.`object`
+
+import core.game.node.entity.npc.NPC
+import core.game.node.entity.player.Player
+import core.game.node.entity.skill.gather.SkillingTool
+import core.game.system.task.Pulse
+import org.rs09.consts.NPCs
+import rs09.game.interaction.InteractionListener
+
+class EnchantedValleyListeners : InteractionListener() {
+    val ENCHANTED_V_TREE = 16265
+    val TREE_SPIRIT_IDS = intArrayOf(NPCs.TREE_SPIRIT_438,NPCs.TREE_SPIRIT_439,NPCs.TREE_SPIRIT_440,NPCs.TREE_SPIRIT_441,NPCs.TREE_SPIRIT_442,NPCs.TREE_SPIRIT_443)
+    override fun defineListeners() {
+
+        on(ENCHANTED_V_TREE,OBJECT,"chop-down"){player, node ->
+            val tool: SkillingTool? = SkillingTool.getHatchet(player)
+            tool ?: player.sendMessage("You lack an axe which you have the Woodcutting level to use.").also { return@on true }
+
+            player.pulseManager.run(object : Pulse(){
+                var counter = 0
+                val n = getSpirit(player)
+                override fun pulse(): Boolean {
+                    when(counter++){
+                        0 -> player.animator.animate(tool?.animation)
+                        3 -> {
+                            n.location = player.location
+                            n.init()
+                            n.moveStep()
+                            n.isRespawn = false
+                        }
+                        4 -> n.attack(player)
+                    }
+                    return false
+                }
+            })
+            return@on true
+        }
+
+    }
+
+    fun getSpirit(player: Player): NPC {
+        val level = player.properties.currentCombatLevel
+        var index = Math.ceil(level / 20.0).toInt()
+        if(index > TREE_SPIRIT_IDS.size) index = TREE_SPIRIT_IDS.size
+        return NPC(TREE_SPIRIT_IDS[index])
+    }
+}
\ No newline at end of file