From 5727b7dac5ad9f5a40af6000ad0c2554e312e677 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 15 Oct 2019 09:57:36 +0000
Subject: [PATCH] Addition of Giran and Aden shop Kamael weapons. Contributed
 by Minzee.

---
 .../dist/game/data/buylists/3008401.xml       | 16 +++++++---
 .../dist/game/data/buylists/3008501.xml       |  2 +-
 .../dist/game/data/buylists/3083701.xml       | 12 +++++--
 .../dist/game/data/multisell/3009701.xml      | 32 +++++++++++++++++++
 .../game/data/stats/items/91800-91899.xml     |  4 +--
 5 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/buylists/3008401.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/buylists/3008401.xml
index 600e6eb28c..c061fd3e92 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/buylists/3008401.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/buylists/3008401.xml
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
 	<npcs>
-		<npc>30084</npc> <!--Warrior Weapon Merchant Graham -->
+		<npc>30084</npc> <!-- Graham -->
 	</npcs>
 	<item id="2" price="149600" /> <!-- Long Sword -->
 	<item id="218" price="149600" /> <!-- Throwing Knife -->
 	<item id="272" price="149600" /> <!-- Forest Bow -->
 	<item id="15" price="149600" /> <!-- Short Spear -->
 	<item id="256" price="149600" /> <!-- Cestus -->
-	<item id="68" price="268400" /> <!-- Falcion -->
+	<item id="68" price="268400" /> <!-- Falchion -->
 	<item id="219" price="268400" /> <!-- Sword Breaker -->
 	<item id="273" price="268400" /> <!-- Compound Bow -->
 	<item id="155" price="268400" /> <!-- Flanged Mace -->
 	<item id="87" price="268400" /> <!-- Iron Hammer -->
 	<item id="16" price="268400" /> <!-- Great Spear -->
 	<item id="257" price="268400" /> <!-- Viper Fang -->
-	<item id="5284" price="268400" /> <!-- Zweinhandler -->
+	<item id="5284" price="268400" /> <!-- Zweihander -->
+	<item id="91891" price="268400" /> <!-- Warrior's Rapier -->
+	<item id="91877" price="268400" /> <!-- Ancient Warrior's Sword -->
 	<item id="123" price="449900" /> <!-- Saber -->
 	<item id="7880" price="449900" /> <!-- Steel Sword -->
 	<item id="220" price="449900" /> <!-- Crafted Dagger -->
@@ -27,6 +29,7 @@
 	<item id="291" price="449900" /> <!-- Trident -->
 	<item id="258" price="449900" /> <!-- Bagh-Nakh -->
 	<item id="5285" price="449900" /> <!-- Heavy Sword -->
+	<item id="91881" price="449900" /> <!-- Talwar -->
 	<item id="69" price="708400" /> <!-- Bastard Sword -->
 	<item id="126" price="708400" /> <!-- Artisan's Sword -->
 	<item id="222" price="708400" /> <!-- Poniard Dagger -->
@@ -37,6 +40,8 @@
 	<item id="292" price="708400" /> <!-- Pike -->
 	<item id="295" price="708400" /> <!-- Dwarven Trident -->
 	<item id="259" price="708400" /> <!-- Single-Edged Jamadhr -->
+	<item id="91895" price="708400" /> <!-- Fleuret -->
+	<item id="91880" price="708400" /> <!-- Military Talwar -->
 	<item id="124" price="1063700" /> <!-- Two-Handed Sword -->
 	<item id="127" price="1063700" /> <!-- Crimson Sword -->
 	<item id="130" price="1063700" /> <!-- Elven Sword -->
@@ -45,7 +50,9 @@
 	<item id="157" price="1063700" /> <!-- Spiked Club -->
 	<item id="293" price="1063700" /> <!-- War Hammer -->
 	<item id="296" price="1063700" /> <!-- Dwarven Pike -->
-	<item id="260" price="1540000" /> <!-- Triple-Edged Jamadhr -->
+	<item id="260" price="1063700" /> <!-- Triple-Edged Jamadhr -->
+	<item id="91894" price="1063700" /> <!-- Estoc -->
+	<item id="91879" price="1063700" /> <!-- Field Sword -->
 	<item id="129" price="1540000" /> <!-- Sword of Revolution -->
 	<item id="224" price="1540000" /> <!-- Maingauche -->
 	<item id="1660" price="1540000" /> <!-- Cursed Maingauche -->
@@ -58,4 +65,5 @@
 	<item id="88" price="1540000" /> <!-- Morning Star -->
 	<item id="93" price="1540000" /> <!-- Winged Spear -->
 	<item id="261" price="1540000" /> <!-- Bich'Kwa -->
+	<item id="91893" price="1540000" /> <!-- Épée -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/buylists/3008501.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/buylists/3008501.xml
index 78175531f6..726dfdc0ea 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/buylists/3008501.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/buylists/3008501.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
 	<npcs>
-		<npc>30085</npc> <!-- Stany -->
+		<npc>30085</npc> <!-- Stanford -->
 	</npcs>
 	<item id="176" price="149600" /> <!-- Apprentice's Staff -->
 	<item id="310" price="149600" /> <!-- Relic of the Saints -->
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/buylists/3083701.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/buylists/3083701.xml
index ec0400b441..1b1cd14fe8 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/buylists/3083701.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/buylists/3083701.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
 	<npcs>
-		<npc>30837</npc> <!--Woodrow -->
+		<npc>30837</npc> <!-- Woodrow -->
 	</npcs>
