From 8f295528ab5ec2aa02e080dc98a454614beceb2d Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Thu, 30 May 2019 15:44:48 -0300
Subject: Fix broken item options

---
 itemfields.xml  | 527 +++++++++++++++++++++++++++++++++++---------------------
 itemoptions.xml | 368 +++++++++++++++++++--------------------
 items.xml       |   2 +-
 3 files changed, 513 insertions(+), 384 deletions(-)

diff --git a/itemfields.xml b/itemfields.xml
index d89f25d9..f2e05997 100644
--- a/itemfields.xml
+++ b/itemfields.xml
@@ -3,203 +3,332 @@
 Copyright (C) 2016 Evol Online -->
 
 <itemfields>
-    <required>
-        <field
-            name="level"
-            description="Req. level %s"
-            signed="false"
-        />
-    </required>
-    <add>
-        <field
-            name="attack"
-            description="Attack %s"
-            signed="true"
-        />
-        <field
-            name="minattack"
-            description="Min attack %s"
-            signed="true"
-        />
-        <field
-            name="maxattack"
-            description="Max attack %s"
-            signed="true"
-        />
-        <field
-            name="criticalattack"
-            description="Critical attack %s"
-            signed="true"
-        />
-        <field
-            name="mattack"
-            description="M. Attack %s"
-            signed="true"
-        />
-        <field
-            name="defense"
-            description="Defense %s"
-            signed="true"
-        />
-        <field
-            name="mindefense"
-            description="Min defense %s"
-            signed="true"
-        />
-        <field
-            name="maxdefense"
-            description="Max defense %s"
-            signed="true"
-        />
-        <field
-            name="criticaldefense"
-            description="Critical defense %s"
-            signed="true"
-        />
-        <field
-            name="mdefense"
-            description="M. Defense %s"
-            signed="true"
-        />
-        <field
-            name="minmdefense"
-            description="Min M. Defense %s"
-            signed="true"
-        />
-        <field
-            name="maxmdefense"
-            description="Max M. Defense %s"
-            signed="true"
-        />
-        <field
-            name="hp"
-            description="HP %s"
-            signed="true"
-        />
-        <field
-            name="maxhp"
-            description="Max HP %s"
-            signed="true"
-        />
-        <field
-            name="mp"
-            description="MP %s"
-            signed="true"
-        />
-        <field
-            name="maxmp"
-            description="Max MP %s"
-            signed="true"
-        />
-        <field
-            name="speed"
-            description="Speed %s"
-            signed="true"
-        />
-        <field
-            name="atkspeed"
-            description="Attack speed %s"
-            signed="true"
-        />
-        <field
-            name="range"
-            description="Range %s"
-            signed="true"
-        />
-        <field
-            name="flee"
-            description="Flee %s"
-            signed="true"
-        />
-        <field
-            name="minflee"
-            description="Min flee %s"
-            signed="true"
-        />
-        <field
-            name="maxflee"
-            description="Max flee %s"
-            signed="true"
-        />
-        <field
-            name="hit"
-            description="Perc. accuracy %s"
-            signed="true"
-        />
-        <field
-            name="cardslots"
-            description="Card slots %s"
-            signed="false"
-        />
-        <field
-            name="exp"
-            description="Experience %s"
-            signed="true"
-        />
-        <field
-            name="karma"
-            description="Karma %s"
-            signed="true"
-        />
-        <field
-            name="manner"
-            description="Manner %s"
-            signed="true"
-        />
-        <field
-            name="money"
-            description="Money %s"
-            signed="true"
-        />
-        <field
-            name="maxweight"
-            description="Max weight %s"
-            signed="true"
-        />
-        <field
-            name="jobexp"
-            description="Job exp. %s"
-            signed="true"
-        />
-        <field
-            name="hprecovery"
-            description="Hp recov. rate %s"
-            signed="true"
-        />
-        <field
-            name="sprecovery"
-            description="Sp recov. rate %s"
-            signed="true"
-        />
-        <field
-            name="str"
-            description="Strength %s"
-            signed="true"
-        />
-        <field
-            name="agi"
-            description="Agility %s"
-            signed="true"
-        />
-        <field
-            name="vit"
-            description="Vitality %s"
-            signed="true"
-        />
-        <field
-            name="int"
-            description="Intelligence %s"
-            signed="true"
-        />
-        <field
-            name="dex"
-            description="Dexterity %s"
-            signed="true"
-        />
-        <field
-            name="luk"
-            description="Luck %s"
-            signed="true"
-        />
-    </add>
+	<required>
+		<field
+			name="level"
+			description="Req. level %s"
+			signed="false"
+		/>
+	</required>
+	<add>
+		<field
+			name="attack"
+			description="Attack %s"
+			signed="true"
+		/>
+		<field
+			name="minattack"
+			description="Min attack %s"
+			signed="true"
+		/>
+		<field
+			name="maxattack"
+			description="Max attack %s"
+			signed="true"
+		/>
+		<field
+			name="criticalattack"
+			description="Critical attack %s"
+			signed="true"
+		/>
+		<field
+			name="mattack"
+			description="M. Attack %s"
+			signed="true"
+		/>
+		<field
+			name="defense"
+			description="Defense %s"
+			signed="true"
+		/>
+		<field
+			name="mindefense"
+			description="Min defense %s"
+			signed="true"
+		/>
+		<field
+			name="maxdefense"
+			description="Max defense %s"
+			signed="true"
+		/>
+		<field
+			name="criticaldefense"
+			description="Critical defense %s"
+			signed="true"
+		/>
+		<field
+			name="mdefense"
+			description="M. Defense %s"
+			signed="true"
+		/>
+		<field
+			name="minmdefense"
+			description="Min M. Defense %s"
+			signed="true"
+		/>
+		<field
+			name="maxmdefense"
+			description="Max M. Defense %s"
+			signed="true"
+		/>
+		<field
+			name="hp"
+			description="HP %s"
+			signed="true"
+		/>
+		<field
+			name="maxhp"
+			description="Max HP %s"
+			signed="true"
+		/>
+		<field
+			name="mp"
+			description="MP %s"
+			signed="true"
+		/>
+		<field
+			name="maxmp"
+			description="Max MP %s"
+			signed="true"
+		/>
+		<field
+			name="speed"
+			description="Speed %s"
+			signed="true"
+		/>
+		<field
+			name="atkspeed"
+			description="Attack speed %s"
+			signed="true"
+		/>
+		<field
+			name="range"
+			description="Range %s"
+			signed="true"
+		/>
+		<field
+			name="flee"
+			description="Flee %s"
+			signed="true"
+		/>
+		<field
+			name="minflee"
+			description="Min flee %s"
+			signed="true"
+		/>
+		<field
+			name="maxflee"
+			description="Max flee %s"
+			signed="true"
+		/>
+		<field
+			name="hit"
+			description="Perc. accuracy %s"
+			signed="true"
+		/>
+		<field
+			name="cardslots"
+			description="Card slots %s"
+			signed="false"
+		/>
+		<field
+			name="exp"
+			description="Experience %s%%"
+			signed="true"
+		/>
+		<field
+			name="karma"
+			description="Karma %s"
+			signed="true"
+		/>
+		<field
+			name="manner"
+			description="Manner %s"
+			signed="true"
+		/>
+		<field
+			name="money"
+			description="Money %s"
+			signed="true"
+		/>
+		<field
+			name="maxweight"
+			description="Max weight %s"
+			signed="true"
+		/>
+		<field
+			name="jobexp"
+			description="Job exp. %s"
+			signed="true"
+		/>
+		<field
+			name="hprecovery"
+			description="Hp recov. rate %s"
+			signed="true"
+		/>
+		<field
+			name="sprecovery"
+			description="Sp recov. rate %s"
+			signed="true"
+		/>
+		<field
+			name="str"
+			description="Strength %s"
+			signed="true"
+		/>
+		<field
+			name="agi"
+			description="Agility %s"
+			signed="true"
+		/>
+		<field
+			name="vit"
+			description="Vitality %s"
+			signed="true"
+		/>
+		<field
+			name="int"
+			description="Intelligence %s"
+			signed="true"
+		/>
+		<field
+			name="dex"
+			description="Dexterity %s"
+			signed="true"
+		/>
+		<field
+			name="luk"
+			description="Luck %s"
+			signed="true"
+		/>
+
+	<!-- TMW2 CUSTOMS -->
+		<field
+			name="maxhp2"
+			description="Max HP %s%%"
+			signed="true"
+		/>
+		<field
+			name="maxmp2"
+			description="Max MP %s%%"
+			signed="true"
+		/>
+		<field
+			name="hpregen"
+			description="HP Regen %s"
+			signed="true"
+		/>
+		<field
+			name="mpregen"
+			description="MP Regen %s"
+			signed="true"
+		/>
+		<field
+			name="atkspeed"
+			description="Attack speed %s%%"
+			signed="true"
+		/>
+		<field
+			name="doubleatk"
+			description="Double Attack %s%%"
+			signed="true"
+		/>
+		<field
+			name="aoe"
+			description="AoE %s"
+			signed="true"
+		/>
+		<field
+			name="critdmg"
+			description="Crit Damage %s%%"
+			signed="true"
+		/>
+		<field
+			name="blindinflict"
+			description="Blind %s"
+			signed="true"
+		/>
+		<field
+			name="curseinflict"
+			description="Curse %s"
+			signed="true"
+		/>
+		<field
+			name="silenceinflict"
+			description="Silence %s"
+			signed="true"
+		/>
+		<field
+			name="poisoninflict"
+			description="Poison %s"
+			signed="true"
+		/>
+		<field
+			name="blindresist"
+			description="Blind Def %s"
+			signed="true"
+		/>
+		<field
+			name="curseresist"
+			description="Curse Def %s"
+			signed="true"
+		/>
+		<field
+			name="silenceresist"
+			description="Silence Def %s"
+			signed="true"
+		/>
+		<field
+			name="poisonresist"
+			description="Poison Def %s"
+			signed="true"
+		/>
+
+		<field
+			name="hpdrain"
+			description="HP Drain %s"
+			signed="true"
+		/>
+		<field
+			name="mpdrain"
+			description="MP Drain %s"
+			signed="true"
+		/>
+		<field
+			name="manause"
+			description="MP Consumption %s"
+			signed="true"
+		/>
+		<field
+			name="rangeddef"
+			description="Ranged Defense %s"
+			signed="true"
+		/>
+		<field
+			name="bossdef"
+			description="Boss Defense %s"
+			signed="true"
+		/>
+		<field
+			name="bossatk"
+			description="Boss Damage %s"
+			signed="true"
+		/>
+		<field
+			name="block"
+			description="Block %s%%"
+			signed="true"
+		/>
+		<field
+			name="attack2"
+			description="Attack %s%%"
+			signed="true"
+		/>
+		<field
+			name="mattack2"
+			description="M. Attack %s%%"
+			signed="true"
+		/>
+
+	</add>
 </itemfields>
