Merge branch '8-introduce-new-maps-from-7-8' into 'master'

Resolve "Introduce new maps from 7.8" Closes #8 See merge request ErikasKontenis/Sabrehaven!14
2025-05-01 10:09:20 +02:00 · 2019-12-03 17:12:33 +00:00 · 2019-12-03 17:12:33 +00:00 · 072fc24a87
commit 072fc24a87
parent f89337d1d6 fbd043b7b1
87 changed files with 8513 additions and 227 deletions
--- a/config.lua
+++ b/config.lua
@ -52,7 +52,7 @@ timeBetweenExActions = 1000

 -- Map
 -- NOTE: set mapName WITHOUT .otbm at the end
-mapName = "mymap"
+mapName = "map"
 mapAuthor = "CipSoft"

 -- MySQL
--- a/data/actions/actions.xml
+++ b/data/actions/actions.xml
@ -94,6 +94,7 @@
 	<action fromid="2948" toid="2950" script="misc/instruments.lua" />
 	<action fromid="2952" toid="2965" script="misc/instruments.lua" />
 	<action itemid="3219" script="misc/instruments.lua" />
+	<action itemid="5786" script="misc/instruments.lua" />
 	
 	<!-- Strange Levers -->
 	<action fromid="2566" toid="2567" script="misc/strange_lever.lua" />
@ -103,6 +104,7 @@
 	<action itemid="435" script="misc/teleporters.lua" />
 	<action itemid="1948" script="misc/teleporters.lua" />
 	<action itemid="1968" script="misc/teleporters.lua" />
+	<action itemid="5542" script="misc/teleporters.lua" />
 	
 	<!-- Special Right -->
 	<action itemid="372" script="misc/special_rights.lua" />
@ -118,7 +120,6 @@
 	
 	<!-- Fun -->
 	<action itemid="611" script="misc/snowheap.lua" />
-	<action itemid="5080" script="misc/panda_teddy.lua" />
 	<action itemid="2974" script="misc/water_pipe.lua" />
 	<action itemid="2976" script="misc/birdcage.lua" />
 	<action itemid="3103" script="misc/cornucopia.lua" />
@ -135,6 +136,7 @@
 	<action itemid="4852" script="misc/ectoplasm_container.lua" />
 	<action itemid="3217" script="misc/letter_bag.lua" />
 	<action fromid="3603" toid="3605" script="misc/baking.lua" />
+	<action itemid="5466" script="misc/distilling_rum.lua" />
 	<action fromid="3264" toid="3276" script="misc/weapons.lua" />
 	<action fromid="3278" toid="3286" script="misc/weapons.lua" />
 	<action fromid="3288" toid="3297" script="misc/weapons.lua" />
@ -144,6 +146,13 @@
 	<action fromid="3331" toid="3348" script="misc/weapons.lua" />
 	<action itemid="3208" script="misc/weapons.lua" />
 	<action itemid="3059" script="misc/spellbook.lua" />
+	<action fromid="5792" toid="5797" script="misc/dice.lua" />
+	<action itemid="3114" script="misc/skull_candle.lua" />
+	
+	<!-- Dolls -->
+	<action itemid="5080" script="misc/dolls.lua" />
+	<action itemid="5668" script="misc/dolls.lua" />
+	<action itemid="5791" script="misc/dolls.lua" />
 	
 	<!-- Keys -->
 	<action fromid="2967" toid="2973" script="misc/key.lua" />
@ -165,11 +174,14 @@
 	<action itemid="4872" script="misc/ice_pick.lua" />
 	<action itemid="3456" script="misc/pick.lua" />
 	<action itemid="3457" script="misc/shovel.lua" />
+	<action itemid="5710" script="misc/shovel.lua" />
 	<action itemid="3483" allowfaruse="1" script="misc/fishing_rod.lua" />
+	<action itemid="5865" script="misc/juice_squeezer.lua" />
 	
 	<!-- Miscellaneous -->
 	<action itemid="4867" script="misc/botanist_container.lua" />
 	<action itemid="4863" script="misc/butterfly_conservation_kit.lua" />
+	<action itemid="5467" script="misc/fire_bug.lua" />
 	
 	<!-- Chests -->
 	<action itemid="2479" script="misc/chests.lua" />
@ -203,6 +215,7 @@
 	<action itemid="2524" script="misc/fluids.lua" />
 	<action itemid="2873" script="misc/fluids.lua" />
 	<action itemid="2874" script="misc/fluids.lua" />
+	<action itemid="2875" script="misc/fluids.lua" />
 	<action itemid="2876" script="misc/fluids.lua" />
 	<action itemid="2877" script="misc/fluids.lua" />
 	<action itemid="2879" script="misc/fluids.lua" />
@ -222,6 +235,7 @@
 	<action itemid="3478" script="misc/fluids.lua" />
 	<action itemid="3479" script="misc/fluids.lua" />
 	<action itemid="3480" script="misc/fluids.lua" />
+	<action itemid="5552" script="misc/fluids.lua" />

 	<!-- Food -->
 	<action itemid="3250" script="misc/food.lua" />
@ -263,6 +277,8 @@
 	<action itemid="3730" script="misc/food.lua" />
 	<action itemid="3731" script="misc/food.lua" />
 	<action itemid="3732" script="misc/food.lua" />
+	<action itemid="5096" script="misc/food.lua" />
+	<action itemid="5678" script="misc/food.lua" />
 	
 	<!-- Passthrough -->
 	<action fromid="2334" toid="2341" script="misc/doors.lua" />
@ -278,6 +294,18 @@
 	<action itemid="1691" script="misc/doors.lua" />
 	<action itemid="5006" script="misc/doors.lua" />
 	<action itemid="5007" script="misc/doors.lua" />
+	<action itemid="5097" script="misc/doors.lua" />
+	<action itemid="5106" script="misc/doors.lua" />
+	<action itemid="5115" script="misc/doors.lua" />
+	<action itemid="5124" script="misc/doors.lua" />
+	<action itemid="5133" script="misc/doors.lua" />
+	<action itemid="5136" script="misc/doors.lua" />
+	<action itemid="5139" script="misc/doors.lua" />
+	<action itemid="5142" script="misc/doors.lua" />
+	<action itemid="5277" script="misc/doors.lua" />
+	<action itemid="5280" script="misc/doors.lua" />
+	<action itemid="5732" script="misc/doors.lua" />
+	<action itemid="5735" script="misc/doors.lua" />
 	
 	<!-- Level Doors -->
 	<action itemid="1646" script="misc/doors.lua" />
@ -288,6 +316,12 @@
 	<action itemid="1680" script="misc/doors.lua" />
 	<action itemid="1687" script="misc/doors.lua" />
 	<action itemid="1696" script="misc/doors.lua" />
+	<action itemid="5102" script="misc/doors.lua" />
+	<action itemid="5111" script="misc/doors.lua" />
+	<action itemid="5120" script="misc/doors.lua" />
+	<action itemid="5129" script="misc/doors.lua" />
+	<action itemid="5291" script="misc/doors.lua" />
+	<action itemid="5293" script="misc/doors.lua" />
 	
 	<!-- Quest Doors -->
 	<action itemid="1642" script="misc/doors.lua" />
@ -298,6 +332,14 @@
 	<action itemid="1676" script="misc/doors.lua" />
 	<action itemid="1689" script="misc/doors.lua" />
 	<action itemid="1698" script="misc/doors.lua" />
+	<action itemid="5104" script="misc/doors.lua" />
+	<action itemid="5113" script="misc/doors.lua" />
+	<action itemid="5122" script="misc/doors.lua" />
+	<action itemid="5131" script="misc/doors.lua" />
+	<action itemid="5287" script="misc/doors.lua" />
+	<action itemid="5289" script="misc/doors.lua" />
+	<action itemid="5745" script="misc/doors.lua" />
+	<action itemid="5749" script="misc/doors.lua" />
 	
 	<!-- Closed Normal Doors -->
 	<action itemid="2177" script="misc/doors.lua" />
@ -319,7 +361,26 @@
 	<action itemid="4912" script="misc/doors.lua" />
 	<action itemid="4913" script="misc/doors.lua" />
 	<action itemid="5082" script="misc/doors.lua" />
-	<action itemid="5084" script="misc/doors.lua" />
+	<action itemid="5098" script="misc/doors.lua" />
+	<action itemid="5100" script="misc/doors.lua" />
+	<action itemid="5107" script="misc/doors.lua" />
+	<action itemid="5109" script="misc/doors.lua" />
+	<action itemid="5116" script="misc/doors.lua" />
+	<action itemid="5118" script="misc/doors.lua" />
+	<action itemid="5125" script="misc/doors.lua" />
+	<action itemid="5127" script="misc/doors.lua" />
+	<action itemid="5134" script="misc/doors.lua" />
+	<action itemid="5137" script="misc/doors.lua" />
+	<action itemid="5140" script="misc/doors.lua" />
+	<action itemid="5143" script="misc/doors.lua" />
+	<action itemid="5278" script="misc/doors.lua" />
+	<action itemid="5281" script="misc/doors.lua" />
+	<action itemid="5283" script="misc/doors.lua" />
+	<action itemid="5285" script="misc/doors.lua" />
+	<action itemid="5514" script="misc/doors.lua" />
+	<action itemid="5516" script="misc/doors.lua" />
+	<action itemid="5733" script="misc/doors.lua" />
+	<action itemid="5736" script="misc/doors.lua" />
 	
 	<!-- Open Vertical Doors -->
 	<action itemid="1630" script="misc/doors.lua" />
@ -340,6 +401,23 @@
 	<action itemid="4914" script="misc/doors.lua" />
 	<action itemid="5083" script="misc/doors.lua" />
 	<action itemid="2178" script="misc/doors.lua" />
+	<action itemid="5108" script="misc/doors.lua" />
+	<action itemid="5110" script="misc/doors.lua" />
+	<action itemid="5112" script="misc/doors.lua" />
+	<action itemid="5114" script="misc/doors.lua" />
+	<action itemid="5126" script="misc/doors.lua" />
+	<action itemid="5128" script="misc/doors.lua" />
+	<action itemid="5130" script="misc/doors.lua" />
+	<action itemid="5132" script="misc/doors.lua" />
+	<action itemid="5141" script="misc/doors.lua" />
+	<action itemid="5144" script="misc/doors.lua" />
+	<action itemid="5282" script="misc/doors.lua" />
+	<action itemid="5284" script="misc/doors.lua" />
+	<action itemid="5288" script="misc/doors.lua" />
+	<action itemid="5292" script="misc/doors.lua" />
+	<action itemid="5515" script="misc/doors.lua" />
+	<action itemid="5737" script="misc/doors.lua" />
+	<action itemid="5748" script="misc/doors.lua" />
 	
 	<!-- Open Horizontal Doors -->
 	<action itemid="1633" script="misc/doors.lua" />
@ -360,4 +438,21 @@
 	<action itemid="4911" script="misc/doors.lua" />
 	<action itemid="5085" script="misc/doors.lua" />
 	<action itemid="2180" script="misc/doors.lua" />
+	<action itemid="5099" script="misc/doors.lua" />
+	<action itemid="5101" script="misc/doors.lua" />
+	<action itemid="5103" script="misc/doors.lua" />
+	<action itemid="5105" script="misc/doors.lua" />
+	<action itemid="5117" script="misc/doors.lua" />
+	<action itemid="5119" script="misc/doors.lua" />
+	<action itemid="5121" script="misc/doors.lua" />
+	<action itemid="5123" script="misc/doors.lua" />
+	<action itemid="5135" script="misc/doors.lua" />
+	<action itemid="5138" script="misc/doors.lua" />
+	<action itemid="5279" script="misc/doors.lua" />
+	<action itemid="5286" script="misc/doors.lua" />
+	<action itemid="5290" script="misc/doors.lua" />
+	<action itemid="5294" script="misc/doors.lua" />
+	<action itemid="5517" script="misc/doors.lua" />
+	<action itemid="5734" script="misc/doors.lua" />
+	<action itemid="5746" script="misc/doors.lua" />
 </actions>
