diff --git a/trunk/dist/game/data/stats/items/22200-22299.xml b/trunk/dist/game/data/stats/items/22200-22299.xml
index d8c4a9c931..e782bb520e 100644
--- a/trunk/dist/game/data/stats/items/22200-22299.xml
+++ b/trunk/dist/game/data/stats/items/22200-22299.xml
@@ -398,13 +398,17 @@
 	<item id="22231" name="Mysterious Blessed Spiritshot (S-grade)" additionalName="Event" type="EtcItem">
 		<!-- High-level spirit light is infused into a weapon, instantly and greatly increasing its M. Atk. Can be used on S-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_gold_i01" />
+		<set name="crystal_type" val="S" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2164-1" /> <!-- Blessed Spiritshot (S-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="22232" name="Mysterious Soulshot Pack (S-grade)" additionalName="Event" type="EtcItem">
@@ -541,52 +545,68 @@
 		<!-- The power of a spirit is bestowed upon a weapon, momentarily increasing its P. Atk. significantly. Can be used with a C-grade weapon. -->
 		<set name="icon" val="icon.bm_spirit_bullet_green" />
 		<set name="commissionItemType" val="SOULSHOT" />
+		<set name="crystal_type" val="C" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_freightable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2151-1" /> <!-- Soulshot (C-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="22245" name="Mysterious Soulshot (B-grade)" type="EtcItem">
 		<!-- The power of a spirit is bestowed upon a weapon, momentarily increasing its P. Atk. significantly. Can be used with a B-grade weapon. -->
 		<set name="icon" val="icon.bm_spirit_bullet_red" />
 		<set name="commissionItemType" val="SOULSHOT" />
+		<set name="crystal_type" val="B" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_freightable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2152-1" /> <!-- Soulshot (B-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="22246" name="Mysterious Soulshot (A-grade)" type="EtcItem">
 		<!-- The power of a spirit is bestowed upon a weapon, momentarily increasing its P. Atk. significantly. Can be used with an A-grade weapon. -->
 		<set name="icon" val="icon.bm_spirit_bullet_silver" />
 		<set name="commissionItemType" val="SOULSHOT" />
+		<set name="crystal_type" val="A" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_freightable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2153-1" /> <!-- Soulshot (A-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="22247" name="Mysterious Soulshot (S-grade)" type="EtcItem">
 		<!-- The power of a spirit is bestowed upon a weapon, momentarily increasing its P. Atk. significantly. Can be used with an S-grade weapon. -->
 		<set name="icon" val="icon.bm_spirit_bullet_gold" />
 		<set name="commissionItemType" val="SOULSHOT" />
+		<set name="crystal_type" val="S" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_freightable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2154-1" /> <!-- Soulshot (S-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="22248" name="Mysterious Soulshot Pack" type="EtcItem">
@@ -605,52 +625,68 @@
 		<!-- The power of a higher-level spirit is bestowed upon a weapon, momentarily increasing its M. Atk. significantly. Can be used with a C-grade weapon. -->
 		<set name="icon" val="icon.bm_spell_shot_green" />
 		<set name="commissionItemType" val="SPIRITSHOT" />
+		<set name="crystal_type" val="C" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_freightable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2161-1" /> <!-- Blessed Spiritshot (C-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="22250" name="Mysterious Blessed Spiritshot (B-grade)" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon, momentarily increasing its M. Atk. significantly. Can be used with a B-grade weapon. -->
 		<set name="icon" val="icon.bm_spell_shot_red" />
 		<set name="commissionItemType" val="SPIRITSHOT" />
+		<set name="crystal_type" val="B" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_freightable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2162-1" /> <!-- Blessed Spiritshot (B-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="22251" name="Mysterious Blessed Spiritshot (A-grade)" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon, momentarily increasing its M. Atk. significantly. Can be used with an A-grade weapon. -->
 		<set name="icon" val="icon.bm_spell_shot_silver" />
 		<set name="commissionItemType" val="SPIRITSHOT" />
+		<set name="crystal_type" val="A" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_freightable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2163-1" /> <!-- Blessed Spiritshot (A-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="22252" name="Mysterious Blessed Spiritshot (S-grade)" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon, momentarily increasing its M. Atk. significantly. Can be used with an S-grade weapon. -->
 		<set name="icon" val="icon.bm_spell_shot_gold" />
 		<set name="commissionItemType" val="SPIRITSHOT" />
