From 304efb8ec9d6de6fce3f11d6b30d5a72332962e6 Mon Sep 17 00:00:00 2001
From: Beats <61994374+Beats-Dh@users.noreply.github.com>
Date: Tue, 23 Nov 2021 15:30:45 -0400
Subject: [PATCH] Decouple "ParseItem Attributes" in it own file (#140)

ItemParse has been refactored and decoupled in a own file to allow for better organization and avoid breakage in the compilation
Fixed some bugs, such as fields in items.xml
This commit is necessary for the pull request (12.72 protocol) to work correctly: #143

Co-authored-by @dudantas <eduardo.dantas@hotmail.com.br>
---
 data/events/scripts/player.lua     |   23 +-
 data/global.lua                    |    7 +
 data/items/items.xml               | 1122 +++++++++++++++-------------
 src/CMakeLists.txt                 |    1 +
 src/items/functions/item_parse.cpp |  816 ++++++++++++++++++++
 src/items/functions/item_parse.hpp |  291 ++++++++
 src/items/item.cpp                 |    1 +
 src/items/item.h                   |    6 +-
 src/items/items.cpp                |  582 +--------------
 src/items/items.h                  |    5 +-
 src/items/items_definitions.hpp    |  115 +++
 11 files changed, 1880 insertions(+), 1089 deletions(-)
 create mode 100644 src/items/functions/item_parse.cpp
 create mode 100644 src/items/functions/item_parse.hpp

diff --git a/data/events/scripts/player.lua b/data/events/scripts/player.lua
index a86b937e71b..39bb5ffbc4f 100644
--- a/data/events/scripts/player.lua
+++ b/data/events/scripts/player.lua
@@ -6,10 +6,10 @@ function Player:onLook(thing, position, distance)
 	local description = "You see "
 	description = description .. thing:getDescription(distance)
 	if thing:isItem() then
-		local item = thing:getType()
-		if (item and item:getImbuingSlots() > 0) then
+		local itemType = thing:getType()
+		if (itemType and itemType:getImbuingSlots() > 0) then
 			local imbuingSlots = "Imbuements: ("
-			for slot = 0, item:getImbuingSlots() - 1 do
+			for slot = 0, itemType:getImbuingSlots() - 1 do
 				if slot > 0 then
 					imbuingSlots = string.format("%s, ", imbuingSlots)
 				end
@@ -25,6 +25,13 @@ function Player:onLook(thing, position, distance)
 			imbuingSlots = string.format("%s).", imbuingSlots)
 			description = string.gsub(description, "It weighs", imbuingSlots.. "\nIt weighs")
 		end
+	elseif thing:isMonster() then
+		description = description .. thing:getDescription(distance)
+		local master = thing:getMaster()
+		if master and table.contains(FAMILIARSNAME, thing:getName():lower()) then
+			description = description..' (Master: ' .. master:getName() .. '). \z
+				It will disappear in ' .. getTimeinWords(master:getStorageValue(Storage.PetSummon) - os.time())
+		end
 	end
 
 	if self:getGroup():getAccess() then
@@ -41,18 +48,18 @@ function Player:onLook(thing, position, distance)
 				description = string.format("%s, Unique ID: %d", description, uniqueId)
 			end
 
-			local item = thing:getType()
+			local itemType = thing:getType()
 
-			if item then
-				local transformEquipId = item:getTransformEquipId()
-				local transformDeEquipId = item:getTransformDeEquipId()
+			if itemType then
+				local transformEquipId = itemType:getTransformEquipId()
+				local transformDeEquipId = itemType:getTransformDeEquipId()
 				if transformEquipId ~= 0 then
 					description = string.format("%s\nTransforms to: %d (onEquip)", description, transformEquipId)
 				elseif transformDeEquipId ~= 0 then
 					description = string.format("%s\nTransforms to: %d (onDeEquip)", 	description, transformDeEquipId)
 				end
 
-				local decayId = item:getDecayId()
+				local decayId = itemType:getDecayId()
 				if decayId ~= -1 then
 					description = string.format("%s\nDecays to: %d", description, decayId)
 				end
diff --git a/data/global.lua b/data/global.lua
index 0d7b07e03b2..5c1926bb170 100644
--- a/data/global.lua
+++ b/data/global.lua
@@ -161,6 +161,13 @@ staminaBonus = {
 	eventsPz = {} -- stamina in Pz
 }
 
+FAMILIARSNAME = {
+	"sorcerer familiar",
+	"knight familiar",
+	"druid familiar",
+	"paladin familiar"
+}
+
 function addStamina(playerId, ...)
 	-- Creature:onTargetCombat
 	if playerId then
diff --git a/data/items/items.xml b/data/items/items.xml
index f4468f863d1..c8e5dd0430e 100644
--- a/data/items/items.xml
+++ b/data/items/items.xml
@@ -32,7 +32,11 @@
 		<attribute key="type" value="magicfield"/>
 		<attribute key="decayTo" value="0"/>
 		<attribute key="duration" value="120"/>
-		<attribute key="field" value="poison"/>
+		<attribute key="field" value="poison">
+			<attribute key="ticks" value="5000" />
+			<attribute key="start" value="5" />
+			<attribute key="damage" value="100" />
+		</attribute>
 	</item>
 	<item id="106" name="grass"/>
 	<item id="107" article="a" name="special flask">
@@ -1401,7 +1405,7 @@
 		<attribute key="slotType" value="feet"/>
 		<attribute key="absorbpercentearth" value="5"/>
 		<attribute key="absorbpercentfire" value="-5"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="814" article="a" name="terra amulet">
 		<attribute key="weight" value="500"/>
@@ -1445,7 +1449,7 @@
 		<attribute key="absorbpercentfire" value="5"/>
 		<attribute key="absorbPercentIce" value="-5"/>
 		<attribute key="slotType" value="feet"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="819" name="glacier shoes">
 		<attribute key="weight" value="750"/>
@@ -1453,7 +1457,7 @@
 		<attribute key="slotType" value="feet"/>
 		<attribute key="absorbPercentIce" value="5"/>
 		<attribute key="absorbpercentenergy" value="-5"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="820" name="lightning boots">
 		<attribute key="weight" value="750"/>
@@ -1461,7 +1465,7 @@
 		<attribute key="absorbpercentenergy" value="5"/>
 		<attribute key="absorbpercentearth" value="-5"/>
 		<attribute key="slotType" value="feet"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="821" name="magma legs">
 		<attribute key="weight" value="1900"/>
@@ -2375,7 +2379,12 @@
 	<item id="1995" article="a" name="sarcophagus"/>
 	<item fromid="1996" toid="1997" article="a" name="campfire"/>
 	<item fromid="1998" toid="2000" article="a" name="campfire">
-		<attribute key="field" value="fire"/>
+		<attribute key="type" value="magicfield"/>
+		<attribute key="field" value="fire">
+			<attribute key="damage" value="20" />
+			<attribute key="ticks" value="4000" />
+			<attribute key="count" value="2" />
+		</attribute>
 	</item>
 	<item id="2001" article="an" name="unlit campfire"/>
 	<item fromid="2002" toid="2003" article="a" name="campfire"/>
@@ -2469,13 +2478,21 @@
 		<attribute key="type" value="magicfield"/>
 		<attribute key="decayTo" value="2119"/>
 		<attribute key="duration" value="120"/>
-		<attribute key="field" value="fire"/>
+		<attribute key="field" value="fire">
+			<attribute key="damage" value="20" />
+			<attribute key="ticks" value="10000" />
+			<attribute key="count" value="7" />
+		</attribute>
 	</item>
 	<item id="2119" article="a" name="fire field">
 		<attribute key="type" value="magicfield"/>
 		<attribute key="decayTo" value="2120"/>
 		<attribute key="duration" value="120"/>
-		<attribute key="field" value="fire"/>
+		<attribute key="field" value="fire">
+			<attribute key="ticks" value="10000" />
+			<attribute key="count" value="7" />
+			<attribute key="damage" value="10" />
+		</attribute>
 	</item>
 	<item id="2120" article="a" name="fire field">
 		<attribute key="type" value="magicfield"/>
@@ -2486,23 +2503,40 @@
 	<item id="2121" article="a" name="poison field">
 		<attribute key="type" value="magicfield"/>
 		<attribute key="replaceable" value="0"/>
-		<attribute key="field" value="poison"/>
+		<attribute key="field" value="poison">
+			<attribute key="ticks" value="5000" />
+			<attribute key="start" value="5" />
+			<attribute key="damage" value="100" />
+		</attribute>
 	</item>
 	<item id="2122" article="an" name="energy field">
 		<attribute key="type" value="magicfield"/>
 		<attribute key="decayTo" value="0"/>
 		<attribute key="duration" value="120"/>
-		<attribute key="field" value="energy"/>
+		<attribute key="field" value="energy">
+			<attribute key="damage" value="30" />
+			<attribute key="ticks" value="10000" />
+			<attribute key="damage" value="25" />
+		</attribute>
 	</item>
 	<item id="2123" article="a" name="fire field">
 		<attribute key="type" value="magicfield"/>
 		<attribute key="replaceable" value="0"/>
-		<attribute key="field" value="fire"/>
+		<attribute key="field" value="fire">
+			<attribute key="damage" value="20" />
+			<attribute key="ticks" value="10000" />
+			<attribute key="count" value="7" />
+			<attribute key="damage" value="10" />
+		</attribute>
 	</item>
 	<item id="2124" article="a" name="fire field">
 		<attribute key="type" value="magicfield"/>
 		<attribute key="replaceable" value="0"/>
-		<attribute key="field" value="fire"/>
+		<attribute key="field" value="fire">
+			<attribute key="ticks" value="10000" />
+			<attribute key="count" value="7" />
+			<attribute key="damage" value="10" />
+		</attribute>
 	</item>
 	<item id="2125" article="a" name="fire field">
 		<attribute key="type" value="magicfield"/>
@@ -2512,7 +2546,11 @@
 	<item id="2126" article="an" name="energy field">
 		<attribute key="type" value="magicfield"/>
 		<attribute key="replaceable" value="0"/>
-		<attribute key="field" value="energy"/>
+		<attribute key="field" value="poison">
+			<attribute key="ticks" value="5000" />
+			<attribute key="start" value="5" />
+			<attribute key="damage" value="100" />
+		</attribute>
 	</item>
 	<item id="2127" article="a" name="poison gas" editorsuffix="(Slime Corpse)">
 		<attribute key="decayTo" value="0"/>
@@ -2536,7 +2574,11 @@
 		<attribute key="type" value="magicfield"/>
 		<attribute key="decayTo" value="2133"/>
 		<attribute key="duration" value="120"/>
-		<attribute key="field" value="fire"/>
+		<attribute key="field" value="fire">
+			<attribute key="ticks" value="10000" />
+			<attribute key="count" value="7" />
+			<attribute key="damage" value="10" />
+		</attribute>
 	</item>
 	<item id="2133" article="a" name="fire field">
 		<attribute key="type" value="magicfield"/>
@@ -2548,13 +2590,21 @@
 		<attribute key="type" value="magicfield"/>
 		<attribute key="decayTo" value="0"/>
 		<attribute key="duration" value="120"/>
-		<attribute key="field" value="poison"/>
+		<attribute key="field" value="poison">
+			<attribute key="ticks" value="5000" />
+			<attribute key="start" value="5" />
+			<attribute key="damage" value="100" />
+		</attribute>
 	</item>
 	<item id="2135" article="an" name="energy field">
 		<attribute key="type" value="magicfield"/>
 		<attribute key="decayTo" value="0"/>
 		<attribute key="duration" value="120"/>
-		<attribute key="field" value="energy"/>
+		<attribute key="field" value="energy">
+			<attribute key="damage" value="30" />
+			<attribute key="ticks" value="10000" />
+			<attribute key="damage" value="25" />
+		</attribute>
 	</item>
 	<item id="2136" name="smoke">
 		<attribute key="type" value="magicfield"/>
@@ -2565,14 +2615,18 @@
 		<attribute key="decayTo" value="2138"/>
 		<attribute key="duration" value="10"/>
 		<attribute key="replaceable" value="0"/>
-		<attribute key="field" value="fire"/>
+		<attribute key="field" value="fire">
+			<attribute key="damage" value="300" />
+		</attribute>
 	</item>
 	<item id="2138" article="a" name="searing fire">
 		<attribute key="type" value="magicfield"/>
 		<attribute key="decayTo" value="2140"/>
 		<attribute key="duration" value="10"/>
 		<attribute key="replaceable" value="0"/>
-		<attribute key="field" value="fire"/>
+		<attribute key="field" value="fire">
+			<attribute key="damage" value="300" />
+		</attribute>
 	</item>
 	<item id="2139" name="RESERVED SPRITE"/>
 	<item id="2140" name="ashes">
@@ -3614,7 +3668,7 @@
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="2855" article="a" name="basket">
 		<attribute key="weight" value="950"/>
@@ -3668,49 +3722,49 @@
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="2866" article="a" name="yellow backpack">
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="2867" article="a" name="red backpack">
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="2868" article="a" name="purple backpack">
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="2869" article="a" name="blue backpack">
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="2870" article="a" name="grey backpack">
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="2871" article="a" name="golden backpack">
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="2872" article="a" name="camouflage backpack">
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="2873" article="a" name="bucket">
 		<attribute key="weight" value="2000"/>
@@ -4180,7 +4234,7 @@
 		<attribute key="weight" value="820"/>
 		<attribute key="armor" value="0"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3023" article="a" name="holy scarab">
 		<attribute key="weight" value="870"/>
@@ -4349,7 +4403,7 @@
 		<attribute key="weight" value="1800"/>
 		<attribute key="defense" value="14"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3060" article="an" name="orb">
 		<attribute key="weight" value="800"/>
@@ -4437,7 +4491,7 @@
 		<attribute key="weaponType" value="wand"/>
 		<attribute key="shootType" value="fire"/>
 		<attribute key="range" value="3"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3076" article="a" name="crystal ball">
 		<attribute key="weight" value="3400"/>
@@ -4453,7 +4507,7 @@
 		<attribute key="slotType" value="feet"/>
 		<attribute key="speed" value="40"/>
 		<attribute key="showAttributes" value="1"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3080" article="a" name="broken amulet">
 		<attribute key="weight" value="420"/>
@@ -4639,7 +4693,7 @@
 	</item>
 	<item id="3101" article="a" name="spellbook">
 		<attribute key="defense" value="14"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="weight" value="5800"/>
 	</item>
 	<item id="3102" article="a" name="paw amulet">
@@ -5026,9 +5080,9 @@
 		<attribute key="description" value="You have a vague feeling that it looks somewhat silly."/>
 		<attribute key="weight" value="700"/>
 		<attribute key="armor" value="3"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3211" article="a" name="broom">
 		<attribute key="weight" value="1100"/>
@@ -5180,7 +5234,7 @@
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3245" article="a" name="ring of wishes">
 		<attribute key="description" value="(This item has 3 charges left)."/>
@@ -5215,7 +5269,7 @@
 		<attribute key="weight" value="1500"/>
 		<attribute key="containerSize" value="24"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3254" article="a" name="roc feather">
 		<attribute key="weight" value="100"/>
@@ -5254,7 +5308,7 @@
 		<attribute key="attack" value="14"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3265" article="a" name="two handed sword">
 		<attribute key="weight" value="7000"/>
@@ -5302,7 +5356,7 @@
 		<attribute key="attack" value="24"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="2"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3272" article="a" name="rapier">
 		<attribute key="weight" value="1500"/>
@@ -5360,7 +5414,7 @@
 		<attribute key="attack" value="45"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="3280" article="a" name="fire sword">
 		<attribute key="description" value="The blade is a magic flame."/>
@@ -5378,7 +5432,7 @@
 		<attribute key="attack" value="46"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="3282" article="a" name="morning star">
 		<attribute key="weight" value="5400"/>
@@ -5430,7 +5484,7 @@
 		<attribute key="attack" value="48"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="3"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3289" article="a" name="staff">
 		<attribute key="weight" value="3800"/>
@@ -5476,7 +5530,7 @@
 		<attribute key="attack" value="36"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3296" article="a" name="warlord sword">
 		<attribute key="description" value="Strong powers flow in this magic sword."/>
@@ -5523,7 +5577,7 @@
 		<attribute key="attack" value="26"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="3302" article="a" name="dragon lance">
 		<attribute key="description" value="The extraordinary sharp blade penetrates every armor."/>
@@ -5532,7 +5586,7 @@
 		<attribute key="attack" value="47"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="3303" article="a" name="great axe">
 		<attribute key="description" value="A masterpiece of a dwarven smith."/>
@@ -5541,7 +5595,7 @@
 		<attribute key="attack" value="52"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3304" article="a" name="crowbar">
 		<attribute key="description" value="It may come in handy sometime."/>
@@ -5582,7 +5636,7 @@
 		<attribute key="attack" value="49"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="extradef" value="1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3310" article="an" name="iron hammer">
 		<attribute key="weight" value="6600"/>
@@ -5596,7 +5650,7 @@
 		<attribute key="attack" value="28"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="extradef" value="1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3312" article="a" name="silver mace">
 		<attribute key="description" value="You feel an aura of protection."/>
@@ -5605,7 +5659,7 @@
 		<attribute key="attack" value="41"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="extradef" value="2"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3313" article="an" name="obsidian lance">
 		<attribute key="weight" value="8000"/>
@@ -5627,7 +5681,7 @@
 		<attribute key="attack" value="46"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="3316" article="an" name="orcish axe">
 		<attribute key="weight" value="4500"/>
@@ -5641,7 +5695,7 @@
 		<attribute key="attack" value="28"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="extradef" value="1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3318" article="a" name="knight axe">
 		<attribute key="weight" value="5900"/>
@@ -5649,7 +5703,7 @@
 		<attribute key="attack" value="33"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="extradef" value="1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3319" article="a" name="stonecutter axe">
 		<attribute key="description" value="You feel the power of this mighty axe."/>
@@ -5658,7 +5712,7 @@
 		<attribute key="attack" value="50"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="extradef" value="3"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3320" article="a" name="fire axe">
 		<attribute key="description" value="The blade is a magic flame."/>
@@ -5691,7 +5745,7 @@
 		<attribute key="attack" value="31"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="extradef" value="2"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3324" article="a" name="skull staff">
 		<attribute key="description" value="The staff longs for death."/>
@@ -5700,7 +5754,7 @@
 		<attribute key="attack" value="36"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="extradef" value="1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3325" article="a" name="light mace">
 		<attribute key="weight" value="4100"/>
@@ -5713,7 +5767,7 @@
 		<attribute key="defense" value="23"/>
 		<attribute key="attack" value="37"/>
 		<attribute key="weaponType" value="sword"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3327" article="a" name="daramian mace">
 		<attribute key="weight" value="6800"/>
@@ -5746,7 +5800,7 @@
 		<attribute key="attack" value="49"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="3332" article="a" name="hammer of wrath">
 		<attribute key="description" value="A giant is said to have forged this hammer to take revenge for the death of his brother."/>
@@ -5755,7 +5809,7 @@
 		<attribute key="attack" value="48"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="3333" article="a" name="crystal mace">
 		<attribute key="weight" value="8000"/>
@@ -5763,7 +5817,7 @@
 		<attribute key="attack" value="38"/>
 		<attribute key="extradef" value="1"/>
 		<attribute key="weaponType" value="club"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3334" article="a" name="pharaoh sword">
 		<attribute key="weight" value="5200"/>
@@ -5778,7 +5832,7 @@
 		<attribute key="attack" value="45"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="3336" article="a" name="studded club">
 		<attribute key="description" value="It has been reinforced with iron."/>
@@ -5806,7 +5860,7 @@
 		<attribute key="attack" value="38"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="2"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3340" article="a" name="heavy mace">
 		<attribute key="description" value="Its tip is made of extremely solid steel."/>
@@ -5815,7 +5869,7 @@
 		<attribute key="attack" value="49"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="3341" article="an" name="arcane staff">
 		<attribute key="description" value="It is enchanted with ancient magic that renders a weak staff into a powerful weapon."/>
@@ -5824,7 +5878,7 @@
 		<attribute key="attack" value="50"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3342" article="a" name="war axe">
 		<attribute key="weight" value="6150"/>
@@ -5832,7 +5886,7 @@
 		<attribute key="attack" value="48"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="3343" article="a" name="lich staff">
 		<attribute key="description" value="A scent of death and decay sticks to this weapon."/>
@@ -5848,7 +5902,7 @@
 		<attribute key="attack" value="35"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="extradef" value="1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3345" article="a" name="templar scytheblade">
 		<attribute key="weight" value="2900"/>
@@ -5886,7 +5940,7 @@
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="ammotype" value="bolt"/>
 		<attribute key="range" value="5"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="3350" article="a" name="bow">
 		<attribute key="weight" value="3100"/>
@@ -5904,7 +5958,7 @@
 		<attribute key="weight" value="4200"/>
 		<attribute key="armor" value="2"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3353" article="an" name="iron helmet">
 		<attribute key="weight" value="3000"/>
@@ -5935,7 +5989,7 @@
 		<attribute key="weight" value="10000"/>
 		<attribute key="armor" value="6"/>
 		<attribute key="slotType" value="body"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3359" article="a" name="brass armor">
 		<attribute key="weight" value="8000"/>
@@ -5946,7 +6000,7 @@
 		<attribute key="weight" value="8000"/>
 		<attribute key="armor" value="14"/>
 		<attribute key="slotType" value="body"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3361" article="a" name="leather armor">
 		<attribute key="weight" value="6000"/>
@@ -5973,13 +6027,13 @@
 		<attribute key="weight" value="3200"/>
 		<attribute key="armor" value="12"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3366" article="a" name="magic plate armor">
 		<attribute key="weight" value="8500"/>
 		<attribute key="armor" value="17"/>
 		<attribute key="slotType" value="body"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3367" article="a" name="viking helmet">
 		<attribute key="weight" value="3900"/>
@@ -5996,13 +6050,13 @@
 		<attribute key="weight" value="6800"/>
 		<attribute key="armor" value="8"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3370" article="a" name="knight armor">
 		<attribute key="weight" value="12000"/>
 		<attribute key="armor" value="12"/>
 		<attribute key="slotType" value="body"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3371" name="knight legs">
 		<attribute key="weight" value="7000"/>
@@ -6053,13 +6107,13 @@
 		<attribute key="weight" value="12000"/>
 		<attribute key="armor" value="11"/>
 		<attribute key="slotType" value="body"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3381" article="a" name="crown armor">
 		<attribute key="weight" value="9900"/>
 		<attribute key="armor" value="13"/>
 		<attribute key="slotType" value="body"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3382" name="crown legs">
 		<attribute key="weight" value="6500"/>
@@ -6080,26 +6134,26 @@
 		<attribute key="weight" value="2950"/>
 		<attribute key="armor" value="7"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3386" article="a" name="dragon scale mail">
 		<attribute key="weight" value="11400"/>
 		<attribute key="armor" value="15"/>
 		<attribute key="slotType" value="body"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3387" article="a" name="demon helmet">
 		<attribute key="description" value="You hear an evil whispering from inside."/>
 		<attribute key="weight" value="2950"/>
 		<attribute key="armor" value="10"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3388" article="a" name="demon armor">
 		<attribute key="weight" value="8000"/>
 		<attribute key="armor" value="16"/>
 		<attribute key="slotType" value="body"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3389" name="demon legs">
 		<attribute key="weight" value="7000"/>
@@ -6115,27 +6169,27 @@
 		<attribute key="weight" value="5200"/>
 		<attribute key="armor" value="8"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3392" article="a" name="royal helmet">
 		<attribute key="description" value="An excellent masterpiece of a smith."/>
 		<attribute key="weight" value="4800"/>
 		<attribute key="armor" value="9"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3393" article="an" name="amazon helmet">
 		<attribute key="weight" value="2950"/>
 		<attribute key="armor" value="7"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3394" article="an" name="amazon armor">
 		<attribute key="weight" value="4500"/>
 		<attribute key="armor" value="13"/>
 		<attribute key="skilldist" value="3"/>
 		<attribute key="slotType" value="body"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3395" article="a" name="ceremonial mask">
 		<attribute key="weight" value="4000"/>
@@ -6147,14 +6201,14 @@
 		<attribute key="armor" value="6"/>
 		<attribute key="slotType" value="head"/>
 		<attribute key="absorbPercentPhysical" value="2"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3397" article="a" name="dwarven armor">
 		<attribute key="weight" value="13000"/>
 		<attribute key="armor" value="10"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="absorbPercentPhysical" value="5"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3398" name="dwarven legs">
 		<attribute key="weight" value="4900"/>
@@ -6166,7 +6220,7 @@
 		<attribute key="weight" value="9000"/>
 		<attribute key="armor" value="9"/>
 		<attribute key="slotType" value="body"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="3400" article="a" name="dragon scale helmet">
 		<attribute key="description" value="It's made of dragon scales."/>
@@ -6193,7 +6247,7 @@
 		<attribute key="weight" value="9500"/>
 		<attribute key="armor" value="9"/>
 		<attribute key="slotType" value="body"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3405" article="a" name="horseman helmet">
 		<attribute key="weight" value="4200"/>
@@ -6214,13 +6268,13 @@
 		<attribute key="weight" value="4600"/>
 		<attribute key="armor" value="7"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3409" article="a" name="steel shield">
 		<attribute key="weight" value="6900"/>
 		<attribute key="defense" value="21"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3410" article="a" name="plate shield">
 		<attribute key="weight" value="6500"/>
@@ -6247,7 +6301,7 @@
 		<attribute key="weight" value="5700"/>
 		<attribute key="defense" value="37"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3415" article="a" name="guardian shield">
 		<attribute key="weight" value="5500"/>
@@ -6258,7 +6312,7 @@
 		<attribute key="weight" value="6000"/>
 		<attribute key="defense" value="31"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3417" article="a" name="shield of honour">
 		<attribute key="description" value="A mighty shield awarded by the gods of Tibia."/>
@@ -6270,20 +6324,20 @@
 		<attribute key="weight" value="4700"/>
 		<attribute key="defense" value="28"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3419" article="a" name="crown shield">
 		<attribute key="weight" value="6200"/>
 		<attribute key="defense" value="32"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3420" article="a" name="demon shield">
 		<attribute key="description" value="This powerful shield seems to be as light as air."/>
 		<attribute key="weight" value="2600"/>
 		<attribute key="defense" value="35"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3421" article="a" name="dark shield">
 		<attribute key="weight" value="5200"/>
@@ -6295,7 +6349,7 @@
 		<attribute key="weight" value="8400"/>
 		<attribute key="defense" value="38"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3423" article="a" name="blessed shield">
 		<attribute key="description" value="The shield grants divine protection."/>
@@ -6308,7 +6362,7 @@
 		<attribute key="weight" value="6700"/>
 		<attribute key="defense" value="22"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3425" article="a" name="dwarven shield">
 		<attribute key="weight" value="5500"/>
@@ -6329,7 +6383,7 @@
 		<attribute key="weight" value="8200"/>
 		<attribute key="defense" value="32"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3429" article="a" name="black shield">
 		<attribute key="description" value="An unholy creature covers the shield."/>
@@ -6346,7 +6400,7 @@
 		<attribute key="weight" value="6600"/>
 		<attribute key="defense" value="22"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3432" article="an" name="ancient shield">
 		<attribute key="weight" value="6100"/>
@@ -6357,32 +6411,32 @@
 		<attribute key="weight" value="5000"/>
 		<attribute key="defense" value="29"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3434" article="a" name="vampire shield">
 		<attribute key="description" value="Dark powers enchant this shield."/>
 		<attribute key="weight" value="3800"/>
 		<attribute key="defense" value="34"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3435" article="a" name="castle shield">
 		<attribute key="weight" value="4900"/>
 		<attribute key="defense" value="28"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3436" article="a" name="medusa shield">
 		<attribute key="weight" value="5800"/>
 		<attribute key="defense" value="33"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3437" article="an" name="amazon shield">
 		<attribute key="weight" value="6200"/>
 		<attribute key="defense" value="32"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3438" article="an" name="eagle shield">
 		<attribute key="weight" value="6200"/>
@@ -6394,7 +6448,7 @@
 		<attribute key="weight" value="3500"/>
 		<attribute key="defense" value="34"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3440" article="a" name="scarab shield">
 		<attribute key="weight" value="4700"/>
@@ -6410,7 +6464,7 @@
 		<attribute key="weight" value="5100"/>
 		<attribute key="defense" value="36"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3443" article="a" name="tusk shield">
 		<attribute key="weight" value="6900"/>
@@ -6421,7 +6475,7 @@
 		<attribute key="weight" value="4900"/>
 		<attribute key="defense" value="22"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3445" article="a" name="salamander shield">
 		<attribute key="weight" value="5900"/>
@@ -6698,43 +6752,43 @@
 		<attribute key="weight" value="1000"/>
 		<attribute key="armor" value="2"/>
 		<attribute key="slotType" value="feet"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3551" name="sandals">
 		<attribute key="armor" value="0"/>
 		<attribute key="slotType" value="feet"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="weight" value="600"/>
 	</item>
 	<item id="3552" name="leather boots">
 		<attribute key="weight" value="900"/>
 		<attribute key="armor" value="1"/>
 		<attribute key="slotType" value="feet"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3553" name="bunnyslippers">
 		<attribute key="defense" value="0"/>
 		<attribute key="slotType" value="feet"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="weight" value="600"/>
 	</item>
 	<item id="3554" name="steel boots">
 		<attribute key="weight" value="2900"/>
 		<attribute key="armor" value="3"/>
 		<attribute key="slotType" value="feet"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3555" name="golden boots">
 		<attribute key="weight" value="3100"/>
 		<attribute key="armor" value="4"/>
 		<attribute key="slotType" value="feet"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3556" name="crocodile boots">
 		<attribute key="weight" value="900"/>
 		<attribute key="armor" value="1"/>
 		<attribute key="slotType" value="feet"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="3557" name="plate legs">
 		<attribute key="weight" value="5000"/>
@@ -6792,7 +6846,7 @@
 		<attribute key="weight" value="2200"/>
 		<attribute key="armor" value="11"/>
 		<attribute key="slotType" value="body"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3568" article="a" name="simple dress">
 		<attribute key="weight" value="1000"/>
@@ -6823,7 +6877,7 @@
 		<attribute key="weight" value="750"/>
 		<attribute key="armor" value="1"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="3574" article="a" name="mystic turban">
 		<attribute key="description" value="Something is strange about this turban."/>
@@ -7422,7 +7476,7 @@
 		<attribute key="speed" value="30"/>
 		<attribute key="weight" value="2500"/>
 		<attribute key="slotType" value="feet"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="4034" article="a" name="slain ghoul">
 		<attribute key="weight" value="60200"/>
@@ -10251,7 +10305,7 @@
 		<attribute key="weight" value="800"/>
 		<attribute key="armor" value="2"/>
 		<attribute key="slotType" value="feet"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="5462" article="a" name="sugar cane">
 		<attribute key="description" value="It has just been harvested."/>
@@ -10711,7 +10765,7 @@
 		<attribute key="weight" value="4200"/>
 		<attribute key="armor" value="9"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item fromid="5743" toid="5744" name="wooden floor"/>
 	<item id="5745" article="a" name="closed door">
@@ -10804,7 +10858,7 @@
 		<attribute key="weight" value="1700"/>
 		<attribute key="containerSize" value="22"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="5802" article="a" name="message in a bottle">
 		<attribute key="weight" value="1200"/>
@@ -11068,7 +11122,7 @@
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="5927" article="a" name="pirate bag">
 		<attribute key="weight" value="800"/>
@@ -11170,7 +11224,7 @@
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="5950" article="a" name="beach bag">
 		<attribute key="weight" value="800"/>
@@ -12826,7 +12880,7 @@
 		<attribute key="weight" value="3200"/>
 		<attribute key="defense" value="37"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="6391" article="a" name="hawser"/>
 	<item id="6392" article="a" name="valentine's cake">
@@ -12845,7 +12899,7 @@
 		<attribute key="weight" value="3200"/>
 		<attribute key="defense" value="37"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="6433" article="a" name="blue tapestry"/>
 	<item id="6434" article="a" name="demon trophy"/>
@@ -13008,7 +13062,7 @@
 		<attribute key="attack" value="50"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="6528" article="an" name="infernal bolt">
 		<attribute key="weight" value="90"/>
@@ -13108,7 +13162,7 @@
 		<attribute key="attack" value="50"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item fromid="6556" toid="6557" article="a" name="tic-tac-toe token">
 		<attribute key="description" value="It seems to be rather fragile."/>
@@ -13946,7 +14000,7 @@
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="7343" article="a" name="fur bag">
 		<attribute key="weight" value="800"/>
@@ -14121,7 +14175,7 @@
 		<attribute key="attack" value="42"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weaponType" value="axe"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="7381" article="a" name="mammoth whopper">
 		<attribute key="description" value="Made from a mammoth's legbones, it is one of the favoured weapons among barbarians."/>
@@ -14136,7 +14190,7 @@
 		<attribute key="attack" value="47"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="7383" article="a" name="relic sword">
 		<attribute key="weight" value="4800"/>
@@ -14144,7 +14198,7 @@
 		<attribute key="attack" value="42"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7384" article="a" name="mystic blade">
 		<attribute key="description" value="This sword is only granted to a scrapper of the Svargrond arena."/>
@@ -14153,7 +14207,7 @@
 		<attribute key="attack" value="44"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="2"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7385" article="a" name="crimson sword">
 		<attribute key="weight" value="3600"/>
@@ -14161,7 +14215,7 @@
 		<attribute key="attack" value="28"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7386" article="a" name="mercenary sword">
 		<attribute key="description" value="This axe is only granted to a scrapper of the Svargrond arena."/>
@@ -14192,7 +14246,7 @@
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="extradef" value="1"/>
 		<attribute key="description" value="This axe is only granted to a scrapper of the Svargrond Arena."/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7390" article="the" name="justice seeker">
 		<attribute key="weight" value="5000"/>
@@ -14208,7 +14262,7 @@
 		<attribute key="attack" value="45"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="7392" article="an" name="orcish maul">
 		<attribute key="weight" value="5400"/>
@@ -14217,7 +14271,7 @@
 		<attribute key="weaponType" value="club"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="description" value="This club is only granted to a greenhorn of the Svargrond arena."/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="7393" article="a" name="demon trophy">
 		<attribute key="weight" value="500"/>
@@ -14252,7 +14306,7 @@
 		<attribute key="attack" value="44"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="7403" article="a" name="berserker">
 		<attribute key="weight" value="13000"/>
@@ -14260,7 +14314,7 @@
 		<attribute key="attack" value="48"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="7404" article="an" name="assassin dagger">
 		<attribute key="weight" value="1700"/>
@@ -14268,7 +14322,7 @@
 		<attribute key="attack" value="40"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="-2"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7405" article="a" name="havoc blade">
 		<attribute key="weight" value="7200"/>
@@ -14276,7 +14330,7 @@
 		<attribute key="attack" value="49"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="7406" article="a" name="blacksteel sword">
 		<attribute key="weight" value="5900"/>
@@ -14285,7 +14339,7 @@
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="description" value="This sword is only granted to a greenhorn of the Svargrond arena."/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="7407" article="a" name="haunted blade">
 		<attribute key="weight" value="3100"/>
@@ -14293,7 +14347,7 @@
 		<attribute key="attack" value="40"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="7408" article="a" name="wyvern fang">
 		<attribute key="weight" value="2000"/>
@@ -14301,7 +14355,7 @@
 		<attribute key="attack" value="32"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7409" article="a" name="northern star">
 		<attribute key="weight" value="4200"/>
@@ -14315,7 +14369,7 @@
 		<attribute key="defense" value="19"/>
 		<attribute key="attack" value="43"/>
 		<attribute key="weaponType" value="club"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7411" article="an" name="ornamented axe">
 		<attribute key="weight" value="6150"/>
@@ -14329,7 +14383,7 @@
 		<attribute key="defense" value="24"/>
 		<attribute key="attack" value="41"/>
 		<attribute key="weaponType" value="axe"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="extradef" value="-2"/>
 	</item>
 	<item id="7413" article="a" name="titan axe">
@@ -14346,7 +14400,7 @@
 		<attribute key="attack" value="47"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="7415" article="a" name="cranial basher">
 		<attribute key="weight" value="7800"/>
@@ -14355,7 +14409,7 @@
 		<attribute key="weaponType" value="club"/>
 		<attribute key="extradef" value="-2"/>
 		<attribute key="description" value="This club is only granted to a scrapper of the Svargrond arena."/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7416" article="a" name="bloody edge">
 		<attribute key="weight" value="5200"/>
@@ -14363,7 +14417,7 @@
 		<attribute key="attack" value="43"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="-3"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7417" article="a" name="runed sword">
 		<attribute key="weight" value="4600"/>
@@ -14371,7 +14425,7 @@
 		<attribute key="attack" value="45"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="2"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7418" article="a" name="nightmare blade">
 		<attribute key="weight" value="4600"/>
@@ -14379,7 +14433,7 @@
 		<attribute key="attack" value="46"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="-3"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7419" article="a" name="dreaded cleaver">
 		<attribute key="weight" value="3800"/>
@@ -14387,7 +14441,7 @@
 		<attribute key="attack" value="40"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="extradef" value="-3"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7420" article="a" name="reaper's axe">
 		<attribute key="weight" value="5900"/>
@@ -14401,7 +14455,7 @@
 		<attribute key="defense" value="18"/>
 		<attribute key="attack" value="45"/>
 		<attribute key="weaponType" value="club"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7422" article="a" name="jade hammer">
 		<attribute key="weight" value="3200"/>
@@ -14416,7 +14470,7 @@
 		<attribute key="attack" value="51"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7424" article="a" name="lunar staff">
 		<attribute key="weight" value="3800"/>
@@ -14424,7 +14478,7 @@
 		<attribute key="attack" value="40"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="7425" article="a" name="taurus mace">
 		<attribute key="weight" value="5100"/>
@@ -14439,7 +14493,7 @@
 		<attribute key="attack" value="43"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="7427" article="a" name="chaos mace">
 		<attribute key="description" value="Only those who have descended to the deepest depths may wield this hammer without it cursing them."/>
@@ -14464,7 +14518,7 @@
 		<attribute key="attack" value="47"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="extradef" value="3"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7430" article="a" name="dragonbone staff">
 		<attribute key="description" value="Small flames are dancing around this strange weapon."/>
@@ -14472,7 +14526,7 @@
 		<attribute key="defense" value="18"/>
 		<attribute key="attack" value="35"/>
 		<attribute key="weaponType" value="club"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7431" article="a" name="demonbone">
 		<attribute key="weight" value="18000"/>
@@ -14480,7 +14534,7 @@
 		<attribute key="extradef" value="-2"/>
 		<attribute key="attack" value="48"/>
 		<attribute key="weaponType" value="club"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7432" article="a" name="furry club">
 		<attribute key="weight" value="4200"/>
@@ -14503,7 +14557,7 @@
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="extradef" value="3"/>
 		<attribute key="description" value="This axe is only granted to a warlord of the Svargrond arena."/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7435" article="an" name="impaler">
 		<attribute key="weight" value="8200"/>
@@ -14511,7 +14565,7 @@
 		<attribute key="attack" value="49"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="extradef" value="-2"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7436" article="an" name="angelic axe">
 		<attribute key="weight" value="5600"/>
@@ -14526,7 +14580,7 @@
 		<attribute key="defense" value="18"/>
 		<attribute key="attack" value="37"/>
 		<attribute key="weaponType" value="club"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7438" article="an" name="elvish bow">
 		<attribute key="description" value="This beautifully ornamented bow was made by a skilled elvish bowmaker."/>
@@ -14536,7 +14590,7 @@
 		<attribute key="ammotype" value="arrow"/>
 		<attribute key="range" value="6"/>
 		<attribute key="hitchance" value="5"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="7439" article="a" name="berserk potion">
 		<attribute key="description" value="Drinking this potion increases temporarily your fighting skill while decreasing your defense."/>
@@ -14591,7 +14645,7 @@
 		<attribute key="defense" value="17"/>
 		<attribute key="attack" value="39"/>
 		<attribute key="weaponType" value="club"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7452" article="a" name="spiked squelcher">
 		<attribute key="weight" value="6800"/>
@@ -14599,7 +14653,7 @@
 		<attribute key="attack" value="41"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="7453" article="an" name="executioner">
 		<attribute key="weight" value="9900"/>
@@ -14607,7 +14661,7 @@
 		<attribute key="attack" value="51"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7454" article="a" name="glorious axe">
 		<attribute key="weight" value="9500"/>
@@ -14622,14 +14676,14 @@
 		<attribute key="attack" value="48"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="extradef" value="2"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7456" article="a" name="noble axe">
 		<attribute key="weight" value="3800"/>
 		<attribute key="defense" value="22"/>
 		<attribute key="attack" value="39"/>
 		<attribute key="weaponType" value="axe"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7457" name="fur boots">
 		<attribute key="description" value="These boots keep your toes warm in even the iciest regions, but they feel kind of heavy."/>
@@ -14637,14 +14691,14 @@
 		<attribute key="armor" value="2"/>
 		<attribute key="slotType" value="feet"/>
 		<attribute key="speed" value="-12"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="7458" article="a" name="fur cap">
 		<attribute key="description" value="It feels nice and warm on your ears."/>
 		<attribute key="weight" value="1800"/>
 		<attribute key="armor" value="3"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7459" article="a" name="pair of earmuffs">
 		<attribute key="weight" value="500"/>
@@ -14656,7 +14710,7 @@
 		<attribute key="weight" value="4100"/>
 		<attribute key="defense" value="28"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="7461" article="a" name="krimhorn helmet">
 		<attribute key="weight" value="5100"/>
@@ -14673,7 +14727,7 @@
 		<attribute key="armor" value="10"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="description" value="It is imbued with protective magic."/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7464" name="mammoth fur shorts">
 		<attribute key="weight" value="150"/>
@@ -14684,7 +14738,9 @@
 	<item fromid="7465" toid="7473" article="a" name="searing fire">
 		<attribute key="type" value="magicfield"/>
 		<attribute key="replaceable" value="0"/>
-		<attribute key="field" value="fire"/>
+		<attribute key="field" value="fire">
+			<attribute key="damage" value="300" />
+		</attribute>
 	</item>
 	<item fromid="7474" toid="7475" article="a" name="sarcophagus"/>
 	<item fromid="7476" toid="7479" article="a" name="cave entrance">
@@ -15204,7 +15260,7 @@
 		<attribute key="weight" value="900"/>
 		<attribute key="armor" value="3"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="7993" article="a" name="witchhunter's coat">
 		<attribute key="weight" value="2500"/>
@@ -15257,7 +15313,7 @@
 		<attribute key="ammotype" value="bolt"/>
 		<attribute key="range" value="5"/>
 		<attribute key="hitchance" value="1"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="8022" article="a" name="chain bolter">
 		<attribute key="weight" value="5500"/>
@@ -15266,7 +15322,7 @@
 		<attribute key="ammotype" value="bolt"/>
 		<attribute key="range" value="3"/>
 		<attribute key="attack" value="4"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="8023" article="a" name="royal crossbow">
 		<attribute key="weight" value="12000"/>
@@ -15276,7 +15332,7 @@
 		<attribute key="range" value="6"/>
 		<attribute key="hitchance" value="3"/>
 		<attribute key="attack" value="5"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="8024" article="the" name="devileye">
 		<attribute key="weight" value="5500"/>
@@ -15286,7 +15342,7 @@
 		<attribute key="range" value="6"/>
 		<attribute key="hitchance" value="-20"/>
 		<attribute key="attack" value="20"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="8025" article="the" name="ironworker">
 		<attribute key="weight" value="5500"/>
@@ -15295,7 +15351,7 @@
 		<attribute key="ammotype" value="bolt"/>
 		<attribute key="range" value="5"/>
 		<attribute key="attack" value="4"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="8026" article="a" name="warsinger bow">
 		<attribute key="weight" value="4500"/>
@@ -15305,7 +15361,7 @@
 		<attribute key="range" value="7"/>
 		<attribute key="hitchance" value="5"/>
 		<attribute key="attack" value="3"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="8027" article="a" name="composite hornbow">
 		<attribute key="weight" value="5200"/>
@@ -15315,7 +15371,7 @@
 		<attribute key="range" value="6"/>
 		<attribute key="hitchance" value="2"/>
 		<attribute key="attack" value="3"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="8028" name="Yol's bow">
 		<attribute key="weight" value="3500"/>
@@ -15332,7 +15388,7 @@
 		<attribute key="ammotype" value="arrow"/>
 		<attribute key="range" value="6"/>
 		<attribute key="hitchance" value="3"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="8030" name="Elethriel's elemental bow">
 		<attribute key="weight" value="4400"/>
@@ -15396,13 +15452,13 @@
 		<attribute key="armor" value="8"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="weight" value="2650"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 	</item>
 	<item id="8043" article="a" name="focus cape">
 		<attribute key="weight" value="2100"/>
 		<attribute key="armor" value="9"/>
 		<attribute key="slotType" value="body"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 	</item>
 	<item id="8044" article="a" name="belted cape">
 		<attribute key="weight" value="3500"/>
@@ -15516,7 +15572,7 @@
 		<attribute key="slotType" value="body"/>
 		<attribute key="weight" value="6900"/>
 		<attribute key="skilldist" value="3"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="8061" article="a" name="skullcracker armor">
 		<attribute key="weight" value="11000"/>
@@ -15537,50 +15593,50 @@
 		<attribute key="slotType" value="body"/>
 		<attribute key="weight" value="6500"/>
 		<attribute key="skilldist" value="2"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="8064" article="an" name="ethno coat">
 		<attribute key="armor" value="7"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="weight" value="2550"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 	</item>
 	<item fromid="8066" toid="8069" article="a" name="mysterious machine"/>
 	<item fromid="8070" toid="8071" article="a" name="chalk board"/>
 	<item id="8072" article="a" name="spellbook of enlightenment">
 		<attribute key="description" value="It shows your spells and can also shield against attacks when worn."/>
 		<attribute key="weight" value="1950"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 		<attribute key="defense" value="18"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="8073" article="a" name="spellbook of warding">
 		<attribute key="description" value="It shows your spells and can also shield against attacks when worn."/>
 		<attribute key="weight" value="2100"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 		<attribute key="defense" value="22"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="8074" article="a" name="spellbook of mind control">
 		<attribute key="description" value="It shows your spells and can also shield against attacks when worn."/>
 		<attribute key="weight" value="2450"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="defense" value="16"/>
 		<attribute key="weaponType" value="shield"/>
 	</item>
 	<item id="8075" article="a" name="spellbook of lost souls">
 		<attribute key="description" value="It shows your spells and can also shield against attacks when worn."/>
 		<attribute key="weight" value="2560"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="defense" value="20"/>
 		<attribute key="weaponType" value="shield"/>
 	</item>
 	<item id="8076" article="a" name="spellscroll of prophecies">
 		<attribute key="description" value="It shows your spells and can also shield against attacks when worn."/>
 		<attribute key="weight" value="2650"/>
-		<attribute key="magicLevelPoints" value="3"/>
+		<attribute key="magicpoints" value="3"/>
 		<attribute key="defense" value="12"/>
 		<attribute key="weaponType" value="shield"/>
 	</item>
@@ -15634,7 +15690,7 @@
 		<attribute key="weaponType" value="wand"/>
 		<attribute key="shootType" value="death"/>
 		<attribute key="range" value="3"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="8083" article="a" name="northwind rod">
 		<attribute key="description" value="It was made by one of the shamans in Svargrond and symbolises an icy mammoth."/>
@@ -15642,7 +15698,7 @@
 		<attribute key="weaponType" value="wand"/>
 		<attribute key="shootType" value="ice"/>
 		<attribute key="range" value="3"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="8084" article="a" name="springsprout rod">
 		<attribute key="description" value="It is filled with the energy of growing plants."/>
@@ -15655,7 +15711,7 @@
 	<item id="8090" article="a" name="spellbook of dark mysteries">
 		<attribute key="description" value="It shows your spells and can also shield against attacks when worn."/>
 		<attribute key="weight" value="2850"/>
-		<attribute key="magicLevelPoints" value="3"/>
+		<attribute key="magicpoints" value="3"/>
 		<attribute key="defense" value="16"/>
 		<attribute key="weaponType" value="shield"/>
 	</item>
@@ -15668,7 +15724,7 @@
 		<attribute key="weaponType" value="wand"/>
 		<attribute key="shootType" value="energy"/>
 		<attribute key="range" value="3"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="8093" article="a" name="wand of draconia">
 		<attribute key="description" value="This wand holds the spirit and soul of a dragon lord."/>
@@ -15676,7 +15732,7 @@
 		<attribute key="weaponType" value="wand"/>
 		<attribute key="shootType" value="fire"/>
 		<attribute key="range" value="3"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="8094" article="a" name="wand of voodoo">
 		<attribute key="description" value="It is filled with the dark hatred and rage of a tormented demonic being."/>
@@ -15684,7 +15740,7 @@
 		<attribute key="weaponType" value="wand"/>
 		<attribute key="shootType" value="death"/>
 		<attribute key="range" value="3"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="8095" name="ranger legs">
 		<attribute key="weight" value="3500"/>
@@ -15697,7 +15753,7 @@
 		<attribute key="attack" value="51"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="extradef" value="2"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="8097" article="a" name="solar axe">
 		<attribute key="weight" value="11000"/>
@@ -15705,7 +15761,7 @@
 		<attribute key="attack" value="52"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="extradef" value="3"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="8098" article="a" name="demonwing axe">
 		<attribute key="weight" value="12000"/>
@@ -15713,7 +15769,7 @@
 		<attribute key="attack" value="53"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="8099" article="a" name="dark trinity mace">
 		<attribute key="weight" value="9900"/>
@@ -15728,7 +15784,7 @@
 		<attribute key="attack" value="50"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="extradef" value="2"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="8101" article="the" name="stomper">
 		<attribute key="weight" value="11500"/>
@@ -15736,7 +15792,7 @@
 		<attribute key="attack" value="51"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="8102" article="an" name="emerald sword">
 		<attribute key="weight" value="4100"/>
@@ -15744,7 +15800,7 @@
 		<attribute key="attack" value="49"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="3"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="8103" article="the" name="epiphany">
 		<attribute key="weight" value="4500"/>
@@ -15752,7 +15808,7 @@
 		<attribute key="attack" value="50"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="3"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="8104" article="the" name="calamity">
 		<attribute key="weight" value="6800"/>
@@ -16596,7 +16652,7 @@
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="8861" article="a" name="brocade bag">
 		<attribute key="weight" value="800"/>
@@ -16620,8 +16676,8 @@
 		<attribute key="weight" value="3500"/>
 		<attribute key="armor" value="5"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="magicLevelPoints" value="2"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="magicpoints" value="2"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="8865" article="a" name="crystal column"/>
 	<item id="8866" article="a" name="dead unknown">
@@ -17020,7 +17076,7 @@
 	<item id="9017" article="a" name="coconut shoes">
 		<attribute key="armor" value="0"/>
 		<attribute key="weight" value="600"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="9018" article="a" name="firewalker boots">
 		<attribute key="description" value="Wearing these boots reduces the damage gotten from fiery ground."/>
@@ -17377,8 +17433,8 @@
 		<attribute key="weight" value="600"/>
 		<attribute key="armor" value="3"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="magicLevelPoints" value="1"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="magicpoints" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="9104" article="a" name="football"/>
 	<item id="9105" article="a" name="crystal ball">
@@ -18010,7 +18066,7 @@
 		<attribute key="defense" value="10"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="description" value="A sturdy shield made of old meat."/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="9373" name="glutton's mace">
 		<attribute key="description" value="It would be an awesome weapon if the handle weren't that greasy."/>
@@ -18024,7 +18080,7 @@
 		<attribute key="weight" value="700"/>
 		<attribute key="armor" value="5"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="9375" article="a" name="pointed rabbitslayer">
 		<attribute key="description" value="Someone has sharpened this carrot to inflict some nasty damage especially on rabbits."/>
@@ -18045,7 +18101,7 @@
 		<attribute key="weight" value="500"/>
 		<attribute key="defense" value="8"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="9378" article="a" name="musician's bow">
 		<attribute key="description" value="If you could only figure out how you are supposed to fire more arrows at once."/>
@@ -18054,35 +18110,35 @@
 		<attribute key="weaponType" value="distance"/>
 		<attribute key="ammotype" value="arrow"/>
 		<attribute key="range" value="4"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="9379" article="a" name="heavy metal t-shirt">
 		<attribute key="description" value="Oddly enough it is not made of metal at all, but years without washing grant it added protection."/>
 		<attribute key="weight" value="800"/>
 		<attribute key="armor" value="6"/>
 		<attribute key="slotType" value="body"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="9380" article="a" name="shield of care">
 		<attribute key="description" value="This shield will surely care for anyone who can bear it."/>
 		<attribute key="weight" value="1700"/>
 		<attribute key="defense" value="8"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="9381" article="a" name="helmet of ultimate terror">
 		<attribute key="description" value="There is evil inside."/>
 		<attribute key="weight" value="1250"/>
 		<attribute key="armor" value="3"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="9382" article="a" name="helmet of nature">
 		<attribute key="description" value="One can only hope nobody will ever insist on wearing that."/>
 		<attribute key="weight" value="1100"/>
 		<attribute key="armor" value="3"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="9383" name="trousers of the ancients">
 		<attribute key="description" value="These atavistic trousers already served the forefathers of mankind."/>
@@ -18417,13 +18473,13 @@
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="9602" article="an" name="orange backpack">
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="9603" article="an" name="orange bag">
 		<attribute key="weight" value="800"/>
@@ -18434,13 +18490,13 @@
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="9605" article="a" name="crown backpack">
 		<attribute key="weight" value="1700"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="9606" article="an" name="egg of The Many">
 		<attribute key="weight" value="5000"/>
@@ -18586,7 +18642,7 @@
 		<attribute key="armor" value="3"/>
 		<attribute key="absorbpercentmanadrain" value="5"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="9654" article="a" name="war crystal" plural="war crystals">
 		<attribute key="weight" value="145"/>
@@ -18867,17 +18923,32 @@
 	<item id="10069" article="a" name="fire field">
 		<attribute key="type" value="magicfield"/>
 		<attribute key="replaceable" value="0"/>
-		<attribute key="field" value="fire"/>
+		<attribute key="field" value="fire">
+			<attribute key="damage" value="20" />
+			<attribute key="ticks" value="10000" />
+			<attribute key="count" value="7" />
+			<attribute key="damage" value="10" />
+		</attribute>
 	</item>
 	<item id="10070" article="a" name="fire field">
 		<attribute key="type" value="magicfield"/>
 		<attribute key="replaceable" value="0"/>
-		<attribute key="field" value="fire"/>
+		<attribute key="field" value="fire">
+			<attribute key="damage" value="10" />
+			<attribute key="ticks" value="10000" />
+			<attribute key="count" value="7" />
+			<attribute key="damage" value="10" />
+		</attribute>
 	</item>
 	<item id="10071" article="a" name="fire field">
 		<attribute key="type" value="magicfield"/>
 		<attribute key="replaceable" value="0"/>
-		<attribute key="field" value="fire"/>
+		<attribute key="field" value="fire">
+			<attribute key="damage" value="5" />
+			<attribute key="ticks" value="10000" />
+			<attribute key="count" value="7" />
+			<attribute key="damage" value="10" />
+		</attribute>
 	</item>
 	<item fromid="10072" toid="10081" name="zaoan decoration"/>
 	<item fromid="10082" toid="10089" article="a" name="dragon statue"/>
@@ -18981,7 +19052,7 @@
 		<attribute key="absorbpercentenergy" value="-3"/>
 		<attribute key="slotType" value="feet"/>
 		<attribute key="weight" value="1850"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="10201" name="dragon scale boots">
 		<attribute key="armor" value="3"/>
@@ -18989,13 +19060,13 @@
 		<attribute key="absorbPercentIce" value="-3"/>
 		<attribute key="slotType" value="feet"/>
 		<attribute key="weight" value="1850"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="10202" article="a" name="heart backpack">
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="10203" article="a" name="skull pile"/>
 	<item id="10205" article="a" name="pile of bones"/>
@@ -19247,13 +19318,13 @@
 		<attribute key="armor" value="3"/>
 		<attribute key="absorbPercentPhysical" value="2"/>
 		<attribute key="absorbpercentholy" value="-2"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="feet"/>
 		<attribute key="weight" value="2250"/>
 	</item>
 	<item id="10324" article="an" name="expedition backpack">
 		<attribute key="containerSize" value="20"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="backpack"/>
 		<attribute key="weight" value="1800"/>
 	</item>
@@ -19266,13 +19337,13 @@
 		<attribute key="weight" value="1700"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="10327" article="a" name="minotaur backpack">
 		<attribute key="weight" value="1850"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="10328" article="a" name="bunch of ripe rice" plural="bunches of ripe rice">
 		<attribute key="weight" value="750"/>
@@ -19361,7 +19432,7 @@
 		<attribute key="weight" value="1650"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="10347" article="a" name="dragon tapestry">
 		<attribute key="weight" value="1000"/>
@@ -19511,14 +19582,14 @@
 		<attribute key="armor" value="9"/>
 		<attribute key="slotType" value="head"/>
 		<attribute key="absorbPercentPhysical" value="5"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="10386" article="a" name="Zaoan shoes">
 		<attribute key="weight" value="700"/>
 		<attribute key="armor" value="1"/>
 		<attribute key="slotType" value="feet"/>
 		<attribute key="speed" value="10"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="10387" article="a" name="Zaoan legs">
 		<attribute key="weight" value="6600"/>
@@ -19532,7 +19603,7 @@
 		<attribute key="attack" value="47"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="10389" article="a" name="sai">
 		<attribute key="weight" value="5000"/>
@@ -19547,7 +19618,7 @@
 		<attribute key="attack" value="43"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="2"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="10391" article="a" name="drachaku">
 		<attribute key="weight" value="6000"/>
@@ -19562,7 +19633,7 @@
 		<attribute key="attack" value="32"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="10393" article="a" name="dead wailing widow">
 		<attribute key="containerSize" value="10"/>
@@ -19635,7 +19706,7 @@
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weight" value="8700"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="10407" article="a" name="shaggy tail">
 		<attribute key="weight" value="112"/>
@@ -19814,9 +19885,9 @@
 	<item id="10451" article="a" name="jade hat">
 		<attribute key="weight" value="900"/>
 		<attribute key="armor" value="4"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="10452" article="a" name="terramite shell" plural="terramite shells">
 		<attribute key="weight" value="150"/>
@@ -20769,7 +20840,7 @@
 		<attribute key="armor" value="15"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="speed" value="20"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="11652" article="a" name="broken key ring">
 		<attribute key="weight" value="50"/>
@@ -20804,7 +20875,7 @@
 		<attribute key="attack" value="47"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="slotType" value="two-handed"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="11658" name="draken sulphur">
 		<attribute key="weight" value="68"/>
@@ -20883,7 +20954,7 @@
 	<item id="11674" article="a" name="cobra crown">
 		<attribute key="weight" value="850"/>
 		<attribute key="armor" value="3"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="absorbPercentFire" value="-5"/>
 		<attribute key="absorbPercentEarth" value="5"/>
 		<attribute key="slotType" value="head"/>
@@ -20945,7 +21016,7 @@
 		<attribute key="weight" value="4500"/>
 		<attribute key="armor" value="12"/>
 		<attribute key="slotType" value="body"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="absorbPercentFire" value="5"/>
 	</item>
 	<item id="11688" article="a" name="shield of corruption">
@@ -20954,7 +21025,7 @@
 		<attribute key="skillSword" value="3"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="showAttributes" value="1"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="11689" article="an" name="elite draken helmet">
 		<attribute key="weight" value="4300"/>
@@ -20962,7 +21033,7 @@
 		<attribute key="slotType" value="head"/>
 		<attribute key="absorbPercentDeath" value="3"/>
 		<attribute key="skillDist" value="1"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="11690" name="trashed draken boots">
 		<attribute key="description" value="They will expire within a short time, sell them back to Esrik before they do."/>
@@ -20972,7 +21043,7 @@
 	<item id="11691" article="a" name="snake god's wristguard">
 		<attribute key="description" value="It shows your spells and can also shield against attacks when worn."/>
 		<attribute key="weight" value="2800"/>
-		<attribute key="magicLevelPoints" value="3"/>
+		<attribute key="magicpoints" value="3"/>
 		<attribute key="defense" value="14"/>
 		<attribute key="weaponType" value="shield"/>
 	</item>
@@ -20982,7 +21053,7 @@
 		<attribute key="attack" value="48"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="extradef" value="3"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="11693" article="a" name="blade of corruption">
 		<attribute key="weight" value="6400"/>
@@ -20990,7 +21061,7 @@
 		<attribute key="attack" value="48"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="2"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="11694" article="a" name="snake god trophy">
 		<attribute key="weight" value="500"/>
@@ -23401,7 +23472,7 @@
 		<attribute key="skillshield" value="3"/>
 		<attribute key="absorbPercentPhysical" value="8"/>
 		<attribute key="showAttributes" value="1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="13994" article="a" name="depth lorica">
 		<attribute key="weight" value="14500"/>
@@ -23410,7 +23481,7 @@
 		<attribute key="skilldist" value="3"/>
 		<attribute key="absorbpercentdeath" value="5"/>
 		<attribute key="showAttributes" value="1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="13995" article="a" name="depth galea">
 		<attribute key="description" value="Enables underwater exploration."/>
@@ -23433,15 +23504,15 @@
 		<attribute key="speed" value="-10"/>
 		<attribute key="absorbPercentPhysical" value="5"/>
 		<attribute key="showAttributes" value="1"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="13998" article="a" name="depth scutum">
 		<attribute key="weight" value="3000"/>
 		<attribute key="defense" value="25"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="showAttributes" value="1"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="13999" article="an" name="ornate legs">
 		<attribute key="weight" value="7700"/>
@@ -23456,14 +23527,14 @@
 		<attribute key="absorbPercentPhysical" value="5"/>
 		<attribute key="showAttributes" value="1"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="14001" article="an" name="ornate mace">
 		<attribute key="weight" value="14900"/>
 		<attribute key="attack" value="49"/>
 		<attribute key="defense" value="24"/>
 		<attribute key="weaponType" value="club"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="14002" article="a" name="trophy of Obujos">
 		<attribute key="weight" value="500"/>
@@ -23606,7 +23677,7 @@
 		<attribute key="attack" value="42"/>
 		<attribute key="defense" value="21"/>
 		<attribute key="weaponType" value="axe"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="14041" article="a" name="deepling ridge">
 		<attribute key="weight" value="180"/>
@@ -23615,7 +23686,7 @@
 		<attribute key="weight" value="7500"/>
 		<attribute key="defense" value="33"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="14043" article="a" name="guardian axe">
 		<attribute key="weight" value="11000"/>
@@ -23689,7 +23760,7 @@
 		<attribute key="weight" value="2000"/>
 		<attribute key="armor" value="12"/>
 		<attribute key="slotType" value="body"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 		<attribute key="absorbPercentIce" value="5"/>
 	</item>
 	<item id="14087" article="a" name="grasshopper legs">
@@ -23703,14 +23774,14 @@
 		<attribute key="weight" value="5500"/>
 		<attribute key="defense" value="36"/>
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="14089" article="a" name="hive scythe">
 		<attribute key="weight" value="7500"/>
 		<attribute key="attack" value="46"/>
 		<attribute key="defense" value="24"/>
 		<attribute key="weaponType" value="axe"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="14090" article="a" name="dead poodle">
 		<attribute key="containerSize" value="20"/>
@@ -23885,7 +23956,7 @@
 		<attribute key="range" value="6"/>
 		<attribute key="hitchance" value="5"/>
 		<attribute key="attack" value="2"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="14247" article="an" name="ornate crossbow">
 		<attribute key="weight" value="9100"/>
@@ -23900,20 +23971,20 @@
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="14249" article="a" name="buggy backpack">
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="14250" article="a" name="deepling squelcher">
 		<attribute key="weight" value="8900"/>
 		<attribute key="attack" value="44"/>
 		<attribute key="defense" value="28"/>
 		<attribute key="weaponType" value="club"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 	</item>
 	<item id="14251" article="a" name="tarsal arrow">
 		<attribute key="weight" value="70"/>
@@ -23972,7 +24043,7 @@
 		<attribute key="weight" value="1500"/>
 		<attribute key="containerSize" value="15"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item fromid="14675" toid="14680" article="a" name="tapestry of honour">
 		<attribute key="description" value="This tapestry has been awarded to the &lt;guild&gt; for being more than &lt;age&gt; years old on January 7th 2012 at Tibia's 15th birthday."/>
@@ -24084,7 +24155,7 @@
 		<attribute key="range" value="6"/>
 		<attribute key="attack" value="9"/>
 		<attribute key="hitchance" value="1"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="14769" article="a" name="spellbook of ancient arcana">
 		<attribute key="description" value="It shows your spells and can also shield against attacks when worn."/>
@@ -24092,7 +24163,7 @@
 		<attribute key="defense" value="19"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="absorbpercentdeath" value="5"/>
-		<attribute key="magicLevelPoints" value="4"/>
+		<attribute key="magicpoints" value="4"/>
 		<attribute key="showAttributes" value="1"/>
 	</item>
 	<item fromid="14770" toid="14801" name="crystal floor"/>
@@ -24931,7 +25002,7 @@
 		<attribute key="weaponType" value="wand"/>
 		<attribute key="shootType" value="energy"/>
 		<attribute key="range" value="4"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 	</item>
 	<item id="16097" article="a" name="glowing mushroom">
 		<attribute key="weight" value="1000"/>
@@ -24945,13 +25016,13 @@
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="16100" article="a" name="crystal backpack">
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="16101" article="a" name="muck remover">
 		<attribute key="description" value="The gnomish slime remover works wonders on mucky objects."/>
@@ -24970,7 +25041,7 @@
 		<attribute key="slotType" value="head"/>
 		<attribute key="absorbpercentearth" value="6"/>
 		<attribute key="absorbpercentfire" value="-6"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 	</item>
 	<item id="16105" article="a" name="gill coat">
 		<attribute key="weight" value="1900"/>
@@ -24978,7 +25049,7 @@
 		<attribute key="slotType" value="body"/>
 		<attribute key="absorbpercentearth" value="10"/>
 		<attribute key="absorbpercentfire" value="-10"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 	</item>
 	<item id="16106" article="a" name="gill legs">
 		<attribute key="weight" value="2800"/>
@@ -24986,12 +25057,12 @@
 		<attribute key="slotType" value="legs"/>
 		<attribute key="absorbpercentearth" value="8"/>
 		<attribute key="absorbpercentfire" value="-8"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 	</item>
 	<item id="16107" article="a" name="spellbook of vigilance">
 		<attribute key="description" value="It shows your spells and can also shield against attacks when worn."/>
 		<attribute key="weight" value="2700"/>
-		<attribute key="magicLevelPoints" value="3"/>
+		<attribute key="magicpoints" value="3"/>
 		<attribute key="defense" value="20"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="absorbpercentearth" value="3"/>
@@ -25020,7 +25091,7 @@
 		<attribute key="absorbPercentPhysical" value="5"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="speed" value="30"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="16111" name="prismatic legs">
 		<attribute key="weight" value="7100"/>
@@ -25036,7 +25107,7 @@
 		<attribute key="speed" value="30"/>
 		<attribute key="absorbpercentdeath" value="3"/>
 		<attribute key="showAttributes" value="1"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="16113" article="a" name="prismatic necklace">
 		<attribute key="weight" value="650"/>
@@ -25063,7 +25134,7 @@
 		<attribute key="weaponType" value="wand"/>
 		<attribute key="shootType" value="fire"/>
 		<attribute key="range" value="4"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 	</item>
 	<item id="16116" article="a" name="prismatic shield">
 		<attribute key="weight" value="7200"/>
@@ -25079,7 +25150,7 @@
 		<attribute key="weaponType" value="wand"/>
 		<attribute key="shootType" value="smallearth"/>
 		<attribute key="range" value="4"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 	</item>
 	<item id="16118" article="a" name="glacial rod">
 		<attribute key="description" value="Hurls the icy essence of the Svargrond glaciers."/>
@@ -25087,7 +25158,7 @@
 		<attribute key="weaponType" value="wand"/>
 		<attribute key="shootType" value="smallice"/>
 		<attribute key="range" value="4"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 	</item>
 	<item id="16119" article="a" name="blue crystal shard" plural="blue crystal shards">
 		<attribute key="weight" value="20"/>
@@ -25258,7 +25329,7 @@
 		<attribute key="extradef" value="3"/>
 		<attribute key="description" value="Even in the light of day, the stars seem to reflect in each facet of this crystalline axe."/>
 		<attribute key="skillaxe" value="1"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="16162" article="a" name="mycological mace">
 		<attribute key="weight" value="5900"/>
@@ -25267,7 +25338,7 @@
 		<attribute key="weaponType" value="club"/>
 		<attribute key="extradef" value="3"/>
 		<attribute key="skillclub" value="1"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="16163" article="a" name="crystal crossbow">
 		<attribute key="weight" value="8400"/>
@@ -25286,7 +25357,7 @@
 		<attribute key="range" value="6"/>
 		<attribute key="attack" value="4"/>
 		<attribute key="hitchance" value="4"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="16165" article="a" name="pet pig">
 		<attribute key="weight" value="600"/>
@@ -25319,7 +25390,7 @@
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="extradef" value="3"/>
 		<attribute key="skillsword" value="1"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item id="16176" article="a" name="dead crystal golem">
 		<attribute key="containerSize" value="25"/>
@@ -26428,7 +26499,7 @@
 		<attribute key="attack" value="27"/>
 		<attribute key="defense" value="19"/>
 		<attribute key="extradef" value="2"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="weight" value="4600"/>
 	</item>
@@ -26518,7 +26589,7 @@
 	<item id="17852" article="a" name="helmet of the lost">
 		<attribute key="armor" value="7"/>
 		<attribute key="slotType" value="head"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="weight" value="3500"/>
 	</item>
 	<item id="17853" name="lost bracers" plural="lost bracers">
@@ -29686,7 +29757,7 @@
 	<item id="19159" article="a" name="pannier backpack">
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="weight" value="1800"/>
 	</item>
 	<item id="19160" name="Omrabas' talking skull">
@@ -29810,7 +29881,7 @@
 		<attribute key="attack" value="3"/>
 		<attribute key="hitchance" value="2"/>
 		<attribute key="showAttributes" value="1"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 		<attribute key="weight" value="6200"/>
 	</item>
 	<item id="19357" article="a" name="shrunken head necklace">
@@ -29824,7 +29895,7 @@
 		<attribute key="armor" value="11"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="showAttributes" value="1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="weight" value="8400"/>
 	</item>
 	<item id="19359" article="a" name="horn">
@@ -29846,14 +29917,14 @@
 		<attribute key="attack" value="1"/>
 		<attribute key="hitchance" value="4"/>
 		<attribute key="showAttributes" value="1"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 		<attribute key="weight" value="4200"/>
 	</item>
 	<item id="19363" article="a" name="runic ice shield">
 		<attribute key="defense" value="31"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="showAttributes" value="1"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="weight" value="4900"/>
 	</item>
 	<item id="19364" name="RESERVED SPRITE"/>
@@ -29889,13 +29960,13 @@
 	<item id="19373" article="a" name="haunted mirror piece">
 		<attribute key="defense" value="34"/>
 		<attribute key="showAttributes" value="1"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="weight" value="2800"/>
 	</item>
 	<item id="19374" name="vampire silk slippers">
 		<attribute key="armor" value="0"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="weight" value="1150"/>
 	</item>
 	<item fromid="19375" toid="19378" article="a" name="slimy growth"/>
@@ -29912,7 +29983,7 @@
 		<attribute key="armor" value="12"/>
 		<attribute key="absorbpercentfire" value="5"/>
 		<attribute key="slotType" value="body"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="showAttributes" value="1"/>
 		<attribute key="weight" value="3400"/>
 	</item>
@@ -30130,7 +30201,7 @@
 		<attribute key="attack" value="50"/>
 		<attribute key="defense" value="29"/>
 		<attribute key="extradef" value="2"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="weight" value="5900"/>
 	</item>
@@ -30138,7 +30209,7 @@
 		<attribute key="attack" value="52"/>
 		<attribute key="defense" value="31"/>
 		<attribute key="extradef" value="3"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="skillsword" value="1"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="weight" value="5500"/>
@@ -30153,7 +30224,7 @@
 	<item id="20068" article="an" name="umbral slayer">
 		<attribute key="attack" value="52"/>
 		<attribute key="defense" value="31"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="weight" value="9500"/>
@@ -30161,7 +30232,7 @@
 	<item id="20069" article="an" name="umbral master slayer">
 		<attribute key="attack" value="54"/>
 		<attribute key="defense" value="35"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="skillsword" value="3"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weaponType" value="sword"/>
@@ -30178,7 +30249,7 @@
 		<attribute key="attack" value="51"/>
 		<attribute key="defense" value="27"/>
 		<attribute key="extradef" value="2"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="weight" value="8500"/>
 	</item>
@@ -30186,7 +30257,7 @@
 		<attribute key="attack" value="53"/>
 		<attribute key="defense" value="30"/>
 		<attribute key="extradef" value="3"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="skillaxe" value="1"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="weight" value="8000"/>
@@ -30201,7 +30272,7 @@
 	<item id="20074" article="an" name="umbral chopper">
 		<attribute key="attack" value="52"/>
 		<attribute key="defense" value="30"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="weight" value="11500"/>
@@ -30209,7 +30280,7 @@
 	<item id="20075" article="an" name="umbral master chopper">
 		<attribute key="attack" value="54"/>
 		<attribute key="defense" value="34"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="skillaxe" value="3"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weaponType" value="axe"/>
@@ -30226,7 +30297,7 @@
 		<attribute key="attack" value="50"/>
 		<attribute key="defense" value="26"/>
 		<attribute key="extradef" value="2"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="weight" value="8500"/>
 	</item>
@@ -30234,7 +30305,7 @@
 		<attribute key="attack" value="52"/>
 		<attribute key="defense" value="30"/>
 		<attribute key="extradef" value="3"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="skillclub" value="1"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="weight" value="8000"/>
@@ -30249,7 +30320,7 @@
 	<item id="20080" article="an" name="umbral hammer">
 		<attribute key="attack" value="53"/>
 		<attribute key="defense" value="30"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="weight" value="16500"/>
@@ -30257,7 +30328,7 @@
 	<item id="20081" article="an" name="umbral master hammer">
 		<attribute key="attack" value="55"/>
 		<attribute key="defense" value="34"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="skillclub" value="3"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weight" value="16000"/>
@@ -30276,7 +30347,7 @@
 		<attribute key="attack" value="4"/>
 		<attribute key="ammotype" value="arrow"/>
 		<attribute key="hitchance" value="5"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="range" value="7"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weaponType" value="distance"/>
@@ -30286,7 +30357,7 @@
 		<attribute key="attack" value="6"/>
 		<attribute key="ammotype" value="arrow"/>
 		<attribute key="hitchance" value="5"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="range" value="7"/>
 		<attribute key="skilldist" value="3"/>
 		<attribute key="slotType" value="two-handed"/>
@@ -30306,7 +30377,7 @@
 		<attribute key="attack" value="6"/>
 		<attribute key="ammotype" value="bolt"/>
 		<attribute key="hitchance" value="2"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="range" value="5"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weight" value="12500"/>
@@ -30316,7 +30387,7 @@
 		<attribute key="attack" value="9"/>
 		<attribute key="ammotype" value="bolt"/>
 		<attribute key="hitchance" value="4"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="range" value="5"/>
 		<attribute key="skilldist" value="3"/>
 		<attribute key="slotType" value="two-handed"/>
@@ -30329,7 +30400,7 @@
 		<attribute key="absorbPercentIce" value="2"/>
 		<attribute key="absorbpercentenergy" value="2"/>
 		<attribute key="defense" value="14"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="weight" value="4000"/>
 	</item>
@@ -30339,8 +30410,8 @@
 		<attribute key="absorbPercentIce" value="3"/>
 		<attribute key="absorbpercentenergy" value="3"/>
 		<attribute key="defense" value="16"/>
-		<attribute key="imbuingslots" value="1"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="imbuingslot" value="1"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="weight" value="3500"/>
 	</item>
@@ -30350,8 +30421,8 @@
 		<attribute key="absorbPercentIce" value="5"/>
 		<attribute key="absorbpercentenergy" value="5"/>
 		<attribute key="defense" value="20"/>
-		<attribute key="imbuingslots" value="1"/>
-		<attribute key="magicLevelPoints" value="4"/>
+		<attribute key="imbuingslot" value="1"/>
+		<attribute key="magicpoints" value="4"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="weight" value="3000"/>
 	</item>
@@ -30952,7 +31023,7 @@
 		<attribute key="weight" value="1800"/>
 		<attribute key="containerSize" value="20"/>
 		<attribute key="slotType" value="backpack"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 	</item>
 	<item fromid="20348" toid="20349" name="RESERVED SPRITE"/>
 	<item id="20350" article="a" name="cake tapestry">
@@ -31613,19 +31684,19 @@
 		<attribute key="armor" value="5"/>
 		<attribute key="absorbpercentearth" value="3"/>
 		<attribute key="absorbpercentfire" value="-3"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 		<attribute key="slotType" value="head"/>
 		<attribute key="weight" value="800"/>
 	</item>
 	<item id="21166" article="a" name="mooh'tah plate">
 		<attribute key="armor" value="12"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="weight" value="12500"/>
 	</item>
 	<item id="21167" article="a" name="heat core">
 		<attribute key="armor" value="12"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="weight" value="5500"/>
 	</item>
@@ -31638,7 +31709,7 @@
 	<item id="21169" name="metal spats">
 		<attribute key="armor" value="1"/>
 		<attribute key="absorbPercentPhysical" value="1"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="feet"/>
 		<attribute key="weight" value="1800"/>
 	</item>
@@ -31656,7 +31727,7 @@
 	<item id="21172" article="a" name="glooth whip">
 		<attribute key="attack" value="33"/>
 		<attribute key="defense" value="19"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="weight" value="3200"/>
 	</item>
@@ -31856,7 +31927,7 @@
 	</item>
 	<item id="21292" article="a" name="feedbag">
 		<attribute key="containerSize" value="20"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="backpack"/>
 		<attribute key="weight" value="1800"/>
 	</item>
@@ -31866,7 +31937,7 @@
 	<item id="21294" article="a" name="parquet floor"/>
 	<item id="21295" article="a" name="glooth backpack">
 		<attribute key="containerSize" value="20"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="backpack"/>
 		<attribute key="weight" value="1800"/>
 	</item>
@@ -32191,7 +32262,12 @@
 		<attribute key="type" value="magicfield"/>
 		<attribute key="decayTo" value="2132"/>
 		<attribute key="duration" value="120"/>
-		<attribute key="field" value="fire"/>
+		<attribute key="field" value="fire">
+			<attribute key="damage" value="20" />
+			<attribute key="ticks" value="10000" />
+			<attribute key="count" value="7" />
+			<attribute key="damage" value="10" />
+		</attribute>
 	</item>
 	<item id="21466" name="ewer with holy water">
 		<attribute key="description" value="The water in the ewer shimmers faintly. In the desert's heat it will evaporate soon, however."/>
@@ -32970,7 +33046,7 @@
 	</item>
 	<item id="21981" name="oriental shoes">
 		<attribute key="armor" value="2"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="feet"/>
 		<attribute key="speed" value="30"/>
 		<attribute key="showAttributes" value="1"/>
@@ -33378,7 +33454,7 @@
 	</item>
 	<item id="22084" article="a" name="wolf backpack">
 		<attribute key="containerSize" value="20"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="backpack"/>
 		<attribute key="weight" value="1800"/>
 	</item>
@@ -33392,7 +33468,7 @@
 	</item>
 	<item id="22086" article="a" name="badger boots">
 		<attribute key="armor" value="2"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="feet"/>
 		<attribute key="speed" value="20"/>
 		<attribute key="showAttributes" value="1"/>
@@ -33571,7 +33647,7 @@
 	<item id="22130" article="an" name="enchanted werewolf amulet">
 		<attribute key="armor" value="9"/>
 		<attribute key="absorbPercentPhysical" value="4"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 		<attribute key="duration" value="3600"/>
 		<attribute key="decayTo" value="22060"/>
 		<attribute key="slotType" value="necklace"/>
@@ -33757,7 +33833,7 @@
 		<attribute key="weight" value="3000"/>
 	</item>
 	<item id="22183" article="an" name="ogre scepta">
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="range" value="3"/>
 		<attribute key="shootType" value="smallearth"/>
 		<attribute key="weaponType" value="wand"/>
@@ -33793,7 +33869,7 @@
 	</item>
 	<item id="22192" article="a" name="shamanic mask">
 		<attribute key="armor" value="4"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="slotType" value="head"/>
 		<attribute key="weight" value="3100"/>
 	</item>
@@ -34022,7 +34098,7 @@
 		<attribute key="armor" value="15"/>
 		<attribute key="absorbpercentfire" value="8"/>
 		<attribute key="absorbPercentIce" value="-8"/>
-		<attribute key="magicLevelPoints" value="4"/>
+		<attribute key="magicpoints" value="4"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="weight" value="14500"/>
 	</item>
@@ -34030,7 +34106,7 @@
 		<attribute key="armor" value="15"/>
 		<attribute key="absorbpercentearth" value="8"/>
 		<attribute key="absorbpercentfire" value="-8"/>
-		<attribute key="magicLevelPoints" value="4"/>
+		<attribute key="magicpoints" value="4"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="weight" value="14500"/>
 	</item>
@@ -34038,7 +34114,7 @@
 		<attribute key="armor" value="15"/>
 		<attribute key="absorbpercentenergy" value="8"/>
 		<attribute key="absorbpercentearth" value="-8"/>
-		<attribute key="magicLevelPoints" value="4"/>
+		<attribute key="magicpoints" value="4"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="weight" value="14500"/>
 	</item>
@@ -34046,7 +34122,7 @@
 		<attribute key="armor" value="15"/>
 		<attribute key="absorbPercentIce" value="8"/>
 		<attribute key="absorbpercentenergy" value="-8"/>
-		<attribute key="magicLevelPoints" value="4"/>
+		<attribute key="magicpoints" value="4"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="weight" value="14500"/>
 	</item>
@@ -34274,14 +34350,14 @@
 	</item>
 	<item id="22726" article="a" name="rift shield">
 		<attribute key="defense" value="37"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="weight" value="6500"/>
 	</item>
 	<item id="22727" article="a" name="rift lance">
 		<attribute key="attack" value="48"/>
 		<attribute key="defense" value="28"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="weight" value="6600"/>
@@ -34363,20 +34439,20 @@
 	<item id="22750" article="a" name="grille"/>
 	<item id="22754" article="a" name="visage of the end days">
 		<attribute key="armor" value="10"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="slotType" value="head"/>
 		<attribute key="weight" value="3800"/>
 	</item>
 	<item id="22755" article="a" name="book of lies">
 		<attribute key="defense" value="18"/>
-		<attribute key="imbuingslots" value="1"/>
-		<attribute key="magicLevelPoints" value="4"/>
+		<attribute key="imbuingslot" value="1"/>
+		<attribute key="magicpoints" value="4"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="weight" value="2400"/>
 	</item>
 	<item id="22756" article="a" name="treader of torment">
 		<attribute key="armor" value="4"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="feet"/>
 		<attribute key="weight" value="3600"/>
 	</item>
@@ -34387,7 +34463,7 @@
 	</item>
 	<item id="22758" article="a" name="death gaze">
 		<attribute key="defense" value="38"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="weight" value="7900"/>
 	</item>
@@ -34414,7 +34490,7 @@
 	<item id="22762" article="a" name="maimer">
 		<attribute key="attack" value="51"/>
 		<attribute key="defense" value="32"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="weight" value="7700"/>
 	</item>
@@ -34444,7 +34520,7 @@
 		<attribute key="description" value="It is made of platinum and emeralds and topped by a large F made of gold."/>
 		<attribute key="decayTo" value="22764"/>
 		<attribute key="duration" value="86400"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 		<attribute key="range" value="4"/>
 		<attribute key="shootType" value="energy"/>
 		<attribute key="weaponType" value="wand"/>
@@ -34629,7 +34705,7 @@
 		<attribute key="attack" value="5"/>
 		<attribute key="ammotype" value="arrow"/>
 		<attribute key="hitchance" value="3"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 		<attribute key="range" value="7"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weaponType" value="distance"/>
@@ -34639,7 +34715,7 @@
 		<attribute key="attack" value="5"/>
 		<attribute key="ammotype" value="bolt"/>
 		<attribute key="hitchance" value="4"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 		<attribute key="range" value="5"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weaponType" value="distance"/>
@@ -34769,19 +34845,35 @@
 	</item>
 	<item id="23365" article="an" name="fire trap">
 		<attribute key="type" value="magicfield"/>
-		<attribute key="field" value="fire"/>
+		<attribute key="field" value="fire">
+			<attribute key="damage" value="30" />
+			<attribute key="ticks" value="10000" />
+			<attribute key="damage" value="25" />
+		</attribute>
 	</item>
 	<item id="23366" article="an" name="energy trap">
 		<attribute key="type" value="magicfield"/>
-		<attribute key="field" value="energy"/>
+		<attribute key="field" value="energy">
+			<attribute key="damage" value="30" />
+			<attribute key="ticks" value="10000" />
+			<attribute key="damage" value="25" />
+		</attribute>
 	</item>
 	<item id="23367" article="a" name="toxic trap">
 		<attribute key="type" value="magicfield"/>
-		<attribute key="field" value="poison"/>
+		<attribute key="field" value="poison">
+			<attribute key="damage" value="30" />
+			<attribute key="ticks" value="10000" />
+			<attribute key="damage" value="25" />
+		</attribute>
 	</item>
 	<item id="23368" article="a" name="poison trap">
 		<attribute key="type" value="magicfield"/>
-		<attribute key="field" value="poison"/>
+		<attribute key="field" value="poison">
+			<attribute key="ticks" value="5000" />
+			<attribute key="start" value="5" />
+			<attribute key="damage" value="100" />
+		</attribute>
 	</item>
 	<item id="23369" article="a" name="blade trap"/>
 	<item id="23370" article="a" name="spike trap"/>
@@ -35296,14 +35388,14 @@
 	</item>
 	<item id="23525" article="an" name="energetic backpack">
 		<attribute key="containerSize" value="24"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="backpack"/>
 		<attribute key="weight" value="2160"/>
 	</item>
 	<item id="23526" article="a" name="collar of blue plasma">
 		<attribute key="decayTo" value="0"/>
 		<attribute key="duration" value="1800"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="showduration" value="1"/>
 		<attribute key="showAttributes" value="1"/>
 		<attribute key="skilldist" value="4"/>
@@ -35318,7 +35410,7 @@
 		<attribute key="healthticks" value="6000"/>
 		<attribute key="managain" value="8"/>
 		<attribute key="manaticks" value="6000"/>
-		<attribute key="magicLevelPoints" value="3"/>
+		<attribute key="magicpoints" value="3"/>
 		<attribute key="showduration" value="1"/>
 		<attribute key="showAttributes" value="1"/>
 		<attribute key="slotType" value="necklace"/>
@@ -35348,7 +35440,7 @@
 	<item id="23530" article="a" name="ring of blue plasma">
 		<attribute key="decayTo" value="0"/>
 		<attribute key="duration" value="1800"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 		<attribute key="showduration" value="1"/>
 		<attribute key="showAttributes" value="1"/>
 		<attribute key="skilldist" value="3"/>
@@ -35370,7 +35462,7 @@
 		<attribute key="healthticks" value="6000"/>
 		<attribute key="managain" value="4"/>
 		<attribute key="manaticks" value="6000"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="showduration" value="1"/>
 		<attribute key="showAttributes" value="1"/>
 		<attribute key="slotType" value="ring"/>
@@ -36008,7 +36100,7 @@
 	</item>
 	<item id="24393" article="a" name="pillow backpack">
 		<attribute key="containerSize" value="24"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="backpack"/>
 		<attribute key="weight" value="1450"/>
 	</item>
@@ -36018,7 +36110,7 @@
 	<item id="24395" article="a" name="birthday backpack">
 		<attribute key="containerSize" value="20"/>
 		<attribute key="description" value="It was awarded during the festivities of Tibia's 20th anniversary."/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="backpack"/>
 		<attribute key="weight" value="1500"/>
 	</item>
@@ -37066,15 +37158,15 @@
 	<item id="25699" article="a" name="wooden spellbook">
 		<attribute key="absorbpercentearth" value="5"/>
 		<attribute key="defense" value="16"/>
-		<attribute key="magicLevelPoints" value="2"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="magicpoints" value="2"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="weight" value="1200"/>
 	</item>
 	<item id="25700" article="a" name="dream blossom staff">
 		<attribute key="description" value="It's a gnarly branch with a gleaming blue blossom."/>
-		<attribute key="imbuingslots" value="2"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="range" value="4"/>
 		<attribute key="shootType" value="death"/>
 		<attribute key="weaponType" value="wand"/>
@@ -37240,7 +37332,7 @@
 		<attribute key="description" value="Temporary magic powers enchant this staff."/>
 		<attribute key="decayTo" value="0"/>
 		<attribute key="duration" value="900"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="range" value="4"/>
 		<attribute key="stopduration" value="0"/>
 		<attribute key="showduration" value="1"/>
@@ -38982,14 +39074,14 @@
 	<item id="27449" article="a" name="blade of destruction">
 		<attribute key="attack" value="50"/>
 		<attribute key="defense" value="33"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="weight" value="5000"/>
 	</item>
 	<item id="27450" article="a" name="slayer of destruction">
 		<attribute key="attack" value="52"/>
 		<attribute key="defense" value="32"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="weight" value="7000"/>
@@ -38997,14 +39089,14 @@
 	<item id="27451" article="an" name="axe of destruction">
 		<attribute key="attack" value="51"/>
 		<attribute key="defense" value="31"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="weight" value="5000"/>
 	</item>
 	<item id="27452" article="a" name="chopper of destruction">
 		<attribute key="attack" value="52"/>
 		<attribute key="defense" value="32"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="weight" value="7000"/>
@@ -39012,14 +39104,14 @@
 	<item id="27453" article="a" name="mace of destruction">
 		<attribute key="attack" value="50"/>
 		<attribute key="defense" value="30"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="weight" value="5000"/>
 	</item>
 	<item id="27454" article="a" name="hammer of destruction">
 		<attribute key="attack" value="53"/>
 		<attribute key="defense" value="30"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="weight" value="7000"/>
@@ -39028,7 +39120,7 @@
 		<attribute key="attack" value="6"/>
 		<attribute key="ammotype" value="arrow"/>
 		<attribute key="hitchance" value="6"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 		<attribute key="range" value="6"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weight" value="5500"/>
@@ -39038,7 +39130,7 @@
 		<attribute key="attack" value="6"/>
 		<attribute key="ammotype" value="bolt"/>
 		<attribute key="hitchance" value="6"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="range" value="5"/>
 		<attribute key="weight" value="6500"/>
@@ -39046,15 +39138,15 @@
 	</item>
 	<item id="27457" article="a" name="wand of destruction">
 		<attribute key="shootType" value="energy"/>
-		<attribute key="imbuingslots" value="2"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="range" value="4"/>
 		<attribute key="weaponType" value="wand"/>
 		<attribute key="weight" value="3500"/>
 	</item>
 	<item id="27458" article="a" name="rod of destruction">
-		<attribute key="imbuingslots" value="2"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="range" value="4"/>
 		<attribute key="shootType" value="ice"/>
 		<attribute key="weight" value="3500"/>
@@ -39622,8 +39714,8 @@
 		<attribute key="absorbPercentPhysical" value="3"/>
 		<attribute key="absorbpercentenergy" value="8"/>
 		<attribute key="absorbPercentIce" value="-2"/>
-		<attribute key="imbuingslots" value="2"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="slotType" value="head"/>
 		<attribute key="weight" value="2400"/>
 	</item>
@@ -39632,7 +39724,7 @@
 		<attribute key="absorbPercentPhysical" value="4"/>
 		<attribute key="absorbpercentenergy" value="8"/>
 		<attribute key="absorbPercentIce" value="-2"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="skilldist" value="3"/>
 		<attribute key="weight" value="12000"/>
@@ -39641,7 +39733,7 @@
 		<attribute key="armor" value="9"/>
 		<attribute key="absorbpercentenergy" value="7"/>
 		<attribute key="absorbPercentIce" value="-2"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="slotType" value="legs"/>
 		<attribute key="weight" value="2500"/>
 	</item>
@@ -39650,7 +39742,7 @@
 		<attribute key="absorbpercentenergy" value="8"/>
 		<attribute key="absorbPercentIce" value="-2"/>
 		<attribute key="defense" value="38"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="skillshield" value="2"/>
 		<attribute key="weight" value="6000"/>
 		<attribute key="weaponType" value="shield"/>
@@ -39661,7 +39753,7 @@
 		<attribute key="defense" value="35"/>
 		<attribute key="elementenergy" value="42"/>
 		<attribute key="extradef" value="3"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="skillsword" value="3"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="weight" value="8500"/>
@@ -40391,7 +40483,7 @@
 	</item>
 	<item id="28571" article="a" name="book backpack">
 		<attribute key="containerSize" value="22"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="backpack"/>
 		<attribute key="weight" value="1800"/>
 	</item>
@@ -41026,8 +41118,8 @@
 	<item id="28714" article="a" name="falcon circlet">
 		<attribute key="absorbpercentfire" value="9"/>
 		<attribute key="armor" value="8"/>
-		<attribute key="imbuingslots" value="2"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="slotType" value="head"/>
 		<attribute key="weight" value="1300"/>
 	</item>
@@ -41035,7 +41127,7 @@
 		<attribute key="absorbpercentfire" value="10"/>
 		<attribute key="absorbPercentPhysical" value="3"/>
 		<attribute key="armor" value="10"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="slotType" value="head"/>
 		<attribute key="skilldist" value="2"/>
 		<attribute key="skillshield" value="2"/>
@@ -41043,8 +41135,8 @@
 	</item>
 	<item id="28716" article="a" name="falcon rod">
 		<attribute key="absorbpercentenergy" value="8"/>
-		<attribute key="imbuingslots" value="2"/>
-		<attribute key="magicLevelPoints" value="3"/>
+		<attribute key="imbuingslot" value="2"/>
+		<attribute key="magicpoints" value="3"/>
 		<attribute key="range" value="5"/>
 		<attribute key="shootType" value="smallearth"/>
 		<attribute key="weaponType" value="wand"/>
@@ -41052,8 +41144,8 @@
 	</item>
 	<item id="28717" article="a" name="falcon wand">
 		<attribute key="absorbpercentfire" value="8"/>
-		<attribute key="imbuingslots" value="2"/>
-		<attribute key="magicLevelPoints" value="3"/>
+		<attribute key="imbuingslot" value="2"/>
+		<attribute key="magicpoints" value="3"/>
 		<attribute key="range" value="5"/>
 		<attribute key="shootType" value="energy"/>
 		<attribute key="weaponType" value="wand"/>
@@ -41064,7 +41156,7 @@
 		<attribute key="absorbpercentfire" value="5"/>
 		<attribute key="ammotype" value="arrow"/>
 		<attribute key="hitchance" value="5"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 		<attribute key="range" value="6"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="skilldist" value="2"/>
@@ -41074,7 +41166,7 @@
 	<item id="28719" article="a" name="falcon plate">
 		<attribute key="absorbPercentPhysical" value="12"/>
 		<attribute key="armor" value="18"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="skillshield" value="4"/>
 		<attribute key="weight" value="18800"/>
@@ -41094,7 +41186,7 @@
 		<attribute key="absorbPercentPhysical" value="6"/>
 		<attribute key="absorbpercentfire" value="10"/>
 		<attribute key="defense" value="39"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="weight" value="5700"/>
 	</item>
@@ -41102,7 +41194,7 @@
 		<attribute key="absorbPercentPhysical" value="7"/>
 		<attribute key="absorbpercentfire" value="15"/>
 		<attribute key="defense" value="40"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="weight" value="6000"/>
 	</item>
@@ -41110,7 +41202,7 @@
 		<attribute key="absorbpercentearth" value="10"/>
 		<attribute key="attack" value="54"/>
 		<attribute key="defense" value="34"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="skillsword" value="4"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weaponType" value="sword"/>
@@ -41121,7 +41213,7 @@
 		<attribute key="attack" value="10"/>
 		<attribute key="defense" value="33"/>
 		<attribute key="elementenergy" value="45"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="skillaxe" value="4"/>
 		<attribute key="weaponType" value="axe"/>
@@ -41133,7 +41225,7 @@
 		<attribute key="defense" value="33"/>
 		<attribute key="elementenergy" value="41"/>
 		<attribute key="extradef" value="3"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="skillclub" value="3"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="weight" value="6800"/>
@@ -41566,8 +41658,8 @@
 	</item>
 	<item id="28825" article="a" name="deepling ceremonial dagger">
 		<attribute key="absorbpercentearth" value="5"/>
-		<attribute key="imbuingslots" value="2"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="range" value="6"/>
 		<attribute key="shootType" value="smallice"/>
 		<attribute key="weaponType" value="wand"/>
@@ -41575,8 +41667,8 @@
 	</item>
 	<item id="28826" article="a" name="deepling fork">
 		<attribute key="absorbpercentholy" value="8"/>
-		<attribute key="imbuingslots" value="2"/>
-		<attribute key="magicLevelPoints" value="3"/>
+		<attribute key="imbuingslot" value="2"/>
+		<attribute key="magicpoints" value="3"/>
 		<attribute key="range" value="5"/>
 		<attribute key="shootType" value="smallice"/>
 		<attribute key="weight" value="3300"/>
@@ -41588,7 +41680,7 @@
 		<attribute key="attack" value="46"/>
 		<attribute key="defense" value="40"/>
 		<attribute key="extradef" value="-1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="weight" value="18000"/>
 		<attribute key="weaponType" value="club"/>
 	</item>
@@ -41598,7 +41690,7 @@
 		<attribute key="attack" value="46"/>
 		<attribute key="defense" value="40"/>
 		<attribute key="extradef" value="-1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="weight" value="18000"/>
 	</item>
@@ -41608,7 +41700,7 @@
 		<attribute key="attack" value="46"/>
 		<attribute key="defense" value="40"/>
 		<attribute key="extradef" value="-1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="weight" value="18000"/>
 	</item>
@@ -41618,7 +41710,7 @@
 		<attribute key="attack" value="46"/>
 		<attribute key="defense" value="40"/>
 		<attribute key="extradef" value="-1"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="weight" value="18000"/>
 	</item>
@@ -42122,7 +42214,7 @@
 		<attribute key="absorbpercentearth" value="4"/>
 		<attribute key="ammotype" value="arrow"/>
 		<attribute key="hitchance" value="4"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 		<attribute key="range" value="6"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="skilldist" value="1"/>
@@ -42133,8 +42225,8 @@
 		<attribute key="absorbpercentearth" value="12"/>
 		<attribute key="absorbpercentfire" value="-5"/>
 		<attribute key="armor" value="13"/>
-		<attribute key="magicLevelPoints" value="2"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="magicpoints" value="2"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="weight" value="4800"/>
 	</item>
@@ -42142,7 +42234,7 @@
 		<attribute key="attack" value="13"/>
 		<attribute key="defense" value="40"/>
 		<attribute key="elementice" value="39"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="skillclub" value="2"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="weight" value="8900"/>
@@ -42151,8 +42243,8 @@
 		<attribute key="absorbpercentearth" value="6"/>
 		<attribute key="absorbPercentPhysical" value="4"/>
 		<attribute key="defense" value="26"/>
-		<attribute key="imbuingslots" value="1"/>
-		<attribute key="magicLevelPoints" value="3"/>
+		<attribute key="imbuingslot" value="1"/>
+		<attribute key="magicpoints" value="3"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="weight" value="3500"/>
 	</item>
@@ -42161,7 +42253,7 @@
 		<attribute key="defense" value="20"/>
 		<attribute key="elementfire" value="42"/>
 		<attribute key="extradef" value="4"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="skillsword" value="1"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="weight" value="4300"/>
@@ -42171,7 +42263,7 @@
 		<attribute key="defense" value="22"/>
 		<attribute key="elementice" value="41"/>
 		<attribute key="extradef" value="4"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="skillsword" value="1"/>
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="weight" value="4300"/>
@@ -42179,23 +42271,23 @@
 	<item id="29423" article="a" name="dream shroud">
 		<attribute key="absorbpercentenergy" value="10"/>
 		<attribute key="armor" value="12"/>
-		<attribute key="imbuingslots" value="1"/>
-		<attribute key="magicLevelPoints" value="3"/>
+		<attribute key="imbuingslot" value="1"/>
+		<attribute key="magicpoints" value="3"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="weight" value="2500"/>
 	</item>
 	<item id="29424" article="a" name="pair of dreamwalkers">
 		<attribute key="armor" value="2"/>
 		<attribute key="absorbpercentearth" value="8"/>
-		<attribute key="imbuingslots" value="1"/>
-		<attribute key="magicLevelPoints" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
+		<attribute key="magicpoints" value="1"/>
 		<attribute key="slotType" value="feet"/>
 		<attribute key="weight" value="800"/>
 	</item>
 	<item id="29425" article="an" name="energized limb">
 		<attribute key="absorbpercentenergy" value="10"/>
-		<attribute key="imbuingslots" value="2"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="range" value="4"/>
 		<attribute key="shootType" value="fire"/>
 		<attribute key="weight" value="2700"/>
@@ -42204,15 +42296,15 @@
 	<item id="29426" article="a" name="brain in a jar">
 		<attribute key="absorbpercentearth" value="7"/>
 		<attribute key="defense" value="19"/>
-		<attribute key="imbuingslots" value="1"/>
-		<attribute key="magicLevelPoints" value="3"/>
+		<attribute key="imbuingslot" value="1"/>
+		<attribute key="magicpoints" value="3"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="weight" value="2700"/>
 	</item>
 	<item id="29427" article="a" name="dark whispers">
 		<attribute key="absorbPercentIce" value="3"/>
 		<attribute key="armor" value="7"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="skilldist" value="2"/>
 		<attribute key="slotType" value="head"/>
 		<attribute key="weight" value="3400"/>
@@ -42229,7 +42321,7 @@
 		<attribute key="absorbPercentIce" value="7"/>
 		<attribute key="absorbpercentfire" value="-3"/>
 		<attribute key="defense" value="37"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="skillclub" value="3"/>
 		<attribute key="skillaxe" value="3"/>
 		<attribute key="weaponType" value="shield"/>
@@ -42238,8 +42330,8 @@
 	<item id="29431" article="a" name="spirit guide">
 		<attribute key="absorbpercentenergy" value="6"/>
 		<attribute key="defense" value="17"/>
-		<attribute key="imbuingslots" value="1"/>
-		<attribute key="magicLevelPoints" value="4"/>
+		<attribute key="imbuingslot" value="1"/>
+		<attribute key="magicpoints" value="4"/>
 		<attribute key="weaponType" value="shield"/>
 		<attribute key="weight" value="1800"/>
 	</item>
@@ -43135,7 +43227,7 @@
 	</item>
 	<item id="30197" article="a" name="festive backpack">
 		<attribute key="containerSize" value="22"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="backpack"/>
 		<attribute key="weight" value="1500"/>
 	</item>
@@ -43660,7 +43752,7 @@
 	<item id="30373" article="a" name="white raven kit"/>
 	<item fromid="30374" toid="30392" name="RESERVED SPRITE"/>
 	<item id="30393" article="a" name="cobra crossbow">
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="skilldist" value="2"/>
 		<attribute key="weight" value="4000"/>
@@ -43668,7 +43760,7 @@
 	<item id="30394" name="cobra boots">
 		<attribute key="armor" value="3"/>
 		<attribute key="absorbPercentPhysical" value="6"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="speed" value="20"/>
 		<attribute key="slotType" value="feet"/>
 		<attribute key="showAttributes" value="1"/>
@@ -43676,20 +43768,20 @@
 	</item>
 	<item id="30395" name="cobra club">
 		<attribute key="defense" value="29"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="skillclub" value="2"/>
 		<attribute key="weight" value="2500"/>
 	</item>
 	<item id="30396" name="cobra axe">
 		<attribute key="defense" value="29"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="skillaxe" value="2"/>
 		<attribute key="weight" value="4000"/>
 	</item>
 	<item id="30397" article="a" name="cobra hood">
 		<attribute key="absorbPercentPhysical" value="5"/>
 		<attribute key="armor" value="9"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="skillsword" value="1"/>
 		<attribute key="skillclub" value="1"/>
 		<attribute key="skillaxe" value="1"/>
@@ -43699,19 +43791,19 @@
 	</item>
 	<item id="30398" name="cobra sword">
 		<attribute key="defense" value="31"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="skillsword" value="3"/>
 		<attribute key="weight" value="4000"/>
 	</item>
 	<item id="30399" name="cobra wand">
-		<attribute key="imbuingslots" value="2"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="weaponType" value="wand"/>
 		<attribute key="weight" value="4000"/>
 	</item>
 	<item id="30400" name="cobra rod">
-		<attribute key="imbuingslots" value="2"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="weaponType" value="wand"/>
 		<attribute key="weight" value="2500"/>
 	</item>
@@ -43725,7 +43817,7 @@
 		<attribute key="armor" value="2"/>
 		<attribute key="decayTo" value="30403"/>
 		<attribute key="duration" value="7200"/>
-		<attribute key="magicLevelPoints" value="3"/>
+		<attribute key="magicpoints" value="3"/>
 		<attribute key="slotType" value="necklace"/>
 		<attribute key="weight" value="500"/>
 	</item>
@@ -44416,7 +44508,11 @@
 	</item>
 	<item id="31380" article="an" name="energy field">
 		<attribute key="type" value="magicfield"/>
-		<attribute key="field" value="energy"/>
+		<attribute key="field" value="energy">
+			<attribute key="damage" value="30" />
+			<attribute key="ticks" value="10000" />
+			<attribute key="damage" value="25" />
+		</attribute>
 	</item>
 	<item id="31381" name="the missing piece of the cube">
 		<attribute key="description" value="It's black and it's missing."/>
@@ -45086,7 +45182,7 @@
 		<attribute key="absorbPercentPhysical" value="5"/>
 		<attribute key="absorbpercentearth" value="5"/>
 		<attribute key="armor" value="9"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="skillsword" value="2"/>
 		<attribute key="skillclub" value="2"/>
 		<attribute key="skillaxe" value="2"/>
@@ -45097,8 +45193,8 @@
 		<attribute key="armor" value="16"/>
 		<attribute key="absorbpercentearth" value="11"/>
 		<attribute key="absorbpercentfire" value="-2"/>
-		<attribute key="imbuingslots" value="1"/>
-		<attribute key="magicLevelPoints" value="4"/>
+		<attribute key="imbuingslot" value="1"/>
+		<attribute key="magicpoints" value="4"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="weight" value="4400"/>
 	</item>
@@ -45106,7 +45202,7 @@
 		<attribute key="absorbPercentIce" value="11"/>
 		<attribute key="absorbpercentenergy" value="-3"/>
 		<attribute key="armor" value="16"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="skilldist" value="4"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="weight" value="2400"/>
@@ -45116,7 +45212,7 @@
 		<attribute key="defense" value="27"/>
 		<attribute key="elementdeath" value="44"/>
 		<attribute key="extradef" value="2"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="skillclub" value="2"/>
 		<attribute key="weaponType" value="club"/>
 		<attribute key="weight" value="4100"/>
@@ -45126,7 +45222,7 @@
 		<attribute key="attack" value="6"/>
 		<attribute key="ammotype" value="arrow"/>
 		<attribute key="hitchance" value="4"/>
-		<attribute key="imbuingslots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 		<attribute key="range" value="6"/>
 		<attribute key="skilldist" value="4"/>
 		<attribute key="slotType" value="two-handed"/>
@@ -45137,16 +45233,16 @@
 		<attribute key="absorbpercentdeath" value="6"/>
 		<attribute key="absorbpercentholy" value="-3"/>
 		<attribute key="armor" value="7"/>
-		<attribute key="imbuingslots" value="2"/>
-		<attribute key="magicLevelPoints" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
+		<attribute key="magicpoints" value="2"/>
 		<attribute key="slotType" value="head"/>
 		<attribute key="weight" value="2300"/>
 	</item>
 	<item id="31583" article="a" name="toga mortis">
 		<attribute key="absorbpercentdeath" value="6"/>
 		<attribute key="armor" value="16"/>
-		<attribute key="imbuingslots" value="1"/>
-		<attribute key="magicLevelPoints" value="4"/>
+		<attribute key="imbuingslot" value="1"/>
+		<attribute key="magicpoints" value="4"/>
 		<attribute key="slotType" value="body"/>
 		<attribute key="weight" value="5200"/>
 	</item>
@@ -45236,7 +45332,7 @@
 		<attribute key="attack" value="7"/>
 		<attribute key="defense" value="34"/>
 		<attribute key="elementearth" value="46"/>
-		<attribute key="imbuingslots" value="2"/>
+		<attribute key="imbuingslot" value="2"/>
 		<attribute key="skillsword" value="2"/>
 		<attribute key="slotType" value="two-handed"/>
 		<attribute key="weaponType" value="sword"/>
@@ -45258,7 +45354,7 @@
 	<item id="31617" name="winged boots">
 		<attribute key="absorbpercentearth" value="7"/>
 		<attribute key="armor" value="2"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="speed" value="30"/>
 		<attribute key="skilldist" value="1"/>
 		<attribute key="showAttributes" value="1"/>
@@ -45294,7 +45390,7 @@
 	</item>
 	<item id="31625" article="a" name="winged backpack">
 		<attribute key="containerSize" value="24"/>
-		<attribute key="imbuingslots" value="1"/>
+		<attribute key="imbuingslot" value="1"/>
 		<attribute key="slotType" value="backpack"/>
 		<attribute key="weight" value="1500"/>
 	</item>
@@ -46502,7 +46598,7 @@
 		<attribute key="loottype" value="axe" />
 		<attribute key="slotType" value="two-handed" />
 		<attribute key="skillAxe" value="2" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="32617" article="a" name="fabulous legs">
 		<attribute key="weight" value="5500" />
@@ -46522,7 +46618,7 @@
 		<attribute key="slotType" value="legs" />
 		<attribute key="loottype" value="legs" />
 		<attribute key="absorbPercentHoly" value="8" />
-		<attribute key="magiclevelpoints" value="1" />
+		<attribute key="magicpoints" value="1" />
 	</item>
 	<item id="32619" name="pair of nightmare boots">
 		<attribute key="armor" value="2" />
@@ -46530,15 +46626,15 @@
 		<attribute key="slotType" value="feet" />
 		<attribute key="loottype" value="boots" />
 		<attribute key="absorbPercentEnergy" value="6" />
-		<attribute key="magiclevelpoints" value="1" />
-		<attribute key="imbuingSlots" value="1" />
+		<attribute key="magicpoints" value="1" />
+		<attribute key="imbuingslot" value="1" />
 	</item>
 	<item id="32620" article="a" name="ghost backpack">
 		<attribute key="weight" value="500" />
 		<attribute key="containerSize" value="26" />
 		<attribute key="loottype" value="container" />
 		<attribute key="slotType" value="backpack" />
-		<attribute key="imbuingSlots" value="1" />
+		<attribute key="imbuingslot" value="1" />
 	</item>
 	<item id="32621" article="a" name="ring of souls">
 		<attribute key="description" value="This ring is out of magic energy." />
@@ -46576,7 +46672,7 @@
 		<attribute key="armor" value="17" />
 		<attribute key="skillDist" value="2" />
 		<attribute key="absorbPercentPhysical" value="3" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="32629" name="the spectral scrap of cloth">
 		<attribute key="loottype" value="other" />
@@ -46587,7 +46683,7 @@
 		<attribute key="armor" value="1" />
 		<attribute key="slotType" value="head" />
 		<attribute key="loottype" value="helmet" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="32631" article="a" name="ghost claw">
 		<attribute key="loottype" value="other" />
@@ -48193,20 +48289,20 @@
 		<attribute key="weaponType" value="sword" />
 		<attribute key="loottype" value="sword" />
 		<attribute key="skillSword" value="5" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="34083" article="a" name="soulshredder">
 		<attribute key="weight" value="8100" />
 		<attribute key="defense" value="35" />
 		<attribute key="attack" value="10" />
 		<attribute key="elementIce" value="47" />
-		<attribute key="skillcriticalchance" value="10" />
-		<attribute key="skillcriticaldamage" value="10" />
+		<attribute key="criticalhitchance" value="10" />
+		<attribute key="criticalhitdamage" value="10" />
 		<attribute key="slotType" value="two-handed" />
 		<attribute key="weaponType" value="sword" />
 		<attribute key="loottype" value="sword" />
 		<attribute key="skillSword" value="5" />
-		<attribute key="imbuingSlots" value="3" />
+		<attribute key="imbuingslot" value="3" />
 	</item>
 	<item id="34084" article="a" name="soulbiter">
 		<attribute key="weight" value="4000" />
@@ -48221,20 +48317,20 @@
 		<attribute key="weaponType" value="axe" />
 		<attribute key="loottype" value="axe" />
 		<attribute key="skillAxe" value="5" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="34085" article="a" name="souleater">
 		<attribute key="weight" value="7200" />
 		<attribute key="defense" value="35" />
 		<attribute key="attack" value="10" />
 		<attribute key="elementIce" value="47" />
-		<attribute key="skillcriticalchance" value="10" />
-		<attribute key="skillcriticaldamage" value="10" />
+		<attribute key="criticalhitchance" value="10" />
+		<attribute key="criticalhitdamage" value="10" />
 		<attribute key="slotType" value="two-handed" />
 		<attribute key="weaponType" value="axe" />
 		<attribute key="loottype" value="axe" />
 		<attribute key="skillAxe" value="5" />
-		<attribute key="imbuingSlots" value="3" />
+		<attribute key="imbuingslot" value="3" />
 	</item>
 	<item id="34086" article="a" name="soulcrusher">
 		<attribute key="weight" value="4100" />
@@ -48249,20 +48345,20 @@
 		<attribute key="weaponType" value="club" />
 		<attribute key="loottype" value="club" />
 		<attribute key="skillClub" value="5" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="34087" article="a" name="soulmaimer">
 		<attribute key="weight" value="8900" />
 		<attribute key="defense" value="35" />
 		<attribute key="attack" value="10" />
 		<attribute key="elementEnergy" value="47" />
-		<attribute key="skillcriticalchance" value="10" />
-		<attribute key="skillcriticaldamage" value="10" />
+		<attribute key="criticalhitchance" value="10" />
+		<attribute key="criticalhitdamage" value="10" />
 		<attribute key="slotType" value="two-handed" />
 		<attribute key="weaponType" value="club" />
 		<attribute key="loottype" value="club" />
 		<attribute key="skillClub" value="5" />
-		<attribute key="imbuingSlots" value="3" />
+		<attribute key="imbuingslot" value="3" />
 	</item>
 	<item id="34088" article="a" name="soulbleeder">
 		<attribute key="weight" value="4700" />
@@ -48273,11 +48369,11 @@
 		<attribute key="attack" value="8" />
 		<attribute key="HitChance" value="5" />
 		<attribute key="skillDist" value="4" />
-		<attribute key="skillcriticalchance" value="10" />
-		<attribute key="skillcriticaldamage" value="10" />
+		<attribute key="criticalhitchance" value="10" />
+		<attribute key="criticalhitdamage" value="10" />
 		<attribute key="absorbPercentHoly" value="7" />
 		<attribute key="ammoType" value="arrow" />
-		<attribute key="imbuingSlots" value="3" />
+		<attribute key="imbuingslot" value="3" />
 	</item>
 	<item id="34089" article="a" name="soulpiercer">
 		<attribute key="weight" value="4000" />
@@ -48290,45 +48386,45 @@
 		<attribute key="absorbPercentDeath" value="7" />
 		<attribute key="weaponType" value="distance"/>
 		<attribute key="ammoType" value="bolt"/>
-		<attribute key="imbuingSlots" value="3"/>
+		<attribute key="imbuingslot" value="3"/>
 	</item>
 	<item id="34090" article="a" name="soultainter">
 		<attribute key="weaponType" value="wand" />
 		<attribute key="loottype" value="wand" />
 		<attribute key="range" value="6" />
 		<attribute key="shootType" value="death" />
-		<attribute key="skillcriticalchance" value="10" />
-		<attribute key="skillcriticaldamage" value="10" />
+		<attribute key="criticalhitchance" value="10" />
+		<attribute key="criticalhitdamage" value="10" />
 		<attribute key="absorbPercentDeath" value="12" />
-		<attribute key="magiclevelpoints" value="5" />
+		<attribute key="magicpoints" value="5" />
 		<attribute key="weight" value="1900" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="34091" article="a" name="soulhexer">
 		<attribute key="weaponType" value="wand" />
 		<attribute key="loottype" value="wand" />
 		<attribute key="range" value="6" />
 		<attribute key="shootType" value="smallice" />
-		<attribute key="magiclevelpoints" value="5" />
+		<attribute key="magicpoints" value="5" />
 		<attribute key="skilllifechance" value="100" />
 		<attribute key="skilllifeamount" value="5" />
 		<attribute key="skillmanachance" value="100" />
 		<attribute key="skillmanaamount" value="3" />
 		<attribute key="absorbPercentIce" value="12" />
 		<attribute key="weight" value="2500" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="34092" article="a" name="soulshanks">
 		<attribute key="weight" value="3800" />
 		<attribute key="armor" value="10"/>
-		<attribute key="magiclevelpoints" value="3"/>
+		<attribute key="magicpoints" value="3"/>
 		<attribute key="absorbPercentDeath" value="10" />
 		<attribute key="slotType" value="legs"/>
 	</item>
 	<item id="34093" article="a" name="soulstrider">
 		<attribute key="weight" value="3800" />
 		<attribute key="armor" value="10"/>
-		<attribute key="magiclevelpoints" value="3"/>
+		<attribute key="magicpoints" value="3"/>
 		<attribute key="absorbPercentFire" value="10" />
 		<attribute key="slotType" value="legs"/>
 	</item>
@@ -48340,25 +48436,25 @@
 		<attribute key="absorbPercentPhysical" value="3" />
 		<attribute key="absorbPercentFire" value="15" />
 		<attribute key="weight" value="12300" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="34095" article="a" name="soulmantle">
 		<attribute key="slotType" value="body" />
 		<attribute key="loottype" value="armor" />
 		<attribute key="armor" value="17" />
-		<attribute key="magiclevelpoints" value="4" />
+		<attribute key="magicpoints" value="4" />
 		<attribute key="absorbPercentPhysical" value="4" />
 		<attribute key="weight" value="2400" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="34096" article="a" name="soulshroud">
 		<attribute key="slotType" value="body" />
 		<attribute key="loottype" value="armor" />
 		<attribute key="armor" value="17" />
-		<attribute key="magiclevelpoints" value="4" />
+		<attribute key="magicpoints" value="4" />
 		<attribute key="absorbPercentDeath" value="10" />
 		<attribute key="weight" value="2400" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="34097" name="pair of soulwalkers">
 		<attribute key="weight" value="1300"/>
@@ -48371,7 +48467,7 @@
 		<attribute key="absorbPercentFire" value="5" />
 		<attribute key="speed" value="30"/>
 		<attribute key="loottype" value="boots" />
-		<attribute key="imbuingSlots" value="1" />
+		<attribute key="imbuingslot" value="1" />
 	</item>
 	<item id="34098" name="pair of soulstalkers">
 		<attribute key="weight" value="1300"/>
@@ -48381,7 +48477,7 @@
 		<attribute key="absorbPercentPhysical" value="5" />
 		<attribute key="speed" value="40"/>
 		<attribute key="loottype" value="boots" />
-		<attribute key="imbuingSlots" value="1" />
+		<attribute key="imbuingslot" value="1" />
 	</item>
 	<item id="34099" article="a" name="soulbastion">
 		<attribute key="weight" value="5800" />
@@ -48390,7 +48486,7 @@
 		<attribute key="absorbPercentPhysical" value="10" />
 		<attribute key="absorbPercentDeath" value="10" />
 		<attribute key="weaponType" value="shield"/>
-		<attribute key="imbuingSlots" value="1" />
+		<attribute key="imbuingslot" value="1" />
 	</item>
 	<item id="34100" name="Katex' blood">
 		<attribute key="loottype" value="creatureproduct" />
@@ -48620,39 +48716,39 @@
 		<attribute key="skillDist" value="2" />
 		<attribute key="absorbPercentIce" value="5" />
 		<attribute key="ammoType" value="arrow" />
-		<attribute key="imbuingSlots" value="3" />
+		<attribute key="imbuingslot" value="3" />
 	</item>
 	<item id="34151" article="a" name="lion rod">
 		<attribute key="weaponType" value="wand" />
 		<attribute key="loottype" value="wand" />
 		<attribute key="range" value="5" />
 		<attribute key="shootType" value="smallice" />
-		<attribute key="magiclevelpoints" value="2" />
-		<attribute key="skillcriticalchance" value="10" />
-		<attribute key="skillcriticaldamage" value="35" />
+		<attribute key="magicpoints" value="2" />
+		<attribute key="criticalhitchance" value="10" />
+		<attribute key="criticalhitdamage" value="35" />
 		<attribute key="weight" value="3700" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="34152" article="a" name="lion wand">
 		<attribute key="weaponType" value="wand" />
 		<attribute key="loottype" value="wand" />
 		<attribute key="range" value="4" />
 		<attribute key="shootType" value="smallice" />
-		<attribute key="magiclevelpoints" value="2" />
+		<attribute key="magicpoints" value="2" />
 		<attribute key="skilllifechance" value="100" />
 		<attribute key="skilllifeamount" value="18" />
 		<attribute key="weight" value="3300" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="34153" article="a" name="lion spellbook">
 		<attribute key="weight" value="2500" />
-		<attribute key="magiclevelpoints" value="4" />
+		<attribute key="magicpoints" value="4" />
 		<attribute key="absorbPercentPhysical" value="3" />
 		<attribute key="absorbPercentIce" value="7" />
 		<attribute key="defense" value="20" />
 		<attribute key="weaponType" value="shield" />
 		<attribute key="loottype" value="shield" />
-		<attribute key="imbuingSlots" value="1" />
+		<attribute key="imbuingslot" value="1" />
 	</item>
 	<item id="34154" article="a" name="lion shield">
 		<attribute key="weight" value="6500" />
@@ -48671,7 +48767,7 @@
 		<attribute key="weaponType" value="sword" />
 		<attribute key="loottype" value="sword" />
 		<attribute key="skillSword" value="3" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="34156" article="a" name="lion spangenhelm">
 		<attribute key="weight" value="3000" />
@@ -48681,7 +48777,7 @@
 		<attribute key="absorbPercentEarth" value="5" />
 		<attribute key="slotType" value="head" />
 		<attribute key="loottype" value="helmet" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="34157" article="a" name="lion plate">
 		<attribute key="slotType" value="body" />
@@ -48692,7 +48788,7 @@
 		<attribute key="skillClub" value="3" />
 		<attribute key="absorbPercentPhysical" value="6" />
 		<attribute key="weight" value="15000" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="34158" article="a" name="lion amulet">
 		<attribute key="weight" value="520" />
@@ -49020,7 +49116,7 @@
 		<attribute key="weaponType" value="axe" />
 		<attribute key="loottype" value="axe" />
 		<attribute key="skillAxe" value="3" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="34254" article="a" name="lion hammer">
 		<attribute key="weight" value="6500" />
@@ -49031,7 +49127,7 @@
 		<attribute key="weaponType" value="club" />
 		<attribute key="loottype" value="club" />
 		<attribute key="skillClub" value="3" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="34255" article="a" name="trapdoor">
 		<attribute key="floorchange" value="down" />
@@ -49230,7 +49326,7 @@
 		<attribute key="slotType" value="two-handed" />
 		<attribute key="weaponType" value="club" />
 		<attribute key="loottype" value="club" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="35515" article="a" name="throwing axe">
 		<attribute key="weight" value="4700" />
@@ -49240,7 +49336,7 @@
 		<attribute key="loottype" value="axe" />
 		<attribute key="extradef" value="2" />
 		<attribute key="skillAxe" value="2" />
-		<attribute key="imbuingSlots" value="1" />
+		<attribute key="imbuingslot" value="1" />
 	</item>
 	<item id="35516" name="exotic legs">
 		<attribute key="weight" value="7200" />
@@ -49268,45 +49364,45 @@
 		<attribute key="skillDist" value="1" />
 		<attribute key="absorbPercentPhysical" value="3" />
 		<attribute key="weight" value="4700" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="35519" name="makeshift boots">
 		<attribute key="weight" value="1450" />
 		<attribute key="armor" value="2" />
-		<attribute key="magiclevelpoints" value="1" />
+		<attribute key="magicpoints" value="1" />
 		<attribute key="absorbPercentFire" value="6" />
 		<attribute key="slotType" value="feet" />
 		<attribute key="loottype" value="boots" />
-		<attribute key="imbuingSlots" value="1" />
+		<attribute key="imbuingslot" value="1" />
 	</item>
 	<item id="35520" name="make-do boots">
 		<attribute key="weight" value="1200" />
 		<attribute key="armor" value="2" />
-		<attribute key="magiclevelpoints" value="1" />
+		<attribute key="magicpoints" value="1" />
 		<attribute key="absorbPercentIce" value="6" />
 		<attribute key="slotType" value="feet" />
 		<attribute key="loottype" value="boots" />
-		<attribute key="imbuingSlots" value="1" />
+		<attribute key="imbuingslot" value="1" />
 	</item>
 	<item id="35521" article="a" name="jungle rod">
 		<attribute key="weaponType" value="wand" />
 		<attribute key="loottype" value="wand" />
 		<attribute key="range" value="4" />
 		<attribute key="shootType" value="smallice" />
-		<attribute key="magiclevelpoints" value="1" />
+		<attribute key="magicpoints" value="1" />
 		<attribute key="absorbPercentEarth" value="3" />
 		<attribute key="weight" value="3700" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="35522" article="a" name="jungle wand">
 		<attribute key="weaponType" value="wand" />
 		<attribute key="loottype" value="wand" />
 		<attribute key="range" value="4" />
 		<attribute key="shootType" value="smallearth" />
-		<attribute key="magiclevelpoints" value="1" />
+		<attribute key="magicpoints" value="1" />
 		<attribute key="absorbPercentIce" value="3" />
 		<attribute key="weight" value="3200" />
-		<attribute key="imbuingSlots" value="2" />
+		<attribute key="imbuingslot" value="2" />
 	</item>
 	<item id="35523" article="an" name="exotic amulet">
 		<attribute key="slotType" value="necklace" />
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b24b24c5964..1d8fe5d16e0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -154,6 +154,7 @@ target_sources(${PROJECT_NAME}
     items/cylinder.cpp
     items/item.cpp
     items/items.cpp
+    items/functions/item_parse.cpp
     items/thing.cpp
     items/tile.cpp
     items/trashholder.cpp
diff --git a/src/items/functions/item_parse.cpp b/src/items/functions/item_parse.cpp
new file mode 100644
index 00000000000..16f592ace40
--- /dev/null
+++ b/src/items/functions/item_parse.cpp
@@ -0,0 +1,816 @@
+/**
+ * Canary - A free and open-source MMORPG server emulator
+ * Copyright (C) 2018-2021 OpenTibiaBR <opentibiabr@outlook.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "otpch.h"
+
+#include "items/functions/item_parse.hpp"
+
+void ItemParse::initParse(const std::string& tmpStrValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	// Parse all item attributes
+	ItemParse::parseType(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseDescription(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseRuneSpellName(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseWeight(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseShowCount(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseArmor(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseDefense(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseExtraDefense(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseAttack(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseRotateTo(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseWrapContainer(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseImbuingSlot(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseWrapableTo(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseMoveable(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parsePodium(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseBlockProjectTile(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parsePickupable(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseFloorChange(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseCorpseType(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseContainerSize(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseFluidSource(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseWriteables(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseWeaponType(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseSlotType(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseAmmoType(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseShootType(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseMagicEffect(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseLootType(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseRange(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseDuration(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseTransform(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseCharges(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseShowAttributes(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseHitChance(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseInvisible(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseSpeed(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseHealthAndMana(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseSkills(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseCriticalHit(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseLifeAndManaLeech(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseMaxHitAndManaPoints(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseMagicPoints(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseFieldAbsorbPercent(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseAbsorbPercent(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseSupressDrunk(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseField(tmpStrValue, attributeNode, valueAttribute, itemType);
+	ItemParse::parseReplaceable(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseLevelDoor(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseBeds(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseElement(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseWalk(tmpStrValue, valueAttribute, itemType);
+	ItemParse::parseAllowDistanceRead(tmpStrValue, valueAttribute, itemType);
+}
+
+void ItemParse::parseType(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "type") {
+		stringValue = asLowerCaseString(valueAttribute.as_string());
+		auto itemMap = ItemTypesMap.find(stringValue);
+		if (itemMap != ItemTypesMap.end()) {
+			itemType.type = itemMap->second;
+			if (itemType.type == ITEM_TYPE_CONTAINER) {
+				itemType.group = ITEM_GROUP_CONTAINER;
+			}
+		} else {
+			SPDLOG_WARN("[Items::parseItemNode] - Unknown type: {}",
+                        valueAttribute.as_string());
+		}
+	}
+}
+
+void ItemParse::parseDescription(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "description") {
+		itemType.description = valueAttribute.as_string();
+	}
+}
+
+void ItemParse::parseRuneSpellName(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "runespellname") {
+		itemType.runeSpellName = valueAttribute.as_string();
+	}
+}
+
+void ItemParse::parseWeight(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "weight") {
+		itemType.weight = pugi::cast<uint32_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseShowCount(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "showcount") {
+		itemType.showCount = valueAttribute.as_bool();
+	}
+}
+
+void ItemParse::parseArmor(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "armor") {
+		itemType.armor = pugi::cast<int32_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseDefense(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "defense") {
+		itemType.defense = pugi::cast<int32_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseExtraDefense(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "extradef") {
+		itemType.extraDefense = pugi::cast<int32_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseAttack(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "attack") {
+		itemType.attack = pugi::cast<int32_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseRotateTo(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "rotateto") {
+		itemType.rotateTo = pugi::cast<int32_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseWrapContainer(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "wrapcontainer") {
+		itemType.wrapContainer = valueAttribute.as_bool();
+	}
+}
+
+void ItemParse::parseImbuingSlot(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "imbuingslot") {
+		itemType.imbuingSlots = pugi::cast<int32_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseWrapableTo(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "wrapableto") {
+		itemType.wrapableTo = pugi::cast<int32_t>(valueAttribute.value());
+		itemType.wrapable = true;
+	}
+}
+
+void ItemParse::parseMoveable(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "moveable") {
+		itemType.moveable = valueAttribute.as_bool();
+	}
+}
+
+void ItemParse::parsePodium(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "podium") {
+		itemType.isPodium = valueAttribute.as_bool();
+	}
+}
+
+void ItemParse::parseBlockProjectTile(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "blockprojectile") {
+		itemType.blockProjectile = valueAttribute.as_bool();
+	}
+}
+
+void ItemParse::parsePickupable(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "pickupable") {
+		itemType.allowPickupable = valueAttribute.as_bool();
+	}
+}
+
+void ItemParse::parseFloorChange(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "floorchange") {
+		stringValue = asLowerCaseString(valueAttribute.as_string());
+		auto itemMap = TileStatesMap.find(stringValue);
+		if (itemMap != TileStatesMap.end()) {
+			itemType.floorChange = itemMap->second;
+		} else {
+			SPDLOG_WARN("[ItemParse::parseFloorChange] - Unknown floorChange {}",
+                        valueAttribute.as_string());
+		}
+	}
+}
+
+void ItemParse::parseCorpseType(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "corpsetype") {
+		stringValue = asLowerCaseString(valueAttribute.as_string());
+		auto itemMap = RaceTypesMap.find(stringValue);
+		if (itemMap != RaceTypesMap.end()) {
+			itemType.corpseType = itemMap->second;
+		} else {
+			SPDLOG_WARN("[ItemParse::parseCorpseType] - Unknown corpseType {}",
+                        valueAttribute.as_string());
+		}
+	}
+}
+
+void ItemParse::parseContainerSize(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "containersize") {
+		itemType.maxItems = pugi::cast<uint16_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseFluidSource(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "fluidsource") {
+		stringValue = asLowerCaseString(valueAttribute.as_string());
+		auto itemMap = FluidTypesMap.find(stringValue);
+		if (itemMap != FluidTypesMap.end()) {
+			itemType.fluidSource = itemMap->second;
+		} else {
+			SPDLOG_WARN("[Items::parseItemNode] - Unknown fluidSource {}",
+                        valueAttribute.as_string());
+		}
+	}
+}
+
+void ItemParse::parseWriteables(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "readable") {
+		itemType.canReadText = valueAttribute.as_bool();
+	} else if (stringValue == "writeable") {
+		itemType.canWriteText = valueAttribute.as_bool();
+		itemType.canReadText = itemType.canWriteText;
+	} else if (stringValue == "maxtextlen") {
+		itemType.maxTextLen = pugi::cast<uint16_t>(valueAttribute.value());
+	} else if (stringValue == "writeonceitemid") {
+		itemType.writeOnceItemId = pugi::cast<uint16_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseWeaponType(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "weapontype") {
+		stringValue = asLowerCaseString(valueAttribute.as_string());
+		auto itemMap = WeaponTypesMap.find(stringValue);
+		if (itemMap != WeaponTypesMap.end()) {
+			itemType.weaponType = itemMap->second;
+		} else {
+			SPDLOG_WARN("[Items::parseItemNode] - Unknown weaponType {}",
+                        valueAttribute.as_string());
+		}
+	}
+}
+
+void ItemParse::parseSlotType(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "slottype") {
+		stringValue = asLowerCaseString(valueAttribute.as_string());
+	if (stringValue == "head") {
+			itemType.slotPosition |= SLOTP_HEAD;
+		} else if (stringValue == "body") {
+			itemType.slotPosition |= SLOTP_ARMOR;
+		} else if (stringValue == "legs") {
+			itemType.slotPosition |= SLOTP_LEGS;
+		} else if (stringValue == "feet") {
+			itemType.slotPosition |= SLOTP_FEET;
+		} else if (stringValue == "backpack") {
+			itemType.slotPosition |= SLOTP_BACKPACK;
+		} else if (stringValue == "two-handed") {
+			itemType.slotPosition |= SLOTP_TWO_HAND;
+		} else if (stringValue == "right-hand") {
+			itemType.slotPosition &= ~SLOTP_LEFT;
+		} else if (stringValue == "left-hand") {
+			itemType.slotPosition &= ~SLOTP_RIGHT;
+		} else if (stringValue == "necklace") {
+			itemType.slotPosition |= SLOTP_NECKLACE;
+		} else if (stringValue == "ring") {
+			itemType.slotPosition |= SLOTP_RING;
+		} else if (stringValue == "ammo") {
+			itemType.slotPosition |= SLOTP_AMMO;
+		} else if (stringValue == "hand") {
+			itemType.slotPosition |= SLOTP_HAND;
+		} else {
+			SPDLOG_WARN("[itemParseSlotType - Items::parseItemNode] - Unknown slotType {}",
+                        valueAttribute.as_string());
+		}
+	}
+}
+
+void ItemParse::parseAmmoType(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "ammotype") {
+		itemType.ammoType = getAmmoType(asLowerCaseString(valueAttribute.as_string()));
+		if (itemType.ammoType == AMMO_NONE) {
+			SPDLOG_WARN("[Items::parseItemNode] - Unknown ammoType {}",
+                        valueAttribute.as_string());
+		}
+	}
+}
+
+void ItemParse::parseShootType(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "shoottype") {
+		ShootType_t shoot = getShootType(asLowerCaseString(valueAttribute.as_string()));
+		if (shoot != CONST_ANI_NONE) {
+			itemType.shootType = shoot;
+		} else {
+			SPDLOG_WARN("[Items::parseItemNode] - Unknown shootType {}",
+                        valueAttribute.as_string());
+		}
+	}
+}
+
+void ItemParse::parseMagicEffect(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "effect") {
+		MagicEffectClasses effect = getMagicEffect(asLowerCaseString(valueAttribute.as_string()));
+		if (effect != CONST_ME_NONE) {
+			itemType.magicEffect = effect;
+		} else {
+			SPDLOG_WARN("[Items::parseItemNode] - Unknown effect {}",
+                        valueAttribute.as_string());
+		}
+	}
+}
+
+void ItemParse::parseLootType(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "loottype") {
+		itemType.type = Item::items.getLootType(valueAttribute.as_string());
+	}
+}
+
+void ItemParse::parseRange(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "range") {
+		itemType.shootRange = pugi::cast<uint16_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseDuration(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "duration") {
+		itemType.decayTime = pugi::cast<uint32_t>(valueAttribute.value());
+	} else if (stringValue == "stopduration") {
+		itemType.stopTime = valueAttribute.as_bool();
+	} else if (stringValue == "showduration") {
+		itemType.showDuration = valueAttribute.as_bool();
+	}
+}
+
+void ItemParse::parseTransform(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "transformequipto") {
+		itemType.transformEquipTo = pugi::cast<uint16_t>(valueAttribute.value());
+	} else if (stringValue == "transformdeequipto") {
+		itemType.transformDeEquipTo = pugi::cast<uint16_t>(valueAttribute.value());
+	} else if (stringValue == "transformto") {
+		itemType.transformToFree = pugi::cast<uint16_t>(valueAttribute.value());
+	} else if (stringValue == "destroyto") {
+		itemType.destroyTo = pugi::cast<uint16_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseCharges(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "charges") {
+		itemType.charges = pugi::cast<uint32_t>(valueAttribute.value());
+	} else if (stringValue == "showcharges") {
+		itemType.showCharges = valueAttribute.as_bool();
+	}
+}
+
+void ItemParse::parseShowAttributes(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "showattributes") {
+		itemType.showAttributes = valueAttribute.as_bool();
+	}
+}
+
+void ItemParse::parseHitChance(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "hitchance") {
+		itemType.hitChance = std::min<int8_t>(100, std::max<int8_t>(-100, pugi::cast<int16_t>(valueAttribute.value())));
+	} else if (stringValue == "maxhitchance") {
+		itemType.maxHitChance = std::min<uint32_t>(100, pugi::cast<uint32_t>(valueAttribute.value()));
+	}
+}
+
+void ItemParse::parseInvisible(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "invisible") {
+		itemType.getAbilities().invisible = valueAttribute.as_bool();
+	}
+}
+
+void ItemParse::parseSpeed(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "speed") {
+		itemType.getAbilities().speed = pugi::cast<int32_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseHealthAndMana(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "healthgain") {
+		Abilities & abilities = itemType.getAbilities();
+		abilities.regeneration = true;
+		abilities.healthGain = pugi::cast<uint32_t>(valueAttribute.value());
+	} else if (stringValue == "healthticks") {
+		Abilities & abilities = itemType.getAbilities();
+		abilities.regeneration = true;
+		abilities.healthTicks = pugi::cast<uint32_t>(valueAttribute.value());
+	} else if (stringValue == "managain") {
+		Abilities & abilities = itemType.getAbilities();
+		abilities.regeneration = true;
+		abilities.manaGain = pugi::cast<uint32_t>(valueAttribute.value());
+	} else if (stringValue == "manaticks") {
+		Abilities & abilities = itemType.getAbilities();
+		abilities.regeneration = true;
+		abilities.manaTicks = pugi::cast<uint32_t>(valueAttribute.value());
+	} else if (stringValue == "manashield") {
+		itemType.getAbilities().manaShield = valueAttribute.as_bool();
+	}
+}
+
+void ItemParse::parseSkills(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "skillsword") {
+		itemType.getAbilities().skills[SKILL_SWORD] = pugi::cast<int32_t>(valueAttribute.value());
+	} else if (stringValue == "skillaxe") {
+		itemType.getAbilities().skills[SKILL_AXE] = pugi::cast<int32_t>(valueAttribute.value());
+	} else if (stringValue == "skillclub") {
+		itemType.getAbilities().skills[SKILL_CLUB] = pugi::cast<int32_t>(valueAttribute.value());
+	} else if (stringValue == "skilldist") {
+		itemType.getAbilities().skills[SKILL_DISTANCE] = pugi::cast<int32_t>(valueAttribute.value());
+	} else if (stringValue == "skillfish") {
+		itemType.getAbilities().skills[SKILL_FISHING] = pugi::cast<int32_t>(valueAttribute.value());
+	} else if (stringValue == "skillshield") {
+		itemType.getAbilities().skills[SKILL_SHIELD] = pugi::cast<int32_t>(valueAttribute.value());
+	} else if (stringValue == "skillfist") {
+		itemType.getAbilities().skills[SKILL_FIST] = pugi::cast<int32_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseCriticalHit(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "criticalhitchance") {
+		itemType.getAbilities().skills[SKILL_CRITICAL_HIT_CHANCE] = pugi::cast<int32_t>(valueAttribute.value());
+	} else if (stringValue == "criticalhitdamage") {
+		itemType.getAbilities().skills[SKILL_CRITICAL_HIT_DAMAGE] = pugi::cast<int32_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseLifeAndManaLeech(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "lifeleechchance") {
+		itemType.getAbilities().skills[SKILL_LIFE_LEECH_CHANCE] = pugi::cast<int32_t>(valueAttribute.value());
+	} else if (stringValue == "lifeleechamount") {
+		itemType.getAbilities().skills[SKILL_LIFE_LEECH_AMOUNT] = pugi::cast<int32_t>(valueAttribute.value());
+	} else if (stringValue == "manaleechchance") {
+		itemType.getAbilities().skills[SKILL_MANA_LEECH_CHANCE] = pugi::cast<int32_t>(valueAttribute.value());
+	} else if (stringValue == "manaleechamount") {
+		itemType.getAbilities().skills[SKILL_MANA_LEECH_AMOUNT] = pugi::cast<int32_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseMaxHitAndManaPoints(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "maxhitpoints") {
+		itemType.getAbilities().stats[STAT_MAXHITPOINTS] = pugi::cast<int32_t>(valueAttribute.value());
+	} else if (stringValue == "maxhitpointspercent") {
+		itemType.getAbilities().statsPercent[STAT_MAXHITPOINTS] = pugi::cast<int32_t>(valueAttribute.value());
+	} else if (stringValue == "maxmanapoints") {
+		itemType.getAbilities().stats[STAT_MAXMANAPOINTS] = pugi::cast<int32_t>(valueAttribute.value());
+	} else if (stringValue == "maxmanapointspercent") {
+		itemType.getAbilities().statsPercent[STAT_MAXMANAPOINTS] = pugi::cast<int32_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseMagicPoints(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "magicpoints") {
+		itemType.getAbilities().stats[STAT_MAGICPOINTS] = pugi::cast<int32_t>(valueAttribute.value());
+	} else if (stringValue == "magicpointspercent") {
+		itemType.getAbilities().statsPercent[STAT_MAGICPOINTS] = pugi::cast<int32_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseFieldAbsorbPercent(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "fieldabsorbpercentenergy") {
+		itemType.getAbilities().fieldAbsorbPercent[combatTypeToIndex(COMBAT_ENERGYDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
+	} else if (stringValue == "fieldabsorbpercentfire") {
+		itemType.getAbilities().fieldAbsorbPercent[combatTypeToIndex(COMBAT_FIREDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
+	} else if (stringValue == "fieldabsorbpercentpoison") {
+		itemType.getAbilities().fieldAbsorbPercent[combatTypeToIndex(COMBAT_EARTHDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseAbsorbPercent(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "absorbpercentall") {
+		int16_t value = pugi::cast<int16_t>(valueAttribute.value());
+		Abilities & abilities = itemType.getAbilities();
+		for (auto & i: abilities.absorbPercent) {
+			i += value;
+		}
+	} else if (stringValue == "absorbpercentelements") {
+		int16_t value = pugi::cast<int16_t>(valueAttribute.value());
+		Abilities & abilities = itemType.getAbilities();
+		abilities.absorbPercent[combatTypeToIndex(COMBAT_ENERGYDAMAGE)] += value;
+		abilities.absorbPercent[combatTypeToIndex(COMBAT_FIREDAMAGE)] += value;
+		abilities.absorbPercent[combatTypeToIndex(COMBAT_EARTHDAMAGE)] += value;
+		abilities.absorbPercent[combatTypeToIndex(COMBAT_ICEDAMAGE)] += value;
+	} else if (stringValue == "absorbpercentmagic") {
+		int16_t value = pugi::cast<int16_t>(valueAttribute.value());
+		Abilities & abilities = itemType.getAbilities();
+		abilities.absorbPercent[combatTypeToIndex(COMBAT_ENERGYDAMAGE)] += value;
+		abilities.absorbPercent[combatTypeToIndex(COMBAT_FIREDAMAGE)] += value;
+		abilities.absorbPercent[combatTypeToIndex(COMBAT_EARTHDAMAGE)] += value;
+		abilities.absorbPercent[combatTypeToIndex(COMBAT_ICEDAMAGE)] += value;
+		abilities.absorbPercent[combatTypeToIndex(COMBAT_HOLYDAMAGE)] += value;
+		abilities.absorbPercent[combatTypeToIndex(COMBAT_DEATHDAMAGE)] += value;
+	} else if (stringValue == "absorbpercentenergy") {
+		itemType.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_ENERGYDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
+	} else if (stringValue == "absorbpercentfire") {
+		itemType.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_FIREDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
+	} else if (stringValue == "absorbpercentpoison") {
+		itemType.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_EARTHDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
+	} else if (stringValue == "absorbpercentice") {
+		itemType.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_ICEDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
+	} else if (stringValue == "absorbpercentholy") {
+		itemType.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_HOLYDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
+	} else if (stringValue == "absorbpercentdeath") {
+		itemType.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_DEATHDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
+	} else if (stringValue == "absorbpercentlifedrain") {
+		itemType.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_LIFEDRAIN)] += pugi::cast<int16_t>(valueAttribute.value());
+	} else if (stringValue == "absorbpercentmanadrain") {
+		itemType.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_MANADRAIN)] += pugi::cast<int16_t>(valueAttribute.value());
+	} else if (stringValue == "absorbpercentdrown") {
+		itemType.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_DROWNDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
+	} else if (stringValue == "absorbpercentphysical") {
+		itemType.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_PHYSICALDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
+	} else if (stringValue == "absorbpercenthealing") {
+		itemType.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_HEALING)] += pugi::cast<int16_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseSupressDrunk(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (valueAttribute.as_bool()) {
+		if (stringValue == "suppressdrunk") {
+			itemType.getAbilities().conditionSuppressions |= CONDITION_DRUNK;
+		} else if (stringValue == "suppressenergy") {
+			itemType.getAbilities().conditionSuppressions |= CONDITION_ENERGY;
+		} else if (stringValue == "suppressfire") {
+			itemType.getAbilities().conditionSuppressions |= CONDITION_FIRE;
+		} else if (stringValue == "suppresspoison") {
+			itemType.getAbilities().conditionSuppressions |= CONDITION_POISON;
+		} else if (stringValue == "suppressdrown") {
+			itemType.getAbilities().conditionSuppressions |= CONDITION_DROWN;
+		} else if (stringValue == "suppressphysical") {
+			itemType.getAbilities().conditionSuppressions |= CONDITION_BLEEDING;
+		} else if (stringValue == "suppressfreeze") {
+			itemType.getAbilities().conditionSuppressions |= CONDITION_FREEZING;
+		} else if (stringValue == "suppressdazzle") {
+			itemType.getAbilities().conditionSuppressions |= CONDITION_DAZZLED;
+		} else if (stringValue == "suppresscurse") {
+			itemType.getAbilities().conditionSuppressions |= CONDITION_CURSED;
+		}
+	}
+}
+
+std::tuple<ConditionId_t, ConditionType_t, std::string, pugi::xml_attribute> ItemParse::parseFieldConditions(ConditionId_t conditionId, ConditionType_t conditionType, std::string lowerStringValue, pugi::xml_attribute valueAttribute) {
+	lowerStringValue = asLowerCaseString(valueAttribute.as_string());
+	conditionId = CONDITIONID_COMBAT;
+	if (lowerStringValue == "fire") {
+		conditionType = CONDITION_FIRE;
+		return std::make_tuple(conditionId, conditionType, lowerStringValue, valueAttribute);
+	} else if (lowerStringValue == "energy") {
+		conditionType = CONDITION_ENERGY;
+		return std::make_tuple(conditionId, conditionType, lowerStringValue, valueAttribute);
+	} else if (lowerStringValue == "poison") {
+		conditionType = CONDITION_POISON;
+		return std::make_tuple(conditionId, conditionType, lowerStringValue, valueAttribute);
+	} else if (lowerStringValue == "drown") {
+		conditionType = CONDITION_DROWN;
+		return std::make_tuple(conditionId, conditionType, lowerStringValue, valueAttribute);
+	} else if (lowerStringValue == "physical") {
+		conditionType = CONDITION_BLEEDING;
+		return std::make_tuple(conditionId, conditionType, lowerStringValue, valueAttribute);
+	} else {
+		SPDLOG_WARN("[Items::parseItemNode] Unknown field value {}",
+                valueAttribute.as_string());
+	}
+	return std::make_tuple(CONDITIONID_DEFAULT, CONDITION_NONE, lowerStringValue, valueAttribute);
+}
+
+CombatType_t ItemParse::parseFieldCombatType(std::string lowerStringValue, pugi::xml_attribute valueAttribute) {
+	lowerStringValue = asLowerCaseString(valueAttribute.as_string());
+	if (lowerStringValue == "fire") {
+		return COMBAT_FIREDAMAGE;
+	} else if (lowerStringValue == "energy") {
+		return COMBAT_ENERGYDAMAGE;
+	} else if (lowerStringValue == "poison") {
+		return COMBAT_EARTHDAMAGE;
+	} else if (lowerStringValue == "drown") {
+		return COMBAT_DROWNDAMAGE;
+	} else if (lowerStringValue == "physical") {
+		return COMBAT_PHYSICALDAMAGE;
+	} else {
+		SPDLOG_WARN("[Items::parseItemNode] Unknown field value {}",
+                    valueAttribute.as_string());
+	}
+	return COMBAT_NONE;
+}
+
+void ItemParse::parseFieldCombatDamage(ConditionDamage *conditionDamage, std::string stringValue, pugi::xml_node attributeNode) {
+	uint32_t combatTicks = 0;
+	int32_t combatDamage = 0;
+	int32_t combatStart = 0;
+	int32_t combatCount = 1;
+
+	for (auto subAttributeNode: attributeNode.children()) {
+		pugi::xml_attribute subKeyAttribute = subAttributeNode.attribute("key");
+		if (!subKeyAttribute) {
+			continue;
+		}
+
+		pugi::xml_attribute subValueAttribute = subAttributeNode.attribute("value");
+		if (!subValueAttribute) {
+			continue;
+		}
+
+		stringValue = asLowerCaseString(subKeyAttribute.as_string());
+		if (stringValue == "ticks") {
+			combatTicks = pugi::cast<uint32_t>(subValueAttribute.value());
+		} else if (stringValue == "count") {
+			combatCount = std::max<int32_t>(1, pugi::cast<int32_t>(subValueAttribute.value()));
+		} else if (stringValue == "start") {
+			combatStart = std::max<int32_t>(0, pugi::cast<int32_t>(subValueAttribute.value()));
+		} else if (stringValue == "damage") {
+			combatDamage = -pugi::cast<int32_t>(subValueAttribute.value());
+			if (combatStart == 0) {
+				conditionDamage->addDamage(combatCount, combatTicks, combatDamage);
+			}
+
+			std::list<int32_t>damageList;
+			ConditionDamage::generateDamageList(combatDamage, combatStart, damageList);
+			for (int32_t damageValue: damageList) {
+				conditionDamage->addDamage(1, combatTicks, -damageValue);
+			}
+
+			combatStart = 0;
+		}
+	}
+}
+
+void ItemParse::parseField(const std::string& tmpStrValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "field") {
+		CombatType_t combatType = COMBAT_NONE;
+		ConditionDamage* conditionDamage = nullptr;
+
+		// Parse fields conditions (fire/energy/poison/drown/physical)
+		combatType = parseFieldCombatType(stringValue, valueAttribute);
+		ConditionId_t condID = CONDITIONID_DEFAULT;
+		ConditionType_t condType = CONDITION_NONE;
+		auto result = parseFieldConditions(condID, condType, stringValue, valueAttribute);
+		condID = std::get<0>(result);
+		condType = std::get<1>(result);
+		stringValue = std::get<2>(result);
+		valueAttribute = std::get<3>(result);
+
+		if (combatType != COMBAT_NONE) {
+			if (conditionDamage) {
+				delete conditionDamage;
+			}
+
+			conditionDamage = new ConditionDamage(condID, condType);
+
+			itemType.combatType = combatType;
+			itemType.conditionDamage.reset(conditionDamage);
+
+			parseFieldCombatDamage(conditionDamage, stringValue, attributeNode);
+			
+			conditionDamage->setParam(CONDITION_PARAM_FIELD, 1);
+
+			if (conditionDamage->getTotalDamage() > 0) {
+				conditionDamage->setParam(CONDITION_PARAM_FORCEUPDATE, 1);
+			}
+		}
+	}
+}
+
+void ItemParse::parseReplaceable(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "replaceable") {
+		itemType.replaceable = valueAttribute.as_bool();
+	}
+}
+
+void ItemParse::parseLevelDoor(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "leveldoor") {
+		itemType.levelDoor = pugi::cast<uint32_t>(valueAttribute.value());
+	}
+}
+
+void ItemParse::parseBeds(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "partnerdirection") {
+		itemType.bedPartnerDir = getDirection(valueAttribute.as_string());
+	}
+		
+	uint16_t value = pugi::cast<uint16_t>(valueAttribute.value());
+	ItemType & other = Item::items.getItemType(value);
+	if (stringValue == "maletransformto") {
+		itemType.transformToOnUse[PLAYERSEX_MALE] = value;
+		if (other.transformToFree == 0) {
+			other.transformToFree = itemType.id;
+		}
+
+		if (itemType.transformToOnUse[PLAYERSEX_FEMALE] == 0) {
+			itemType.transformToOnUse[PLAYERSEX_FEMALE] = value;
+		}
+	} else if (stringValue == "femaletransformto") {
+		itemType.transformToOnUse[PLAYERSEX_FEMALE] = value;
+
+		if (other.transformToFree == 0) {
+			other.transformToFree = itemType.id;
+		}
+
+		if (itemType.transformToOnUse[PLAYERSEX_MALE] == 0) {
+			itemType.transformToOnUse[PLAYERSEX_MALE] = value;
+		}
+	}
+}
+
+void ItemParse::parseElement(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "elementice") {
+		Abilities & abilities = itemType.getAbilities();
+		abilities.elementDamage = pugi::cast<uint16_t>(valueAttribute.value());
+		abilities.elementType = COMBAT_ICEDAMAGE;
+	} else if (stringValue == "elementearth") {
+		Abilities & abilities = itemType.getAbilities();
+		abilities.elementDamage = pugi::cast<uint16_t>(valueAttribute.value());
+		abilities.elementType = COMBAT_EARTHDAMAGE;
+	} else if (stringValue == "elementfire") {
+		Abilities & abilities = itemType.getAbilities();
+		abilities.elementDamage = pugi::cast<uint16_t>(valueAttribute.value());
+		abilities.elementType = COMBAT_FIREDAMAGE;
+	} else if (stringValue == "elementenergy") {
+		Abilities & abilities = itemType.getAbilities();
+		abilities.elementDamage = pugi::cast<uint16_t>(valueAttribute.value());
+		abilities.elementType = COMBAT_ENERGYDAMAGE;
+	} else if (stringValue == "elementdeath") {
+		Abilities & abilities = itemType.getAbilities();
+		abilities.elementDamage = pugi::cast<uint16_t>(valueAttribute.value());
+		abilities.elementType = COMBAT_DEATHDAMAGE;
+	} else if (stringValue == "elementholy") {
+		Abilities & abilities = itemType.getAbilities();
+		abilities.elementDamage = pugi::cast<uint16_t>(valueAttribute.value());
+		abilities.elementType = COMBAT_HOLYDAMAGE;
+	}
+}
+
+void ItemParse::parseWalk(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "walkstack") {
+		itemType.walkStack = valueAttribute.as_bool();
+	} else if (stringValue == "block_solid") {
+		itemType.blockSolid = valueAttribute.as_bool();
+	}
+}
+
+void ItemParse::parseAllowDistanceRead(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType) {
+	std::string stringValue = tmpStrValue;
+	if (stringValue == "allowdistread") {
+		itemType.allowDistRead = booleanString(valueAttribute.as_string());
+	}
+}
diff --git a/src/items/functions/item_parse.hpp b/src/items/functions/item_parse.hpp
new file mode 100644
index 00000000000..a2fc34122bf
--- /dev/null
+++ b/src/items/functions/item_parse.hpp
@@ -0,0 +1,291 @@
+/**
+ * Canary - A free and open-source MMORPG server emulator
+ * Copyright (C) 2018-2021 OpenTibiaBR <opentibiabr@outlook.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * It under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef SRC_ITEMS_FUNCTIONS_ITEM_PARSE_HPP_
+#define SRC_ITEMS_FUNCTIONS_ITEM_PARSE_HPP_
+
+#include "creatures/combat/condition.h"
+#include "declarations.hpp"
+#include "items/item.h"
+#include "items/items.h"
+#include "utils/pugicast.h"
+
+class ConditionDamage;
+
+const std::unordered_map<std::string, ItemParseAttributes_t> ItemParseAttributesMap = {
+	{"type", ITEM_PARSE_TYPE},
+	{"description", ITEM_PARSE_DESCRIPTION},
+	{"runespellname", ITEM_PARSE_RUNESPELLNAME},
+	{"weight", ITEM_PARSE_WEIGHT},
+	{"showcount", ITEM_PARSE_SHOWCOUNT},
+	{"armor", ITEM_PARSE_ARMOR},
+	{"defense", ITEM_PARSE_DEFENSE},
+	{"extradef", ITEM_PARSE_EXTRADEF},
+	{"attack", ITEM_PARSE_ATTACK},
+	{"rotateto", ITEM_PARSE_ROTATETO},
+	{"wrapcontainer", ITEM_PARSE_WRAPCONTAINER},
+	{"imbuingslot", ITEM_PARSE_IMBUINGSLOT},
+	{"wrapableto", ITEM_PARSE_WRAPABLETO},
+	{"unwrapableto", ITEM_PARSE_WRAPABLETO},
+	{"moveable", ITEM_PARSE_MOVEABLE},
+	{"movable", ITEM_PARSE_MOVEABLE},
+	{"ispodium", ITEM_PARSE_PODIUM},
+	{"blockprojectile", ITEM_PARSE_BLOCKPROJECTILE},
+	{"allowpickupable", ITEM_PARSE_PICKUPABLE},
+	{"pickupable", ITEM_PARSE_PICKUPABLE},
+	{"floorchange", ITEM_PARSE_FLOORCHANGE},
+	{"corpsetype", ITEM_PARSE_CORPSETYPE},
+	{"containersize", ITEM_PARSE_CONTAINERSIZE},
+	{"fluidsource", ITEM_PARSE_FLUIDSOURCE},
+	{"readable", ITEM_PARSE_READABLE},
+	{"writeable", ITEM_PARSE_WRITEABLE},
+	{"maxtextlen", ITEM_PARSE_MAXTEXTLEN},
+	{"writeonceitemid", ITEM_PARSE_WRITEONCEITEMID},
+	{"weapontype", ITEM_PARSE_WEAPONTYPE},
+	{"slottype", ITEM_PARSE_SLOTTYPE},
+	{"ammotype", ITEM_PARSE_AMMOTYPE},
+	{"shoottype", ITEM_PARSE_SHOOTTYPE},
+	{"effect", ITEM_PARSE_EFFECT},
+	{"loottype", ITEM_PARSE_LOOTTYPE},
+	{"range", ITEM_PARSE_RANGE},
+	{"stopduration", ITEM_PARSE_STOPDURATION},
+	{"decayto", ITEM_PARSE_DECAYTO},
+	{"transformequipto", ITEM_PARSE_TRANSFORMEQUIPTO},
+	{"transformdeequipto", ITEM_PARSE_TRANSFORMDEEQUIPTO},
+	{"duration", ITEM_PARSE_DURATION},
+	{"showduration", ITEM_PARSE_SHOWDURATION},
+	{"charges", ITEM_PARSE_CHARGES},
+	{"showcharges", ITEM_PARSE_SHOWCHARGES},
+	{"showattributes", ITEM_PARSE_SHOWATTRIBUTES},
+	{"hitchance", ITEM_PARSE_HITCHANCE},
+	{"maxhitchance", ITEM_PARSE_MAXHITCHANCE},
+	{"invisible", ITEM_PARSE_INVISIBLE},
+	{"speed", ITEM_PARSE_SPEED},
+	{"healthgain", ITEM_PARSE_HEALTHGAIN},
+	{"healthticks", ITEM_PARSE_HEALTHTICKS},
+	{"managain", ITEM_PARSE_MANAGAIN},
+	{"manaticks", ITEM_PARSE_MANATICKS},
+	{"manashield", ITEM_PARSE_MANASHIELD},
+	{"skillsword", ITEM_PARSE_SKILLSWORD},
+	{"skillaxe", ITEM_PARSE_SKILLAXE},
+	{"skillclub", ITEM_PARSE_SKILLCLUB},
+	{"skilldist", ITEM_PARSE_SKILLDIST},
+	{"skillfish", ITEM_PARSE_SKILLFISH},
+	{"skillshield", ITEM_PARSE_SKILLSHIELD},
+	{"skillfist", ITEM_PARSE_SKILLFIST},
+	{"criticalhitchance", ITEM_PARSE_CRITICALHITCHANCE},
+	{"criticalhitdamage", ITEM_PARSE_CRITICALHITDAMAGE},
+	{"skilllifechance", ITEM_PARSE_LIFELEECHCHANCE},
+	{"skilllifeamount", ITEM_PARSE_LIFELEECHAMOUNT},
+	{"skillmanachance", ITEM_PARSE_MANALEECHCHANCE},
+	{"skillmanaamount", ITEM_PARSE_MANALEECHAMOUNT},
+	{"maxhitpoints", ITEM_PARSE_MAXHITPOINTS},
+	{"maxhitpointspercent", ITEM_PARSE_MAXHITPOINTSPERCENT},
+	{"maxmanapoints", ITEM_PARSE_MAXMANAPOINTS},
+	{"maxmanapointspercent", ITEM_PARSE_MAXMANAPOINTSPERCENT},
+	{"magicpoints", ITEM_PARSE_MAGICPOINTS},
+	{"magicpointspercent", ITEM_PARSE_MAGICPOINTSPERCENT},
+	{"fieldabsorbpercentenergy", ITEM_PARSE_FIELDABSORBPERCENTENERGY},
+	{"fieldabsorbpercentfire", ITEM_PARSE_FIELDABSORBPERCENTFIRE},
+	{"fieldabsorbpercentpoison", ITEM_PARSE_FIELDABSORBPERCENTPOISON},
+	{"fieldabsorbpercentearth", ITEM_PARSE_FIELDABSORBPERCENTPOISON},
+	{"absorbpercentall", ITEM_PARSE_ABSORBPERCENTALL},
+	{"absorbpercentallelements", ITEM_PARSE_ABSORBPERCENTELEMENTS},
+	{"absorbpercentelements", ITEM_PARSE_ABSORBPERCENTELEMENTS},
+	{"absorbpercentmagic", ITEM_PARSE_ABSORBPERCENTMAGIC},
+	{"absorbpercentenergy", ITEM_PARSE_ABSORBPERCENTENERGY},
+	{"absorbpercentfire", ITEM_PARSE_ABSORBPERCENTFIRE},
+	{"absorbpercentpoison", ITEM_PARSE_ABSORBPERCENTPOISON},
+	{"absorbpercentearth", ITEM_PARSE_ABSORBPERCENTPOISON},
+	{"absorbpercentice", ITEM_PARSE_ABSORBPERCENTICE},
+	{"absorbpercentholy", ITEM_PARSE_ABSORBPERCENTHOLY},
+	{"absorbpercentdeath", ITEM_PARSE_ABSORBPERCENTDEATH},
+	{"absorbpercentlifedrain", ITEM_PARSE_ABSORBPERCENTLIFEDRAIN},
+	{"absorbpercentmanadrain", ITEM_PARSE_ABSORBPERCENTMANADRAIN},
+	{"absorbpercentdrown", ITEM_PARSE_ABSORBPERCENTDROWN},
+	{"absorbpercentphysical", ITEM_PARSE_ABSORBPERCENTPHYSICAL},
+	{"absorbpercenthealing", ITEM_PARSE_ABSORBPERCENTHEALING},
+	{"suppressdrunk", ITEM_PARSE_SUPPRESSDRUNK},
+	{"suppressenergy", ITEM_PARSE_SUPPRESSENERGY},
+	{"suppressfire", ITEM_PARSE_SUPPRESSFIRE},
+	{"suppresspoison", ITEM_PARSE_SUPPRESSPOISON},
+	{"suppressdrown", ITEM_PARSE_SUPPRESSDROWN},
+	{"suppressphysical", ITEM_PARSE_SUPPRESSPHYSICAL},
+	{"suppressfreeze", ITEM_PARSE_SUPPRESSFREEZE},
+	{"suppressdazzle", ITEM_PARSE_SUPPRESSDAZZLE},
+	{"suppresscurse", ITEM_PARSE_SUPPRESSCURSE},
+	{"field", ITEM_PARSE_FIELD},
+	{"replaceable", ITEM_PARSE_REPLACEABLE},
+	{"partnerdirection", ITEM_PARSE_PARTNERDIRECTION},
+	{"leveldoor", ITEM_PARSE_LEVELDOOR},
+	{"maletransformto", ITEM_PARSE_MALETRANSFORMTO},
+	{"malesleeper", ITEM_PARSE_MALETRANSFORMTO},
+	{"femaletransformto", ITEM_PARSE_FEMALETRANSFORMTO},
+	{"femalesleeper", ITEM_PARSE_FEMALETRANSFORMTO},
+	{"transformto", ITEM_PARSE_TRANSFORMTO},
+	{"destroyto", ITEM_PARSE_DESTROYTO},
+	{"elementice", ITEM_PARSE_ELEMENTICE},
+	{"elementearth", ITEM_PARSE_ELEMENTEARTH},
+	{"elementfire", ITEM_PARSE_ELEMENTFIRE},
+	{"elementenergy", ITEM_PARSE_ELEMENTENERGY},
+	{"elementdeath", ITEM_PARSE_ELEMENTDEATH},
+	{"elementholy", ITEM_PARSE_ELEMENTHOLY},
+	{"walkstack", ITEM_PARSE_WALKSTACK},
+	{"blocking", ITEM_PARSE_BLOCK_SOLID},
+	{"allowdistread", ITEM_PARSE_ALLOWDISTREAD},
+};
+
+const std::unordered_map<std::string, ItemTypes_t> ItemTypesMap = {
+	{"key", ITEM_TYPE_KEY},
+	{"magicfield", ITEM_TYPE_MAGICFIELD},
+	{"container", ITEM_TYPE_CONTAINER},
+	{"depot", ITEM_TYPE_DEPOT},
+	{"rewardchest", ITEM_TYPE_REWARDCHEST},
+	{"carpet", ITEM_TYPE_CARPET},
+	{"mailbox", ITEM_TYPE_MAILBOX},
+	{"trashholder", ITEM_TYPE_TRASHHOLDER},
+	{"teleport", ITEM_TYPE_TELEPORT},
+	{"door", ITEM_TYPE_DOOR},
+	{"bed", ITEM_TYPE_BED},
+	{"rune", ITEM_TYPE_RUNE},
+	{"supply", ITEM_TYPE_SUPPLY},
+	{"creatureproduct", ITEM_TYPE_CREATUREPRODUCT},
+	{"food", ITEM_TYPE_FOOD},
+	{"valuable", ITEM_TYPE_VALUABLE},
+	{"potion", ITEM_TYPE_POTION},
+};
+
+const std::unordered_map<std::string, TileFlags_t> TileStatesMap = {
+	{"down", TILESTATE_FLOORCHANGE_DOWN},
+	{"north", TILESTATE_FLOORCHANGE_NORTH},
+	{"south", TILESTATE_FLOORCHANGE_SOUTH},
+	{"southalt", TILESTATE_FLOORCHANGE_SOUTH_ALT},
+	{"west", TILESTATE_FLOORCHANGE_WEST},
+	{"east", TILESTATE_FLOORCHANGE_EAST},
+	{"eastalt", TILESTATE_FLOORCHANGE_EAST_ALT},
+};
+
+const std::unordered_map<std::string, RaceType_t> RaceTypesMap = {
+	{"venom", RACE_VENOM},
+	{"blood", RACE_BLOOD},
+	{"undead", RACE_UNDEAD},
+	{"fire", RACE_FIRE},
+	{"energy", RACE_ENERGY},
+};
+
+const std::unordered_map<std::string, FluidTypes_t> FluidTypesMap = {
+	{"water", FLUID_WATER },
+	{"blood", FLUID_BLOOD},
+	{"beer", FLUID_BEER},
+	{"slime", FLUID_SLIME},
+	{"lemonade", FLUID_LEMONADE},
+	{"milk", FLUID_MILK },
+	{"mana", FLUID_MANA },
+	{"life", FLUID_LIFE },
+	{"oil", FLUID_OIL },
+	{"urine", FLUID_URINE },
+	{"coconut", FLUID_COCONUTMILK },
+	{"wine", FLUID_WINE },
+	{"mud", FLUID_MUD },
+	{"fruitjuice", FLUID_FRUITJUICE },
+	{"lava", FLUID_LAVA },
+	{"rum", FLUID_RUM },
+	{"swamp", FLUID_SWAMP },
+	{"tea", FLUID_TEA },
+	{"mead", FLUID_MEAD },
+};
+
+const std::unordered_map<std::string, WeaponType_t> WeaponTypesMap = {
+	{"sword", WEAPON_SWORD},
+	{"club", WEAPON_CLUB},
+	{"axe", WEAPON_AXE},
+	{"shield", WEAPON_SHIELD},
+	{"distance", WEAPON_DISTANCE},
+	{"wand", WEAPON_WAND},
+	{"ammunition", WEAPON_AMMO},
+	{"quiver", WEAPON_QUIVER},
+};
+
+class ItemParse final : public Items
+{
+	public:
+	static void initParse(const std::string& tmpStrValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType& itemType);
+
+	private:
+	static void parseType(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseDescription(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseRuneSpellName(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseWeight(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseShowCount(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseArmor(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseDefense(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseExtraDefense(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseAttack(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseRotateTo(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseWrapContainer(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseImbuingSlot(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseWrapableTo(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseMoveable(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parsePodium(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseBlockProjectTile(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parsePickupable(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseFloorChange(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseCorpseType(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseContainerSize(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseFluidSource(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseWriteables(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseWeaponType(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseSlotType(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseAmmoType(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseShootType(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseMagicEffect(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseLootType(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseRange(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseDuration(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseTransform(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseCharges(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseShowAttributes(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseHitChance(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseInvisible(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseSpeed(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseHealthAndMana(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseSkills(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseCriticalHit(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseLifeAndManaLeech(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseMaxHitAndManaPoints(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseMagicPoints(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseFieldAbsorbPercent(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseAbsorbPercent(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseSupressDrunk(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseField(const std::string& tmpStrValue, pugi::xml_node attributeNode, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseReplaceable(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseLevelDoor(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseBeds(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseElement(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseWalk(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+	static void parseAllowDistanceRead(const std::string& tmpStrValue, pugi::xml_attribute valueAttribute, ItemType& itemType);
+
+	private:
+	// Parent of the function: static void parseField
+	static std::tuple<ConditionId_t, ConditionType_t, std::string, pugi::xml_attribute> parseFieldConditions(ConditionId_t conditionId, ConditionType_t conditionType, std::string lowerStringValue, pugi::xml_attribute valueAttribute);
+	static CombatType_t parseFieldCombatType(std::string string, pugi::xml_attribute valueAttribute);
+	static void parseFieldCombatDamage(ConditionDamage *conditionDamage, std::string stringValue, pugi::xml_node attributeNode);
+};
+
+#endif // SRC_ITEMS_FUNCTIONS_ITEM_PARSE_HPP_
diff --git a/src/items/item.cpp b/src/items/item.cpp
index 6a8a38b3376..f6d2c9f2c18 100644
--- a/src/items/item.cpp
+++ b/src/items/item.cpp
@@ -20,6 +20,7 @@
 #include "otpch.h"
 
 #include "items/item.h"
+#include "items/functions/item_parse.hpp"
 #include "items/containers/container.h"
 #include "game/movement/teleport.h"
 #include "items/trashholder.h"
diff --git a/src/items/item.h b/src/items/item.h
index 0be9cc7416d..ffa74a990d4 100644
--- a/src/items/item.h
+++ b/src/items/item.h
@@ -918,9 +918,9 @@ class Item : virtual public Thing
 			count = n;
 		}
 
-		static uint32_t countByType(const Item* i, int32_t subType) {
-			if (subType == -1 || subType == i->getSubType()) {
-				return i->getItemCount();
+		static uint32_t countByType(const Item* item, int32_t subType) {
+			if (subType == -1 || subType == item->getSubType()) {
+				return item->getItemCount();
 			}
 
 			return 0;
diff --git a/src/items/items.cpp b/src/items/items.cpp
index be2451d647a..6416c2095a6 100644
--- a/src/items/items.cpp
+++ b/src/items/items.cpp
@@ -19,6 +19,7 @@
 
 #include "otpch.h"
 
+#include "items/functions/item_parse.hpp"
 #include "items/items.h"
 #include "creatures/combat/spells.h"
 #include "items/weapons/weapons.h"
@@ -409,36 +410,38 @@ void Items::buildInventoryList()
 	std::sort(inventory.begin(), inventory.end());
 }
 
-void Items::parseItemNode(const pugi::xml_node& itemNode, uint16_t id)
-{
+void Items::parseItemNode(const pugi::xml_node & itemNode, uint16_t id) {
 	if (id >= items.size()) {
 		items.resize(id + 1);
 	}
-	ItemType& iType = items[id];
+	ItemType & iType = items[id];
 	iType.id = id;
 
-	ItemType& it = getItemType(id);
-	if (it.id == 0) {
+	ItemType & itemType = getItemType(id);
+	if (itemType.id == 0) {
 		return;
 	}
 
-	if (!it.name.empty()) {
+	if (!itemType.name.empty()) {
 		SPDLOG_WARN("[Items::parseItemNode] - Duplicate item with id: {}", id);
 		return;
 	}
 
-	it.name = itemNode.attribute("name").as_string();
+	itemType.name = itemNode.attribute("name").as_string();
 
-	nameToItems.insert({ asLowerCaseString(it.name), id });
+	nameToItems.insert({
+		asLowerCaseString(itemType.name),
+		id
+	});
 
 	pugi::xml_attribute articleAttribute = itemNode.attribute("article");
 	if (articleAttribute) {
-		it.article = articleAttribute.as_string();
+		itemType.article = articleAttribute.as_string();
 	}
 
 	pugi::xml_attribute pluralAttribute = itemNode.attribute("plural");
 	if (pluralAttribute) {
-		it.pluralName = pluralAttribute.as_string();
+		itemType.pluralName = pluralAttribute.as_string();
 	}
 
 	for (auto attributeNode : itemNode.children()) {
@@ -453,565 +456,18 @@ void Items::parseItemNode(const pugi::xml_node& itemNode, uint16_t id)
 		}
 
 		std::string tmpStrValue = asLowerCaseString(keyAttribute.as_string());
-
-		// Put here because have many conditions (C1601 - compiler limit: blocks nested too deeply)
-		if (tmpStrValue == "type") {
-			tmpStrValue = asLowerCaseString(valueAttribute.as_string());
-			if (tmpStrValue == "key") {
-				it.type = ITEM_TYPE_KEY;
-			} else if (tmpStrValue == "magicfield") {
-				it.type = ITEM_TYPE_MAGICFIELD;
-			} else if (tmpStrValue == "container") {
-				it.group = ITEM_GROUP_CONTAINER;
-				it.type = ITEM_TYPE_CONTAINER;
-			} else if (tmpStrValue == "depot") {
-				it.type = ITEM_TYPE_DEPOT;
-			} else if (tmpStrValue == "rewardchest") {
-				it.type = ITEM_TYPE_REWARDCHEST;
-			} else if (tmpStrValue == "carpet") {
-				it.type = ITEM_TYPE_CARPET;
-			} else if (tmpStrValue == "mailbox") {
-				it.type = ITEM_TYPE_MAILBOX;
-			} else if (tmpStrValue == "trashholder") {
-				it.type = ITEM_TYPE_TRASHHOLDER;
-			} else if (tmpStrValue == "teleport") {
-				it.type = ITEM_TYPE_TELEPORT;
-			} else if (tmpStrValue == "door") {
-				it.type = ITEM_TYPE_DOOR;
-			} else if (tmpStrValue == "bed") {
-				it.type = ITEM_TYPE_BED;
-			} else if (tmpStrValue == "rune") {
-				it.type = ITEM_TYPE_RUNE;
-			} else if (tmpStrValue == "supply") {
-				it.type = ITEM_TYPE_SUPPLY;
-			} else if (tmpStrValue == "creatureproduct") {
-				it.type = ITEM_TYPE_CREATUREPRODUCT;
-			} else if (tmpStrValue == "food") {
-				it.type = ITEM_TYPE_FOOD;
-			} else if (tmpStrValue == "valuable") {
-				it.type = ITEM_TYPE_VALUABLE;
-			} else if (tmpStrValue == "potion") {
-				it.type = ITEM_TYPE_POTION;
-			} else {
-				SPDLOG_WARN("[Items::parseItemNode] - Unknown type: {}",
-                            valueAttribute.as_string());
-			}
-		} else if (tmpStrValue == "description") {
-			it.description = valueAttribute.as_string();
-		} else if (tmpStrValue == "runespellname") {
-			it.runeSpellName = valueAttribute.as_string();
-		} else if (tmpStrValue == "weight") {
-			it.weight = pugi::cast<uint32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "showcount") {
-			it.showCount = valueAttribute.as_bool();
-		} else if (tmpStrValue == "armor") {
-			it.armor = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "defense") {
-			it.defense = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "extradef") {
-			it.extraDefense = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "attack") {
-			it.attack = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "rotateto") {
-			it.rotateTo = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "wrapcontainer") {
-			it.wrapContainer = valueAttribute.as_bool();
-		} else if (tmpStrValue == "imbuingslots") {
-			it.imbuingSlots = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "wrapableto" || tmpStrValue == "unwrapableto") {
-			it.wrapableTo = pugi::cast<int32_t>(valueAttribute.value());
-			it.wrapable = true;
-		} else if (tmpStrValue == "moveable" || tmpStrValue == "movable") {
-			it.moveable = valueAttribute.as_bool();
-		} else if (tmpStrValue == "ispodium") {
-			it.isPodium = valueAttribute.as_bool();
-		} else if (tmpStrValue == "blockprojectile") {
-			it.blockProjectile = valueAttribute.as_bool();
-		} else if (tmpStrValue == "allowpickupable" || tmpStrValue == "pickupable") {
-			it.allowPickupable = valueAttribute.as_bool();
-		} else if (tmpStrValue == "floorchange") {
-			tmpStrValue = asLowerCaseString(valueAttribute.as_string());
-			if (tmpStrValue == "down") {
-				it.floorChange |= TILESTATE_FLOORCHANGE_DOWN;
-			} else if (tmpStrValue == "north") {
-				it.floorChange |= TILESTATE_FLOORCHANGE_NORTH;
-			} else if (tmpStrValue == "south") {
-				it.floorChange |= TILESTATE_FLOORCHANGE_SOUTH;
-			} else if (tmpStrValue == "southalt") {
-				it.floorChange |= TILESTATE_FLOORCHANGE_SOUTH_ALT;
-			} else if (tmpStrValue == "west") {
-				it.floorChange |= TILESTATE_FLOORCHANGE_WEST;
-			} else if (tmpStrValue == "east") {
-				it.floorChange |= TILESTATE_FLOORCHANGE_EAST;
-			} else if (tmpStrValue == "eastalt") {
-				it.floorChange |= TILESTATE_FLOORCHANGE_EAST_ALT;
-			} else {
-				SPDLOG_WARN("[Items::parseItemNode] - Unknown floorChange: {}",
-                            valueAttribute.as_string());
-			}
-		} else if (tmpStrValue == "corpsetype") {
-			tmpStrValue = asLowerCaseString(valueAttribute.as_string());
-			if (tmpStrValue == "venom") {
-				it.corpseType = RACE_VENOM;
-			} else if (tmpStrValue == "blood") {
-				it.corpseType = RACE_BLOOD;
-			} else if (tmpStrValue == "undead") {
-				it.corpseType = RACE_UNDEAD;
-			} else if (tmpStrValue == "fire") {
-				it.corpseType = RACE_FIRE;
-			} else if (tmpStrValue == "energy") {
-				it.corpseType = RACE_ENERGY;
-			} else {
-				SPDLOG_WARN("[Items::parseItemNode] - Unknown corpseType: {}",
-                            valueAttribute.as_string());
-			}
-		} else if (tmpStrValue == "containersize") {
-			it.maxItems = pugi::cast<uint16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "fluidsource") {
-			tmpStrValue = asLowerCaseString(valueAttribute.as_string());
-			if (tmpStrValue == "water") {
-				it.fluidSource = FLUID_WATER;
-			} else if (tmpStrValue == "blood") {
-				it.fluidSource = FLUID_BLOOD;
-			} else if (tmpStrValue == "beer") {
-				it.fluidSource = FLUID_BEER;
-			} else if (tmpStrValue == "slime") {
-				it.fluidSource = FLUID_SLIME;
-			} else if (tmpStrValue == "lemonade") {
-				it.fluidSource = FLUID_LEMONADE;
-			} else if (tmpStrValue == "milk") {
-				it.fluidSource = FLUID_MILK;
-			} else if (tmpStrValue == "mana") {
-				it.fluidSource = FLUID_MANA;
-			} else if (tmpStrValue == "life") {
-				it.fluidSource = FLUID_LIFE;
-			} else if (tmpStrValue == "oil") {
-				it.fluidSource = FLUID_OIL;
-			} else if (tmpStrValue == "urine") {
-				it.fluidSource = FLUID_URINE;
-			} else if (tmpStrValue == "coconut") {
-				it.fluidSource = FLUID_COCONUTMILK;
-			} else if (tmpStrValue == "wine") {
-				it.fluidSource = FLUID_WINE;
-			} else if (tmpStrValue == "mud") {
-				it.fluidSource = FLUID_MUD;
-			} else if (tmpStrValue == "fruitjuice") {
-				it.fluidSource = FLUID_FRUITJUICE;
-			} else if (tmpStrValue == "lava") {
-				it.fluidSource = FLUID_LAVA;
-			} else if (tmpStrValue == "rum") {
-				it.fluidSource = FLUID_RUM;
-			} else if (tmpStrValue == "swamp") {
-				it.fluidSource = FLUID_SWAMP;
-			} else if (tmpStrValue == "tea") {
-				it.fluidSource = FLUID_TEA;
-			} else if (tmpStrValue == "mead") {
-				it.fluidSource = FLUID_MEAD;
-			} else {
-				SPDLOG_WARN("[Items::parseItemNode] - Unknown fluidSource: {}",
-                            valueAttribute.as_string());
-			}
-		} else if (tmpStrValue == "readable") {
-			it.canReadText = valueAttribute.as_bool();
-		} else if (tmpStrValue == "writeable") {
-			it.canWriteText = valueAttribute.as_bool();
-			it.canReadText = it.canWriteText;
-		} else if (tmpStrValue == "maxtextlen") {
-			it.maxTextLen = pugi::cast<uint16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "writeonceitemid") {
-			it.writeOnceItemId = pugi::cast<uint16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "weapontype") {
-			tmpStrValue = asLowerCaseString(valueAttribute.as_string());
-			if (tmpStrValue == "sword") {
-				it.weaponType = WEAPON_SWORD;
-			} else if (tmpStrValue == "club") {
-				it.weaponType = WEAPON_CLUB;
-			} else if (tmpStrValue == "axe") {
-				it.weaponType = WEAPON_AXE;
-			} else if (tmpStrValue == "shield") {
-				it.weaponType = WEAPON_SHIELD;
-			} else if (tmpStrValue == "distance") {
-				it.weaponType = WEAPON_DISTANCE;
-			} else if (tmpStrValue == "wand") {
-				it.weaponType = WEAPON_WAND;
-			} else if (tmpStrValue == "ammunition") {
-				it.weaponType = WEAPON_AMMO;
-      } else if (tmpStrValue == "quiver") {
-				it.weaponType = WEAPON_QUIVER;
-			} else {
-				SPDLOG_WARN("[Items::parseItemNode] - Unknown weaponType: {}",
-                            valueAttribute.as_string());
-			}
-		} else if (tmpStrValue == "slottype") {
-			tmpStrValue = asLowerCaseString(valueAttribute.as_string());
-			if (tmpStrValue == "head") {
-				it.slotPosition |= SLOTP_HEAD;
-			} else if (tmpStrValue == "body") {
-				it.slotPosition |= SLOTP_ARMOR;
-			} else if (tmpStrValue == "legs") {
-				it.slotPosition |= SLOTP_LEGS;
-			} else if (tmpStrValue == "feet") {
-				it.slotPosition |= SLOTP_FEET;
-			} else if (tmpStrValue == "backpack") {
-				it.slotPosition |= SLOTP_BACKPACK;
-			} else if (tmpStrValue == "two-handed") {
-				it.slotPosition |= SLOTP_TWO_HAND;
-			} else if (tmpStrValue == "right-hand") {
-				it.slotPosition &= ~SLOTP_LEFT;
-			} else if (tmpStrValue == "left-hand") {
-				it.slotPosition &= ~SLOTP_RIGHT;
-			} else if (tmpStrValue == "necklace") {
-				it.slotPosition |= SLOTP_NECKLACE;
-			} else if (tmpStrValue == "ring") {
-				it.slotPosition |= SLOTP_RING;
-			} else if (tmpStrValue == "ammo") {
-				it.slotPosition |= SLOTP_AMMO;
-			} else if (tmpStrValue == "hand") {
-				it.slotPosition |= SLOTP_HAND;
-			} else {
-				SPDLOG_WARN("[Items::parseItemNode] - Unknown slotType: {}",
-                            valueAttribute.as_string());
-			}
-		} else if (tmpStrValue == "ammotype") {
-			it.ammoType = getAmmoType(asLowerCaseString(valueAttribute.as_string()));
-			if (it.ammoType == AMMO_NONE) {
-				SPDLOG_WARN("[Items::parseItemNode] - Unknown ammoType: {}",
-                            valueAttribute.as_string());
-			}
-		} else if (tmpStrValue == "shoottype") {
-			ShootType_t shoot = getShootType(asLowerCaseString(valueAttribute.as_string()));
-			if (shoot != CONST_ANI_NONE) {
-				it.shootType = shoot;
-			} else {
-				SPDLOG_WARN("[Items::parseItemNode] - Unknown shootType: {}",
-                            valueAttribute.as_string());
-			}
-		} else if (tmpStrValue == "effect") {
-			MagicEffectClasses effect = getMagicEffect(asLowerCaseString(valueAttribute.as_string()));
-			if (effect != CONST_ME_NONE) {
-				it.magicEffect = effect;
-			} else {
-				SPDLOG_WARN("[Items::parseItemNode] - Unknown effect: {}",
-                            valueAttribute.as_string());
-			}
-		} else if (tmpStrValue == "loottype") {
-			it.type = getLootType(valueAttribute.as_string());
-		} else if (tmpStrValue == "range") {
-			it.shootRange = pugi::cast<uint16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "stopduration") {
-			it.stopTime = valueAttribute.as_bool();
-		} else if (tmpStrValue == "decayto") {
-			it.decayTo = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "transformequipto") {
-			it.transformEquipTo = pugi::cast<uint16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "transformdeequipto") {
-			it.transformDeEquipTo = pugi::cast<uint16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "duration") {
-			it.decayTime = pugi::cast<uint32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "showduration") {
-			it.showDuration = valueAttribute.as_bool();
-		} else if (tmpStrValue == "charges") {
-			it.charges = pugi::cast<uint32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "showcharges") {
-			it.showCharges = valueAttribute.as_bool();
-		} else if (tmpStrValue == "showattributes") {
-			it.showAttributes = valueAttribute.as_bool();
-		} else if (tmpStrValue == "hitchance") {
-			it.hitChance = std::min<int8_t>(100, std::max<int8_t>(-100, pugi::cast<int16_t>(valueAttribute.value())));
-		} else if (tmpStrValue == "maxhitchance") {
-			it.maxHitChance = std::min<uint32_t>(100, pugi::cast<uint32_t>(valueAttribute.value()));
-		} else if (tmpStrValue == "invisible") {
-			it.getAbilities().invisible = valueAttribute.as_bool();
-		} else if (tmpStrValue == "speed") {
-			it.getAbilities().speed = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "healthgain") {
-			Abilities& abilities = it.getAbilities();
-			abilities.regeneration = true;
-			abilities.healthGain = pugi::cast<uint32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "healthticks") {
-			Abilities& abilities = it.getAbilities();
-			abilities.regeneration = true;
-			abilities.healthTicks = pugi::cast<uint32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "managain") {
-			Abilities& abilities = it.getAbilities();
-			abilities.regeneration = true;
-			abilities.manaGain = pugi::cast<uint32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "manaticks") {
-			Abilities& abilities = it.getAbilities();
-			abilities.regeneration = true;
-			abilities.manaTicks = pugi::cast<uint32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "manashield") {
-			it.getAbilities().manaShield = valueAttribute.as_bool();
-		} else if (tmpStrValue == "skillsword") {
-			it.getAbilities().skills[SKILL_SWORD] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "skillaxe") {
-			it.getAbilities().skills[SKILL_AXE] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "skillclub") {
-			it.getAbilities().skills[SKILL_CLUB] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "skilldist") {
-			it.getAbilities().skills[SKILL_DISTANCE] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "skillfish") {
-			it.getAbilities().skills[SKILL_FISHING] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "skillshield") {
-			it.getAbilities().skills[SKILL_SHIELD] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "skillfist") {
-			it.getAbilities().skills[SKILL_FIST] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "skillcriticalchance") {
-			it.getAbilities().skills[SKILL_CRITICAL_HIT_CHANCE] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "skillcriticaldamage") {
-			it.getAbilities().skills[SKILL_CRITICAL_HIT_DAMAGE] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "skilllifechance") {
-			it.getAbilities().skills[SKILL_LIFE_LEECH_CHANCE] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "skilllifeamount") {
-			it.getAbilities().skills[SKILL_LIFE_LEECH_AMOUNT] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "skillmanachance") {
-			it.getAbilities().skills[SKILL_MANA_LEECH_CHANCE] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "skillmanaamount") {
-			it.getAbilities().skills[SKILL_MANA_LEECH_AMOUNT] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "maxhitpoints") {
-			it.getAbilities().stats[STAT_MAXHITPOINTS] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "maxhitpointspercent") {
-			it.getAbilities().statsPercent[STAT_MAXHITPOINTS] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "maxmanapoints") {
-			it.getAbilities().stats[STAT_MAXMANAPOINTS] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "maxmanapointspercent") {
-			it.getAbilities().statsPercent[STAT_MAXMANAPOINTS] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "magicpoints" || tmpStrValue == "magiclevelpoints") {
-			it.getAbilities().stats[STAT_MAGICPOINTS] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "magicpointspercent") {
-			it.getAbilities().statsPercent[STAT_MAGICPOINTS] = pugi::cast<int32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "fieldabsorbpercentenergy") {
-			it.getAbilities().fieldAbsorbPercent[combatTypeToIndex(COMBAT_ENERGYDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "fieldabsorbpercentfire") {
-			it.getAbilities().fieldAbsorbPercent[combatTypeToIndex(COMBAT_FIREDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "fieldabsorbpercentpoison" || tmpStrValue == "fieldabsorpercentearth") {
-			it.getAbilities().fieldAbsorbPercent[combatTypeToIndex(COMBAT_EARTHDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "absorbpercentall" || tmpStrValue == "absorbpercentallelements") {
-			int16_t value = pugi::cast<int16_t>(valueAttribute.value());
-			Abilities& abilities = it.getAbilities();
-			for (auto& i : abilities.absorbPercent) {
-				i += value;
-			}
-		} else if (tmpStrValue == "absorbpercentelements") {
-			int16_t value = pugi::cast<int16_t>(valueAttribute.value());
-			Abilities& abilities = it.getAbilities();
-			abilities.absorbPercent[combatTypeToIndex(COMBAT_ENERGYDAMAGE)] += value;
-			abilities.absorbPercent[combatTypeToIndex(COMBAT_FIREDAMAGE)] += value;
-			abilities.absorbPercent[combatTypeToIndex(COMBAT_EARTHDAMAGE)] += value;
-			abilities.absorbPercent[combatTypeToIndex(COMBAT_ICEDAMAGE)] += value;
-		} else if (tmpStrValue == "absorbpercentmagic") {
-			int16_t value = pugi::cast<int16_t>(valueAttribute.value());
-			Abilities& abilities = it.getAbilities();
-			abilities.absorbPercent[combatTypeToIndex(COMBAT_ENERGYDAMAGE)] += value;
-			abilities.absorbPercent[combatTypeToIndex(COMBAT_FIREDAMAGE)] += value;
-			abilities.absorbPercent[combatTypeToIndex(COMBAT_EARTHDAMAGE)] += value;
-			abilities.absorbPercent[combatTypeToIndex(COMBAT_ICEDAMAGE)] += value;
-			abilities.absorbPercent[combatTypeToIndex(COMBAT_HOLYDAMAGE)] += value;
-			abilities.absorbPercent[combatTypeToIndex(COMBAT_DEATHDAMAGE)] += value;
-		} else if (tmpStrValue == "absorbpercentenergy") {
-			it.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_ENERGYDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "absorbpercentfire") {
-			it.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_FIREDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "absorbpercentpoison" ||	tmpStrValue == "absorbpercentearth") {
-			it.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_EARTHDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "absorbpercentice") {
-			it.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_ICEDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "absorbpercentholy") {
-			it.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_HOLYDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "absorbpercentdeath") {
-			it.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_DEATHDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "absorbpercentlifedrain") {
-			it.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_LIFEDRAIN)] += pugi::cast<int16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "absorbpercentmanadrain") {
-			it.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_MANADRAIN)] += pugi::cast<int16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "absorbpercentdrown") {
-			it.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_DROWNDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "absorbpercentphysical") {
-			it.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_PHYSICALDAMAGE)] += pugi::cast<int16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "absorbpercenthealing") {
-			it.getAbilities().absorbPercent[combatTypeToIndex(COMBAT_HEALING)] += pugi::cast<int16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "suppressdrunk") {
-			if (valueAttribute.as_bool()) {
-				it.getAbilities().conditionSuppressions |= CONDITION_DRUNK;
-			}
-		} else if (tmpStrValue == "suppressenergy") {
-			if (valueAttribute.as_bool()) {
-				it.getAbilities().conditionSuppressions |= CONDITION_ENERGY;
-			}
-		} else if (tmpStrValue == "suppressfire") {
-			if (valueAttribute.as_bool()) {
-				it.getAbilities().conditionSuppressions |= CONDITION_FIRE;
-			}
-		} else if (tmpStrValue == "suppresspoison") {
-			if (valueAttribute.as_bool()) {
-				it.getAbilities().conditionSuppressions |= CONDITION_POISON;
-			}
-		} else if (tmpStrValue == "suppressdrown") {
-			if (valueAttribute.as_bool()) {
-				it.getAbilities().conditionSuppressions |= CONDITION_DROWN;
-			}
-		} else if (tmpStrValue == "suppressphysical") {
-			if (valueAttribute.as_bool()) {
-				it.getAbilities().conditionSuppressions |= CONDITION_BLEEDING;
-			}
-		} else if (tmpStrValue == "suppressfreeze") {
-			if (valueAttribute.as_bool()) {
-				it.getAbilities().conditionSuppressions |= CONDITION_FREEZING;
-			}
-		} else if (tmpStrValue == "suppressdazzle") {
-			if (valueAttribute.as_bool()) {
-				it.getAbilities().conditionSuppressions |= CONDITION_DAZZLED;
-			}
-		} else if (tmpStrValue == "suppresscurse") {
-			if (valueAttribute.as_bool()) {
-				it.getAbilities().conditionSuppressions |= CONDITION_CURSED;
-			}
-		} else if (tmpStrValue == "field") {
-			CombatType_t combatType = COMBAT_NONE;
-			ConditionDamage* conditionDamage = nullptr;
-
-			tmpStrValue = asLowerCaseString(valueAttribute.as_string());
-			if (tmpStrValue == "fire") {
-				conditionDamage = new ConditionDamage(CONDITIONID_COMBAT, CONDITION_FIRE);
-				combatType = COMBAT_FIREDAMAGE;
-			} else if (tmpStrValue == "energy") {
-				conditionDamage = new ConditionDamage(CONDITIONID_COMBAT, CONDITION_ENERGY);
-				combatType = COMBAT_ENERGYDAMAGE;
-			} else if (tmpStrValue == "poison") {
-				conditionDamage = new ConditionDamage(CONDITIONID_COMBAT, CONDITION_POISON);
-				combatType = COMBAT_EARTHDAMAGE;
-			} else if (tmpStrValue == "drown") {
-				conditionDamage = new ConditionDamage(CONDITIONID_COMBAT, CONDITION_DROWN);
-				combatType = COMBAT_DROWNDAMAGE;
-			} else if (tmpStrValue == "physical") {
-				conditionDamage = new ConditionDamage(CONDITIONID_COMBAT, CONDITION_BLEEDING);
-				combatType = COMBAT_PHYSICALDAMAGE;
-			} else {
-				SPDLOG_WARN("[Items::parseItemNode] Unknown field value: {}",
-                            valueAttribute.as_string());
-			}
-
-			if (combatType != COMBAT_NONE) {
-				it.combatType = combatType;
-				it.conditionDamage.reset(conditionDamage);
-				uint32_t ticks = 0;
-				int32_t damage = 0;
-				int32_t start = 0;
-				int32_t count = 1;
-
-				for (auto subAttributeNode : attributeNode.children()) {
-					pugi::xml_attribute subKeyAttribute = subAttributeNode.attribute("key");
-					if (!subKeyAttribute) {
-						continue;
-					}
-
-					pugi::xml_attribute subValueAttribute = subAttributeNode.attribute("value");
-					if (!subValueAttribute) {
-						continue;
-					}
-
-					tmpStrValue = asLowerCaseString(subKeyAttribute.as_string());
-					if (tmpStrValue == "ticks") {
-						ticks = pugi::cast<uint32_t>(subValueAttribute.value());
-					} else if (tmpStrValue == "count") {
-						count = std::max<int32_t>(1, pugi::cast<int32_t>(subValueAttribute.value()));
-					} else if (tmpStrValue == "start") {
-						start = std::max<int32_t>(0, pugi::cast<int32_t>(subValueAttribute.value()));
-					} else if (tmpStrValue == "damage") {
-						damage = -pugi::cast<int32_t>(subValueAttribute.value());
-
-						if (start > 0) {
-							std::list<int32_t> damageList;
-							ConditionDamage::generateDamageList(damage, start, damageList);
-							for (int32_t damageValue : damageList) {
-								conditionDamage->addDamage(1, ticks, -damageValue);
-							}
-
-							start = 0;
-						} else {
-							conditionDamage->addDamage(count, ticks, damage);
-						}
-					}
-				}
-
-				conditionDamage->setParam(CONDITION_PARAM_FIELD, 1);
-
-				if (conditionDamage->getTotalDamage() > 0) {
-					conditionDamage->setParam(CONDITION_PARAM_FORCEUPDATE, 1);
-				}
-			}
-		} else if (tmpStrValue == "replaceable") {
-			it.replaceable = valueAttribute.as_bool();
-		} else if (tmpStrValue == "partnerdirection") {
-			it.bedPartnerDir = getDirection(valueAttribute.as_string());
-		} else if (tmpStrValue == "leveldoor") {
-			it.levelDoor = pugi::cast<uint32_t>(valueAttribute.value());
-		} else if (tmpStrValue == "maletransformto" || tmpStrValue == "malesleeper") {
-			uint16_t value = pugi::cast<uint16_t>(valueAttribute.value());
-			it.transformToOnUse[PLAYERSEX_MALE] = value;
-			ItemType& other = getItemType(value);
-			if (other.transformToFree == 0) {
-				other.transformToFree = it.id;
-			}
-
-			if (it.transformToOnUse[PLAYERSEX_FEMALE] == 0) {
-				it.transformToOnUse[PLAYERSEX_FEMALE] = value;
-			}
-		} else if (tmpStrValue == "femaletransformto" || tmpStrValue == "femalesleeper") {
-			uint16_t value = pugi::cast<uint16_t>(valueAttribute.value());
-			it.transformToOnUse[PLAYERSEX_FEMALE] = value;
-
-			ItemType& other = getItemType(value);
-			if (other.transformToFree == 0) {
-				other.transformToFree = it.id;
-			}
-
-			if (it.transformToOnUse[PLAYERSEX_MALE] == 0) {
-				it.transformToOnUse[PLAYERSEX_MALE] = value;
-			}
-		} else if (tmpStrValue == "transformto") {
-			it.transformToFree = pugi::cast<uint16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "destroyto") {
-			it.destroyTo = pugi::cast<uint16_t>(valueAttribute.value());
-		} else if (tmpStrValue == "elementice") {
-			Abilities& abilities = it.getAbilities();
-			abilities.elementDamage = pugi::cast<uint16_t>(valueAttribute.value());
-			abilities.elementType = COMBAT_ICEDAMAGE;
-		} else if (tmpStrValue == "elementearth") {
-			Abilities& abilities = it.getAbilities();
-			abilities.elementDamage = pugi::cast<uint16_t>(valueAttribute.value());
-			abilities.elementType = COMBAT_EARTHDAMAGE;
-		} else if (tmpStrValue == "elementfire") {
-			Abilities& abilities = it.getAbilities();
-			abilities.elementDamage = pugi::cast<uint16_t>(valueAttribute.value());
-			abilities.elementType = COMBAT_FIREDAMAGE;
-		} else if (tmpStrValue == "elementenergy") {
-			Abilities& abilities = it.getAbilities();
-			abilities.elementDamage = pugi::cast<uint16_t>(valueAttribute.value());
-			abilities.elementType = COMBAT_ENERGYDAMAGE;
-		} else if (tmpStrValue == "elementdeath") {
-			Abilities& abilities = it.getAbilities();
-			abilities.elementDamage = pugi::cast<uint16_t>(valueAttribute.value());
-			abilities.elementType = COMBAT_DEATHDAMAGE;
-		} else if (tmpStrValue == "elementholy") {
-			Abilities& abilities = it.getAbilities();
-			abilities.elementDamage = pugi::cast<uint16_t>(valueAttribute.value());
-			abilities.elementType = COMBAT_HOLYDAMAGE;
-		} else if (tmpStrValue == "walkstack") {
-			it.walkStack = valueAttribute.as_bool();
-		} else if (tmpStrValue == "blocking") {
-			it.blockSolid = valueAttribute.as_bool();
-		} else if (tmpStrValue == "allowdistread") {
-			it.allowDistRead = booleanString(valueAttribute.as_string());
+		auto parseAttribute = ItemParseAttributesMap.find(tmpStrValue);
+		if (parseAttribute != ItemParseAttributesMap.end()) {
+			ItemParse::initParse(tmpStrValue, attributeNode, valueAttribute, itemType);
 		} else {
 			SPDLOG_WARN("[Items::parseItemNode] - Unknown key value: {}",
                         keyAttribute.as_string());
 		}
 	}
 
-	//check bed items
-	if ((it.transformToFree != 0 || it.transformToOnUse[PLAYERSEX_FEMALE] != 0 || it.transformToOnUse[PLAYERSEX_MALE] != 0) && it.type != ITEM_TYPE_BED) {
-		SPDLOG_WARN("[Items::parseItemNode] - Item {} is not set as a bed-type", it.id);
+	// Check bed items
+	if ((itemType.transformToFree != 0 || itemType.transformToOnUse[PLAYERSEX_FEMALE] != 0 || itemType.transformToOnUse[PLAYERSEX_MALE] != 0) && itemType.type != ITEM_TYPE_BED) {
+		SPDLOG_WARN("[Items::parseItemNode] - Item {} is not set as a bed-type", itemType.id);
 	}
 }
 
diff --git a/src/items/items.h b/src/items/items.h
index ca7b3d78e81..392a36f288c 100644
--- a/src/items/items.h
+++ b/src/items/items.h
@@ -212,8 +212,8 @@ class ItemType
 		ShootType_t shootType = CONST_ANI_NONE;
 		RaceType_t corpseType = RACE_NONE;
 		FluidTypes_t fluidSource = FLUID_NONE;
+		TileFlags_t floorChange = TILESTATE_NONE;
 
-		uint8_t floorChange = 0;
 		uint8_t alwaysOnTopOrder = 0;
 		uint8_t lightLevel = 0;
 		uint8_t lightColor = 0;
@@ -276,6 +276,8 @@ class Items
 
 		uint16_t getItemIdByName(const std::string& name);
 
+		ItemTypes_t getLootType(const std::string& strValue);
+
 		uint32_t majorVersion = 0;
 		uint32_t minorVersion = 0;
 		uint32_t buildNumber = 0;
@@ -295,7 +297,6 @@ class Items
 		NameMap nameToItems;
 
 	private:
-		ItemTypes_t getLootType(const std::string& strValue);
 
 		std::map<uint16_t, uint16_t> reverseItemMap;
 		std::vector<ItemType> items;
diff --git a/src/items/items_definitions.hpp b/src/items/items_definitions.hpp
index 6a032cba906..1b6b38e3fc5 100644
--- a/src/items/items_definitions.hpp
+++ b/src/items/items_definitions.hpp
@@ -500,4 +500,119 @@ enum CylinderLink_t {
 	LINK_NEAR,
 };
 
+enum ItemParseAttributes_t {
+	ITEM_PARSE_TYPE,
+	ITEM_PARSE_DESCRIPTION,
+	ITEM_PARSE_RUNESPELLNAME,
+	ITEM_PARSE_WEIGHT,
+	ITEM_PARSE_SHOWCOUNT,
+	ITEM_PARSE_ARMOR,
+	ITEM_PARSE_DEFENSE,
+	ITEM_PARSE_EXTRADEF,
+	ITEM_PARSE_ATTACK,
+	ITEM_PARSE_ROTATETO,
+	ITEM_PARSE_WRAPCONTAINER,
+	ITEM_PARSE_IMBUINGSLOT,
+	ITEM_PARSE_WRAPABLETO,
+	ITEM_PARSE_MOVEABLE,
+	ITEM_PARSE_PODIUM,
+	ITEM_PARSE_BLOCKPROJECTILE,
+	ITEM_PARSE_PICKUPABLE,
+	ITEM_PARSE_FLOORCHANGE,
+	ITEM_PARSE_CORPSETYPE,
+	ITEM_PARSE_CONTAINERSIZE,
+	ITEM_PARSE_FLUIDSOURCE,
+	ITEM_PARSE_READABLE,
+	ITEM_PARSE_WRITEABLE,
+	ITEM_PARSE_MAXTEXTLEN,
+	ITEM_PARSE_WRITEONCEITEMID,
+	ITEM_PARSE_WEAPONTYPE,
+	ITEM_PARSE_SLOTTYPE,
+	ITEM_PARSE_AMMOTYPE,
+	ITEM_PARSE_SHOOTTYPE,
+	ITEM_PARSE_EFFECT,
+	ITEM_PARSE_LOOTTYPE,
+	ITEM_PARSE_RANGE,
+	ITEM_PARSE_STOPDURATION,
+	ITEM_PARSE_DECAYTO,
+	ITEM_PARSE_TRANSFORMEQUIPTO,
+	ITEM_PARSE_TRANSFORMDEEQUIPTO,
+	ITEM_PARSE_DURATION,
+	ITEM_PARSE_SHOWDURATION,
+	ITEM_PARSE_CHARGES,
+	ITEM_PARSE_SHOWCHARGES,
+	ITEM_PARSE_SHOWATTRIBUTES,
+	ITEM_PARSE_HITCHANCE,
+	ITEM_PARSE_MAXHITCHANCE,
+	ITEM_PARSE_INVISIBLE,
+	ITEM_PARSE_SPEED,
+	ITEM_PARSE_HEALTHGAIN,
+	ITEM_PARSE_HEALTHTICKS,
+	ITEM_PARSE_MANAGAIN,
+	ITEM_PARSE_MANATICKS,
+	ITEM_PARSE_MANASHIELD,
+	ITEM_PARSE_SKILLSWORD,
+	ITEM_PARSE_SKILLAXE,
+	ITEM_PARSE_SKILLCLUB,
+	ITEM_PARSE_SKILLDIST,
+	ITEM_PARSE_SKILLFISH,
+	ITEM_PARSE_SKILLSHIELD,
+	ITEM_PARSE_SKILLFIST,
+	ITEM_PARSE_CRITICALHITCHANCE,
+	ITEM_PARSE_CRITICALHITDAMAGE,
+	ITEM_PARSE_LIFELEECHCHANCE,
+	ITEM_PARSE_LIFELEECHAMOUNT,
+	ITEM_PARSE_MANALEECHCHANCE,
+	ITEM_PARSE_MANALEECHAMOUNT,
+	ITEM_PARSE_MAXHITPOINTS,
+	ITEM_PARSE_MAXHITPOINTSPERCENT,
+	ITEM_PARSE_MAXMANAPOINTS,
+	ITEM_PARSE_MAXMANAPOINTSPERCENT,
+	ITEM_PARSE_MAGICPOINTS,
+	ITEM_PARSE_MAGICPOINTSPERCENT,
+	ITEM_PARSE_FIELDABSORBPERCENTENERGY,
+	ITEM_PARSE_FIELDABSORBPERCENTFIRE,
+	ITEM_PARSE_FIELDABSORBPERCENTPOISON,
+	ITEM_PARSE_ABSORBPERCENTALL,
+	ITEM_PARSE_ABSORBPERCENTELEMENTS,
+	ITEM_PARSE_ABSORBPERCENTMAGIC,
+	ITEM_PARSE_ABSORBPERCENTENERGY,
+	ITEM_PARSE_ABSORBPERCENTFIRE,
+	ITEM_PARSE_ABSORBPERCENTPOISON,
+	ITEM_PARSE_ABSORBPERCENTICE,
+	ITEM_PARSE_ABSORBPERCENTHOLY,
+	ITEM_PARSE_ABSORBPERCENTDEATH,
+	ITEM_PARSE_ABSORBPERCENTLIFEDRAIN,
+	ITEM_PARSE_ABSORBPERCENTMANADRAIN,
+	ITEM_PARSE_ABSORBPERCENTDROWN,
+	ITEM_PARSE_ABSORBPERCENTPHYSICAL,
+	ITEM_PARSE_ABSORBPERCENTHEALING,
+	ITEM_PARSE_SUPPRESSDRUNK,
+	ITEM_PARSE_SUPPRESSENERGY,
+	ITEM_PARSE_SUPPRESSFIRE,
+	ITEM_PARSE_SUPPRESSPOISON,
+	ITEM_PARSE_SUPPRESSDROWN,
+	ITEM_PARSE_SUPPRESSPHYSICAL,
+	ITEM_PARSE_SUPPRESSFREEZE,
+	ITEM_PARSE_SUPPRESSDAZZLE,
+	ITEM_PARSE_SUPPRESSCURSE,
+	ITEM_PARSE_FIELD,
+	ITEM_PARSE_REPLACEABLE,
+	ITEM_PARSE_PARTNERDIRECTION,
+	ITEM_PARSE_LEVELDOOR,
+	ITEM_PARSE_MALETRANSFORMTO,
+	ITEM_PARSE_FEMALETRANSFORMTO,
+	ITEM_PARSE_TRANSFORMTO,
+	ITEM_PARSE_DESTROYTO,
+	ITEM_PARSE_ELEMENTICE,
+	ITEM_PARSE_ELEMENTEARTH,
+	ITEM_PARSE_ELEMENTFIRE,
+	ITEM_PARSE_ELEMENTENERGY,
+	ITEM_PARSE_ELEMENTDEATH,
+	ITEM_PARSE_ELEMENTHOLY,
+	ITEM_PARSE_WALKSTACK,
+	ITEM_PARSE_BLOCK_SOLID,
+	ITEM_PARSE_ALLOWDISTREAD,
+};
+
 #endif  // SRC_ITEMS_ITEMS_DEFINITIONS_HPP_