From 9a58fbe21eddd5a1de37d5e149ea748d10488bf5 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 15 Apr 2021 03:15:59 +0000
Subject: [PATCH] Fixed game assistance weapon C grade. Contributed by
 manax182.

---
 .../dist/game/data/multisell/3247842.xml      | 85 +++++++++++++++++++
 .../others/GameAssistant/GameAssistant.java   | 16 ++--
 2 files changed, 95 insertions(+), 6 deletions(-)
 create mode 100644 L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247842.xml

diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247842.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247842.xml
new file mode 100644
index 0000000000..85e2008be6
--- /dev/null
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247842.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd">
+	<npcs>
+		<npc>-1</npc> <!-- Dimensional Merchant / Everywhere -->
+	</npcs>
+	<!-- Exchange Weapon C-Grade -->
+	<item>
+		<!-- Enchanted C-grade Weapon Coupon -->
+		<ingredient count="1" id="93498" />
+		<!-- +4 ~ +15 Weapon Pack - Samurai Long Sword -->
+		<production count="1" id="93436" />
+	</item>
+	<item>
+		<!-- Enchanted C-grade Weapon Coupon -->
+		<ingredient count="1" id="93498" />
+		<!-- +4 ~ +15 Weapon Pack - Demon's Staff -->
+		<production count="1" id="93437" />
+	</item>
+	<item>
+		<!-- Enchanted C-grade Weapon Coupon -->
+		<ingredient count="1" id="93498" />
+		<!-- +4 ~ +15 Weapon Pack - Ecliptic Axe -->
+		<production count="1" id="93438" />
+	</item>
+	<item>
+		<!-- Enchanted C-grade Weapon Coupon -->
+		<ingredient count="1" id="93498" />
+		<!-- +4 ~ +15 Weapon Pack - Crystal Dagger -->
+		<production count="1" id="93439" />
+	</item>
+	<item>
+		<!-- Enchanted C-grade Weapon Coupon -->
+		<ingredient count="1" id="93498" />
+		<!-- +4 ~ +15 Weapon Pack - Eminence Bow -->
+		<production count="1" id="93440" />
+	</item>
+	<item>
+		<!-- Enchanted C-grade Weapon Coupon -->
+		<ingredient count="1" id="93498" />
+		<!-- +4 ~ +15 Weapon Pack - Orcish Poleaxe -->
+		<production count="1" id="93441" />
+	</item>
+	<item>
+		<!-- Enchanted C-grade Weapon Coupon -->
+		<ingredient count="1" id="93498" />
+		<!-- +4 ~ +15 Weapon Pack - Katana*Katana -->
+		<production count="1" id="93442" />
+	</item>
+	<item>
+		<!-- Enchanted C-grade Weapon Coupon -->
+		<ingredient count="1" id="93498" />
+		<!-- +4 ~ +15 Weapon Pack - Yaksa Mace -->
+		<production count="1" id="93443" />
+	</item>
+	<item>
+		<!-- Enchanted C-grade Weapon Coupon -->
+		<ingredient count="1" id="93498" />
+		<!-- +4 ~ +15 Weapon Pack - Berserker Blade -->
+		<production count="1" id="93444" />
+	</item>
+	<item>
+		<!-- Enchanted C-grade Weapon Coupon -->
+		<ingredient count="1" id="93498" />
+		<!-- +4 ~ +15 Weapon Pack - Great Pata -->
+		<production count="1" id="93445" />
+	</item>
+	<item>
+		<!-- Enchanted C-grade Weapon Coupon -->
+		<ingredient count="1" id="93498" />
+		<!-- +4 ~ +15 Weapon Pack - Admiral's Estoc -->
+		<production count="1" id="93446" />
+	</item>
+	<item>
+		<!-- Enchanted C-grade Weapon Coupon -->
+		<ingredient count="1" id="93498" />
+		<!-- +4 ~ +15 Weapon Pack - Saber Tooth -->
+		<production count="1" id="93447" />
+	</item>
+	<item>
+		<!-- Enchanted C-grade Weapon Coupon -->
+		<ingredient count="1" id="93498" />
+		<!-- +4 ~ +15 Weapon Pack - Flint Pistols -->
+		<production count="1" id="95658" />
+	</item>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
index f3c817ee9d..c474aa27e1 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java
@@ -42,12 +42,12 @@ import ai.AbstractNpcAI;
 
 /**
  * Dimensional Merchant AI.
- * @author Mobius, quangnguyen
+ * @author Mobius, quangnguyen, manax
  */
 public class GameAssistant extends AbstractNpcAI
 {
 	// NPC
-	private static final int MERCHANT = 32478; // Dimensional Merchant
+	private static final int MERCHANT = 32478;
 	// Items
 	private static final int BLACK_SAYHA_CLOAK = 91210;
 	private static final int WHITE_SAYHA_CLOAK = 91211;
@@ -56,10 +56,8 @@ public class GameAssistant extends AbstractNpcAI
 	private static final int SAYHA_CLOAK_COUPON = 91227;
 	// Multisells
 	private static final int ATTENDANCE_REWARD_MULTISELL = 3247801;
-	//
 	private static final int EX_BOSS_WEAPON_SHOP = 3247813;
 	private static final int EX_LA_VIE_EN_ROSE = 3247841;
-	//
 	private static final int EX_HEAVY_A_GRADE = 3247821;
 	private static final int EX_LIGHT_A_GRADE = 3247822;
 	private static final int EX_ROBE_A_GRADE = 3247823;
@@ -70,6 +68,7 @@ public class GameAssistant extends AbstractNpcAI
 	private static final int EX_ROBE_B_GRADE = 3247828;
 	private static final int EX_WEAPON_B_GRADE = 3247829;
 	private static final int EX_WEAPON_7_B_GRADE = 3247840;
+	private static final int EX_WEAPON_C_GRADE = 3247842;
 	private static final int EX_ARMOR_C_GRADE = 3247830;
 	private static final int EX_ARMOR_4_C_GRADE = 3247831;
 	private static final int EX_AGATHION_SPIRIT = 3247835;
@@ -193,13 +192,13 @@ public class GameAssistant extends AbstractNpcAI
 				player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/armors.html")));
 				break;
 			}
-
+			
 			case "Chat_Agathions":
 			{
 				player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/agathions.html")));
 				break;
 			}
-
+			
 			case "Chat_Soulshots":
 			{
 				player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/soulshots.html")));
@@ -288,6 +287,11 @@ public class GameAssistant extends AbstractNpcAI
 				MultisellData.getInstance().separateAndSend(EX_WEAPON_7_B_GRADE, player, null, false);
 				break;
 			}
+			case "Ex_WeaponCgrade":
+			{
+				MultisellData.getInstance().separateAndSend(EX_WEAPON_C_GRADE, player, null, false);
+				break;
+			}
 			case "Ex_ArmorCgrade":
 			{
 				MultisellData.getInstance().separateAndSend(EX_ARMOR_C_GRADE, player, null, false);