diff --git a/itemoptions.xml b/itemoptions.xml
index 32a43873..abadb553 100644
--- a/itemoptions.xml
+++ b/itemoptions.xml
@@ -3,189 +3,189 @@
 Copyright (C) 2017 Evol Online -->
 
 <itemoptions>
-    <option
-        id="1"
-        field1="maxhp"
-    />
-    <option
-        id="2"
-        field="maxsp"
-    />
-    <option
-        id="3"
-        field="str"
-    />
-    <option
-        id="4"
-        field="agi"
-    />
-    <option
-        id="5"
-        field="vit"
-    />
-    <option
-        id="6"
-        field="int"
-    />
-    <option
-        id="7"
-        field="dex"
-    />
-    <option
-        id="8"
-        field="luk"
-    />
-    <option
-        id="9"
-        field="maxhp %"
-    />
-    <option
-        id="10"
-        field="maxmp %"
-    />
-    <option
-        id="11"
-        field="HP Regen"
-    />
-    <option
-        id="12"
-        field="MP Regen"
-    />
-    <option
-        id="13"
-        field="Atk %"
-    />
-    <option
-        id="14"
-        field="Matk %"
-    />
-    <option
-        id="15"
-        field="Atk Spd."
-    />
-    <option
-        id="16"
-        field="Atk Spd. %"
-    />
-    <option
-        id="17"
-        field="Atk"
-    />
-    <option
-        id="18"
-        field="hit"
-    />
-    <option
-        id="19"
-        field="Matk"
-    />
-    <option
-        id="20"
-        field="def"
-    />
-    <option
-        id="21"
-        field="mdef"
-    />
-    <option
-        id="22"
-        field="evade"
-    />
-    <option
-        id="23"
-        field="block"
-    />
-    <option
-        id="24"
-        field="crit"
-    />
-    <!-- elemental bonuses not used -->
-    <option
-        id="148"
-        field="boss atk"
-    />
-    <!-- 149 unused -->
-    <option
-        id="150"
-        field="boss def"
-    />
-    <!-- more elemental and race and size - unused -->
-    <option
-        id="165"
-        field="crit def"
-    />
-    <!-- 166 long atk rate -->
-    <option
-        id="167"
-        field="ranged def"
-    />
-    <!-- NOTE: We don't need magical dmg reduction bonus, we have mdef -->
-    <!-- heal power and casting bonuses - unused -->
-    <option
-        id="172"
-        field="mana use"
-    />
-    <option
-        id="173"
-        field="hp drain"
-    />
-    <option
-        id="174"
-        field="mp drain"
-    />
-    <!-- Attack element not used -->
-    <!-- TMW2 Custom Effects -->
-    <option
-        id="187"
-        field="AoE"
-    />
-    <option
-        id="188"
-        field="walk spd."
-    />
-    <option
-        id="189"
-        field="exp %"
-    />
-    <option
-        id="190"
-        field="double atk"
-    />
-    <option
-        id="191"
-        field="poison resist"
-    />
-    <option
-        id="192"
-        field="silence resist"
-    />
-    <option
-        id="193"
-        field="curse resist"
-    />
-    <option
-        id="194"
-        field="blind resist"
-    />
-    <option
-        id="195"
-        field="poison inflict"
-    />
-    <option
-        id="196"
-        field="silence inflict"
-    />
-    <option
-        id="197"
-        field="curse inflict"
-    />
-    <option
-        id="198"
-        field="blind inflict"
-    />
-    <option
-        id="199"
-        field="crit dmg %"
-    />
+	<option
+		id="1"
+		field1="maxhp"
+	/>
+	<option
+		id="2"
+		field="maxsp"
+	/>
+	<option
+		id="3"
+		field="str"
+	/>
+	<option
+		id="4"
+		field="agi"
+	/>
+	<option
+		id="5"
+		field="vit"
+	/>
+	<option
+		id="6"
+		field="int"
+	/>
+	<option
+		id="7"
+		field="dex"
+	/>
+	<option
+		id="8"
+		field="luk"
+	/>
+	<option
+		id="9"
+		field="maxhp2"
+	/>
+	<option
+		id="10"
+		field="maxmp2"
+	/>
+	<option
+		id="11"
+		field="hpregen"
+	/>
+	<option
+		id="12"
+		field="mpregen"
+	/>
+	<option
+		id="13"
+		field="attack2"
+	/>
+	<option
+		id="14"
+		field="mattack2"
+	/>
+	<option
+		id="15"
+		field="atkspeed"
+	/>
+	<option
+		id="16"
+		field="atkspeed2"
+	/>
+	<option
+		id="17"
+		field="attack"
+	/>
+	<option
+		id="18"
+		field="hit"
+	/>
+	<option
+		id="19"
+		field="mattack"
+	/>
+	<option
+		id="20"
+		field="defense"
+	/>
+	<option
+		id="21"
+		field="mdefense"
+	/>
+	<option
+		id="22"
+		field="flee"
+	/>
+	<option
+		id="23"
+		field="block"
+	/>
+	<option
+		id="24"
+		field="criticalattack"
+	/>
+	<!-- elemental bonuses not used -->
+	<option
+		id="148"
+		field="bossatk"
+	/>
+	<!-- 149 unused -->
+	<option
+		id="150"
+		field="bossdef"
+	/>
+	<!-- more elemental and race and size - unused -->
+	<option
+		id="165"
+		field="criticaldefense"
+	/>
+	<!-- 166 long atk rate -->
+	<option
+		id="167"
+		field="rangeddef"
+	/>
+	<!-- NOTE: We don't need magical dmg reduction bonus, we have mdef -->
+	<!-- heal power and casting bonuses - unused -->
+	<option
+		id="172"
+		field="manause"
+	/>
+	<option
+		id="173"
+		field="hpdrain"
+	/>
+	<option
+		id="174"
+		field="mpdrain"
+	/>
+	<!-- Attack element not used -->
+	<!-- TMW2 Custom Effects -->
+	<option
+		id="187"
+		field="aoe"
+	/>
+	<option
+		id="188"
+		field="speed"
+	/>
+	<option
+		id="189"
+		field="exp"
+	/>
+	<option
+		id="190"
+		field="doubleatk"
+	/>
+	<option
+		id="191"
+		field="poisonresist"
+	/>
+	<option
+		id="192"
+		field="silenceresist"
+	/>
+	<option
+		id="193"
+		field="curseresist"
+	/>
+	<option
+		id="194"
+		field="blindresist"
+	/>
+	<option
+		id="195"
+		field="poisoninflict"
+	/>
+	<option
+		id="196"
+		field="silenceinflict"
+	/>
+	<option
+		id="197"
+		field="curseinflict"
+	/>
+	<option
+		id="198"
+		field="blindinflict"
+	/>
+	<option
+		id="199"
+		field="critdmg"
+	/>
 
 </itemoptions>
diff --git a/items.xml b/items.xml
index ebe0e543..afd0a2cf 100644
--- a/items.xml
+++ b/items.xml
@@ -405,7 +405,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 	<item id="524"
 		image="usable/potion/atroposmixture.png"
 		name="Atropos Mixture"
-		description="The most advanced potion ever synthesised."
+		description="The most advanced potion ever synthesized."
 		effect="Heal 50%-90% HP"
 		useButton="Drink"
 		type="usable"
-- 
cgit v1.2.3-60-g2f50