From 469bdf0c9e9c430300ce1a4792ab656851df4cc6 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 21 Dec 2017 05:06:54 +0000
Subject: [PATCH] Various fixes. Contributed by gamelike85.

---
 .../Q10793_SaveTheSouls.java                  |  2 +-
 .../game/data/stats/items/46000-46099.xml     | 14 ++++++++++
 .../game/data/stats/items/47300-47399.xml     | 28 +++++++++++++++++++
 .../game/data/stats/skills/30000-30099.xml    |  1 -
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
index 9f8d696c86..b97fd4db7d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java
@@ -150,7 +150,7 @@ public final class Q10793_SaveTheSouls extends Quest
 		{
 			int count = qs.getInt(KILL_COUNT_VAR);
 			qs.set(KILL_COUNT_VAR, ++count);
-			if (count >= 50)
+			if (count >= 200)
 			{
 				qs.setCond(2, true);
 			}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/46000-46099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/46000-46099.xml
index de901812fe..ec561cd27a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/46000-46099.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/46000-46099.xml
@@ -1038,20 +1038,34 @@
 	<item id="46082" name="Mysterious Soulshot (R-grade)" type="EtcItem">
 		<!-- The power of a spirit is bestowed upon a weapon (R-grade), temporarily inflicting a powerful attack on the enemy. -->
 		<set name="icon" val="icon.soulshot_r_i00" />
+		<set name="default_action" val="SOULSHOT" />
 		<set name="price" val="380" />
 		<set name="is_sellable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="crystal_type" val="R" />
+		<set name="handler" val="SoulShots" />
 		<set name="etcitem_type" val="SOULSHOT" />
 		<set name="is_stackable" val="true" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="9193" level="1" /> <!-- Soulshot (R-grade) -->
+		</skills>
 	</item>
 	<item id="46083" name="Mysterious Blessed Spiritshot (R-grade)" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon (R-grade), temporarily increasing its magic significantly. -->
 		<set name="icon" val="icon.blessed_spiritshot_r_i00" />
+		<set name="default_action" val="SPIRITSHOT" />
 		<set name="price" val="1100" />
 		<set name="is_sellable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="crystal_type" val="R" />
+		<set name="handler" val="BlessedSpiritShot" />
 		<set name="etcitem_type" val="SOULSHOT" />
 		<set name="is_stackable" val="true" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="9195" level="1" /> <!-- Blessed Spiritshot (R-grade) -->
+		</skills>
 	</item>
 	<item id="46084" name="Player Commendation Special Bait" additionalName="PC-exclusive" type="EtcItem">
 		<!-- Bait that can no longer be used. Can be exchanged through Village Fishing Guild Members for a new PC Cafe Bait Exchange. -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47300-47399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47300-47399.xml
index aee7e59770..d9774e3261 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47300-47399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47300-47399.xml
@@ -853,6 +853,14 @@
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="37667" min="1" max="1" chance="100" />
+			<item id="37668" min="1" max="1" chance="100" />
+			<item id="37670" min="1" max="1" chance="100" />
+			<item id="37669" min="1" max="1" chance="100" />
+		</capsuled_items>
 	</item>
 	<item id="47354" name="Emperor Shunaiman's Weapon Set Pack" type="EtcItem">
 		<!-- Double click to obtain Emperor Shunaiman's weapons. -->
@@ -864,6 +872,24 @@
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="46693" min="1" max="1" chance="100" />
+			<item id="46694" min="1" max="1" chance="100" />
+			<item id="46695" min="1" max="1" chance="100" />
+			<item id="46696" min="1" max="1" chance="100" />
+			<item id="46697" min="1" max="1" chance="100" />
+			<item id="46698" min="1" max="1" chance="100" />
+			<item id="46699" min="1" max="1" chance="100" />
+			<item id="46700" min="1" max="1" chance="100" />
+			<item id="46701" min="1" max="1" chance="100" />
+			<item id="46702" min="1" max="1" chance="100" />
+			<item id="46703" min="1" max="1" chance="100" />
+			<item id="46704" min="1" max="1" chance="100" />
+			<item id="46705" min="1" max="1" chance="100" />
+			<item id="46706" min="1" max="1" chance="100" />
+		</capsuled_items>
 	</item>
 	<item id="47355" name="Superion Support Box" type="EtcItem">
 		<!-- Double click to obtain Emperor Shunaiman's Weapon Set Pack x1, +8 Bloody Eternal Pack x1, 2,000,000,000 Adena, Rare Accessory Pack x1, Talisman - Longing x1, Enhanced Tauti's Bracelet x1, Refined Romantic Chapeau containing the GM's Blessing x3, Old Elemental Shirt x1, Nurka's Belt x1, Lv. 5 Legendary Dye Pack x1, Mysterious No-grade Soulshot x20,000, and Mysterious Blessed No-grade Spiritshot x20,000. -->
@@ -875,6 +901,8 @@
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ExtractableItems" />
 	</item>
 	<item id="47356" name="Basic Supply Box" additionalName="Blackbird Clan" type="EtcItem">
 		<!-- A basic supply box received in exchange for helping the Blackbird Clan with their mission in the Phantasmal Ridge's Magic Circle area. Double click to view the item. -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml
index ee1914afc0..738940c52f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/30000-30099.xml
@@ -755,7 +755,6 @@
 			<value level="5">20000</value>
 		</reuseDelay>
 		<isMagic>1</isMagic>
-		<withoutAction>true</withoutAction>
 		<conditions>
 			<condition name="EquipWeapon">
 				<weaponType>