+		<set name="crystal_type" val="S" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_freightable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2164-1" /> <!-- Blessed Spiritshot (S-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="22253" name="Mysterious Blessed Spiritshot Pack" type="EtcItem">
diff --git a/trunk/dist/game/data/stats/items/23500-23599.xml b/trunk/dist/game/data/stats/items/23500-23599.xml
index e8c6a995f8..c1457c3f3a 100644
--- a/trunk/dist/game/data/stats/items/23500-23599.xml
+++ b/trunk/dist/game/data/stats/items/23500-23599.xml
@@ -404,24 +404,32 @@
 		<!-- 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="commissionItemType" val="SOULSHOT" />
+		<set name="crystal_type" val="R" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="9194-1" /> <!-- Spiritshot (R-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="23553" name="Mysterious Spiritshot (R-grade)" additionalName="Event" 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="commissionItemType" val="SPIRITSHOT" />
+		<set name="crystal_type" val="R" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="SpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="9195-1" /> <!-- Blessed Spiritshot (R-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="23554" name="Ninja Top" additionalName="Modified Set Test" type="Armor">
diff --git a/trunk/dist/game/data/stats/items/33700-33799.xml b/trunk/dist/game/data/stats/items/33700-33799.xml
index d9e80ac676..a7732f17b4 100644
--- a/trunk/dist/game/data/stats/items/33700-33799.xml
+++ b/trunk/dist/game/data/stats/items/33700-33799.xml
@@ -1474,252 +1474,333 @@
 		<!-- Spirit light is bestowed on the weapon to temporarily inflict a powerful attack on the enemy. Can be used on no-grade weapons. -->
 		<set name="icon" val="icon.etc_spirit_bullet_white_i00" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2039-1" /> <!-- Soulshot (No-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33775" name="Soulshot (D-grade)" additionalName="Event" type="EtcItem">
 		<!-- Spirit light is bestowed on the weapon to temporarily inflict a powerful attack on the enemy. Can be used on D-grade weapons. -->
 		<set name="icon" val="icon.etc_spirit_bullet_blue_i00" />
+		<set name="crystal_type" val="D" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2150-1" /> <!-- Soulshot (D-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33776" name="Soulshot (C-grade)" additionalName="Event" type="EtcItem">
 		<!-- Spirit light is bestowed on the weapon to temporarily inflict a powerful attack on the enemy. Can be used on C-grade weapons. -->
 		<set name="icon" val="icon.etc_spirit_bullet_green_i00" />
+		<set name="crystal_type" val="C" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2151-1" /> <!-- Soulshot (C-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33777" name="Soulshot (B-grade)" additionalName="Event" type="EtcItem">
 		<!-- Spirit light is bestowed on the weapon to temporarily inflict a powerful attack on the enemy. Can be used on B-grade weapons. -->
 		<set name="icon" val="icon.etc_spirit_bullet_red_i00" />
+		<set name="crystal_type" val="B" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2152-1" /> <!-- Soulshot (B-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33778" name="Soulshot (A-grade)" additionalName="Event" type="EtcItem">
 		<!-- Spirit light is bestowed on the weapon to temporarily inflict a powerful attack on the enemy. Can be used on A-grade weapons. -->
 		<set name="icon" val="icon.etc_spirit_bullet_silver_i00" />
+		<set name="crystal_type" val="A" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2153-1" /> <!-- Soulshot (A-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33779" name="Soulshot (S-grade)" additionalName="Event" type="EtcItem">
 		<!-- Spirit light is bestowed on the weapon to temporarily inflict a powerful attack on the enemy. Can be used on S-grade weapons. -->
 		<set name="icon" val="icon.etc_spirit_bullet_gold_i00" />
+		<set name="crystal_type" val="S" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2154-1" /> <!-- Soulshot (S-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33780" name="Soulshot (R-grade)" additionalName="Event" type="EtcItem">
 		<!-- Spirit light is bestowed on the weapon to temporarily inflict a powerful attack on the enemy. Can be used on R-grade weapons. -->
 		<set name="icon" val="icon.soulshot_r_i00" />
+		<set name="crystal_type" val="R" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="9193-1" /> <!-- Soulshot (R-grade) -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33781" name="Spiritshot (No-grade)" additionalName="Event" type="EtcItem">
 		<!-- Spirit light is bestowed on the weapon to temporarily strengthen M. Atk. Can be used on no-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_white_i00" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="SpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2047-1" /> <!-- Spiritshot (No-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33782" name="Spiritshot (D-grade)" additionalName="Event" type="EtcItem">
 		<!-- Spirit light is bestowed on the weapon to temporarily strengthen M. Atk. Can be used on D-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_blue_i00" />
+		<set name="crystal_type" val="D" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="SpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2155-1" /> <!-- Spiritshot (D-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33783" name="Spiritshot (C-grade)" additionalName="Event" type="EtcItem">
 		<!-- Spirit light is bestowed on the weapon to temporarily strengthen M. Atk. Can be used on C-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_green_i00" />
+		<set name="crystal_type" val="C" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="SpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2156-1" /> <!-- Spiritshot (C-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33784" name="Spiritshot (B-grade)" additionalName="Event" type="EtcItem">
 		<!-- Spirit light is bestowed on the weapon to temporarily strengthen M. Atk. Can be used on B-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_red_i00" />
+		<set name="crystal_type" val="B" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="SpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2157-1" /> <!-- Spiritshot (B-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33785" name="Spiritshot (A-grade)" additionalName="Event" type="EtcItem">
 		<!-- Spirit light is bestowed on the weapon to temporarily strengthen M. Atk. Can be used on A-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_silver_i00" />
+		<set name="crystal_type" val="A" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="SpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2158-1" /> <!-- Spiritshot (A-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33786" name="Spiritshot (S-grade)" additionalName="Event" type="EtcItem">
 		<!-- Spirit light is bestowed on the weapon to temporarily strengthen M. Atk. Can be used on S-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_gold_i00" />
+		<set name="crystal_type" val="S" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="SpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2159-1" /> <!-- Spiritshot (S-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33787" name="Spiritshot (R-grade)" additionalName="Event" type="EtcItem">
 		<!-- Spirit light is bestowed on the weapon to temporarily strengthen M. Atk. Can be used on R-grade weapons. -->
 		<set name="icon" val="icon.spiritshot_r_i00" />
+		<set name="crystal_type" val="R" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="SpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="9194-1" /> <!-- Spiritshot (R-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33788" name="Blessed Spiritshot (No-grade)" additionalName="Event" type="EtcItem">
 		<!-- Higher level spirit light is bestowed on the weapon to temporarily strengthen M. Atk. greatly. Can be used on no-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_white_i01" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2061-1" /> <!-- Blessed Spiritshot (No-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33789" name="Blessed Spiritshot (D-grade)" additionalName="Event" type="EtcItem">
 		<!-- Higher level spirit light is bestowed on the weapon to temporarily strengthen M. Atk. greatly. Can be used on D-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_blue_i01" />
+		<set name="crystal_type" val="D" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2160-1" /> <!-- Blessed Spiritshot (D-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33790" name="Blessed Spiritshot (C-grade)" additionalName="Event" type="EtcItem">
 		<!-- Higher level spirit light is bestowed on the weapon to temporarily strengthen M. Atk. greatly. Can be used on C-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_green_i01" />
+		<set name="crystal_type" val="C" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2161-1" /> <!-- Blessed Spiritshot (C-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33791" name="Blessed Spiritshot (B-grade)" additionalName="Event" type="EtcItem">
 		<!-- Higher level spirit light is bestowed on the weapon to temporarily strengthen M. Atk. greatly. Can be used on B-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_red_i01" />
+		<set name="crystal_type" val="B" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2162-1" /> <!-- Blessed Spiritshot (B-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33792" name="Blessed Spiritshot (A-grade)" additionalName="Event" type="EtcItem">
 		<!-- Higher level spirit light is bestowed on the weapon to temporarily strengthen M. Atk. greatly. Can be used on A-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_silver_i01" />
+		<set name="crystal_type" val="A" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2163-1" /> <!-- Blessed Spiritshot (A-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33793" name="Blessed Spiritshot (S-grade)" additionalName="Event" type="EtcItem">
 		<!-- Higher level spirit light is bestowed on the weapon to temporarily strengthen M. Atk. greatly. Can be used on S-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_gold_i01" />
+		<set name="crystal_type" val="S" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="2164-1" /> <!-- Blessed Spiritshot (S-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33794" name="Blessed Spiritshot (R-grade)" additionalName="Event" type="EtcItem">
 		<!-- Higher level spirit light is bestowed on the weapon to temporarily strengthen M. Atk. greatly. Can be used on R-grade weapons. -->
 		<set name="icon" val="icon.blessed_spiritshot_r_i00" />
+		<set name="crystal_type" val="R" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="9195-1" /> <!-- Blessed Spiritshot (R-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="33795" name="Returning Hero's Vitality Replenishing Juice 3-unit Pack" additionalName="Event" type="EtcItem">
diff --git a/trunk/dist/game/data/stats/items/34600-34699.xml b/trunk/dist/game/data/stats/items/34600-34699.xml
index 8addd1bc95..6461561304 100644
--- a/trunk/dist/game/data/stats/items/34600-34699.xml
+++ b/trunk/dist/game/data/stats/items/34600-34699.xml
@@ -42,53 +42,76 @@
 		<set name="icon" val="icon.etc_spirit_bullet_white_i00" />
 		<set name="commissionItemType" val="SOULSHOT" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="item_skill" val="2039-1" /> <!-- Soulshot (No-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="34604" name="Mysterious Soulshot (D-grade)" additionalName="Event" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon, temporarily increasing power of attack. Used with a D-grade weapon. -->
 		<set name="icon" val="icon.etc_spirit_bullet_blue_i00" />
 		<set name="commissionItemType" val="SOULSHOT" />
+		<set name="crystal_type" val="D" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="item_skill" val="2150-1" /> <!-- Soulshot (D-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="34605" name="Mysterious Soulshot (C-grade)" additionalName="Event" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon, temporarily increasing power of attack. Used with a C-grade weapon. -->
 		<set name="icon" val="icon.etc_spirit_bullet_green_i00" />
 		<set name="commissionItemType" val="SOULSHOT" />
+		<set name="crystal_type" val="C" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="item_skill" val="2151-1" /> <!-- Soulshot (C-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="34606" name="Mysterious Soulshot (B-grade)" additionalName="Event" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon, temporarily increasing power of attack. Used with a B-grade weapon. -->
 		<set name="icon" val="icon.etc_spirit_bullet_red_i00" />
 		<set name="commissionItemType" val="SOULSHOT" />
+		<set name="crystal_type" val="B" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="item_skill" val="2152-1" /> <!-- Soulshot (B-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="34607" name="Mysterious Soulshot (A-grade)" additionalName="Event" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon, temporarily increasing power of attack. Used with an A-grade weapon. -->
 		<set name="icon" val="icon.etc_spirit_bullet_silver_i00" />
 		<set name="commissionItemType" val="SOULSHOT" />
+		<set name="crystal_type" val="A" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="item_skill" val="2153-1" /> <!-- Soulshot (A-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="34608" name="Mysterious Soulshot (S-grade)" additionalName="Event" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon, temporarily increasing power of attack. Used with an S-grade weapon. -->
 		<set name="icon" val="icon.etc_spirit_bullet_gold_i00" />
 		<set name="commissionItemType" val="SOULSHOT" />
+		<set name="crystal_type" val="S" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="item_skill" val="2154-1" /> <!-- Soulshot (S-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="34609" name="Mysterious Soulshot (R-grade)" additionalName="Event" type="EtcItem">
@@ -110,53 +133,76 @@
 		<set name="icon" val="icon.etc_spell_shot_white_i01" />
 		<set name="commissionItemType" val="SPIRITSHOT" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="item_skill" val="2061-1" /> <!-- Blessed Spiritshot (No-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="34611" name="Mysterious Blessed Spiritshot (D-grade)" additionalName="Event" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon, temporarily increasing its magic significantly. Used with D-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_blue_i01" />
 		<set name="commissionItemType" val="SPIRITSHOT" />
+		<set name="crystal_type" val="D" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="item_skill" val="2160-1" /> <!-- Blessed Spiritshot (D-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="34612" name="Mysterious Blessed Spiritshot (C-grade)" additionalName="Event" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon, temporarily increasing its magic significantly. Used with C-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_green_i01" />
 		<set name="commissionItemType" val="SPIRITSHOT" />
+		<set name="crystal_type" val="C" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="item_skill" val="2161-1" /> <!-- Blessed Spiritshot (C-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="34613" name="Mysterious Blessed Spiritshot (B-grade)" additionalName="Event" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon, temporarily increasing its magic significantly. Used with B-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_red_i01" />
 		<set name="commissionItemType" val="SPIRITSHOT" />
+		<set name="crystal_type" val="B" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="item_skill" val="2162-1" /> <!-- Blessed Spiritshot (B-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="34614" name="Mysterious Blessed Spiritshot (A-grade)" additionalName="Event" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon, temporarily increasing its magic significantly. Used with A-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_silver_i01" />
 		<set name="commissionItemType" val="SPIRITSHOT" />
+		<set name="crystal_type" val="A" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="item_skill" val="2163-1" /> <!-- Blessed Spiritshot (A-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="34615" name="Mysterious Blessed Spiritshot (S-grade)" additionalName="Event" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon, temporarily increasing its magic significantly. Used with S-grade weapons. -->
 		<set name="icon" val="icon.etc_spell_shot_gold_i01" />
 		<set name="commissionItemType" val="SPIRITSHOT" />
+		<set name="crystal_type" val="S" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="item_skill" val="2164-1" /> <!-- Blessed Spiritshot (S-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="34616" name="Mysterious Blessed Spiritshot (R-grade)" additionalName="Event" type="EtcItem">
diff --git a/trunk/dist/game/data/stats/items/35600-35699.xml b/trunk/dist/game/data/stats/items/35600-35699.xml
index 073f249084..75cccfc96d 100644
--- a/trunk/dist/game/data/stats/items/35600-35699.xml
+++ b/trunk/dist/game/data/stats/items/35600-35699.xml
@@ -1069,23 +1069,31 @@
 		<!-- The light of Spirits fill the pet/servitor to instantly inflict a powerful attack on the enemy. You can check the number of consumed soulshots at the pet/servitor info screen. (They are used from the master's inventory.) -->
 		<set name="icon" val="BranchSys.icon.br_beast_soul_shot_i00" />
 		<set name="default_action" val="SUMMON_SOULSHOT" />
+		<set name="for_npc" val="true" />
+		<set name="handler" val="BeastSoulShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="22036-1" /> <!-- Beast Soulshot -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="35671" name="Blessed Beast Spiritshot" additionalName="Wynn Summoners Only" type="EtcItem">
 		<!-- High-level light of Spirits fill the pet/servitor to instantly strengthen the pet/servitor's M. Atk. It is very light. You can check the number of consumed spiritshots at the pet/servitor info screen. (They are used from the master's inventory.) -->
 		<set name="icon" val="BranchSys.icon.br_blessed_beast_spirit_shot_i00" />
 		<set name="default_action" val="SUMMON_SPIRITSHOT" />
+		<set name="for_npc" val="true" />
+		<set name="handler" val="BeastSpiritShot" />
+		<set name="immediate_effect" val="true" />
 		<set name="is_auctionable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
+		<set name="item_skill" val="22038-1" /> <!-- Blessed Beast Spiritshot -->
 		<set name="material" val="PAPER" />
 		<set name="price" val="65" />
 	</item>
diff --git a/trunk/dist/game/data/stats/items/46000-46099.xml b/trunk/dist/game/data/stats/items/46000-46099.xml
index 29acb76b84..8d6be8dcb5 100644
--- a/trunk/dist/game/data/stats/items/46000-46099.xml
+++ b/trunk/dist/game/data/stats/items/46000-46099.xml
@@ -1165,20 +1165,26 @@
 		<!-- 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="commissionItemType" val="SOULSHOT" />
+		<set name="crystal_type" val="R" />
 		<set name="default_action" val="SOULSHOT" />
+		<set name="handler" val="SoulShots" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="item_skill" val="9193-1" /> <!-- Soulshot (R-grade) -->
 		<set name="material" val="PAPER" />
 	</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="commissionItemType" val="SPIRITSHOT" />
+		<set name="crystal_type" val="R" />
 		<set name="default_action" val="SPIRITSHOT" />
+		<set name="handler" val="BlessedSpiritShot" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="item_skill" val="9195-1" /> <!-- Blessed Spiritshot (R-grade)  -->
 		<set name="material" val="PAPER" />
 	</item>
 	<item id="46084" name="Player Commendation Special Bait" additionalName="PC-exclusive" type="EtcItem">