Regenerate databases

10 files changed, 207 insertions, 409 deletions

diff --git a/graphics/items/ml/usable/donuts/donut1.png b/graphics/items/ml/usable/donuts/donut1.png
new file mode 100644
index 0000000..675af9a
--- /dev/null
+++ b/graphics/items/ml/usable/donuts/donut1.png
diff --git a/graphics/items/ml/usable/donuts/donut2.png b/graphics/items/ml/usable/donuts/donut2.png
new file mode 100644
index 0000000..7b8f090
--- /dev/null
+++ b/graphics/items/ml/usable/donuts/donut2.png
diff --git a/graphics/items/ml/usable/donuts/donut3.png b/graphics/items/ml/usable/donuts/donut3.png
new file mode 100644
index 0000000..f533a6d
--- /dev/null
+++ b/graphics/items/ml/usable/donuts/donut3.png
diff --git a/graphics/items/ml/usable/food/jasminetea.png b/graphics/items/ml/usable/food/jasminetea.png
new file mode 100644
index 0000000..90937c9
--- /dev/null
+++ b/graphics/items/ml/usable/food/jasminetea.png
diff --git a/graphics/sprites/ml/equipment/weapons/weapon-staff-golden.xml b/graphics/sprites/ml/equipment/weapons/weapon-staff-golden.xml
new file mode 100644
index 0000000..04aebf3
--- /dev/null
+++ b/graphics/sprites/ml/equipment/weapons/weapon-staff-golden.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="staff" src="ml/graphics/sprites/equipment/weapons/weapon-staff-golden.png" width="128" height="128" />
+
+  <include file="ml/equipment/weapons/scorpionkinglance.xml"/>
+
+</sprite>
diff --git a/graphics/sprites/tmw/monsters/skeleton.xml b/graphics/sprites/tmw/monsters/skeleton.xml
index 6ae1783..0f1ad2d 100644
--- a/graphics/sprites/tmw/monsters/skeleton.xml
+++ b/graphics/sprites/tmw/monsters/skeleton.xml
@@ -1,365 +1,96 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Author: Micksha, Saulc  -->
-
-<sprite variants="128">
-    <imageset name="base"
-              src="tmw/graphics/sprites/monsters/skeleton.png|W"
-              width="64"
-              height="64"/>
-
-    <action name="stand" imageset="base">
-        <animation direction="down">
-            <frame index="0"/>
-        </animation>
-        <animation direction="left">
-            <frame index="16"/>
-        </animation>
-        <animation direction="up">
-            <frame index="32"/>
-        </animation>
-        <animation direction="right">
-            <frame index="48"/>
-        </animation>
-    </action>
-
-    <action name="walk" imageset="base">
-        <animation direction="down">
-            <sequence start="1" end="6" delay="80"/>
-        </animation>
-        <animation direction="left">
-            <sequence start="17" end="22" delay="80"/>
-        </animation>
-        <animation direction="up">
-            <sequence start="33" end="38" delay="80"/>
-        </animation>
-        <animation direction="right">
-            <sequence start="49" end="54" delay="80"/>
-        </animation>
-    </action>
-
-    <action name="attack" imageset="base">
-        <animation direction="down">
-            <sequence start="7" end="10" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <sequence start="23" end="26" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <sequence start="39" end="42" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <sequence start="55" end="58" delay="80"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="attack_bow" imageset="base">
-        <animation direction="down">
-            <sequence start="11" end="15" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <sequence start="27" end="31" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <sequence start="43" end="47" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <sequence start="59" end="63" delay="80"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="attack_wand" imageset="base">
-        <animation direction="down">
-            <frame index="7" delay="80"/>
-            <frame index="8" delay="80"/>
-            <frame index="11" delay="90"/>
-            <sequence start="8" end="10" delay="70"/>
-            <end />
-        </animation>
-        <animation direction="left">
-             <frame index="23" delay="80"/>
-             <frame index="28" delay="80"/>
-             <frame index="27" delay="90"/>
-             <frame index="28" delay="70"/>
-            <sequence start="24" end="26" delay="70"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="39" delay="90"/>
-            <frame index="43" delay="90"/>
-            <sequence start="40" end="42" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="55" delay="80"/>
-            <frame index="60" delay="80"/>
-            <frame index="59" delay="90"/>
-            <frame index="60" delay="70"/>
-            <sequence start="56" end="58" delay="70"/>
-            <end />
-        </animation>
-    </action>
-
-   <action name="attack_scythe" imageset="base">
-        <animation direction="down">
-            <frame index="11" delay="100"/>
-            <frame index="8" delay="100"/>
-            <frame index="9" delay="90"/>
-            <frame index="7" delay="90"/>
-            <frame index="10" delay="85"/>
-            <frame index="7" delay="90"/>
-            <frame index="9" delay="90"/>
-            <frame index="8" delay="100"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="27" delay="100"/>
-            <frame index="23" delay="90"/>
-            <frame index="24" delay="90"/>
-            <frame index="25" delay="80"/>
-            <frame index="26" delay="90"/>
-            <frame index="25" delay="90"/>
-            <frame index="24" delay="100"/>
-            <frame index="23" delay="90"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="43" delay="100"/>
-            <frame index="42" delay="90"/>
-            <frame index="41" delay="90"/>
-            <frame index="40" delay="80"/>
-            <frame index="39" delay="90"/>
-            <frame index="40" delay="90"/>
-            <frame index="41" delay="100"/>
-            <frame index="42" delay="90"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="59" delay="100"/>
-            <frame index="55" delay="90"/>
-            <frame index="56" delay="90"/>
-            <frame index="57" delay="80"/>
-            <frame index="58" delay="90"/>
-            <frame index="57" delay="90"/>
-            <frame index="56" delay="100"/>
-            <frame index="55" delay="90"/>
-            <end />
-        </animation>
-    </action>
-
-   <action name="attack_chop" imageset="base">
-        <animation direction="down">
-            <frame index="7" delay="100"/>
-            <frame index="8" delay="100"/>
-            <frame index="11" delay="120"/>
-            <frame index="9" delay="90"/>
-            <frame index="10" delay="70"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="23" delay="100"/>
-            <frame index="24" delay="100"/>
-            <frame index="27" delay="120"/>
-            <frame index="25" delay="90"/>
-            <frame index="26" delay="70"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="39" delay="100"/>
-            <frame index="40" delay="100"/>
-            <frame index="41" delay="120"/>
-            <frame index="42" delay="90"/>
-            <frame index="44" delay="70"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="55" delay="100"/>
-            <frame index="56" delay="100"/>
-            <frame index="59" delay="120"/>
-            <frame index="57" delay="90"/>
-            <frame index="58" delay="70"/>
-            <end />
-        </animation>
-    </action>
-
-   <action name="attack_chop_long" imageset="base">
-        <animation direction="down">
-            <frame index="8" delay="120"/>
-            <frame index="11" delay="130"/>
-            <frame index="7" delay="70"/>
-            <frame index="10" delay="70"/>
-            <frame index="9" delay="90"/>
-            <end />
-        </animation>
-        <animation direction="left">
-            <frame index="23" delay="120"/>
-            <frame index="27" delay="130"/>
-            <frame index="26" delay="80"/>
-            <frame index="25" delay="100"/>
-            <frame index="24" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="39" delay="120"/>
-            <frame index="40" delay="80"/>
-            <frame index="41" delay="130"/>
-            <frame index="42" delay="70"/>
-            <frame index="44" delay="100"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="55" delay="120"/>
-            <frame index="59" delay="130"/>
-            <frame index="58" delay="80"/>
-            <frame index="57" delay="100"/>
-            <frame index="56" delay="80"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="cast" imageset="base">
-        <animation direction="down">
-            <frame index="7" delay="80"/>
-            <frame index="8" delay="80"/>
-            <frame index="11" delay="90"/>
-            <sequence start="8" end="10" delay="70"/>
-            <end />
-        </animation>
-        <animation direction="left">
-             <frame index="23" delay="80"/>
-             <frame index="28" delay="80"/>
-             <frame index="27" delay="90"/>
-             <frame index="28" delay="70"/>
-            <sequence start="24" end="26" delay="70"/>
-            <end />
-        </animation>
-        <animation direction="up">
-            <frame index="39" delay="90"/>
-            <frame index="43" delay="90"/>
-            <sequence start="40" end="42" delay="80"/>
-            <end />
-        </animation>
-        <animation direction="right">
-            <frame index="55" delay="80"/>
-            <frame index="60" delay="80"/>
-            <frame index="59" delay="90"/>
-            <frame index="60" delay="70"/>
-            <sequence start="56" end="58" delay="70"/>
-            <end />
-        </animation>
-    </action>
-
-    <action name="sit" imageset="base">
-        <animation direction="down">
-            <frame index="64"/>
-        </animation>
-        <animation direction="left">
-            <frame index="65"/>
-        </animation>
-        <animation direction="up">
-            <frame index="66"/>
-        </animation>
-        <animation direction="right">
-            <frame index="67"/>
-        </animation>
-    </action>
-
-    <action name="sittop" imageset="base">
-        <animation direction="down">
-            <frame index="68"/><!-- TODO: 68~71 are sit2, no model sprites are available as per now! -->
-        </animation>
-        <animation direction="left">
-            <frame index="69"/>
-        </animation>
-        <animation direction="up">
-            <frame index="70"/>
-        </animation>
-        <animation direction="right">
-            <frame index="71"/>
-        </animation>
-    </action>
-
-    <action name="standride" imageset="base">
-        <animation direction="down">
-            <frame index="64"/>
-        </animation>
-        <animation direction="left">
-            <frame index="65"/>
-        </animation>
-        <animation direction="up">
-            <frame index="66"/>
-        </animation>
-        <animation direction="right">
-            <frame index="67"/>
-        </animation>
-    </action>
-
-    <action name="spawnride" imageset="base">
-        <animation direction="down">
-            <frame index="64"/>
-        </animation>
-        <animation direction="left">
-            <frame index="65"/>
-        </animation>
-        <animation direction="up">
-            <frame index="66"/>
-        </animation>
-        <animation direction="right">
-            <frame index="67"/>
-        </animation>
-    </action>
-
-    <action name="ride" imageset="base">
-        <animation direction="down">
-            <frame index="64"/>
-        </animation>
-        <animation direction="left">
-            <frame index="65"/>
-        </animation>
-        <animation direction="up">
-            <frame index="66"/>
-        </animation>
-        <animation direction="right">
-            <frame index="67"/>
-        </animation>
-    </action>
-
-    <action name="attackride" imageset="base">
-        <animation direction="down">
-            <frame index="64"/>
-        </animation>
-        <animation direction="left">
-            <frame index="65"/>
-        </animation>
-        <animation direction="up">
-            <frame index="66"/>
-        </animation>
-        <animation direction="right">
-            <frame index="67"/>
-        </animation>
-    </action>
-
-    <action name="dead" imageset="base">
-        <animation direction="down">
-            <frame index="72"/>
-        </animation>
-        <animation direction="left">
-            <frame index="72"/>
-        </animation>
-        <animation direction="up">
-            <frame index="72"/>
-        </animation>
-        <animation direction="right">
-            <frame index="72"/>
-        </animation>
-    </action>
-
+<?xml version="1.0"?>
+<sprite>
+  <imageset name="base" src="tmw/graphics/sprites/monsters/skeleton.png|W" width="64" height="64"/>
+  <action name="stand" imageset="base">
+    <animation direction="down">
+      <frame index="0"/>
+    </animation>
+    <animation direction="left">
+      <frame index="18"/>
+    </animation>
+    <animation direction="up">
+      <frame index="36"/>
+    </animation>
+    <animation direction="right">
+      <frame index="54"/>
+    </animation>
+  </action>
+  <action name="walk" imageset="base">
+    <animation direction="down">
+      <sequence start="1" end="6" delay="75"/>
+    </animation>
+    <animation direction="left">
+      <sequence start="19" end="24" delay="75"/>
+    </animation>
+    <animation direction="up">
+      <sequence start="37" end="42" delay="75"/>
+    </animation>
+    <animation direction="right">
+      <sequence start="55" end="60" delay="75"/>
+    </animation>
+  </action>
+  <action name="sit" imageset="base">
+    <animation direction="down">
+      <frame index="7"/>
+    </animation>
+    <animation direction="left">
+      <frame index="25"/>
+    </animation>
+    <animation direction="up">
+      <frame index="43"/>
+    </animation>
+    <animation direction="right">
+      <frame index="61"/>
+    </animation>
+  </action>
+  <action name="dead" imageset="base">
+    <animation direction="down">
+      <frame index="8"/>
+    </animation>
+    <animation direction="left">
+      <frame index="26"/>
+    </animation>
+    <animation direction="up">
+      <frame index="44"/>
+    </animation>
+    <animation direction="right">
+      <frame index="62"/>
+    </animation>
+  </action>
+  <action name="attack" imageset="base">
+    <animation direction="down">
+      <sequence start="9" end="12" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence start="27" end="30" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence start="45" end="48" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence start="63" end="66" delay="75"/>
+      <end/>
+    </animation>
+  </action>
+  <action name="attack_bow" imageset="base">
+    <animation direction="down">
+      <sequence start="13" end="17" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence start="31" end="35" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence start="49" end="53" delay="75"/>
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence start="67" end="71" delay="75"/>
+      <end/>
+    </animation>
+  </action>
 </sprite>
