From e61dae88b1cfbb1cb6df5d9ff95869118160f497 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 18 Jan 2021 15:57:04 +0000
Subject: [PATCH] Kamael weapon adjustments. Contributed by AnsS.

---
 .../data/stats/augmentation/Variations.xml    | 27 +++++++++++++++++++
 .../game/data/stats/items/71800-71899.xml     | 10 ++++---
 .../game/data/stats/items/91800-91899.xml     |  1 -
 .../game/data/stats/items/71800-71899.xml     | 10 ++++---
 .../game/data/stats/items/91800-91899.xml     |  1 -
 5 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/augmentation/Variations.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/augmentation/Variations.xml
index 6affd48370..96cfd8da55 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/augmentation/Variations.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/augmentation/Variations.xml
@@ -210,6 +210,14 @@
 			<item id="187" /> <!-- Atuba Hammer -->
 			<item id="188" /> <!-- Ghost Staff -->
 			<item id="190" /> <!-- Atuba Mace -->
+			<item id="91878" /> <!-- Katzbalger -->
+			<item id="91879" /> <!-- Field Sword -->
+			<item id="91880" /> <!-- Military Talwar -->
+			<item id="91881" /> <!-- Talwar -->
+			<item id="91892" /> <!-- Grand Épée -->
+			<item id="91893" /> <!-- Épée-->
+			<item id="91894" /> <!-- Estoc -->
+			<item id="91895" /> <!-- Fleuret -->
 		</itemGroup>
 		<!-- Weapon C-Grade -->
 		<itemGroup id="2">
@@ -319,6 +327,13 @@
 			<item id="2574" /> <!-- Shamshir*Spirit Sword -->
 			<item id="2592" /> <!-- Spirit Sword*Raid Sword -->
 			<item id="2591" /> <!-- Spirit Sword*Spirit Sword -->
+			<item id="91882" /> <!-- Saber Tooth -->
+			<item id="91883" /> <!-- Immortal Edge -->
+			<item id="91884" /> <!-- Schlager -->
+			<item id="91896" /> <!-- Admiral's Estoc -->
+			<item id="91897" /> <!-- Blinzlasher -->
+			<item id="91898" /> <!-- Chevalier Rapier -->
+			<item id="91899" /> <!-- Soldat Estoc -->
 		</itemGroup>
 		<!-- Weapon B-Grade -->
 		<itemGroup id="3">
@@ -398,6 +413,10 @@
 			<item id="2624" /> <!-- Tsurugi*Tsurugi -->
 			<item id="2625" /> <!-- Tsurugi*Samurai Long Sword -->
 			<item id="2626" /> <!-- Samurai Long Sword*Samurai Long Sword -->
+			<item id="91885" /> <!-- Dismantler -->
+			<item id="91886" /> <!-- Innominate Victory -->
+			<item id="91900" /> <!-- Colichemarde -->
+			<item id="91901" /> <!-- Military Fleuret -->
 		</itemGroup>
 		<!-- Weapon A-Grade -->
 		<itemGroup id="4">
@@ -438,6 +457,12 @@
 			<item id="5705" /> <!-- Keshanberk*Damascus -->
 			<item id="5706" /> <!-- Damascus*Damascus -->
 			<item id="8938" /> <!-- Tallum Blade*Damascus -->
+			<item id="91887" /> <!-- Durendal -->
+			<item id="91888" /> <!-- Undertaker -->
+			<item id="91889" /> <!-- Divine Pain -->
+			<item id="91902" /> <!-- Éclair Bijou -->
+			<item id="91903" /> <!-- Lacerator -->
+			<item id="91904" /> <!-- White Lightning -->
 		</itemGroup>
 		<!-- Weapon S-Grade -->
 		<itemGroup id="5">
@@ -452,6 +477,8 @@
 			<item id="6579" /> <!-- Arcana Mace -->
 			<item id="6580" /> <!-- Tallum Blade*Dark Legion's Edge -->
 			<item id="7575" /> <!-- Draconic Bow -->
+			<item id="91890" /> <!-- Gram -->
+			<item id="91891" /> <!-- Warrior's Rapier -->
 		</itemGroup>
 	</itemGroups>
 	<fees>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/71800-71899.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/71800-71899.xml
index b29814d19f..85eb25bcd1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/71800-71899.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/71800-71899.xml
@@ -379,6 +379,8 @@
 		<!-- Available for 30 days. -->
 		<set name="icon" val="icon.weapon_soldat_estoc_i00" />
 		<set name="default_action" val="EQUIP" />
+		<set name="weapon_type" val="RAPIER" />
+		<set name="bodypart" val="rhand" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="C" />
 		<set name="material" val="STEEL" />
