Skip to content

items.xml by Xanthem

Jesusaves requested to merge items-002 into master

9 out of 48 hunks FAILED

The following changes were lost and must be manually applied if still relevant:

--- items.xml
+++ items.xml
@@ -3178,21 +3201,22 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		level="85"
 		defense="15"
 		type="equip-necklace"
-		weight="800">
+		weight="450">
 	</item>
 	<item id="1153"
 		image="equipment/charms/brokendoll.png"
 		name="Broken Doll"
 		description="An ancient doll taken from a fallen Fey Element that used it as a lure for its young victims."
+		defense="2"
 		level="5"
 		type="equip-necklace"
-		weight="27">
+		weight="450">
 	</item>
 	<item id="1154"
 		image="equipment/charms/doll.png"
 		name="Doll"
 		description="A doll. Monsters will underestimate you, allowing to crit more often."
-		effect="Critical +10%"
+		criticalattackrate="10"
 		level="30"
 		type="equip-necklace"
 		weight="60">
@@ -3201,23 +3225,25 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		image="equipment/charms/firescroll.png"
 		name="Fire Scroll"
 		description="This scroll should burn!"
+		defense="1"
 		level="54"
 		type="equip-necklace"
-		weight="10">
+		weight="450">
 	</item>
 	<item id="1156"
 		image="equipment/charms/heartofisis.png"
 		name="Heart Of Isis"
 		description="Life emanates through the natural warmth of this jewel."
+		defense="1"
 		level="54"
 		type="equip-necklace"
-		weight="40">
+		weight="450">
 	</item>
 	<item id="1157"
 		image="equipment/charms/leatherball.png"
 		name="Leather Ball"
 		description="A leather ball handmade by Santa's helpers."
-		effect="Acc +15%"
+		hit="15"
 		level="26"
 		type="equip-necklace"
 		weight="45">
@@ -3289,16 +3320,19 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		name="Spectral Orb"
 		description="This ghost-like essence is Saulc's fault."
 		effect="DMG vs Ghost +50%, Holy Def -25%"
-		level="80"
 		defense="10"
+		level="80"
 		type="equip-necklace"
 		weight="450">
 	</item>
 	<item id="1165"
 		image="equipment/charms/thetabook.png"
 		name="Theta Book"
-		description="An ancient spellbook filled with the wisdom of generations of magic. Maybe you could do more than just holding it?"
-		effect="MAtk +10, MP +20, MP Regen +10%"
+		description="An ancient spellbook filled with the wisdom of generations of magic. Maybe you could do more than just hold it?"
+		maxmp="20"
+		sprecovery="10"
+		defense="1"
+		mattack="10"
 		level="37"
 		type="equip-necklace"
 		weight="450">
@@ -5555,10 +5595,10 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		image="equipment/head/alphamouboohead.png"
 		name="Alpha Mouboo Hat"
 		description="You murderer!"
-		maxhp="300"		
+		maxhp="300"
+		defense="20"
 		str="1"
 		dex=" 1"
-		defense="20"
 		level="65"
 		type="equip-head"
 		weight="300">
@@ -5712,8 +5751,8 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		name="Magic Top Hat"
 		description="Probably not the best way to stay hidden."
 		maxhp="50000"
-		flee="(80)"
 		defense="25"
+		flee="(80)"
 		type="equip-head"
 		sellProtected="true"
 		weight="800">
@@ -5745,9 +5784,9 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		name="Murderer Crown"
 		description="Royal blood has been shed for the ownership of this crown."
 		maxhp="6"
+		defense="2"
 		criticalattackrate="50"
 		effect="Holy Damage Taken +25%, Dark Resist +25%. Item lost after Kill Saulc events."
-		defense="2"
 		level="10"
 		type="equip-head"
 		sellProtected="true"
@@ -5873,8 +5909,8 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		name="Cave Snake Hat"
 		description="Shine in the darkness of the cave."
 		maxhp="16"
-		agi="2"
 		defense="5"
+		agi="2"
 		level="20"
 		type="equip-head"
 		weight="46">
@@ -5898,8 +5932,8 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		name="Shroom Hat"
 		description="A rare mushroom hat."
 		maxhp="30"
-		str="2"
 		defense="8"
+		str="2"
 		level="30"
 		type="equip-head"
 		weight="320">
@@ -5910,9 +5944,9 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		name="Forest Shroom Hat"
 		description="You are now a invisible in forest"
 		maxhp="68"
+		defense="15"
 		dex="3"
 		int="1"
-		defense="15"
 		level="50"
 		type="equip-head"
 		weight="320">

Merge request reports