diff --git a/items.xml b/items.xml
index 8ba67c2..fd219b0 100644
--- a/items.xml
+++ b/items.xml
@@ -1331,7 +1331,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		effect="Status Reset"
 		type="usable"
 		sellProtected="true"
-		weight="700"/>
+		weight="20"/>
 	<item id="646"
 		image="ml/usable/potion/dpotion.png|G:#dae569,ffffda"
 		name="Movement Potion"
@@ -1493,7 +1493,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		useButton="Drink"
 		effect="Flee +40"
 		type="usable"
-		weight="50"/>
+		weight="20"/>
 	<item id="670"
 		image="ml/usable/warpcrystal.png|W:#ffffff,999999"
 		name="Candor Warp Crystal"
@@ -2287,7 +2287,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		name="Iten"
 		description="Small but heavy."
 		type="generic"
-		weight="1"/>
+		weight="2000"/>
 	<item id="797"
 		image="ml/generic/jackolantern.png"
 		name="Jacko Lantern"
@@ -2567,50 +2567,50 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		name="Copper Ore"
 		description="Copper in its unrefined form."
 		type="generic"
-		weight="800"/>
+		weight="700"/>
 	<item id="843"
 		image="ml/generic/ore.png|W:#1b120c,2e1f15,3d291c,60402b,65442e,8c5e3f,af7650,c6a48d,e7ddd6;R:#191919,2a2a2a,3f3f3f,626262,8d8d8d,b8b8b8,bfbfbf"
 		name="Lead Ore"
 		description="Lead in its unrefined form."
 		type="generic"
