From 476f0b584656e90aadaa019a3b3d493b9ee202fb Mon Sep 17 00:00:00 2001
From: HT Cesta <58153179+htc16@users.noreply.github.com>
Date: Sat, 6 Jul 2024 14:22:49 -0300
Subject: [PATCH] Druid Outfits Quest on Rook

---
 data-otservbr-global/lib/core/storages.lua | 17 ++++++++++-------
 data-otservbr-global/npc/lubo.lua          |  1 -
 data-otservbr-global/npc/tom.lua           |  9 +++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/data-otservbr-global/lib/core/storages.lua b/data-otservbr-global/lib/core/storages.lua
index 0c05efb74d9..fd0196bfd45 100644
--- a/data-otservbr-global/lib/core/storages.lua
+++ b/data-otservbr-global/lib/core/storages.lua
@@ -747,11 +747,6 @@ Storage = {
 		-- Until all outfit quests are completed
 		DefaultStart = 50960,
 		Ref = 50961,
-		-- Druid-outfit Quest
-		DruidHatAddon = 50977,
-		DruidBodyAddon = 50978,
-		DruidAmuletDoor = 50979,
-
 		-- Hunter-outfit Quest
 		HunterMusicSheet01 = 50984,
 		HunterMusicSheet02 = 50985,
@@ -2027,8 +2022,16 @@ Storage = {
 				AddonBackpack = 40779,
 				AddonBackpackTimer = 40780,
 			},
-			DruidOutfits = {},
-			DruidOutfitsRook = {},
+			DruidOutfitsRook = {
+				DruidHatAddonRook = 40781,
+				DruidBodyAddonRook = 40782,
+				DruidAmuletDoorRook = 40783,
+			},
+			DruidOutfits = {
+				DruidHatAddon = 40784,
+				DruidBodyAddon = 40785,
+				DruidAmuletDoor = 40786,
+			},
 			HunterOutfits = {},
 			KnightOutfits = {},
 			MageOutfits = {},
diff --git a/data-otservbr-global/npc/lubo.lua b/data-otservbr-global/npc/lubo.lua
index a73537ec306..2c1d7ab661b 100644
--- a/data-otservbr-global/npc/lubo.lua
+++ b/data-otservbr-global/npc/lubo.lua
@@ -79,7 +79,6 @@ local function creatureSayCallback(npc, creature, type, message)
 				player:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
 				player:setStorageValue(Storage.Quest.U7_8.CitizenOutfits.MissionBackpack, 0)
 				player:setStorageValue(Storage.Quest.U7_8.CitizenOutfits.AddonBackpack, 3)
-
 				player:addOutfitAddon(136, 1)
 				player:addOutfitAddon(128, 1)
 			else
diff --git a/data-otservbr-global/npc/tom.lua b/data-otservbr-global/npc/tom.lua
index c278a728d77..c66ade91e30 100644
--- a/data-otservbr-global/npc/tom.lua
+++ b/data-otservbr-global/npc/tom.lua
@@ -228,13 +228,13 @@ local function creatureSayCallback(npc, creature, type, message)
 	if MsgContains(message, "cough syrup") then
 		npcHandler:say("I had some cough syrup a while ago. It was stolen in an ape raid. I fear if you want more cough syrup you will have to buy it in the druids guild in carlin.", npc, creature)
 	elseif MsgContains(message, "addon") then
-		if player:getStorageValue(Storage.OutfitQuest.DruidBodyAddon) < 1 then
+		if player:getStorageValue(Storage.Quest.U7_8.DruidOutfitsRook.DruidBodyAddonRook) < 1 then
 			npcHandler:say("Would you like to wear bear paws like I do? No problem, just bring me 50 bear paws and 50 wolf paws and I'll fit them on.", npc, creature)
-			player:setStorageValue(Storage.OutfitQuest.DruidBodyAddon, 1)
+			player:setStorageValue(Storage.Quest.U7_8.DruidOutfitsRook.DruidBodyAddonRook, 1)
 			npcHandler:setTopic(playerId, 0)
 		end
 	elseif MsgContains(message, "paws") or MsgContains(message, "bear paws") then
-		if player:getStorageValue(Storage.OutfitQuest.DruidBodyAddon) == 1 then
+		if player:getStorageValue(Storage.Quest.U7_8.DruidOutfitsRook.DruidBodyAddonRook) == 1 then
 			npcHandler:say("Have you brought 50 bear paws and 50 wolf paws?", npc, creature)
 			npcHandler:setTopic(playerId, 1)
 		end
@@ -244,7 +244,8 @@ local function creatureSayCallback(npc, creature, type, message)
 				npcHandler:say("Excellent! Like promised, here are your bear paws. ", npc, creature)
 				player:removeItem(5896, 50)
 				player:removeItem(5897, 50)
-				player:setStorageValue(Storage.OutfitQuest.DruidBodyAddon, 2)
+				player:setStorageValue(Storage.Quest.U7_8.DruidOutfitsRook.DruidBodyAddonRook, 2)
+				player:getPosition():sendMagicEffect(CONST_ME_MAGIC_BLUE)
 				player:addOutfitAddon(148, 1)
 				player:addOutfitAddon(144, 1)
 				npcHandler:setTopic(playerId, 0)