Merge branch 'main' into addPaymentInWar

opentibiabr · Mar 1, 2024 · aaf5256 · aaf5256
2 parents 1ec3bc4 + 025f3fe
commit aaf5256
Show file tree

Hide file tree

Showing 39 changed files with 164 additions and 362 deletions.
diff --git a/data-canary/scripts/actions/other/cask_kegs.lua b/data-canary/scripts/actions/other/cask_kegs.lua
diff --git a/data-canary/scripts/actions/other/costume_bag.lua b/data-canary/scripts/actions/other/costume_bag.lua
diff --git a/data-canary/scripts/actions/other/fireworks_rocket.lua b/data-canary/scripts/actions/other/fireworks_rocket.lua
diff --git a/data-canary/scripts/actions/other/scroll_of_ascension.lua b/data-canary/scripts/actions/other/scroll_of_ascension.lua
diff --git a/data-canary/scripts/movements/snow.lua b/data-canary/scripts/movements/snow.lua
diff --git a/data-canary/scripts/movements/swimming.lua b/data-canary/scripts/movements/swimming.lua
diff --git a/data-otservbr-global/lib/others/vip_system.lua b/data-otservbr-global/lib/others/vip_system.lua
@@ -3,7 +3,7 @@ local config = {
 	activationMessageType = MESSAGE_EVENT_ADVANCE,
 
 	expirationMessage = "Your VIP days ran out.",
-	expirationMessageType = MESSAGE_ADMINISTRADOR,
+	expirationMessageType = MESSAGE_ADMINISTRATOR,
 
 	outfits = {},
 	mounts = {},

diff --git a/data-otservbr-global/scripts/actions/other/cask_kegs.lua b/data-otservbr-global/scripts/actions/other/cask_kegs.lua
diff --git a/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/scroll_of_ascension.lua b/data-otservbr-global/scripts/actions/quests/ferumbras_ascendant/scroll_of_ascension.lua
diff --git a/data/global.lua b/data/global.lua
@@ -77,6 +77,7 @@ SCARLETT_MAY_DIE = 0
 
 ropeSpots = { 386, 421, 386, 7762, 12202, 12936, 14238, 17238, 23363, 21965, 21966, 21967, 21968 }
 specialRopeSpots = { 12935 }
+swimmingTiles = { 629, 630, 631, 632, 633, 634, 4809, 4810, 4811, 4812, 4813, 4814 }
 
 -- Global tables for systems
 if not _G.GlobalBosses then

diff --git a/data/libs/functions/creature.lua b/data/libs/functions/creature.lua
@@ -78,10 +78,6 @@ function Creature:setMonsterOutfit(monster, time)
 		return false
 	end
 
-	if self:isPlayer() and not (self:hasFlag(PlayerFlag_CanIllusionAll) or monsterType:isIllusionable()) then
-		return false
-	end
-
 	local condition = Condition(CONDITION_OUTFIT)
 	condition:setOutfit(monsterType:getOutfit())
 	condition:setTicks(time)

diff --git a/data/modules/scripts/gamestore/init.lua b/data/modules/scripts/gamestore/init.lua
@@ -1631,20 +1631,22 @@ function GameStore.processHouseRelatedPurchase(player, offer)
 	local inbox = player:getStoreInbox()
 	if inbox then
 		for _, itemId in ipairs(itemIds) do
-			local decoKit = inbox:addItem(ITEM_DECORATION_KIT, 1)
-			if decoKit then
-				decoKit:setAttribute(ITEM_ATTRIBUTE_DESCRIPTION, "You bought this item in the Store.\nUnwrap it in your own house to create a <" .. ItemType(itemId):getName() .. ">.")
-				decoKit:setCustomAttribute("unWrapId", itemId)
-				if isCaskItem(itemId) then
-					decoKit:setAttribute(ITEM_ATTRIBUTE_DATE, offer.count)
-				end
+			for i = 1, offer.count do
+				local decoKit = inbox:addItem(ITEM_DECORATION_KIT, 1)
+				if decoKit then
+					decoKit:setAttribute(ITEM_ATTRIBUTE_DESCRIPTION, "You bought this item in the Store.\nUnwrap it in your own house to create a <" .. ItemType(itemId):getName() .. ">.")
+					decoKit:setCustomAttribute("unWrapId", itemId)
+					if isCaskItem(itemId) then
+						decoKit:setAttribute(ITEM_ATTRIBUTE_DATE, offer.count)
+					end
 
-				if offer.movable ~= true then
-					decoKit:setAttribute(ITEM_ATTRIBUTE_STORE, systemTime())
+					if offer.movable ~= true then
+						decoKit:setAttribute(ITEM_ATTRIBUTE_STORE, systemTime())
+					end
 				end
 			end
+			player:sendUpdateContainer(inbox)
 		end
-		player:sendUpdateContainer(inbox)
 	end
 end