-		weight="800"/>
+		weight="700"/>
 	<!-- BR: Estanho, FR: Étain -->
 	<item id="844"
 		image="ml/generic/ore.png|W:#0f0a0e,1b141b,231a23,362736,4f3a4f,634863,936a92,b499b4;R:#000000,404040,5b5b5b,848484,c8c8c8,d4d4d4"
 		name="Tin Ore"
 		description="Tin in its unrefined form."
 		type="generic"
-		weight="800"/>
+		weight="700"/>
 	<item id="845"
 		image="ml/generic/ore.png|W:#0f0a0e,1b141b,231a23,362736,4f3a4f,634863,936a92,b499b4;R:#1a1e1f,2f3739,4a575b,94a1a4,cad5d7,effafc"
 		name="Silver Ore"
 		description="Silver in its unrefined form."
 		type="generic"
-		weight="800"/>
+		weight="700"/>
 	<item id="846"
 		image="ml/generic/ore.png|W:#1b120c,2e1f15,3d291c,60402b,65442e,8c5e3f,af7650,c6a48d,e7ddd6;R:#7a5f00,ac8600,e6b300,ffcc1d"
 		name="Gold Ore"
 		description="Gold in its unrefined form."
 		type="generic"
-		weight="800"/>
+		weight="700"/>
 	<item id="847"
 		image="ml/generic/ore.png|W:#0f0a0e,1b141b,231a23,362736,4f3a4f,634863,936a92,b499b4;R:#1d2229,2f3846,47546b,6c83a8,8399bd,aabbd6,ecf3ff"
 		name="Platinum Ore"
 		description="Platinum in its unrefined form."
 		type="generic"