--- a/data/actions/scripts/misc/dice.lua
+++ b/data/actions/scripts/misc/dice.lua
@ -0,0 +1,31 @@
+function onUse(player, item, fromPosition, target, toPosition, isHotkey)
+	local playerPosition = player:getPosition()
+	local afrompos = {x=playerPosition.x - 1, y=playerPosition.y - 1, z=playerPosition.z}
+	local atopos = {x=playerPosition.x + 1, y=playerPosition.y + 1, z=playerPosition.z}
+	for xa = afrompos.x,atopos.x do
+		for ya = afrompos.y,atopos.y do
+			for za = afrompos.z,atopos.z do
+				local npos = {x = xa,y = ya,z = za}	
+				local depotItem = Tile(npos):getItemByType(ITEM_TYPE_DEPOT)
+				if depotItem ~= nil then
+					player:sendCancelMessage("You cannot use this object.")
+					return true
+				end
+			end
+		end
+	end
+	
+	local dicePosition = item:getPosition()
+	local value = math.random(6)
+	local isInGhostMode = player:isInGhostMode()
+
+	dicePosition:sendMagicEffect(CONST_ME_CRAPS, isInGhostMode and player)
+
+	local spectators = Game.getSpectators(dicePosition, false, true, 3, 3)
+	for i = 1, #spectators do
+		player:say(player:getName() .. " rolled a " .. value .. ".", TALKTYPE_MONSTER_SAY, isInGhostMode, spectators[i], dicePosition)
+	end
+
+	item:transform(5791 + value)
+	return true
+end
--- a/data/actions/scripts/misc/distilling_rum.lua
+++ b/data/actions/scripts/misc/distilling_rum.lua
@ -0,0 +1,20 @@
+local distillingMachines = {
+	[5468] = 5512,
+	[5469] = 5513
+}
+
+function onUse(player, item, fromPosition, target, toPosition)
+	if not target:isItem() then
+		return false
+	end
+	
+	local machine = distillingMachines[target:getId()]
+	if machine then
+		target:transform(machine, 1)
+		target:decay()
+		item:remove(1)
+		return true
+	end
+		
+	return false
+end
--- a/data/actions/scripts/misc/dolls.lua
+++ b/data/actions/scripts/misc/dolls.lua
@ -0,0 +1,53 @@
+local dolls = {
+	[5080] = {"Hug me."},
+	[5668] = {
+		"It's not winning that matters, but winning in style.",
+		"Today's your lucky day. Probably.",
+		"Do not meddle in the affairs of dragons, for you are crunchy and taste good with ketchup.",
+		"That is one stupid question.",
+		"You'll need more rum for that.",
+		"Do or do not. There is no try.",
+		"You should do something you always wanted to.",
+		"If you walk under a ladder and it falls down on you it probably means bad luck.",
+		"Never say 'oops'. Always say 'Ah, interesting!'",
+		"Five steps east, fourteen steps south, two steps north and seventeen steps west!"
+	},
+	[5791] = {
+		"Fchhhhhh!",
+		"Zchhhhhh!",
+		"Grooaaaaar*cough*",
+		"Aaa... CHOO!",
+		"You... will.... burn!!"
+	}
+}
+
+function onUse(player, item, fromPosition, target, toPosition, isHotkey)
+	local sounds = dolls[item.itemid]
+	if not sounds then
+		return false
+	end
+
+	if fromPosition.x == CONTAINER_POSITION then
+		fromPosition = player:getPosition()
+	end
+
+	local random = math.random(#sounds)
+	local sound = sounds[random]
+	if item.itemid == 5791 then
+		if random == 3 then
+			fromPosition:sendMagicEffect(CONST_ME_POFF)
+		elseif random == 4 then
+			fromPosition:sendMagicEffect(CONST_ME_FIREAREA)
+		elseif random == 5 then
+			doTargetCombatHealth(0, player, COMBAT_PHYSICALDAMAGE, -1, -1, CONST_ME_EXPLOSIONHIT)
+		end
+	elseif item.itemid == 5668 then
+		fromPosition:sendMagicEffect(CONST_ME_MAGIC_RED)
+		item:transform(item.itemid + 1)
+		item:decay()
+	end
+
+	sound = sound:gsub('|PLAYERNAME|', player:getName())
+	player:say(sound, TALKTYPE_MONSTER_SAY, false, 0, fromPosition)
+	return true
+end
--- a/data/actions/scripts/misc/doors.lua
+++ b/data/actions/scripts/misc/doors.lua
@ -1,5 +1,5 @@
 local lockedDoors = {
-	1628, 1631, 1650, 1653, 1668, 1671, 1682, 1691, 5006, 5007
+	1628, 1631, 1650, 1653, 1668, 1671, 1682, 1691, 5006, 5007, 5097, 5106, 5115, 5124, 5133, 5136, 5139, 5142, 5277, 5280, 5732, 5735
 }

 local closedNormalDoors = {
@ -23,6 +23,26 @@ local closedNormalDoors = {
 	[5084] = 5085,
 	[2177] = 2178,
 	[2179] = 2180,
+	[5098] = 5099,
+	[5100] = 5101,
+	[5107] = 5108,
+	[5109] = 5110,
+	[5116] = 5117,
+	[5118] = 5119,
+	[5125] = 5126,
+	[5127] = 5128,
+	[5134] = 5135,
+	[5137] = 5138,
+	[5140] = 5141,
+	[5143] = 5144,
+	[5278] = 5279,
+	[5281] = 5282,
+	[5283] = 5284,
+	[5285] = 5286,
+	[5514] = 5515,
+	[5516] = 5517,
+	[5733] = 5734,
+	[5736] = 5737,
 }

 local openVerticalDoors = {
@ -44,6 +64,23 @@ local openVerticalDoors = {
 	[4914] = 4913,
 	[5083] = 5082,
 	[2178] = 2177,
+	[5108] = 5107,
+	[5110] = 5109,
+	[5112] = 5111,
+	[5114] = 5113,
+	[5126] = 5125,
+	[5128] = 5127,
+	[5130] = 5129,
+	[5132] = 5131,
+	[5141] = 5140,
+	[5144] = 5143,
+	[5282] = 5281,
+	[5284] = 5283,
+	[5288] = 5287,
+	[5292] = 5291,
+	[5515] = 5514,
+	[5737] = 5736,
+	[5748] = 5749,
 }

 local openHorizontalDoors = {
@ -65,6 +102,23 @@ local openHorizontalDoors = {
 	[4911] = 4912,
 	[5085] = 5084,
 	[2180] = 2179,
+	[5099] = 5098,
+	[5101] = 5100,
+	[5103] = 5102,
+	[5105] = 5104,
+	[5117] = 5116,
+	[5119] = 5118,
+	[5121] = 5120,
+	[5123] = 5122,
+	[5135] = 5134,
+	[5138] = 5137,
+	[5279] = 5278,
+	[5286] = 5285,
+	[5290] = 5289,
+	[5294] = 5293,
+	[5517] = 5516,
+	[5734] = 5733,
+	[5746] = 5745,
 }

 local levelDoors = {
@ -76,6 +130,13 @@ local levelDoors = {
 	[1680] = 1681,
 	[1687] = 1688,
 	[1696] = 1697,
+	[5102] = 5103,
+	[5104] = 5105,
+	[5111] = 5112,
+	[5120] = 5121,
+	[5129] = 5130,
+	[5291] = 5292,
+	[5293] = 5294,
 }

 local questDoors = {
@ -87,6 +148,13 @@ local questDoors = {
 	[1676] = 1677,
 	[1689] = 1690,
 	[1698] = 1699,
+	[5113] = 5114,
+	[5122] = 5123,
+	[5131] = 5132,
+	[5287] = 5288,
+	[5289] = 5290,
+	[5745] = 5746,
+	[5749] = 5748,
 }

 local passthrough = {
--- a/data/actions/scripts/misc/fire_bug.lua
+++ b/data/actions/scripts/misc/fire_bug.lua
@ -0,0 +1,26 @@
+function onUse(player, item, fromPosition, target, toPosition, isHotkey)
+	local random = math.random(10)
+	if random >= 4 then --success 6% chance
+		if target.itemid == 5465 then --Burn Sugar Cane
+			toPosition:sendMagicEffect(CONST_ME_FIREAREA)
+			target:transform(5464)
+			target:decay()
+		elseif target.itemid == 3514 then --Light Up empty coal basins
+			toPosition:sendMagicEffect(CONST_ME_HITBYFIRE)
+			target:transform(3513)
+		elseif target.itemid == 2114 then --Light Up empty coal basins
+			toPosition:sendMagicEffect(CONST_ME_HITBYFIRE)
+			target:transform(2113)
+		end
+	elseif random == 2 then --it remove the fire bug 2% chance
+		item:remove(1)
+		toPosition:sendMagicEffect(CONST_ME_POFF)
+	elseif random == 1 then --it explode on the user 1% chance
+		doTargetCombatHealth(0, player, COMBAT_FIREDAMAGE, -5, -5, CONST_ME_HITBYFIRE)
+		player:say('OUCH!', TALKTYPE_MONSTER_SAY)
+		item:remove(1)
+	else
+		toPosition:sendMagicEffect(CONST_ME_POFF) --it fails, but dont get removed 3% chance
+	end
+	return true
+end
--- a/data/actions/scripts/misc/fluids.lua
+++ b/data/actions/scripts/misc/fluids.lua
@ -21,7 +21,10 @@ local messages = {
 	[FLUID_MILK] = "Mmmh.",
 	[FLUID_MANAFLUID] = "Aaaah...",
 	[FLUID_LIFEFLUID] = "Aaaah...",
-	[FLUID_LEMONADE] = "Mmmh."
+	[FLUID_LEMONADE] = "Mmmh.",
+	[FLUID_RUM] = "Aah...",
+	[FLUID_COCONUTMILK] = "Mmmh.",
+	[FLUID_FRUITJUICE] = "Mmmh."
 }

 function onUse(player, item, fromPosition, target, toPosition)
@ -32,8 +35,7 @@ function onUse(player, item, fromPosition, target, toPosition)
 			item:transform(item:getId(), 0)
 			return true
 		elseif target:getFluidType() ~= 0 and item:getFluidType() == 0 then
-			target:transform(target:getId(), 0)
-			item:transform(item:getId(), target:getFluidType())
+			player:sendCancelMessage("You cannot use this object.")
 			return true
 		end
 	end
@ -43,7 +45,7 @@ function onUse(player, item, fromPosition, target, toPosition)
 			player:sendCancelMessage("It is empty.")
 		else
 			local self = target == player
-			if self and item:getFluidType() == FLUID_BEER or item:getFluidType() == FLUID_WINE then
+			if self and item:getFluidType() == FLUID_BEER or item:getFluidType() == FLUID_WINE or item:getFluidType() == FLUID_RUM then
 				player:addCondition(drunk)
 			elseif self and item:getFluidType() == FLUID_SLIME then
 				player:addCondition(slime)
--- a/data/actions/scripts/misc/instruments.lua
+++ b/data/actions/scripts/misc/instruments.lua
@ -8,6 +8,15 @@ function onUse(player, item, fromPosition, target, toPosition)
 		item:getPosition():sendMagicEffect(CONST_ME_SOUND_PURPLE)
 	elseif item:getId() == 3219 then
 		item:getPosition():sendMagicEffect(19)
+	elseif item:getId() == 5786 then
+		Game.createMonster("wolf", player:getPosition())
+		local random = math.random(1,10)
+		if random > 3 then -- destroy 70% chance
+			item:getPosition():sendMagicEffect(CONST_ME_SOUND_RED)
+			item:remove(1)
+		else
+			item:getPosition():sendMagicEffect(CONST_ME_SOUND_YELLOW)
+		end
 	end
 	
 	return true
--- a/data/actions/scripts/misc/juice_squeezer.lua
+++ b/data/actions/scripts/misc/juice_squeezer.lua
@ -0,0 +1,9 @@
+local fruits = {3584, 3585, 3586, 3587, 3588, 3589, 3590, 3591, 3592, 3593, 3595, 3596, 5096}
+
+function onUse(player, item, fromPosition, target, toPosition, isHotkey)
+	if isInArray(fruits, target.itemid) and player:removeItem(2874, 1, 0) then
+		target:remove(1)
+		player:addItem(2874, target.itemid == 3589 and 14 or 15)
+		return true
+	end
+end
--- a/data/actions/scripts/misc/panda_teddy.lua
+++ b/data/actions/scripts/misc/panda_teddy.lua
@ -1,4 +0,0 @@
-function onUse(player, item, fromPosition, target, toPosition)
-	player:sendCancelMessage("Hug me ^^")
-	return true
-end
--- a/data/actions/scripts/misc/scythe.lua
+++ b/data/actions/scripts/misc/scythe.lua
@ -11,6 +11,11 @@ function onUse(player, item, fromPosition, target, toPosition)
 		target:decay()
 		Game.createItem(3605, 1, target:getPosition()) 
 		return true
+	elseif target:getId() == 5463 then
+		target:transform(5462, 1)
+		target:decay()
+		Game.createItem(5466, 1, target:getPosition()) 
+		return true
 	end
 	return doDestroyItem(target)
 end
--- a/data/actions/scripts/misc/skull_candle.lua
+++ b/data/actions/scripts/misc/skull_candle.lua
@ -0,0 +1,14 @@
+function onUse(player, item, fromPosition, target, toPosition)
+	if not target:isItem() then
+		return false
+	end
+	
+	if target:getId() == 2917 then
+		player:addItem(5813, 1)
+		item:remove(1)
+		target:remove(1)
+		return true
+	end
+		
+	return false
+end
--- a/data/actions/scripts/misc/teleporters.lua
+++ b/data/actions/scripts/misc/teleporters.lua
@ -3,7 +3,7 @@ local downstairs = {
 }

 local upstairs = {
-	1948, 1968
+	1948, 1968, 5542
 }

 function onUse(player, item, fromPosition, target, toPosition)
--- a/data/items/items.srv
+++ b/data/items/items.srv
--- a/data/monster/bat.xml
+++ b/data/monster/bat.xml
@ -23,4 +23,7 @@
 	<voices>
 		<voice sentence="Flap! Flap!" />
 	</voices>
+	<loot>
+		<item id="5894" chance="8" /><!-- bat wing -->
+	</loot>
 </monster>
--- a/data/monster/bear.xml
+++ b/data/monster/bear.xml
@ -28,5 +28,7 @@
 		<item id="3582" countmax="2" chance="400" /> <!-- ham -->
 		<item id="3577" countmax="4" chance="700" /> <!-- meat -->
 		<item id="3492" countmax="1" chance="50" /> <!-- a worm -->
+		<item id="5896" countmax="1" chance="25" /> <!-- bear paw -->
+		<item id="5902" countmax="1" chance="10" /> <!-- honeycomb -->
 	</loot>
 </monster>
--- a/data/monster/behemoth.xml
+++ b/data/monster/behemoth.xml
@ -56,5 +56,7 @@
 		<item id="3554" countmax="1" chance="4" /> <!-- steel boots -->
 		<item id="3058" countmax="1" chance="8" /> <!-- a strange symbol -->
 		<item id="3265" countmax="1" chance="40" /> <!-- a two handed sword -->
+		<item id="5893" countmax="1" chance="9" /> <!-- perfect behemoth fang -->
+		<item id="5930" countmax="1" chance="9" /> <!-- behemoth claw -->
 	</loot>
 </monster>
--- a/data/monster/beholder.xml
+++ b/data/monster/beholder.xml
@ -65,5 +65,6 @@
 		<item id="3409" countmax="1" chance="40" /> <!-- a steel shield -->
 		<item id="3265" countmax="1" chance="40" /> <!-- a two handed sword -->
 		<item id="3412" countmax="1" chance="30" /> <!-- a wooden shield -->
+		<item id="5898" countmax="1" chance="8" /> <!-- beholder eye -->
 	</loot>
 </monster>
--- a/data/monster/bluedjinn.xml
+++ b/data/monster/bluedjinn.xml
@ -59,5 +59,6 @@
 		<item id="3574" countmax="1" chance="1" /> <!-- a mystic turban -->
 		<item id="2933" countmax="1" chance="75" /> <!-- a small oil lamp -->
 		<item id="3029" countmax="4" chance="25" /> <!-- a small sapphire -->
+		<item id="5912" countmax="1" chance="10" /> <!-- a blue piece of cloth -->
 	</loot>
 </monster>
--- a/data/monster/bonebeast.xml
+++ b/data/monster/bonebeast.xml
@ -53,5 +53,6 @@
 		<item id="3732" countmax="1" chance="15" /> <!-- a green mushroom -->
 		<item id="3357" countmax="1" chance="80" /> <!-- a plate armor -->
 		<item id="3114" countmax="1" chance="200" /> <!-- a skull -->
+		<item id="5925" countmax="1" chance="10" /> <!-- a hardened bone -->
 	</loot>
 </monster>
--- a/data/monster/chicken.xml
+++ b/data/monster/chicken.xml
@ -28,5 +28,6 @@
 		<item id="3606" countmax="1" chance="10" /> <!-- an egg -->
 		<item id="3577" countmax="2" chance="20" /> <!-- meat -->
 		<item id="3492" countmax="3" chance="300" /> <!-- a worm -->
+		<item id="5890" countmax="1" chance="300" /> <!-- chicken feather -->
 	</loot>
 </monster>
--- a/data/monster/demodras.xml
+++ b/data/monster/demodras.xml
@ -65,5 +65,7 @@
 		<item id="3029" countmax="1" chance="100" /> <!-- a small sapphire -->
 		<item id="3373" countmax="1" chance="8" /> <!-- a strange helmet -->
 		<item id="3428" countmax="1" chance="6" /> <!-- a tower shield -->
+		<item id="5919" countmax="1" chance="1000" /> <!-- a dragon claw -->
+		<item id="5948" countmax="1" chance="10" /> <!-- red dragon leather -->
 	</loot>
 </monster>
--- a/data/monster/demon.xml
+++ b/data/monster/demon.xml
@ -78,5 +78,6 @@
 		<item id="3032" countmax="1" chance="110" /> <!-- a small emerald -->
 		<item id="3049" countmax="1" chance="14" /> <!-- a stealth ring -->
 		<item id="3034" countmax="1" chance="35" /> <!-- a talon -->
+		<item id="5954" countmax="1" chance="100" /> <!-- a demon horn -->
 	</loot>
 </monster>
--- a/data/monster/dharalion.xml
+++ b/data/monster/dharalion.xml
@ -65,5 +65,7 @@
 		<item id="3738" countmax="1" chance="70" /> <!-- a sling herb -->
 		<item id="3289" countmax="1" chance="110" /> <!-- a staff -->
 		<item id="3037" countmax="1" chance="4" /> <!-- a yellow gem -->
+		<item id="5805" countmax="1" chance="65" /> <!-- a golden goblet -->
+		<item id="5922" countmax="1" chance="1000" /> <!-- a holy orchid -->
 	</loot>
 </monster>
--- a/data/monster/dragon.xml
+++ b/data/monster/dragon.xml
@ -60,5 +60,7 @@
 		<item id="3351" countmax="1" chance="30" /> <!-- a steel helmet -->
 		<item id="3409" countmax="1" chance="150" /> <!-- a steel shield -->
 		<item id="3071" countmax="1" chance="10" /> <!-- a wand of inferno -->
+		<item id="5877" countmax="1" chance="10" /> <!-- green dragon leather -->
+		<item id="5920" countmax="1" chance="10" /> <!-- green dragon scale -->
 	</loot>
 </monster>
--- a/data/monster/dragonlord.xml
+++ b/data/monster/dragonlord.xml
@ -61,5 +61,7 @@
 		<item id="3029" countmax="1" chance="50" /> <!-- a small sapphire -->
 		<item id="3373" countmax="1" chance="4" /> <!-- a strange helmet -->
 		<item id="3428" countmax="1" chance="3" /> <!-- a tower shield -->
+		<item id="5882" countmax="1" chance="18" /> <!-- red dragon scale -->
+		<item id="5948" countmax="1" chance="10" /> <!-- red dragon leather -->
 	</loot>
 </monster>
--- a/data/monster/dwarf.xml
+++ b/data/monster/dwarf.xml
@ -37,5 +37,6 @@
 		<item id="3456" countmax="1" chance="100" /> <!-- a pick -->
 		<item id="3378" countmax="1" chance="80" /> <!-- a studded armor -->
 		<item id="3723" countmax="1" chance="500" /> <!-- a white mushroom -->
+		<item id="5880" countmax="1" chance="7" /> <!-- iron ore -->
 	</loot>
 </monster>
--- a/data/monster/dwarfgeomancer.xml
+++ b/data/monster/dwarfgeomancer.xml
@ -51,5 +51,6 @@
 		<item id="3059" countmax="1" chance="4" /> <!-- a spellbook -->
 		<item id="3362" countmax="1" chance="200" /> <!-- studded legs -->
 		<item id="3723" countmax="2" chance="600" /> <!-- a white mushroom -->
+		<item id="5880" countmax="1" chance="1" /> <!-- Iron Ore -->
 	</loot>
 </monster>
--- a/data/monster/dwarfguard.xml
+++ b/data/monster/dwarfguard.xml
@ -38,5 +38,6 @@
 		<item id="3033" countmax="1" chance="1" /> <!-- a small amethyst -->
 		<item id="3351" countmax="1" chance="20" /> <!-- a steel helmet -->
 		<item id="3723" countmax="2" chance="550" /> <!-- a white mushroom -->
+		<item id="5880" countmax="1" chance="8" /> <!-- iron ore -->
 	</loot>
 </monster>
--- a/data/monster/dwarfsoldier.xml
+++ b/data/monster/dwarfsoldier.xml
@ -40,5 +40,6 @@
 		<item id="3457" countmax="1" chance="100" /> <!-- a shovel -->
 		<item id="3375" countmax="1" chance="120" /> <!-- a soldier helmet -->
 		<item id="3723" countmax="2" chance="400" /> <!-- a white mushroom -->
+		<item id="5880" countmax="1" chance="6" /> <!-- iron ore -->
 	</loot>
 </monster>
--- a/data/monster/efreet.xml
+++ b/data/monster/efreet.xml
@ -75,5 +75,6 @@
 		<item id="3032" countmax="2" chance="70" /> <!-- a small emerald -->
 		<item id="2933" countmax="1" chance="200" /> <!-- a small oil lamp -->
 		<item id="3071" countmax="1" chance="5" /> <!-- a wand of inferno -->
+		<item id="5910" countmax="1" chance="25" /> <!-- green piece of cloth -->
 	</loot>
 </monster>
--- a/data/monster/elderbeholder.xml
+++ b/data/monster/elderbeholder.xml
@ -71,5 +71,6 @@
 		<item id="3059" countmax="1" chance="10" /> <!-- a spellbook -->
 		<item id="3409" countmax="1" chance="60" /> <!-- a steel shield -->
 		<item id="3265" countmax="1" chance="60" /> <!-- a two handed sword -->
+		<item id="5898" countmax="1" chance="8" /> <!-- beholder eye -->
 	</loot>
 </monster>
--- a/data/monster/elf.xml
+++ b/data/monster/elf.xml
@ -41,5 +41,6 @@
 		<item id="3585" countmax="2" chance="200" /> <!-- a red apple -->
 		<item id="3378" countmax="1" chance="110" /> <!-- a studded armor -->
 		<item id="3376" countmax="1" chance="150" /> <!-- a studded helmet -->
+		<item id="5921" countmax="1" chance="10" /> <!-- a heaven blossom -->
 	</loot>
 </monster>
--- a/data/monster/elfarcanist.xml
+++ b/data/monster/elfarcanist.xml
@ -65,5 +65,6 @@
 		<item id="3289" countmax="1" chance="110" /> <!-- a staff -->
 		<item id="3073" countmax="1" chance="10" /> <!-- a wand of cosmic energy -->
 		<item id="3037" countmax="1" chance="2" /> <!-- a yellow gem -->
+		<item id="5922" countmax="1" chance="25" /> <!-- a holy orchid -->
 	</loot>
 </monster>
--- a/data/monster/elfscout.xml
+++ b/data/monster/elfscout.xml
@ -44,5 +44,6 @@
 		<item id="3378" countmax="1" chance="120" /> <!-- a studded armor -->
 		<item id="3376" countmax="1" chance="80" /> <!-- a studded helmet -->
 		<item id="2901" countmax="1" chance="140" /> <!-- a waterskin -->
+		<item id="5921" countmax="1" chance="10" /> <!-- a heaven blossom -->
 	</loot>
 </monster>
--- a/data/monster/evileye.xml
+++ b/data/monster/evileye.xml
@ -79,5 +79,6 @@
 		<item id="3409" countmax="1" chance="40" /> <!-- a steel shield -->
 		<item id="3265" countmax="1" chance="40" /> <!-- a two handed sword -->
 		<item id="3412" countmax="1" chance="15" /> <!-- a wooden shield -->
+		<item id="5898" countmax="1" chance="1000" /> <!-- beholder eye -->
 	</loot>
 </monster>
--- a/data/monster/fernfang.xml
+++ b/data/monster/fernfang.xml
@ -71,5 +71,6 @@
 		<item id="3736" countmax="1" chance="90" /> <!-- a star herb -->
 		<item id="3012" countmax="1" chance="100" /> <!-- a wolf tooth chain -->
 		<item id="3037" countmax="1" chance="4" /> <!-- a yellow gem -->
+		<item id="5786" countmax="1" chance="10" /> <!-- wooden whistle -->
 	</loot>
 </monster>
--- a/data/monster/ferumbras.xml
+++ b/data/monster/ferumbras.xml
@ -132,5 +132,7 @@
 		<item id="3002" countmax="1" chance="1" /> <!-- a voodoo doll -->
 		<item id="3069" countmax="1" chance="35" /> <!-- a volcanic rod -->
 		<item id="3026" countmax="15" chance="125" /> <!-- a white pearl -->
+		<item id="5944" countmax="8" chance="125" /> <!-- a soul orb -->
+		<item id="5903" countmax="1" chance="1000" /> <!-- Ferumbras' hat -->
 	</loot>
 </monster>
--- a/data/monster/ghost.xml
+++ b/data/monster/ghost.xml
@ -41,5 +41,6 @@
 		<item id="3551" countmax="1" chance="200" /> <!-- sandals -->
 		<item id="3740" countmax="1" chance="150" /> <!-- a shadow herb -->
 		<item id="3049" countmax="1" chance="2" /> <!-- a stealth ring -->
+		<item id="5909" countmax="1" chance="8" /> <!-- white piece of cloth -->
 	</loot>
 </monster>
--- a/data/monster/ghoul.xml
+++ b/data/monster/ghoul.xml
@ -40,5 +40,6 @@
 		<item id="2920" countmax="1" chance="600" /> <!-- a torch -->
 		<item id="3367" countmax="1" chance="50" /> <!-- a viking helmet -->
 		<item id="3492" countmax="6" chance="800" /> <!-- a worm -->
+		<item id="5913" countmax="1" chance="10" /> <!-- a brown piece of cloth -->
 	</loot>
 </monster>
--- a/data/monster/giantspider.xml
+++ b/data/monster/giantspider.xml
@ -47,5 +47,6 @@
 		<item id="3055" countmax="1" chance="1" /> <!-- a platinum amulet -->
 		<item id="3351" countmax="1" chance="50" /> <!-- a steel helmet -->
 		<item id="3053" countmax="1" chance="7" /> <!-- a time ring -->
+		<item id="5879" countmax="1" chance="21" /> <!-- spider silk -->
 	</loot>
 </monster>
--- a/data/monster/greendjinn.xml
+++ b/data/monster/greendjinn.xml
@ -60,5 +60,6 @@
 		<item id="3574" countmax="1" chance="1" /> <!-- a mystic turban -->
 		<item id="3032" countmax="4" chance="27" /> <!-- a small emerald -->
 		<item id="2933" countmax="1" chance="75" /> <!-- a small oil lamp -->
+		<item id="5910" countmax="1" chance="25" /> <!-- green piece of cloth -->
 	</loot>
 </monster>
--- a/data/monster/grorlam.xml
+++ b/data/monster/grorlam.xml
@ -46,5 +46,6 @@
 		<item id="1781" countmax="4" chance="130" /> <!-- a small stone -->
 		<item id="3554" countmax="1" chance="5" /> <!-- steel boots -->
 		<item id="3409" countmax="1" chance="70" /> <!-- a steel shield -->
+		<item id="5880" countmax="1" chance="130" /> <!-- Iron Ore -->
 	</loot>
 </monster>
--- a/data/monster/hero.xml
+++ b/data/monster/hero.xml
@ -61,5 +61,6 @@
 		<item id="3265" countmax="1" chance="15" /> <!-- a two handed sword -->
 		<item id="3279" countmax="1" chance="10" /> <!-- a war hammer -->
 		<item id="3004" countmax="1" chance="50" /> <!-- a wedding ring -->
+		<item id="5911" countmax="1" chance="25" /> <!-- a red piece of cloth -->
 	</loot>
 </monster>
--- a/data/monster/hornedfox.xml
+++ b/data/monster/hornedfox.xml
@ -56,5 +56,7 @@
 		<item id="3031" countmax="20" chance="600" /> <!-- a gold coin -->
 		<item id="3276" countmax="1" chance="90" /> <!-- a hatchet -->
 		<item id="3577" countmax="1" chance="100" /> <!-- meat -->
+		<item id="5804" countmax="1" chance="1000" /> <!-- nose ring -->
+		<item id="5878" countmax="1" chance="600" /> <!-- minotaur leather -->
 	</loot>
 </monster>
--- a/data/monster/hunter.xml
+++ b/data/monster/hunter.xml
@ -40,5 +40,6 @@
 		<item id="3601" countmax="2" chance="110" /> <!-- a roll -->
 		<item id="3030" countmax="1" chance="2" /> <!-- a small ruby -->
 		<item id="2920" countmax="1" chance="50" /> <!-- a torch -->
+		<item id="5875" countmax="1" chance="7" /> <!-- sniper gloves -->
 	</loot>
 </monster>
--- a/data/monster/kongra.xml
+++ b/data/monster/kongra.xml
@ -37,5 +37,6 @@
 		<item id="3357" countmax="1" chance="10" /> <!-- a plate armor -->
 		<item id="3050" countmax="1" chance="5" /> <!-- a power ring -->
 		<item id="3084" countmax="1" chance="10" /> <!-- a protection amulet -->
+		<item id="5883" countmax="1" chance="8" /> <!-- ape fur -->
 	</loot>
 </monster>
--- a/data/monster/lizardsentinel.xml
+++ b/data/monster/lizardsentinel.xml
@ -39,5 +39,7 @@
 		<item id="3444" countmax="1" chance="3" /> <!-- a sentinel shield -->
 		<item id="3028" countmax="1" chance="1" /> <!-- a small diamond -->
 		<item id="3277" countmax="3" chance="100" /> <!-- a spear -->
+		<item id="5876" countmax="1" chance="9" /> <!-- lizard leather -->
+		<item id="5881" countmax="1" chance="9" /><!-- lizard scale -->
 	</loot>
 </monster>
--- a/data/monster/lizardsnakecharmer.xml
+++ b/data/monster/lizardsnakecharmer.xml
@ -54,5 +54,7 @@
 		<item id="3033" countmax="1" chance="5" /> <!-- a small amethyst -->
 		<item id="3066" countmax="1" chance="1" /> <!-- a snakebite rod -->
 		<item id="3037" countmax="1" chance="2" /> <!-- a yellow gem -->
+		<item id="5876" countmax="1" chance="9" /> <!-- lizard leather -->
+		<item id="5881" countmax="1" chance="9" /><!-- lizard scale -->
 	</loot>
 </monster>
--- a/data/monster/lizardtemplar.xml
+++ b/data/monster/lizardtemplar.xml
@ -36,5 +36,7 @@
 		<item id="3351" countmax="1" chance="20" /> <!-- a steel helmet -->
 		<item id="3264" countmax="1" chance="50" /> <!-- a sword -->
 		<item id="3345" countmax="1" chance="5" /> <!-- a templar scytheblade -->
+		<item id="5876" countmax="1" chance="10" /> <!-- lizard leather -->
+		<item id="5881" countmax="1" chance="10" /><!-- lizard scale -->
 	</loot>
 </monster>
--- a/data/monster/marid.xml
+++ b/data/monster/marid.xml
@ -75,5 +75,6 @@
 		<item id="3029" countmax="2" chance="70" /> <!-- a small sapphire -->
 		<item id="3067" countmax="1" chance="5" /> <!-- a tempest rod -->
 		<item id="2948" countmax="1" chance="3" /> <!-- a wooden flute -->
+		<item id="5912" countmax="1" chance="25" /> <!-- a blue piece of cloth -->
 	</loot>
 </monster>
--- a/data/monster/merlkin.xml
+++ b/data/monster/merlkin.xml
@ -52,5 +52,6 @@
 		<item id="3586" countmax="5" chance="10" /> <!-- an orange -->
 		<item id="3033" countmax="1" chance="5" /> <!-- a small amethyst -->
 		<item id="3072" countmax="1" chance="10" /> <!-- a wand of plague -->
+		<item id="5883" countmax="1" chance="8" /> <!-- ape fur -->
 	</loot>
 </monster>
--- a/data/monster/minotaur.xml
+++ b/data/monster/minotaur.xml
@ -37,5 +37,6 @@
 		<item id="3410" countmax="1" chance="200" /> <!-- a plate shield -->
 		<item id="3457" countmax="1" chance="30" /> <!-- a shovel -->
 		<item id="3264" countmax="1" chance="100" /> <!-- a sword -->
+		<item id="5878" countmax="1" chance="8" /> <!-- minotaur leather -->
 	</loot>
 </monster>
--- a/data/monster/minotaurarcher.xml
+++ b/data/monster/minotaurarcher.xml
@ -39,5 +39,6 @@
 		<item id="3577" countmax="1" chance="100" /> <!-- meat -->
 		<item id="3377" countmax="1" chance="10" /> <!-- a scale armor -->
 		<item id="3375" countmax="1" chance="20" /> <!-- a soldier helmet -->
+		<item id="5878" countmax="1" chance="10" /> <!-- minotaur leather -->
 	</loot>
 </monster>
--- a/data/monster/minotaurguard.xml
+++ b/data/monster/minotaurguard.xml
@ -35,5 +35,6 @@
 		<item id="3276" countmax="1" chance="100" /> <!-- a hatchet -->
 		<item id="3559" countmax="1" chance="150" /> <!-- leather legs -->
 		<item id="3577" countmax="1" chance="100" /> <!-- meat -->
+		<item id="5878" countmax="1" chance="10" /> <!-- minotaur leather -->
 	</loot>
 </monster>
--- a/data/monster/minotaurmage.xml
+++ b/data/monster/minotaurmage.xml
@ -51,5 +51,6 @@
 		<item id="3559" countmax="1" chance="150" /> <!-- leather legs -->
 		<item id="2920" countmax="2" chance="300" /> <!-- a torch -->
 		<item id="3073" countmax="1" chance="5" /> <!-- a wand of cosmic energy -->
+		<item id="5878" countmax="1" chance="10" /> <!-- minotaur leather -->
 	</loot>
 </monster>
--- a/data/monster/morgaroth.xml
+++ b/data/monster/morgaroth.xml
@ -125,5 +125,7 @@
 		<item id="3002" countmax="1" chance="1" /> <!-- a voodoo doll -->
 		<item id="3069" countmax="1" chance="35" /> <!-- a volcanic rod -->
 		<item id="3026" countmax="15" chance="125" /> <!-- a white pearl -->
+		<item id="5943" countmax="1" chance="10" /> <!-- Morgaroth's heart -->
+		<item id="5954" countmax="2" chance="200" /> <!-- a demon horn -->
 	</loot>
 </monster>
--- a/data/monster/mummy.xml
+++ b/data/monster/mummy.xml
@ -50,5 +50,6 @@
 		<item id="3017" countmax="1" chance="40" /> <!-- a silver brooch -->
 		<item id="3045" countmax="1" chance="50" /> <!-- a strange talisman -->
 		<item id="3492" countmax="3" chance="700" /> <!-- a worm -->
+		<item id="5914" countmax="1" chance="10" /> <!-- a yellow piece of cloth -->
 	</loot>
 </monster>
--- a/data/monster/murius.xml
+++ b/data/monster/murius.xml
@ -52,5 +52,6 @@
 		<item id="3483" countmax="1" chance="50" /> <!-- a fishing rod -->
 		<item id="3031" countmax="50" chance="600" /> <!-- a gold coin -->
 		<item id="3577" countmax="1" chance="100" /> <!-- meat -->
+		<item id="5878" chance="100" /> <!-- minotaur leather -->
 	</loot>
 </monster>
--- a/data/monster/necropharus.xml
+++ b/data/monster/necropharus.xml
@ -60,5 +60,6 @@
 		<item id="3294" countmax="1" chance="86" /> <!-- a short sword -->
 		<item id="3114" countmax="1" chance="160" /> <!-- a skull -->
 		<item id="3324" countmax="1" chance="4" /> <!-- a skull staff -->
+		<item id="5809" countmax="1" chance="1000" /> <!-- soul stone -->
 	</loot>
 </monster>
--- a/data/monster/oldwidow.xml
+++ b/data/monster/oldwidow.xml
@ -58,5 +58,7 @@
 		<item id="3055" countmax="1" chance="2" /> <!-- a platinum amulet -->
 		<item id="3351" countmax="1" chance="100" /> <!-- a steel helmet -->
 		<item id="3053" countmax="1" chance="14" /> <!-- a time ring -->
+		<item id="5879" countmax="1" chance="500" /> <!-- spider silk -->
+		<item id="5886" countmax="1" chance="6" /> <!-- spool of yarn -->
 	</loot>
 </monster>
--- a/data/monster/orshabaal.xml
+++ b/data/monster/orshabaal.xml
@ -119,5 +119,7 @@
 		<item id="3002" countmax="1" chance="1" /> <!-- a voodoo doll -->
 		<item id="3069" countmax="1" chance="35" /> <!-- a volcanic rod -->
 		<item id="3026" countmax="15" chance="125" /> <!-- a white pearl -->
+		<item id="5808" countmax="1" chance="100" /> <!-- orshabaal's brain -->
+		<item id="5954" countmax="2" chance="200" /> <!-- a demon horn -->
 	</loot>
 </monster>
--- a/data/monster/sibang.xml
+++ b/data/monster/sibang.xml
@ -43,5 +43,6 @@
 		<item id="3593" countmax="1" chance="100" /> <!-- a melon -->
 		<item id="3586" countmax="5" chance="200" /> <!-- an orange -->
 		<item id="1781" countmax="3" chance="300" /> <!-- a small stone -->
+		<item id="5883" countmax="1" chance="8" /> <!-- ape fur -->
 	</loot>
 </monster>
--- a/data/monster/stonegolem.xml
+++ b/data/monster/stonegolem.xml
@ -35,5 +35,6 @@
 		<item id="1781" countmax="4" chance="130" /> <!-- a small stone -->
 		<item id="3409" countmax="1" chance="70" /> <!-- a steel shield -->
 		<item id="2920" countmax="1" chance="55" /> <!-- a torch -->
+		<item id="5880" countmax="1" chance="7" /> <!-- iron ore -->
 	</loot>
 </monster>
--- a/data/monster/warwolf.xml
+++ b/data/monster/warwolf.xml
@ -27,5 +27,6 @@
 	<loot>
 		<item id="3582" countmax="2" chance="400" /> <!-- ham -->
 		<item id="3577" countmax="4" chance="700" /> <!-- meat -->
+		<item id="5897" countmax="1" chance="8" /> <!-- wolf paw -->
 	</loot>
 </monster>
--- a/data/monster/wasp.xml
+++ b/data/monster/wasp.xml
@ -26,4 +26,7 @@
 	<voices>
 		<voice sentence="Bsssssss" />
 	</voices>
+	<loot>
+		<item id="5902" countmax="1" chance="30" /> <!-- honeycomb -->
+	</loot>
 </monster>
--- a/data/monster/wolf.xml
+++ b/data/monster/wolf.xml
@ -23,5 +23,6 @@
 	<loot>
 		<item id="3577" countmax="2" chance="500" /> <!-- meat -->
 		<item id="3492" countmax="1" chance="100" /> <!-- a worm -->
+		<item id="5897" countmax="1" chance="8" /> <!-- wolf paw -->
 	</loot>
 </monster>
--- a/data/movements/movements.xml
+++ b/data/movements/movements.xml
@ -532,6 +532,20 @@
 	<movevent event="AddItem" itemid="2196" tileitem="1" script="misc/floorchange.lua" />
 	<movevent event="StepIn" itemid="2198" script="misc/floorchange.lua" />
 	<movevent event="AddItem" itemid="2198" tileitem="1" script="misc/floorchange.lua" />
+	<movevent event="StepIn" itemid="5257" script="misc/floorchange.lua" />
+	<movevent event="AddItem" itemid="5257" tileitem="1" script="misc/floorchange.lua" />
+	<movevent event="StepIn" itemid="5258" script="misc/floorchange.lua" />
+	<movevent event="AddItem" itemid="5258" tileitem="1" script="misc/floorchange.lua" />
+	<movevent event="StepIn" itemid="5259" script="misc/floorchange.lua" />
+	<movevent event="AddItem" itemid="5259" tileitem="1" script="misc/floorchange.lua" />
+	<movevent event="StepIn" itemid="5544" script="misc/floorchange.lua" />
+	<movevent event="AddItem" itemid="5544" tileitem="1" script="misc/floorchange.lua" />
+	<movevent event="StepIn" itemid="5691" script="misc/floorchange.lua" />
+	<movevent event="AddItem" itemid="5691" tileitem="1" script="misc/floorchange.lua" />
+	<movevent event="StepIn" itemid="5731" script="misc/floorchange.lua" />
+	<movevent event="AddItem" itemid="5731" tileitem="1" script="misc/floorchange.lua" />
+	<movevent event="StepIn" itemid="5763" script="misc/floorchange.lua" />
+	<movevent event="AddItem" itemid="5763" tileitem="1" script="misc/floorchange.lua" />
 	
 	<!-- Damage -->
 	<movevent event="StepIn" itemid="2145" script="misc/damage.lua" />
@ -583,6 +597,20 @@
 	<movevent event="StepOut" itemid="1681" script="misc/doors.lua" />
 	<movevent event="StepOut" itemid="1688" script="misc/doors.lua" />
 	<movevent event="StepOut" itemid="1690" script="misc/doors.lua" />
+	<movevent event="StepOut" itemid="5103" script="misc/doors.lua" />
+	<movevent event="StepOut" itemid="5105" script="misc/doors.lua" />
+	<movevent event="StepOut" itemid="5112" script="misc/doors.lua" />
+	<movevent event="StepOut" itemid="5114" script="misc/doors.lua" />
+	<movevent event="StepOut" itemid="5121" script="misc/doors.lua" />
+	<movevent event="StepOut" itemid="5123" script="misc/doors.lua" />
+	<movevent event="StepOut" itemid="5130" script="misc/doors.lua" />
+	<movevent event="StepOut" itemid="5132" script="misc/doors.lua" />
+	<movevent event="StepOut" itemid="5288" script="misc/doors.lua" />
+	<movevent event="StepOut" itemid="5290" script="misc/doors.lua" />
+	<movevent event="StepOut" itemid="5292" script="misc/doors.lua" />
+	<movevent event="StepOut" itemid="5294" script="misc/doors.lua" />
+	<movevent event="StepOut" itemid="5746" script="misc/doors.lua" />
+	<movevent event="StepOut" itemid="5748" script="misc/doors.lua" />
 	
 	<!-- Magic Fields -->
 	<movevent event="StepIn" itemid="1998"  function="onStepInField" />
--- a/data/movements/scripts/misc/doors.lua
+++ b/data/movements/scripts/misc/doors.lua
@ -7,6 +7,13 @@ local verticalDoors = {
 	[1679] = 1678, 
 	[1697] = 1696, 
 	[1699] = 1698,
+	[5112] = 5111,
+	[5114] = 5113,
+	[5130] = 5129,
+	[5132] = 5131,
+	[5288] = 5287,
+	[5292] = 5291,
+	[5748] = 5749,
 }

 local horizontalDoors = {
@ -18,6 +25,13 @@ local horizontalDoors = {
 	[1681] = 1680,
 	[1688] = 1687,
 	[1690] = 1689,
+	[5103] = 5102,
+	[5105] = 5104,
+	[5121] = 5120,
+	[5123] = 5122,
+	[5290] = 5289,
+	[5294] = 5293,
+	[5746] = 5745,
 }

 function onStepOut(creature, item, fromPosition, toPosition)
--- a/data/movements/scripts/misc/floorchange.lua
+++ b/data/movements/scripts/misc/floorchange.lua
@ -70,6 +70,13 @@ local list = {
 	[2194] = {x = 1, y = -1, z = -1},
 	[2196] = {x = 1, y = 1, z = -1},
 	[2198] = {x = -1, y = 1, z = -1},
+	[5257] = {x = -1, y = 0, z = -1},
+	[5258] = {x = 0, y = -1, z = -1},
+	[5259] = {x = -1, y = 0, z = -1},
+	[5544] = {x = 0, y = 0, z = 1},
+	[5691] = {x = 0, y = 0, z = 1},
+	[5731] = {x = 0, y = 0, z = 1},
+	[5763] = {x = 0, y = 0, z = 1},
 }

 function onStepIn(creature, item, position, fromPosition)
--- a/data/npc/amber.npc
+++ b/data/npc/amber.npc
@ -2,7 +2,7 @@
 # amber.npc: Datenbank für die Abenteurerin Amber

 Name = "Amber"
-Outfit = (137,59-113-132-76)
+Outfit = (136,59-113-132-76-1)
 Home = [32103,32182,8]
 Radius = 4

--- a/data/npc/bigben.npc
+++ b/data/npc/bigben.npc
@ -50,14 +50,35 @@ VANISH,!           -> "Hum Humm."
 "cyclops"        -> "Me people not live here much. Most are far away."
 "excalibug"      -> "Me wish I could make weapon like it."

-"fire","sword"         -> "Do lil' one want to trade a fire sword?", topic=1 
-"bright","word"        -> "Do lil' one want to trade a bright sword?", topic=1 
-"warlord","sword"      -> "Do lil' one want to trade a warlord sword?", topic=1 
-"sword","of","valor"   -> "Do lil' one want to trade a sword of valor?", topic=1 
-"serpent","sword"      -> "Do lil' one want to trade a serpent sword?", topic=1 
-"enchanted","plate"    -> "Do lil' one want to trade an enchanted plate armor?", topic=1 
-"dragon","shield"      -> "Do lil' one want to trade a dragon shield?", topic=1 
+"uth'kean"         -> Type=3381, Amount=1,  "Very noble. Shiny. Me like. But breaks so fast. Me can make from shiny armour. Lil' one want to trade?", Topic=1
+Topic=1,"yes",QuestValue(17500)<2,!     -> "Wait. Me work no cheap is. Do favour for me first, yes?", Topic=2
+Topic=1,"yes",Count(Type)>=Amount -> "Cling clang!", Delete(Type), Type=5887, Amount=1, Create(Type)
+Topic=1,"yes"                             -> "You not have stuff me want for."
+Topic=1                                   -> "Silly lil' one you are."
+
+"uth'lokr"         -> Type=3416, Amount=1,  "Firy steel it is. Need green ones' breath to melt. Or red even better. Me can make from shield. Lil' one want to trade?", Topic=4
+Topic=4,"yes",QuestValue(17500)<2,!     -> "Wait. Me work no cheap is. Do favour for me first, yes?", Topic=2
+Topic=4,"yes",Count(Type)>=Amount -> "Cling clang!", Delete(Type), Type=5889, Amount=1, Create(Type)
+Topic=4,"yes"                             -> "You not have stuff me want for."
+Topic=4                                   -> "Silly lil' one you are."
+
+"za'ralator"         -> Type=3356, Amount=1,  "Hellsteel is. Cursed and evil. Dangerous to work with. Me can make from evil helmet. Lil' one want to trade?", Topic=5
+Topic=5,"yes",QuestValue(17500)<2,!     -> "Wait. Me work no cheap is. Do favour for me first, yes?", Topic=2
+Topic=5,"yes",Count(Type)>=Amount -> "Cling clang!", Delete(Type), Type=5888, Amount=1, Create(Type)
+Topic=5,"yes"                             -> "You not have stuff me want for."
+Topic=5                                   -> "Silly lil' one you are."
+
+"uth'prta"         -> Type=3281, Amount=1,  "Good iron is. Me friends use it much for fight. Me can make from weapon. Lil' one want to trade?", Topic=6
+Topic=6,"yes",QuestValue(17500)<2,!     -> "Wait. Me work no cheap is. Do favour for me first, yes?", Topic=2
+Topic=6,"yes",Count(Type)>=Amount -> "Cling clang!", Delete(Type), Type=5892, Amount=1, Create(Type)
+Topic=6,"yes"                             -> "You not have stuff me want for."
+Topic=6                                   -> "Silly lil' one you are."
+
+Topic=2,"yes"                 -> "Me need gift for woman. We dance, so me want to give her bast skirt. But she big is. So I need many to make big one. Bring three okay? Me wait.", SetQuestValue(17500,1)
+
+"bast skirt",QuestValue(17500)=1         -> Type=3560, Amount=3,  "Lil' one bring three bast skirts?", Topic=3
+Topic=3,"yes",Count(Type)>=Amount -> "Good good! Woman happy will be. Now me happy too and help you.", Delete(Type), SetQuestValue(17500,2)
+Topic=3,"yes"                             -> "You not have stuff me want for."
+Topic=3                                   -> "Silly lil' one you are."

-Topic=1,"yes" -> "You not have stuff me want for."
-Topic=1       -> "Silly lil' one you are."
 }
--- a/data/npc/brasith.npc
+++ b/data/npc/brasith.npc
@ -59,6 +59,7 @@ VANISH,!                 -> "Asha Thrazi."
 "strawberry"      -> Type=3591, Amount=1, Price=1, "Do you want to buy a strawberry for %P gold?", Topic=1
 "carrot"          -> Type=3595, Amount=1, Price=3, "Do you want to buy a carrot for %P gold?", Topic=1
 "pumpkin"         -> Type=3594, Amount=1, Price=10, "Do you want to buy a pumpkin for %P gold?", Topic=1
+"juice squeezer"  -> Type=5865, Amount=1, Price=100, "Do you want to buy a juice squeezer for %P gold?", Topic=1

 %1,1<%1,"corncob"         -> Type=3597, Amount=%1, Price=3*%1, "Do you want to buy %A corncobs for %P gold?", Topic=1
 %1,1<%1,"cherr"           -> Type=3590, Amount=%1, Price=1*%1, "Do you want to buy %A cherries for %P gold?", Topic=1
@ -68,6 +69,7 @@ VANISH,!                 -> "Asha Thrazi."
 %1,1<%1,"strawberries"    -> Type=3591, Amount=%1, Price=1*%1, "Do you want to buy %A strawberries for %P gold?", Topic=1
 %1,1<%1,"carrot"          -> Type=3595, Amount=%1, Price=3*%1, "Do you want to buy %A carrots for %P gold?", Topic=1
 %1,1<%1,"pumpkin"         -> Type=3594, Amount=%1, Price=10*%1, "Do you want to buy %A pumpkins for %P gold?", Topic=1
+%1,1<%1,"juice squeezer"  -> Type=5865, Amount=%1, Price=100*%1, "Do you want to buy %A juice squeezers for %P gold?", Topic=1

 "bugmilk" -> Type=2875, Data=9, Amount=1, Price=15, "Do you want to buy a bottle of bugmilk for %P gold?", Topic=1

--- a/data/npc/elane.npc
+++ b/data/npc/elane.npc
@ -2,7 +2,7 @@
 # elane.npc: Datenbank für die Paladinin Elane

 Name = "Elane"
-Outfit = (137,113-63-120-119)
+Outfit = (137,113-63-120-119-2)
 Home = [32343,32239,7]
 Radius = 4

@ -47,6 +47,7 @@ VANISH,!                   -> "Bye."
 "lugri"     -> "A follower of evil that will get what he deserves one day."
 "excalibug" -> "A weapon of myth. I don't believe that this weapon exists."
 "news"      -> "I am a paladin, not a storyteller."
+"Sniper gloves"      -> "We are always looking for sniper gloves. They are supposed to raise accuracy. If you find a pair, bring them here. Maybe I can offer you a nice trade."

 "member"        -> "Every paladin profits from his vocation. It has many advantages to be a paladin."
 "profit"        -> "We will help you to improve your skills. Besides I offer spells for paladins."
--- a/data/npc/haroun.npc
+++ b/data/npc/haroun.npc
@ -173,4 +173,32 @@ Topic=11,"yes"                             -> "You do not have one."
 Topic=11,"yes",Amount>1                    -> "You do not have that many."
 Topic=11                                   -> "I understand. Perhaps another time then."

+"fighting","spirit"          -> Type=3392, Amount=2,  "Do you want to trade %A royal helmets for fighting spirit?", Topic=12
+Topic=12,QuestValue(283)<3,!     -> "I'm sorry, human. But you need Gabel's permission to trade with me."
+Topic=12,"yes",Count(Type)>=Amount -> "Here you are.", Delete(Type), Type=5884, Amount=1, Create(Type)
+Topic=12,"yes"                             -> "You do not have one."
+Topic=12,"yes",Amount>1                    -> "You do not have that many."
+Topic=12                                   -> "I understand. Perhaps another time then."
+
+"magic","sulphur"          -> Type=3280, Amount=3,  "Do you want to trade %A fire swords for magic sulphur?", Topic=13
+Topic=13,QuestValue(283)<3,!     -> "I'm sorry, human. But you need Gabel's permission to trade with me."
+Topic=13,"yes",Count(Type)>=Amount -> "Here you are.", Delete(Type), Type=5904, Amount=1, Create(Type)
+Topic=13,"yes"                             -> "You do not have one."
+Topic=13,"yes",Amount>1                    -> "You do not have that many."
+Topic=13                                   -> "I understand. Perhaps another time then."
+
+"warrior","sweat"          -> Type=3369, Amount=4,  "Do you want to trade %A warrior helmets for flask of warrior's sweat?", Topic=14
+Topic=14,QuestValue(283)<3,!     -> "I'm sorry, human. But you need Gabel's permission to trade with me."
+Topic=14,"yes",Count(Type)>=Amount -> "Here you are.", Delete(Type), Type=5885, Amount=1, Create(Type)
+Topic=14,"yes"                             -> "You do not have one."
+Topic=14,"yes",Amount>1                    -> "You do not have that many."
+Topic=14                                   -> "I understand. Perhaps another time then."
+
+"chicken","wing"          -> Type=3079, Amount=1,  "Do you want to trade %A boots of haste for enchanted chicken wing?", Topic=15
+Topic=15,QuestValue(283)<3,!     -> "I'm sorry, human. But you need Gabel's permission to trade with me."
+Topic=15,"yes",Count(Type)>=Amount -> "Here you are.", Delete(Type), Type=5891, Amount=1, Create(Type)
+Topic=15,"yes"                             -> "You do not have one."
+Topic=15,"yes",Amount>1                    -> "You do not have that many."
+Topic=15                                   -> "I understand. Perhaps another time then."
+
 }
--- a/data/npc/livielle.npc
+++ b/data/npc/livielle.npc
@ -44,6 +44,8 @@ VANISH,!                  -> "Aww, I don't even deserve a farewell?"
 "melon"            -> Type=3593, Amount=1, Price=10, "Do you want to buy a melon for %P gold?", Topic=1
 "pumpkin"          -> Type=3594, Amount=1, Price=10, "Do you want to buy a pumpkin for %P gold?", Topic=1
 "blueberr"         -> Type=3588, Amount=1, Price=1,  "Do you want to buy a blueberry for %P gold?", Topic=1
+"mango"            -> Type=5096, Amount=1, Price=10,  "Do you want to buy a mango for %P gold?", Topic=1
+"juice squeezer"   -> Type=5865, Amount=1, Price=100,  "Do you want to buy a juice squeezer for %P gold?", Topic=1

 %1,1<%1,"banana"           -> Type=3587, Amount=%1, Price=5*%1,  "Do you want to buy %A bananas for %P gold?", Topic=1
 %1,1<%1,"white","mushroom" -> Type=3723, Amount=%1, Price=10*%1, "Do you want to buy %A of the white mushrooms for %P gold?", Topic=1
@ -52,6 +54,8 @@ VANISH,!                  -> "Aww, I don't even deserve a farewell?"
 %1,1<%1,"melon"            -> Type=3593, Amount=%1, Price=10*%1, "Do you want to buy %A melons for %P gold?", Topic=1
 %1,1<%1,"pumpkin"          -> Type=3594, Amount=%1, Price=10*%1, "Do you want to buy %A pumpkins for %P gold?", Topic=1
 %1,1<%1,"blueberr"         -> Type=3588, Amount=%1, Price=1*%1,  "Do you want to buy %A blueberries for %P gold?", Topic=1
+%1,1<%1,"mango"            -> Type=5096, Amount=%1, Price=10*%1,  "Do you want to buy %A mangos for %P gold?", Topic=1
+%1,1<%1,"juice squeezer"   -> Type=5865, Amount=%1, Price=100*%1,  "Do you want to buy %A juice squeezers for %P gold?", Topic=1

 Topic=1,"yes",CountMoney>=Price -> "Merci, 'ere you go.", DeleteMoney, Create(Type)
 Topic=1,"yes"                   -> "Sorry, but that's not enough money, please count again."
--- a/data/npc/tom.npc
+++ b/data/npc/tom.npc
@ -40,9 +40,10 @@ VANISH,!           -> "Doh?"

 "rat",Questvalue(224)=0     -> Type=3994, Amount=1, Price=2,  "I'll give you %P gold for a dead rat. Do you accept?", Topic=2
 "rabbit",Questvalue(224)=0  -> Type=4173, Amount=1, Price=2,  "I'll give you %P gold for a dead rabbit. Do you accept?", Topic=2
-"rat"     -> Type=3994, Amount=1, Price=2,  "I'll give you %P gold for a dead rat. Do you accept?", Topic=1
-"rabbit"  -> Type=4173, Amount=1, Price=2,  "I'll give you %P gold for a dead rabbit. Do you accept?", Topic=1
-"wolf"    -> Type=4007, Amount=1, Price=5,  "Do you want to sell a dead wolf for %P gold?", Topic=1
+"rat"                 -> Type=3994, Amount=1, Price=2,  "I'll give you %P gold for a dead rat. Do you accept?", Topic=1
+"rabbit"              -> Type=4173, Amount=1, Price=2,  "I'll give you %P gold for a dead rabbit. Do you accept?", Topic=1
+"wolf"                -> Type=4007, Amount=1, Price=5,  "Do you want to sell a dead wolf for %P gold?", Topic=1
+"minotaur leather"    -> Type=5878, Amount=1, Price=12,  "Do you want to sell a minotaur leather for %P gold?", Topic=1

 %1,1<%1,"rat",Questvalue(224)=0     -> Type=3994, Amount=%1, Price=2*%1,  "I'll give you %P gold for %A dead rats. Do you accept?", Topic=2
 %1,1<%1,"rabbit",Questvalue(224)=0  -> Type=4173, Amount=%1, Price=2*%1,  "I'll give you %P gold for %A dead rabbits. Do you accept?", Topic=2
@ -50,6 +51,7 @@ VANISH,!           -> "Doh?"
 %1,1<%1,"rabbit"  -> Type=4173, Amount=%1, Price=2*%1,  "I'll give you %P gold for %A dead rabbits. Do you accept?", Topic=1
 %1,1<%1,"wolf"    -> Type=4007, Amount=%1, Price=5*%1,  "Do you want to sell %A dead wolves for %P gold?", Topic=1
 %1,1<%1,"wolves"    -> Type=4007, Amount=%1, Price=5*%1,  "Do you want to sell %A dead wolves for %P gold?", Topic=1
+%1,1<%1,"minotaur leather"    -> Type=5878, Amount=%1, Price=12*%1,  "Do you want to sell %A minotaur leathers for %P gold?", Topic=1

 Topic=1,"yes",Count(Type)>=Amount -> "Ok. Corpse for me, gold for you.", Delete(Type), CreateMoney
 Topic=1,"yes"                             -> "Sorry, you do not have a fresh one."
--- a/data/npc/yaman.npc
+++ b/data/npc/yaman.npc
@ -158,4 +158,32 @@ Topic=11,"yes",Count(Type)>=Amount -> "Good. Here is your money.", Delete(Type),
 Topic=11,"yes"                             -> "You do not have one, human!"
 Topic=11,"yes",Amount>1                    -> "You do not have that many, human!"
 Topic=11                                   -> "As you wish."
+
+"fighting","spirit"          -> Type=3392, Amount=2,  "Do you want to trade %A royal helmets for fighting spirit?", Topic=12
+Topic=12,QuestValue(288)<3,!     -> "I'm sorry, but you don't have Malor's permission to trade with me."
+Topic=12,"yes",Count(Type)>=Amount -> "Good. Here you are.", Delete(Type), Type=5884, Amount=1, Create(Type)
+Topic=12,"yes"                             -> "You do not have one, human!"
+Topic=12,"yes",Amount>1                    -> "You do not have that many, human!"
+Topic=12                                   -> "As you wish."
+
+"magic","sulphur"          -> Type=3280, Amount=3,  "Do you want to trade %A fire swords for magic sulphur?", Topic=13
+Topic=13,QuestValue(288)<3,!     -> "I'm sorry, but you don't have Malor's permission to trade with me."
+Topic=13,"yes",Count(Type)>=Amount -> "Good. Here you are.", Delete(Type), Type=5904, Amount=1, Create(Type)
+Topic=13,"yes"                             -> "You do not have one, human!"
+Topic=13,"yes",Amount>1                    -> "You do not have that many, human!"
+Topic=13                                   -> "As you wish."
+
+"warrior","sweat"          -> Type=3369, Amount=4,  "Do you want to trade %A warrior helmets for flask of warrior's sweat?", Topic=14
+Topic=14,QuestValue(288)<3,!     -> "I'm sorry, but you don't have Malor's permission to trade with me."
+Topic=14,"yes",Count(Type)>=Amount -> "Good. Here you are.", Delete(Type), Type=5885, Amount=1, Create(Type)
+Topic=14,"yes"                             -> "You do not have one, human!"
+Topic=14,"yes",Amount>1                    -> "You do not have that many, human!"
+Topic=14                                   -> "As you wish."
+
+"chicken","wing"          -> Type=3079, Amount=1,  "Do you want to trade %A boots of haste for enchanted chicken wing?", Topic=15
+Topic=15,QuestValue(288)<3,!     -> "I'm sorry, but you don't have Malor's permission to trade with me."
+Topic=15,"yes",Count(Type)>=Amount -> "Good. Here you are.", Delete(Type), Type=5891, Amount=1, Create(Type)
+Topic=15,"yes"                             -> "You do not have one, human!"
+Topic=15,"yes",Amount>1                    -> "You do not have that many, human!"
+Topic=15                                   -> "As you wish."
 }
--- a/data/npc/zebron.npc
+++ b/data/npc/zebron.npc
@ -40,11 +40,22 @@ VANISH,!           -> "Hey, you can't leave. Luck is smiling on you. I can feel
 "game"  -> *
 "dice"  -> *

-Topic=1,"yes" -> "I will roll a dice. If it shows 6, you will get five times your bet. How much do you want to bet?", Amount=Random(1,6), Topic=2
+Topic=1,"yes" -> "Hmmm, would you like to play for money or for a chance to win your own dice?", Topic=3
 Topic=1,"no"  -> "Oh come on, don't be a child."

-Topic=2,%1,0<%1,100>%1,CountMoney>=%1,Amount=6 -> Price=%1*5, "Ok, here we go ... 6! You have won %P, congratulations. One more game?", CreateMoney, Topic=1
-Topic=2,%1,0<%1,100>%1,CountMoney>=%1          -> Price=%1, "Ok, here we go ... %A! You have lost. Bad luck. One more game?", DeleteMoney, Topic=1
+Topic=3,"money" -> "I thought so. Okay, I will roll a dice. If it shows 6, you will get five times your bet. How much do you want to bet?", Amount=Random(1,6), Topic=2
+Topic=3,"dice"  -> "Hehe, good choice. Okay, the price for this game is 100 gold pieces. I will roll a dice. If I roll a 6, you can have my dice. Agreed?", Amount=Random(1,6), Topic=4
+
+Topic=6,"yes" -> "Okay, I will roll a dice. If it shows 6, you will get five times your bet. How much do you want to bet?", Amount=Random(1,6), Topic=2
+Topic=6,"no"  -> "Oh come on, don't be a child."
+Topic=2,%1,0<%1,100>%1,CountMoney>=%1,Amount=6 -> Price=%1*5, "Ok, here we go ... 6! You have won %P, congratulations. One more game?", CreateMoney, EffectMe(27), Topic=6
+Topic=2,%1,0<%1,100>%1,CountMoney>=%1          -> Price=%1, "Ok, here we go ... %A! You have lost. Bad luck. One more game?", DeleteMoney, EffectMe(27), Topic=6
 Topic=2,%1,0<%1,100>%1                         -> "I am sorry, but you don't have so much money. How much do you want to bet?", Topic=2
 Topic=2,%1                                     -> "I am sorry, but I accept only bets between 1 and 99 gold. I don't want to ruin you after all. How much do you want to bet?", Topic=2
+
+Topic=5,"yes" -> "Okay, the price for this game is 100 gold pieces. I will roll a dice. If I roll a 6, you can have my dice. Agreed?", Amount=Random(1,6), Topic=4
+Topic=5,"no"  -> "Oh come on, don't be a child."
+Topic=4,"yes",CountMoney>=100,Amount=6 -> Price=100, Type=5792, Amount=1, "Ok, here we go ... 6! You have won a dice, congratulations. One more game?", DeleteMoney, Create(Type), EffectMe(27), Topic=5
+Topic=4,"yes",CountMoney>=100          -> Price=100, "Ok, here we go ... %A! You have lost. Bad luck. One more game?", DeleteMoney, EffectMe(27), Topic=5
+Topic=4,"yes"                          -> "I am sorry, but you don't have so much money."
 }
--- a/data/world/houses.xml
+++ b/data/world/houses.xml
@ -861,4 +861,76 @@
 	<house name="Darashia 8, Flat 12" houseid="859" entryx="33249" entryy="32446" entryz="6" rent="3520" townid="6" size="28" />
 	<house name="Darashia 8, Flat 13" houseid="860" entryx="33254" entryy="32449" entryz="6" rent="3880" townid="6" size="32" />
 	<house name="Darashia 8, Flat 14" houseid="861" entryx="33254" entryy="32449" entryz="6" rent="3520" townid="6" size="31" />
+	<house name="Admiral's Avenue 3" houseid="2013" entryx="32336" entryy="32806" entryz="7" rent="4115" townid="12" size="68" />
+	<house name="Admiral's Avenue 2" houseid="2014" entryx="32326" entryy="32806" entryz="7" rent="5470" townid="12" size="85" />
+	<house name="Admiral's Avenue 1" houseid="2015" entryx="32309" entryy="32805" entryz="7" rent="5105" townid="12" size="83" />
+	<house name="Ivory Circle 1" houseid="2012" entryx="32347" entryy="32799" entryz="7" rent="4280" townid="7" size="71" />
+	<house name="Admiral's Avenue 3" houseid="2013" entryx="32336" entryy="32806" entryz="7" rent="4115" townid="7" size="68" />
+	<house name="Admiral's Avenue 2" houseid="2014" entryx="32326" entryy="32806" entryz="7" rent="5470" townid="7" size="85" />
+	<house name="Admiral's Avenue 1" houseid="2015" entryx="32309" entryy="32805" entryz="7" rent="5105" townid="7" size="83" />
+	<house name="Sugar Street 5" houseid="2016" entryx="32301" entryy="32811" entryz="7" rent="1350" townid="7" size="20" />
+	<house name="Freedom Street 1" houseid="2017" entryx="32323" entryy="32812" entryz="7" rent="2450" townid="7" size="41" />
+	<house name="Freedom Street 2" houseid="2018" entryx="32325" entryy="32812" entryz="7" rent="6050" townid="7" size="103" />
+	<house name="Trader's Point 2 (Shop)" houseid="2019" entryx="32330" entryy="32826" entryz="7" rent="5350" townid="7" size="93" />
+	<house name="Trader's Point 3 (Shop)" houseid="2020" entryx="32344" entryy="32826" entryz="7" rent="5950" townid="7" size="106" />
+	<house name="Ivory Circle 2" houseid="2021" entryx="32364" entryy="32818" entryz="7" rent="7030" townid="7" size="120" />
+	<house name="The Tavern 1a" houseid="2022" entryx="32295" entryy="32837" entryz="6" rent="2750" townid="7" size="40" />
+	<house name="The Tavern 1b" houseid="2023" entryx="32297" entryy="32836" entryz="6" rent="1900" townid="7" size="31" />
+	<house name="The Tavern 1c" houseid="2024" entryx="32299" entryy="32839" entryz="6" rent="4150" townid="7" size="73" />
+	<house name="The Tavern 1d" houseid="2025" entryx="32297" entryy="32840" entryz="6" rent="1550" townid="7" size="24" />
+	<house name="The Tavern 2d" houseid="2026" entryx="32298" entryy="32838" entryz="5" rent="1350" townid="7" size="20" />
+	<house name="The Tavern 2c" houseid="2027" entryx="32302" entryy="32838" entryz="5" rent="950" townid="7" size="16" />
+	<house name="The Tavern 2b" houseid="2028" entryx="32303" entryy="32838" entryz="5" rent="1700" townid="7" size="27" />
+	<house name="The Tavern 2a" houseid="2029" entryx="32301" entryy="32835" entryz="5" rent="5550" townid="7" size="92" />
+	<house name="Straycat's Corner 4" houseid="2030" entryx="32291" entryy="32852" entryz="7" rent="210" townid="7" size="4" />
+	<house name="Straycat's Corner 3" houseid="2031" entryx="32283" entryy="32850" entryz="7" rent="210" townid="7" size="4" />
+	<house name="Straycat's Corner 2" houseid="2032" entryx="32284" entryy="32845" entryz="7" rent="660" townid="7" size="18" />
+	<house name="Litter Promenade 5" houseid="2033" entryx="32290" entryy="32859" entryz="7" rent="580" townid="7" size="11" />
+	<house name="Litter Promenade 4" houseid="2034" entryx="32288" entryy="32865" entryz="7" rent="390" townid="7" size="10" />
+	<house name="Litter Promenade 3" houseid="2035" entryx="32286" entryy="32865" entryz="7" rent="450" townid="7" size="12" />
+	<house name="Litter Promenade 2" houseid="2036" entryx="32277" entryy="32861" entryz="7" rent="300" townid="7" size="7" />
+	<house name="Litter Promenade 1" houseid="2037" entryx="32271" entryy="32862" entryz="7" rent="400" townid="7" size="6" />
+	<house name="The Shelter" houseid="2038" entryx="32267" entryy="32860" entryz="7" rent="13590" guildhall="true" townid="7" size="282" />
+	<house name="Straycat's Corner 6" houseid="2039" entryx="32281" entryy="32858" entryz="7" rent="300" townid="7" size="7" />
+	<house name="Straycat's Corner 5" houseid="2040" entryx="32281" entryy="32853" entryz="7" rent="760" townid="7" size="16" />
+	<house name="Rum Alley 3" houseid="2042" entryx="32272" entryy="32854" entryz="7" rent="330" townid="7" size="9" />
+	<house name="Straycat's Corner 1" houseid="2043" entryx="32280" entryy="32843" entryz="7" rent="300" townid="7" size="7" />
+	<house name="Rum Alley 2" houseid="2044" entryx="32260" entryy="32846" entryz="7" rent="300" townid="7" size="7" />
+	<house name="Rum Alley 1" houseid="2045" entryx="32257" entryy="32839" entryz="7" rent="510" townid="7" size="14" />
+	<house name="Smuggler Backyard 3" houseid="2046" entryx="32263" entryy="32838" entryz="7" rent="700" townid="7" size="15" />
+	<house name="Shady Trail 3" houseid="2048" entryx="32274" entryy="32835" entryz="7" rent="300" townid="7" size="7" />
+	<house name="Shady Trail 1" houseid="2049" entryx="32283" entryy="32834" entryz="7" rent="1150" townid="7" size="14" />
+	<house name="Shady Trail 2" houseid="2050" entryx="32274" entryy="32830" entryz="7" rent="490" townid="7" size="8" />
+	<house name="Smuggler Backyard 5" houseid="2051" entryx="32266" entryy="32823" entryz="7" rent="610" townid="7" size="11" />
+	<house name="Smuggler Backyard 4" houseid="2052" entryx="32263" entryy="32830" entryz="7" rent="390" townid="7" size="10" />
+	<house name="Smuggler Backyard 2" houseid="2053" entryx="32261" entryy="32829" entryz="7" rent="670" townid="7" size="15" />
+	<house name="Smuggler Backyard 1" houseid="2054" entryx="32264" entryy="32823" entryz="7" rent="670" townid="7" size="14" />
+	<house name="Sugar Street 2" houseid="2055" entryx="32262" entryy="32815" entryz="7" rent="2550" townid="7" size="39" />
+	<house name="Sugar Street 1" houseid="2056" entryx="32256" entryy="32815" entryz="7" rent="3000" townid="7" size="50" />
+	<house name="Sugar Street 3a" houseid="2057" entryx="32271" entryy="32813" entryz="7" rent="1650" townid="7" size="22" />
+	<house name="Sugar Street 3b" houseid="2058" entryx="32275" entryy="32798" entryz="7" rent="2050" townid="7" size="30" />
+	<house name="Harvester's Haven, Flat 01" houseid="2059" entryx="32274" entryy="32792" entryz="7" rent="950" townid="7" size="12" />
+	<house name="Harvester's Haven, Flat 03" houseid="2060" entryx="32274" entryy="32787" entryz="7" rent="950" townid="7" size="12" />
+	<house name="Harvester's Haven, Flat 05" houseid="2061" entryx="32274" entryy="32783" entryz="7" rent="950" townid="7" size="12" />
+	<house name="Harvester's Haven, Flat 02" houseid="2062" entryx="32276" entryy="32791" entryz="7" rent="950" townid="7" size="12" />
+	<house name="Harvester's Haven, Flat 04" houseid="2063" entryx="32276" entryy="32786" entryz="7" rent="950" townid="7" size="12" />
+	<house name="Harvester's Haven, Flat 06" houseid="2064" entryx="32276" entryy="32783" entryz="7" rent="950" townid="7" size="12" />
+	<house name="Harvester's Haven, Flat 07" houseid="2065" entryx="32274" entryy="32783" entryz="6" rent="950" townid="7" size="12" />
+	<house name="Harvester's Haven, Flat 09" houseid="2066" entryx="32274" entryy="32787" entryz="6" rent="950" townid="7" size="13" />
+	<house name="Harvester's Haven, Flat 11" houseid="2067" entryx="32274" entryy="32792" entryz="6" rent="950" townid="7" size="12" />
+	<house name="Harvester's Haven, Flat 12" houseid="2068" entryx="32276" entryy="32791" entryz="6" rent="950" townid="7" size="13" />
+	<house name="Harvester's Haven, Flat 10" houseid="2069" entryx="32276" entryy="32786" entryz="6" rent="950" townid="7" size="12" />
+	<house name="Harvester's Haven, Flat 08" houseid="2070" entryx="32276" entryy="32783" entryz="6" rent="950" townid="7" size="12" />
+	<house name="Marble Lane 4" houseid="2071" entryx="32298" entryy="32792" entryz="7" rent="6350" townid="7" size="102" />
+	<house name="Marble Lane 2" houseid="2072" entryx="32298" entryy="32782" entryz="7" rent="6415" townid="7" size="106" />
+	<house name="Marble Lane 3" houseid="2073" entryx="32301" entryy="32782" entryz="7" rent="8055" townid="7" size="133" />
+	<house name="Marble Lane 1" houseid="2074" entryx="32300" entryy="32772" entryz="7" rent="11060" townid="7" size="178" />
+	<house name="Ivy Cottage" houseid="2075" entryx="32277" entryy="32775" entryz="7" rent="30650" guildhall="true" townid="7" size="469" />
+	<house name="Sugar Street 4d" houseid="2076" entryx="32287" entryy="32801" entryz="7" rent="750" townid="7" size="8" />
+	<house name="Sugar Street 4c" houseid="2077" entryx="32287" entryy="32805" entryz="7" rent="650" townid="7" size="10" />
+	<house name="Sugar Street 4b" houseid="2078" entryx="32287" entryy="32810" entryz="7" rent="950" townid="7" size="12" />
+	<house name="Sugar Street 4a" houseid="2079" entryx="32279" entryy="32813" entryz="7" rent="950" townid="7" size="12" />
+	<house name="Trader's Point 1" houseid="2080" entryx="32306" entryy="32826" entryz="7" rent="2200" townid="7" size="38" />
+	<house name="Mountain Hideout" houseid="2081" entryx="32392" entryy="32705" entryz="6" rent="15550" guildhall="true" townid="7" size="234" />
+	<house name="Meriana Beach" houseid="2381" entryx="32383" entryy="32584" entryz="7" rent="8230" townid="7" size="140" />
 </houses>
--- a/data/world/map.otbm
+++ b/data/world/map.otbm
--- a/data/world/spawns.xml
+++ b/data/world/spawns.xml
--- a/src/const.h
+++ b/src/const.h
@ -50,6 +50,8 @@ enum MagicEffectClasses : uint8_t {
 	CONST_ME_SOUND_PURPLE = 23,
 	CONST_ME_SOUND_BLUE = 24,
 	CONST_ME_SOUND_WHITE = 25,
+	CONST_ME_BUBBLES = 26,
+	CONST_ME_CRAPS = 27,
 };

 enum ShootType_t : uint8_t {
@ -122,6 +124,9 @@ enum FluidTypes_t : uint8_t
 	FLUID_MANAFLUID,
 	FLUID_LIFEFLUID,
 	FLUID_LEMONADE,
+	FLUID_RUM,
+	FLUID_COCONUTMILK,
+	FLUID_FRUITJUICE,
 };

 enum FluidColor_t : uint8_t
@ -130,10 +135,12 @@ enum FluidColor_t : uint8_t
 	FLUID_COLOR_BLUE = 1,
 	FLUID_COLOR_PURPLE = 2,
 	FLUID_COLOR_BROWN = 3,
-	FLUID_COLOR_RED = 4,
-	FLUID_COLOR_GREEN = 5,
-	FLUID_COLOR_YELLOW = 6,
-	FLUID_COLOR_WHITE = 7,
+	FLUID_COLOR_BROWN1 = 4,
+	FLUID_COLOR_RED = 5,
+	FLUID_COLOR_GREEN = 6,
+	FLUID_COLOR_BROWN2 = 7,
+	FLUID_COLOR_YELLOW = 8,
+	FLUID_COLOR_WHITE = 9,
 };

 enum SquareColor_t : uint8_t {
--- a/src/luascript.cpp
+++ b/src/luascript.cpp
@ -1189,6 +1189,8 @@ void LuaScriptInterface::registerFunctions()
 	registerEnum(CONST_ME_SOUND_PURPLE)
 	registerEnum(CONST_ME_SOUND_BLUE)
 	registerEnum(CONST_ME_SOUND_WHITE)
+	registerEnum(CONST_ME_BUBBLES)
+	registerEnum(CONST_ME_CRAPS)
 	registerEnum(CONST_ANI_NONE)
 	registerEnum(CONST_ANI_SPEAR)
 	registerEnum(CONST_ANI_BOLT)
@ -1407,6 +1409,9 @@ void LuaScriptInterface::registerFunctions()
 	registerEnum(FLUID_MANAFLUID)
 	registerEnum(FLUID_LIFEFLUID)
 	registerEnum(FLUID_LEMONADE)
+	registerEnum(FLUID_RUM)
+	registerEnum(FLUID_COCONUTMILK)
+	registerEnum(FLUID_FRUITJUICE)

 	registerEnum(TALKTYPE_SAY)
 	registerEnum(TALKTYPE_WHISPER)
--- a/src/npc.cpp
+++ b/src/npc.cpp
@ -143,6 +143,7 @@ bool Npc::load()
 				currentOutfit.lookBody = c[1];
 				currentOutfit.lookLegs = c[2];
 				currentOutfit.lookFeet = c[3];
+				currentOutfit.lookAddons = c[4];
 			} else {
 				currentOutfit.lookTypeEx = script.readNumber();
 			}
--- a/src/tools.cpp
+++ b/src/tools.cpp
@ -188,40 +188,43 @@ std::string transformToSHA1(const std::string& input)

 uint8_t getLiquidColor(uint8_t type)
 {
-	uint8_t result = 0;
+	uint8_t result = FLUID_COLOR_NONE;
 	switch (type)
 	{
-	case 1:
-		result = 1;
+	case FLUID_WATER:
+		result = FLUID_COLOR_BLUE;
 		break;
-	case 0:
-		result = 0;
+	case FLUID_NONE:
+		result = FLUID_COLOR_NONE;
 		break;
-	case 6:
-		result = 4;
+	case FLUID_SLIME:
+		result = FLUID_COLOR_GREEN;
 		break;
-	case 3:
-	case 4:
-	case 7:
-		result = 3;
+	case FLUID_BEER:
+	case FLUID_MUD:
+	case FLUID_OIL:
+	case FLUID_RUM:
+		result = FLUID_COLOR_BROWN;
 		break;
-	case 9:
-		result = 6;
+	case FLUID_MILK:
+	case FLUID_COCONUTMILK:
+		result = FLUID_COLOR_WHITE;
 		break;
-	case 2:
-	case 10:
-		result = 7;
+	case FLUID_WINE:
+	case FLUID_MANAFLUID:
+		result = FLUID_COLOR_PURPLE;
 		break;
-	case 5:
-	case 11:
-		result = 2;
+	case FLUID_BLOOD:
+	case FLUID_LIFEFLUID:
+		result = FLUID_COLOR_RED;
 		break;
-	case 8:
-	case 12:
-		result = 5;
+	case FLUID_URINE:
+	case FLUID_LEMONADE:
+	case FLUID_FRUITJUICE:
+		result = FLUID_COLOR_YELLOW;
 		break;
 	default:
-		result = 0;
+		result = FLUID_COLOR_NONE;
 		break;
 	}
 	return result;
@ -644,6 +647,8 @@ MagicEffectNames magicEffectNames[] = {
 	{"purplenote",		CONST_ME_SOUND_PURPLE},
 	{"bluenote",		CONST_ME_SOUND_BLUE},
 	{"whitenote",		CONST_ME_SOUND_WHITE},
+	{"bubbles",		CONST_ME_BUBBLES},
+	{"dice",		CONST_ME_CRAPS},
 };

 ShootTypeNames shootTypeNames[] = {
@ -717,7 +722,10 @@ FluidNames fluidNames[] = {
 	{"milk",			FLUID_MILK},
 	{"manafluid",		FLUID_MANAFLUID},
 	{"lifefluid",		FLUID_LIFEFLUID},
-	{"lemonade",		FLUID_LEMONADE}
+	{"lemonade",		FLUID_LEMONADE},
+	{"rum",				FLUID_RUM},
+	{"coconutmilk",		FLUID_COCONUTMILK},
+	{"fruitjuice",		FLUID_FRUITJUICE}
 };

 MagicEffectClasses getMagicEffect(const std::string& strValue)