From 0b15f031745956977bb139cb1bc836441f86c187 Mon Sep 17 00:00:00 2001
From: Lila Hioh <hioh-hioh@protonmail.com>
Date: Wed, 10 Aug 2022 11:15:15 +0000
Subject: [PATCH] Fossegrimen now recharges all out-of-charge lyres

---
 .../members/thefremenniktrials/TFTInteractionListeners.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TFTInteractionListeners.kt b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TFTInteractionListeners.kt
index d1e0eb686..3073072e6 100644
--- a/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TFTInteractionListeners.kt
+++ b/Server/src/main/kotlin/rs09/game/content/quest/members/thefremenniktrials/TFTInteractionListeners.kt
@@ -61,7 +61,7 @@ class TFTInteractionListeners : InteractionListener{
         }
 
         onUseWith(SCENERY,FISH_ALTAR,*FISH){ player, _, fish ->
-            if(inInventory(player,Items.LYRE_3689)) {
+            if(inInventory(player,Items.LYRE_3689) || inInventory(player,Items.ENCHANTED_LYRE_3690)) {
                 Pulser.submit(SpiritPulse(player, fish.id))
             } else {
                 sendMessage(player,"I should probably have my lyre with me.")
@@ -331,7 +331,7 @@ class TFTInteractionListeners : InteractionListener{
                 2 -> npc.face(player).also { player.face(npc) }
                 3 -> player.dialogueInterpreter?.sendDialogues(npc,
                     FacialExpression.HAPPY,"I will kindly accept this offering, and","bestow upon you a gift in return.")
-                4 -> removeItem(player,Items.LYRE_3689)
+                4 -> if(!removeItem(player,Items.LYRE_3689)) { removeItem(player,Items.ENCHANTED_LYRE_3690) }
                 5 -> when(fish){
                     383 -> addItem(player,Items.ENCHANTED_LYRE2_6125)
                     389 -> addItem(player,Items.ENCHANTED_LYRE3_6126)
@@ -444,7 +444,7 @@ class TFTInteractionListeners : InteractionListener{
                     setAttribute(player,"/save:lyreConcertPlayed",true)
                     player.removeAttribute("LyreEnchanted")
                     if(removeItem(player,Lyre))
-                        addItem(player,3689)
+                        addItem(player,Items.ENCHANTED_LYRE_3690)
                     player.unlock()
                 }
             }