-		weight="800"/>
+		weight="700"/>
 	<item id="848"
 		image="ml/generic/ore.png|W:#000000,121212,1d1d1d,383838,5c5c5c,787878,acacac,e9e9e9;R:#272727,663432,823937,ae423f,c64643,d0716f,d27d7a"
 		name="Iridium Ore"
 		description="Iridium in its unrefined form."
 		type="generic"
-		weight="800"/>
+		weight="700"/>
 	<item id="849"
 		image="ml/generic/ore.png|W:#000000,121212,1d1d1d,383838,5c5c5c,787878,acacac,e9e9e9;R:#145d5d,2ba2a2,67bcbc,80c5c5,d1e0e0,e0e3e3"
 		name="Titanium Ore"
 		description="Titanium in its unrefined form."
 		type="generic"
-		weight="800"/>
+		weight="700"/>
 
 	<item id="850"
 		image="ml/generic/ingot.png|W:#334422,556644,778866"
@@ -2618,35 +2618,35 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		description="Used to craft copper objects."
 		type="generic"
 		sellProtected="true"
-		weight="1000"/>
+		weight="800"/>
 	<item id="851"
 		image="ml/generic/ingot.png|W:#111111,333333,555555"
 		name="Lead Ingot"
 		description="Used to craft lead objects."
 		type="generic"
 		sellProtected="true"