@@ -399,6 +401,8 @@
 	<item id="71838" name="Colichemarde" additionalName="15 days" type="Weapon">
 		<set name="icon" val="icon.weapon_colichemarde_i00" />
 		<set name="default_action" val="EQUIP" />
+		<set name="weapon_type" val="RAPIER" />
+		<set name="bodypart" val="rhand" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="B" />
 		<set name="material" val="STEEL" />
@@ -420,7 +424,7 @@
 		<!-- Available for 30 days. -->
 		<set name="icon" val="icon.weapon_tulwar_i00" />
 		<set name="default_action" val="EQUIP" />
-		<set name="weapon_type" val="DUALBLUNT" />
+		<set name="weapon_type" val="ANCIENTSWORD" />
 		<set name="bodypart" val="lrhand" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="D" />
@@ -444,7 +448,7 @@
 		<!-- Available for 30 days. -->
 		<set name="icon" val="icon.weapon_schlaeger_i00" />
 		<set name="default_action" val="EQUIP" />
-		<set name="weapon_type" val="DUALBLUNT" />
+		<set name="weapon_type" val="ANCIENTSWORD" />
 		<set name="bodypart" val="lrhand" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="C" />
@@ -467,7 +471,7 @@
 	<item id="71841" name="Dismantler" additionalName="15 days" type="Weapon">
 		<set name="icon" val="icon.weapon_dismantler_i00" />
 		<set name="default_action" val="EQUIP" />
-		<set name="weapon_type" val="DUALBLUNT" />
+		<set name="weapon_type" val="ANCIENTSWORD" />
 		<set name="bodypart" val="lrhand" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="B" />
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/91800-91899.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/91800-91899.xml
index 3fc6ceb0de..a5f6915c28 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/91800-91899.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/91800-91899.xml
@@ -1232,7 +1232,6 @@
 		<set name="bodypart" val="rhand" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
-		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="D" />
 		<set name="material" val="STEEL" />
 		<set name="weight" val="1300" />
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/71800-71899.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/71800-71899.xml
index aa6c8048ca..6861f4d50b 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/71800-71899.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/71800-71899.xml
@@ -388,6 +388,8 @@
 		<!-- Available for 30 days. -->
 		<set name="icon" val="icon.weapon_soldat_estoc_i00" />
 		<set name="default_action" val="EQUIP" />
+		<set name="weapon_type" val="RAPIER" />
+		<set name="bodypart" val="rhand" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="C" />
 		<set name="material" val="STEEL" />
@@ -407,6 +409,8 @@
 	<item id="71838" name="Colichemarde" additionalName="15 days" type="Weapon">
 		<set name="icon" val="icon.weapon_colichemarde_i00" />
 		<set name="default_action" val="EQUIP" />
+		<set name="weapon_type" val="RAPIER" />
+		<set name="bodypart" val="rhand" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="B" />
 		<set name="material" val="STEEL" />
@@ -427,7 +431,7 @@
 		<!-- Available for 30 days. -->
 		<set name="icon" val="icon.weapon_tulwar_i00" />
 		<set name="default_action" val="EQUIP" />
-		<set name="weapon_type" val="DUALBLUNT" />
+		<set name="weapon_type" val="ANCIENTSWORD" />
 		<set name="bodypart" val="lrhand" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="D" />
@@ -452,7 +456,7 @@
 		<!-- Available for 30 days. -->
 		<set name="icon" val="icon.weapon_schlaeger_i00" />
 		<set name="default_action" val="EQUIP" />
-		<set name="weapon_type" val="DUALBLUNT" />
+		<set name="weapon_type" val="ANCIENTSWORD" />
 		<set name="bodypart" val="lrhand" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="C" />
@@ -476,7 +480,7 @@
 	<item id="71841" name="Dismantler" additionalName="15 days" type="Weapon">
 		<set name="icon" val="icon.weapon_dismantler_i00" />
 		<set name="default_action" val="EQUIP" />
-		<set name="weapon_type" val="DUALBLUNT" />
+		<set name="weapon_type" val="ANCIENTSWORD" />
 		<set name="bodypart" val="lrhand" />
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="B" />
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91800-91899.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91800-91899.xml
index 1060c9e484..2fbef56878 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91800-91899.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91800-91899.xml
@@ -1251,7 +1251,6 @@
 		<set name="bodypart" val="rhand" />
 		<set name="soulshots" val="1" />
 		<set name="spiritshots" val="1" />
-		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="D" />
 		<set name="material" val="STEEL" />
 		<set name="weight" val="1300" />