From c7cb4dea5f25f7f4722bb29615476dbdd99547aa Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 24 Dec 2021 06:53:57 +0000
Subject: [PATCH] Implementation of Honor Coin Pouch (95672). Thanks to
 nnlyy520 and jorfan.

---
 .../handlers/itemhandlers/ExtractableItems.java   | 15 ++++++++++++++-
 .../dist/game/data/stats/items/95600-95699.xml    |  5 +++++
 .../dist/game/data/xsd/items.xsd                  |  2 +-
 .../handlers/itemhandlers/ExtractableItems.java   | 15 ++++++++++++++-
 .../dist/game/data/stats/items/95600-95699.xml    |  5 +++++
 .../dist/game/data/xsd/items.xsd                  |  2 +-
 6 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java
index 6ed099eccf..a535d9c4a1 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java
@@ -117,6 +117,13 @@ public class ExtractableItems implements IItemHandler
 							primeReward = true;
 							continue;
 						}
+						if (expi.getId() == -700) // Honor Coins
+						{
+							player.setHonorCoins(player.getHonorCoins() + (int) createItemAmount);
+							player.sendMessage("You have obtained " + (createItemAmount) + " Honor Coin.");
+							primeReward = true;
+							continue;
+						}
 						
 						if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1))
 						{
@@ -172,7 +179,13 @@ public class ExtractableItems implements IItemHandler
 						primeReward = true;
 						continue;
 					}
-					
+					if (expi.getId() == -700) // Honor Coins
+					{
+						player.setHonorCoins(player.getHonorCoins() + (int) createItemAmount);
+						player.sendMessage("You have obtained " + (createItemAmount) + " Honor Points!");
+						primeReward = true;
+						continue;
+					}
 					if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1))
 					{
 						final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/95600-95699.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/95600-95699.xml
index c3656f22df..ff0bc212b7 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/95600-95699.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/items/95600-95699.xml
@@ -1001,9 +1001,14 @@
 		<set name="icon" val="icon.bm_dragon_present_poket" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="FISH" />
+		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="-700" min="5" max="5" chance="100" /> <!-- Honor Coin -->
+		</capsuled_items>
 	</item>
 	<item id="95673" name="Sylph's Blessing Pack (Time-limited)" type="EtcItem">
 		<!-- Double-click to obtain a random item from the list or one of various items. -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/items.xsd b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/items.xsd
index c6c1d36150..f3c8d0febe 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/items.xsd
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/items.xsd
@@ -84,7 +84,7 @@
 										<xs:sequence>
 											<xs:element maxOccurs="unbounded" name="item">
 												<xs:complexType>
-													<xs:attribute name="id" type="xs:unsignedInt" use="required" />
+													<xs:attribute name="id" type="xs:integer" use="required" />
 													<xs:attribute name="min" type="xs:unsignedLong" use="required" />
 													<xs:attribute name="max" type="xs:unsignedLong" use="required" />
 													<xs:attribute name="chance" type="xs:decimal" use="required" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java
index 6ed099eccf..a535d9c4a1 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java
@@ -117,6 +117,13 @@ public class ExtractableItems implements IItemHandler
 							primeReward = true;
 							continue;
 						}
+						if (expi.getId() == -700) // Honor Coins
+						{
+							player.setHonorCoins(player.getHonorCoins() + (int) createItemAmount);
+							player.sendMessage("You have obtained " + (createItemAmount) + " Honor Coin.");
+							primeReward = true;
+							continue;
+						}
 						
 						if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1))
 						{
@@ -172,7 +179,13 @@ public class ExtractableItems implements IItemHandler
 						primeReward = true;
 						continue;
 					}
-					
+					if (expi.getId() == -700) // Honor Coins
+					{
+						player.setHonorCoins(player.getHonorCoins() + (int) createItemAmount);
+						player.sendMessage("You have obtained " + (createItemAmount) + " Honor Points!");
+						primeReward = true;
+						continue;
+					}
 					if (ItemTable.getInstance().getTemplate(expi.getId()).isStackable() || (createItemAmount == 1))
 					{
 						final Item newItem = player.addItem("Extract", expi.getId(), createItemAmount, player, false);
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/items/95600-95699.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/items/95600-95699.xml
index c3656f22df..ff0bc212b7 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/items/95600-95699.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/items/95600-95699.xml
@@ -1001,9 +1001,14 @@
 		<set name="icon" val="icon.bm_dragon_present_poket" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="FISH" />
+		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="-700" min="5" max="5" chance="100" /> <!-- Honor Coin -->
+		</capsuled_items>
 	</item>
 	<item id="95673" name="Sylph's Blessing Pack (Time-limited)" type="EtcItem">
 		<!-- Double-click to obtain a random item from the list or one of various items. -->
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/xsd/items.xsd b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/xsd/items.xsd
index c6c1d36150..f3c8d0febe 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/xsd/items.xsd
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/xsd/items.xsd
@@ -84,7 +84,7 @@
 										<xs:sequence>
 											<xs:element maxOccurs="unbounded" name="item">
 												<xs:complexType>
-													<xs:attribute name="id" type="xs:unsignedInt" use="required" />
+													<xs:attribute name="id" type="xs:integer" use="required" />
 													<xs:attribute name="min" type="xs:unsignedLong" use="required" />
 													<xs:attribute name="max" type="xs:unsignedLong" use="required" />
 													<xs:attribute name="chance" type="xs:decimal" use="required" />