-		weight="1000"/>
+		weight="800"/>
 	<item id="852"
 		image="ml/generic/ingot.png|W:#555555,777777,999999"
 		name="Tin Ingot"
 		description="Used to craft tin objects."
 		type="generic"
 		sellProtected="true"
-		weight="1000"/>
+		weight="800"/>
 	<item id="853"
 		image="ml/generic/ingot.png"
 		name="Silver Ingot"
 		description="Used to craft silver objects."
 		type="generic"
 		sellProtected="true"
-		weight="1000"/>
+		weight="800"/>
 	<item id="854"
 		image="ml/generic/ingot.png|W:#888844,CCCC66,FFFF88"
 		name="Gold Ingot"
 		description="Used to craft gold objects."
 		type="generic"
 		sellProtected="true"
-		weight="1000"/>
+		weight="800"/>
 	<!-- Note: Can we rename it to “Platyna Ingot”? :> -->
 	<item id="855"
 		image="ml/generic/ingot.png|W:#888888,AAAAAA,CCCCCC"
@@ -2654,21 +2654,21 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		description="Used to craft platinum objects."
 		type="generic"
 		sellProtected="true"
-		weight="1000"/>
+		weight="800"/>
 	<item id="856"
 		image="ml/generic/ingot.png|W:#884444,CC6666,FF8888"
 		name="Iridum Ingot"
 		description="Used to craft iridium objects."
 		type="generic"
 		sellProtected="true"
-		weight="1000"/>
+		weight="800"/>
 	<item id="857"
 		image="ml/generic/ingot.png|W:#9999BB,BBBBDD,DDDDFF"
 		name="Titanium Ingot"
 		description="Used to craft titanium objects."
 		type="generic"
 		sellProtected="true"
-		weight="1000"/>
+		weight="800"/>
 	<item id="858"
 		image="ml/generic/gempowder.png|W:#5e7480,f1ffff,ffffff"
 		name="Diamond Powder"
