[ItemParse] - Fix life and mana leech amount/chance attribute (#254)

Fix to correct the item tags of mana leech and life leech items attributes. Extra: added attributes missing on some soulwar weapons.
opentibiabr · Mar 9, 2022 · 56ddcf2 · 56ddcf2
1 parent 990da24
commit 56ddcf2
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 22 deletions.
diff --git a/data/items/items.xml b/data/items/items.xml
@@ -47315,6 +47315,8 @@
 	<item id="30399" name="cobra wand">
 		<attribute key="weaponType" value="wand"/>
 		<attribute key="magicpoints" value="2"/>
+		<attribute key="criticalhitdamage" value="35"/>
+		<attribute key="criticalhitchance" value="10"/>
 		<attribute key="range" value="4"/>
 		<attribute key="weight" value="1900"/>
 		<attribute key="upgradeclassification" value="4"/>
@@ -47327,6 +47329,8 @@
 	<item id="30400" name="cobra rod">
 		<attribute key="weaponType" value="wand"/>
 		<attribute key="magicpoints" value="2"/>
+		<attribute key="lifeleechamount" value="18"/>
+		<attribute key="lifeleechchance" value="100"/>
 		<attribute key="range" value="5"/>
 		<attribute key="weight" value="2500"/>
 		<attribute key="upgradeclassification" value="4"/>
@@ -52162,10 +52166,10 @@
 		<attribute key="weaponType" value="sword"/>
 		<attribute key="loottype" value="sword"/>
 		<attribute key="elementdeath" value="45"/>
-		<attribute key="skillmanaamount" value="3"/>
-		<attribute key="skillmanachance" value="100"/>
-		<attribute key="skilllifeamount" value="5"/>
-		<attribute key="skilllifechance" value="100"/>
+		<attribute key="manaleechamount" value="3"/>
+		<attribute key="manaleechchance" value="100"/>
+		<attribute key="lifeleechamount" value="5"/>
+		<attribute key="lifeleechchance" value="100"/>
 		<attribute key="skillsword" value="5"/>
 		<attribute key="attack" value="7"/>
 		<attribute key="extradef" value="3"/>
@@ -52204,10 +52208,10 @@
 		<attribute key="weaponType" value="axe"/>
 		<attribute key="loottype" value="axe"/>
 		<attribute key="elementdeath" value="45"/>
-		<attribute key="skillmanaamount" value="3"/>
-		<attribute key="skillmanachance" value="100"/>
-		<attribute key="skilllifeamount" value="5"/>
-		<attribute key="skilllifechance" value="100"/>
+		<attribute key="manaleechamount" value="3"/>
+		<attribute key="manaleechchance" value="100"/>
+		<attribute key="lifeleechamount" value="5"/>
+		<attribute key="lifeleechchance" value="100"/>
 		<attribute key="skillaxe" value="5"/>
 		<attribute key="attack" value="7"/>
 		<attribute key="extradef" value="3"/>
@@ -52246,10 +52250,10 @@
 		<attribute key="weaponType" value="club"/>
 		<attribute key="loottype" value="club"/>
 		<attribute key="elementice" value="46"/>
-		<attribute key="skillmanaamount" value="3"/>
-		<attribute key="skillmanachance" value="100"/>
-		<attribute key="skilllifeamount" value="5"/>
-		<attribute key="skilllifechance" value="100"/>
+		<attribute key="manaleechamount" value="3"/>
+		<attribute key="manaleechchance" value="100"/>
+		<attribute key="lifeleechamount" value="5"/>
+		<attribute key="lifeleechchance" value="100"/>
 		<attribute key="skillclub" value="5"/>
 		<attribute key="attack" value="6"/>
 		<attribute key="extradef" value="3"/>
@@ -52311,6 +52315,8 @@
 		<attribute key="loottype" value="distance"/>
 		<attribute key="absorbpercentdeath" value="7"/>
 		<attribute key="skilldist" value="4"/>
+		<attribute key="criticalhitdamage" value="10"/>
+		<attribute key="criticalhitchance" value="10"/>
 		<attribute key="hitchance" value="6"/>
 		<attribute key="range" value="6"/>
 		<attribute key="attack" value="9"/>
@@ -52347,10 +52353,10 @@
 		<attribute key="loottype" value="wand"/>
 		<attribute key="absorbpercentice" value="12"/>
 		<attribute key="magicpoints" value="5"/>
-		<attribute key="skillmanaamount" value="3"/>
-		<attribute key="skillmanachance" value="100"/>
-		<attribute key="skilllifeamount" value="5"/>
-		<attribute key="skilllifechance" value="100"/>
+		<attribute key="manaleechamount" value="3"/>
+		<attribute key="manaleechchance" value="100"/>
+		<attribute key="lifeleechamount" value="5"/>
+		<attribute key="lifeleechchance" value="100"/>
 		<attribute key="range" value="6"/>
 		<attribute key="weight" value="2500"/>
 		<attribute key="upgradeclassification" value="4"/>
@@ -52728,8 +52734,8 @@
 		<attribute key="shootType" value="smallice"/>
 		<attribute key="loottype" value="wand"/>
 		<attribute key="magicpoints" value="2"/>
-		<attribute key="skilllifeamount" value="18"/>
-		<attribute key="skilllifechance" value="100"/>
+		<attribute key="lifeleechamount" value="18"/>
+		<attribute key="lifeleechchance" value="100"/>
 		<attribute key="range" value="4"/>
 		<attribute key="weight" value="2100"/>
 		<attribute key="upgradeclassification" value="4"/>

diff --git a/src/items/functions/item_parse.hpp b/src/items/functions/item_parse.hpp
@@ -91,10 +91,10 @@ const std::unordered_map<std::string, ItemParseAttributes_t> ItemParseAttributes
 	{"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},
+	{"lifeleechchance", ITEM_PARSE_LIFELEECHCHANCE},
+	{"lifeleechamount", ITEM_PARSE_LIFELEECHAMOUNT},
+	{"manaleechchance", ITEM_PARSE_MANALEECHCHANCE},
+	{"manaleechamount", ITEM_PARSE_MANALEECHAMOUNT},
 	{"maxhitpoints", ITEM_PARSE_MAXHITPOINTS},
 	{"maxhitpointspercent", ITEM_PARSE_MAXHITPOINTSPERCENT},
 	{"maxmanapoints", ITEM_PARSE_MAXMANAPOINTS},