From 48f949a45233228fa8edd6f812edce4d16420ffd Mon Sep 17 00:00:00 2001 From: Player Name Date: Sun, 8 Feb 2026 12:45:29 +0000 Subject: [PATCH] Made the swaying tree authentically work exactly the same as the dramen tree --- .../global/skill/gather/woodcutting/WoodcuttingListener.kt | 6 +++--- .../quest/thefremenniktrials/TFTInteractionListeners.kt | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingListener.kt b/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingListener.kt index 6b1be0ab0..28cfc2c86 100644 --- a/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingListener.kt +++ b/Server/src/main/content/global/skill/gather/woodcutting/WoodcuttingListener.kt @@ -50,7 +50,7 @@ class WoodcuttingListener : InteractionListener { defineInteraction( IntType.SCENERY, ids = WoodcuttingNode.values().map { it.id }.toIntArray(), - "chop-down", "chop", "chop down", "cut down", + "chop-down", "chop", "chop down", "cut down", "cut-branch", persistent = true, allowedDistance = 1, handler = ::handleWoodcutting @@ -74,10 +74,10 @@ class WoodcuttingListener : InteractionListener { if (clockReady(player, Clocks.SKILLING)) { animateWoodcutting(player) - if (resource == WoodcuttingNode.DRAMEN_TREE) { + if (resource in arrayOf(WoodcuttingNode.DRAMEN_TREE, WoodcuttingNode.SWAYING_TREE)) { // Reward after one chop and then abort chopping (this is authentic) queueScript(player, 1, QueueStrength.STRONG) { - sendMessage(player, "You cut a branch from the Dramen tree.") + sendMessage(player, "You cut a branch from the ${if (resource == WoodcuttingNode.DRAMEN_TREE) "Dramen" else "strangely musical"} tree.") addItem(player, resource.getReward()) return@queueScript clearScripts(player) } diff --git a/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/TFTInteractionListeners.kt b/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/TFTInteractionListeners.kt index db98b2314..e7b48f9d3 100644 --- a/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/TFTInteractionListeners.kt +++ b/Server/src/main/content/region/fremennik/rellekka/quest/thefremenniktrials/TFTInteractionListeners.kt @@ -260,11 +260,6 @@ class TFTInteractionListeners : InteractionListener { return@on true } - on(SWAYING_TREE, IntType.SCENERY, "cut-branch"){ player, node -> - player.pulseManager.run(WoodcuttingSkillPulse(player, node as Scenery)) - return@on true - } - on(SHOPNPCS, IntType.NPC, "Trade") { player, npc -> if(isQuestComplete(player, Quests.THE_FREMENNIK_TRIALS)){ npc.asNpc().openShop(player)