@@ -3121,8 +3121,8 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		image="ml/equipment/amulet/bloodstonependant.png"
 		name="Bloodstone Pendant"
 		description="Rumored to contain blood from the Red Queen."
+		bAtkRate="30"
 		maxhp="(20)"
-		attack="30"
 		defense="1"
 		level="45"
 		type="equip-necklace"
@@ -3159,8 +3159,8 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		image="ml/equipment/amulet/toothnecklace.png"
 		name="Tooth Necklace"
 		description="A plain necklace made from a single tooth."
+		bAtkRate="5"
 		maxhp="(200)"
-		attack="5"
 		str="2"
 		level="8"
 		type="equip-necklace"
@@ -3170,8 +3170,8 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		image="ml/equipment/amulet/wolvernteethnecklace.png"
 		name="Wolvern Teeth Necklace"
 		description="A necklace popular with poachers. Looks barbaric."
+		bAtkRate="7"
 		maxhp="(250)"
-		attack="7"
 		defense="3"
 		str="4"
 		level="24"
@@ -3182,8 +3182,8 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		image="ml/equipment/amulet/clawpendant.png"
 		name="Claw Pendant"
 		description="A pendant made for hermits."
+		bAtkRate="10"
 		maxhp="(250)"
-		attack="10"
 		defense="3"
 		str="4"
 		level="24"
@@ -3194,8 +3194,8 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		image="ml/equipment/amulet/barbarianamulet.png"
 		name="Barbarian Amulet"
 		description="A typical amulet for adult barbarians."
+		bAtkRate="10"
 		maxhp="(300)"
-		attack="10"
 		defense="1"
 		str="7"
 		level="44"
@@ -3206,8 +3206,8 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		image="ml/equipment/amulet/barbarianmasteramulet.png"
 		name="Barbarian Master Amulet"
 		description="An unique amulet in a tribe."
+		bAtkRate="12"
 		maxhp="(400)"
-		attack="12"
 		defense="1"
 		str="11"
 		level="54"
@@ -3430,6 +3430,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		image="ml/generic/blanket.png"
 		name="Blanket"
 		description="A blanket big enough to cover a reinboo's back, but it is not very warm."
+		effect="Speech+"
 		hit="(-10)"
 		flee="(-10)"
 		level="70"
@@ -3522,7 +3523,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		description="Don't stare at it too much. It's too shiny for your eyes."
 		maxweight="700"
 		effect="DEF -12%"
-		level="70"
+		level="54"
 		type="equip-necklace"
 		weight="30"/>
 	<item id="1177"
@@ -4003,7 +4004,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		description="Congrats you're part of master of TMW2."
 		maxmp="100"
 		mattack="20"
-		defense="149"
+		defense="37"
 		level="75"
 		type="equip-torso"
 		weight="25">
@@ -4027,6 +4028,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		image="ml/equipment/chest/bathrobe.png"
 		name="Bathrobe"
 		description="A bathrobe, not really useful at all. At least you wont be as cold as if you were naked."
+		effect="Speech+"
 		defense="1"
 		level="50"
 		type="equip-torso"
@@ -4297,6 +4299,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		image="ml/equipment/feet/slippers.png"
 		name="Slippers"
 		description="Simple slippers. You can't run with them, but you won't get cold feet either."
+		effect="Speech+"
 		defense="1"
 		level="30"
 		type="equip-feet"
@@ -4923,12 +4926,12 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		image="ml/equipment/shields/bladeshield.png"
 		name="Blade Shield"
 		description="Small and round shield with iron reinforcements."
+		bAtkRate="5"
 		sprecovery="(3)"
 		flee="(6)"
 		hprecovery="12"
 		criticaldefense="12"
 		block="3"
-		attack="5"
 		defense="24"
 		level="36"
 		type="equip-shield"
@@ -4938,7 +4941,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 	<item id="2703"
 		image="ml/equipment/shields/blueknightshield.png"
 		name="Blue Knight Shield"
-		description="A shield perfect that goes perfectly with the prsm helmet."
+		description="A shield that goes perfectly with the prsm helmet."
 		maxhp="280"
 		sprecovery="(6)"
 		flee="(9)"