-	<item id="2" price="490800" /> <!-- Long Sword -->
+	<item id="2" price="163200" /> <!-- Long Sword -->
 	<item id="218" price="163200" /> <!-- Throwing Knife -->
 	<item id="272" price="163200" /> <!-- Forest Bow -->
 	<item id="15" price="163200" /> <!-- Short Spear -->
@@ -16,6 +16,8 @@
 	<item id="16" price="292800" /> <!-- Great Spear -->
 	<item id="257" price="292800" /> <!-- Viper Fang -->
 	<item id="29226" price="292800" /> <!-- Zweihander -->
+	<item id="91891" price="292800" /> <!-- Warrior's Rapier -->
+	<item id="91877" price="292800" /> <!-- Ancient Warrior's Sword -->
 	<item id="123" price="490800" /> <!-- Saber -->
 	<item id="7880" price="490800" /> <!-- Steel Sword -->
 	<item id="220" price="490800" /> <!-- Crafted Dagger -->
@@ -27,6 +29,7 @@
 	<item id="291" price="490800" /> <!-- Trident -->
 	<item id="258" price="490800" /> <!-- Bagh-Nakh -->
 	<item id="5285" price="490800" /> <!-- Heavy Sword -->
+	<item id="91881" price="490800" /> <!-- Talwar -->
 	<item id="69" price="772800" /> <!-- Bastard Sword -->
 	<item id="126" price="772800" /> <!-- Artisan's Sword -->
 	<item id="222" price="772800" /> <!-- Poniard Dagger -->
@@ -37,6 +40,8 @@
 	<item id="292" price="772800" /> <!-- Pike -->
 	<item id="295" price="772800" /> <!-- Dwarven Trident -->
 	<item id="259" price="772800" /> <!-- Single-Edged Jamadhr -->
+	<item id="91895" price="772800" /> <!-- Fleuret -->
+	<item id="91880" price="772800" /> <!-- Military Talwar -->
 	<item id="124" price="1160400" /> <!-- Two-handed Sword -->
 	<item id="127" price="1160400" /> <!-- Crimson Sword -->
 	<item id="130" price="1160400" /> <!-- Elven Sword -->
@@ -46,6 +51,8 @@
 	<item id="293" price="1160400" /> <!-- War Hammer -->
 	<item id="296" price="1160400" /> <!-- Dwarven Pike -->
 	<item id="260" price="1160400" /> <!-- Triple-Edged Jamadhr -->
+	<item id="91894" price="1160400" /> <!-- Estoc -->
+	<item id="91879" price="1160400" /> <!-- Field Sword -->
 	<item id="129" price="1680000" /> <!-- Sword of Revolution -->
 	<item id="224" price="1680000" /> <!-- Maingauche -->
 	<item id="1660" price="1680000" /> <!-- Cursed Maingauche -->
@@ -58,4 +65,5 @@
 	<item id="88" price="1680000" /> <!-- Mornign Star -->
 	<item id="93" price="1680000" /> <!-- Winged Spear -->
 	<item id="261" price="1680000" /> <!-- Bich'Hwa -->
+	<item id="91893" price="1680000" /> <!-- Épée -->
 </list>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/multisell/3009701.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/multisell/3009701.xml
index 3ae9aa2bd7..f12b63ea13 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/multisell/3009701.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/multisell/3009701.xml
@@ -131,4 +131,36 @@
 		<!-- Poleaxe -->
 		<production count="1" id="95" />
 	</item>
+	<item>
+		<!-- Crystal (C-Grade) -->
+		<ingredient count="573" id="1459" />
+		<!-- Crystal (D-Grade) -->
+		<ingredient count="2865" id="1458" />
+		<!-- Schlager -->
+		<production count="1" id="91884" />
+	</item>
+	<item>
+		<!-- Crystal (C-Grade) -->
+		<ingredient count="1075" id="1459" />
+		<!-- Crystal (D-Grade) -->
+		<ingredient count="5375" id="1458" />
+		<!-- Immortal Edge -->
+		<production count="1" id="91883" />
+	</item>
+	<item>
+		<!-- Crystal (C-Grade) -->
+		<ingredient count="573" id="1459" />
+		<!-- Crystal (D-Grade) -->
+		<ingredient count="2865" id="1458" />
+		<!-- Soldat Estoc -->
+		<production count="1" id="91899" />
+	</item>
+	<item>
+		<!-- Crystal (C-Grade) -->
+		<ingredient count="1075" id="1459" />
+		<!-- Crystal (D-Grade) -->
+		<ingredient count="5375" id="1458" />
+		<!-- Blinzlasher -->
+		<production count="1" id="91897" />
+	</item>
 </list>
\ No newline at end of file
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 b8ab1ea097..b3879a5f13 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
@@ -1262,7 +1262,7 @@
 			<stat type="randomDamage">20</stat>
 		</stats>
 	</item>
-	<item id="91892" name="Grand ?p?e" type="Weapon">
+	<item id="91892" name="Grand Épée" type="Weapon">
 		<set name="icon" val="icon.weapon_rapier_i00" />
 		<set name="default_action" val="EQUIP" />
 		<set name="immediate_effect" val="true" />
@@ -1280,7 +1280,7 @@
 			<stat type="randomDamage">20</stat>
 		</stats>
 	</item>
-	<item id="91893" name="?p?e" type="Weapon">
+	<item id="91893" name="Épée" type="Weapon">
 		<set name="icon" val="icon.weapon_rapier_i00" />
 		<set name="default_action" val="EQUIP" />
 		<set name="immediate_effect" val="true" />