@@ -6001,7 +6004,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 	<item id="2993"
 		image="ml/equipment/head/fluffyhat.png"
 		name="Fluffy Hat"
-		description="How many fluffy did you kill for that!!!"
+		description="How many fluffies have you killed for that!?!?"
 		maxhp="19"
 		defense="5"
 		level="22"
@@ -6226,7 +6229,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		name="Fafi Mask"
 		description="Your friends will think you're a dragon!"
 		maxhp="75"
-		defense="36"
+		defense="16"
 		sprecovery="5"
 		int="1"
 		mp="25"
@@ -6239,9 +6242,10 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		image="ml/equipment/head/afkcap.png"
 		name="AFK Cap"
 		description="A cap which identifies you as an useless player."
+		effect="Speech+"
 		maxhp="30"
 		defense="5"
-		level="2"
+		level="30"
 		type="equip-head"
 		weight="30">
 		<sprite>ml/equipment/head/afkcap.xml</sprite>
@@ -6257,7 +6261,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		description="Winter is coming!"
 		maxhp="29"
 		effect="+20 DEF and +15% EXP on Winter"
-		defense="17"
+		defense="7"
 		level="29"
 		type="equip-head"
 		weight="70">
@@ -6923,7 +6927,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="equip-2hand"
 		sellProtected="true"
 		weight="600">
-		<sprite>ml/equipment/weapons/bugslayer.xml</sprite>
+		<sprite>ml/equipment/weapons/staff-warped.xml</sprite>
 		<sound event="hit">weapons/knife/hit1.ogg</sound>
 		<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
 		<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
@@ -8453,7 +8457,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="equip-2hand"
 		attack-action="attack"
 		weight="158">
-		<sprite>ml/equipment/weapons/weapon-staff.xml</sprite>
+		<sprite>ml/equipment/weapons/legend-wand.xml</sprite>
 	</item>
 	<item id="7003"
 		image="ml/equipment/weapons/woodenstaff.png"
@@ -8479,7 +8483,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="equip-2hand"
 		attack-action="attack"
 		weight="158">
-		<sprite>ml/equipment/weapons/legend-wand.xml</sprite>
+		<sprite>ml/equipment/weapons/weapon-staff-golden.xml</sprite>
 	</item>
 	<item id="7005"
 		image="ml/equipment/weapons/reinboowand.png"
@@ -8491,7 +8495,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="equip-2hand"
 		attack-action="attack"
 		weight="158">
-		<sprite>ml/equipment/weapons/weapon-staff.xml</sprite>
+		<sprite>ml/equipment/weapons/staff-wizard.xml</sprite>
 	</item>
 
 	<item id="7020"
@@ -8504,7 +8508,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="equip-2hand"
 		attack-action="attack"
 		weight="960">
-		<sprite>ml/equipment/weapons/weapon-staff.xml</sprite>
+		<sprite>ml/equipment/weapons/staff-wizard.xml</sprite>
 	</item>
 
 	<!-- System Reserved -->
@@ -9353,7 +9357,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="5"/>
 	<item id="8017"
-		image="ml/usable/food/pumpkinjuice.png"
+		image="ml/usable/food/jasminetea.png"
 		name="Jasmine Tea"
 		useButton="Drink"
 		description="Tea is good for health, according to specialists."
@@ -9481,7 +9485,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="20"/>
 	<item id="8029"
 		image="ml/generic/document.png"
-		name="Insurance Contact"
+		name="Insurance Contract"
 		description="No EXP penalty on death."
 		effect="Time limit: 15 minutes"
 		type="usable"
@@ -9662,6 +9666,62 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		useButton="Cast"
 		type="usable"
 		weight="10"/>
+	<item id="8052"
+		image="ml/usable/donuts/donut1.png"
+		name="Dodge Donut"
+		description="Can't get a good hold of it, can you?"
+		useButton="Eat"
+		effect="Flee +20"
+		type="usable"
+		weight="20"/>
+	<item id="8053"
+		image="ml/usable/donuts/donut2.png"
+		name="Chocolate Donut"
+		description="This item is unavailable at the moment."
+		useButton="Eat"
+		effect="Blame Saulc"
+		type="usable"
+		weight="20"/>
+	<item id="8054"
+		image="ml/usable/donuts/donut3.png"
+		name="Sparkly Chocolate Donut"
+		description="This item is unavailable at the moment."
+		useButton="Eat"
+		effect="Blame Saulc"
+		type="usable"
+		weight="20"/>
+	<item id="8055"
+		image="ml/usable/donuts/donut2.png"
+		name="Mint Donut"
+		description="This item is unavailable at the moment."
+		useButton="Eat"
+		effect="Blame Saulc"
+		type="usable"
+		weight="20"/>
+	<item id="8056"
+		image="ml/usable/donuts/donut3.png"
+		name="Sparkly Mint Donut"
+		description="This item is unavailable at the moment."
+		useButton="Eat"
+		effect="Blame Saulc"
+		type="usable"
+		weight="20"/>
+	<item id="8057"
+		image="ml/usable/donuts/donut2.png"
+		name="Strawberry Donut"
+		description="I always heard strawberry was magical, but this is ridiculous."
+		useButton="Eat"
+		effect="MAX MP +5%"
+		type="usable"
+		weight="20"/>
+	<item id="8058"
+		image="ml/usable/donuts/donut3.png"
+		name="Sparkly Strawberry Donut"
+		description="You ruined its magical properties, but not the calories."
+		useButton="Eat"
+		effect="MAX HP +5%"
+		type="usable"
+		weight="20"/>
 
 	<!-- For quests.xml -->
 	<item id="9999"
@@ -10816,7 +10876,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
         type="usable"
         weight="0"
   />
-  <item id="15267"
+  <item id="15141"
         image="tmw/use/scrolls/scroll-alizarin.png"
         name="Alizarin Scroll"
         description="Scroll with natural power; summons a plant if read."
@@ -10825,7 +10885,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
         weight="2"
         tag="Scrolls"
   />
-  <item id="15268"
+  <item id="15142"
         image="tmw/use/scrolls/scroll-cobalt.png"
         name="Cobalt Scroll"
         description="Scroll with natural power; summons a plant if read."
@@ -10834,7 +10894,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
         weight="2"
         tag="Scrolls"
   />
-  <item id="15269"
+  <item id="15143"
         image="tmw/use/scrolls/scroll-gamboge.png"
         name="Gamboge Scroll"
         description="Scroll with natural power; summons a plant if read."
@@ -10843,7 +10903,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
         weight="2"
         tag="Scrolls"
   />
-  <item id="15270"
+  <item id="15144"
         image="tmw/use/scrolls/scroll-mauve.png"
         name="Mauve Scroll"
         description="Scroll with natural power; summons a plant if read."
@@ -10852,7 +10912,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
         weight="2"
         tag="Scrolls"
   />
-  <item id="15271"
+  <item id="15145"
         image="tmw/use/scrolls/scroll-joy.png"
         name="Joyplim Scroll"
         description="A very funny scroll. Read it, and be amused!"
diff --git a/ml/graphics/sprites/equipment/weapons/weapon-staff-golden.png b/ml/graphics/sprites/equipment/weapons/weapon-staff-golden.png
new file mode 100644
index 0000000..2fec263
--- /dev/null
+++ b/ml/graphics/sprites/equipment/weapons/weapon-staff-golden.png
diff --git a/tmw/graphics/sprites/monsters/skeleton.png b/tmw/graphics/sprites/monsters/skeleton.png
index ed4f0bd..b5d8d38 100644
--- a/tmw/graphics/sprites/monsters/skeleton.png
+++ b/tmw/graphics/sprites/monsters/skeleton.png
diff --git a/tmw/graphics/sprites/monsters/troll.png b/tmw/graphics/sprites/monsters/troll.png
index 01b5ba7..eb6a625 100644
--- a/tmw/graphics/sprites/monsters/troll.png
+++ b/tmw/graphics/sprites/monsters/troll.png