From 59d7023e1bd8bbfbabae85973a0f839d89238c97 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 9 May 2021 21:43:01 +0000
Subject: [PATCH] Various additions and adjustments. Contributed by manax182.

---
 .../game/data/stats/items/01300-01399.xml     |   2 +-
 .../game/data/stats/items/04600-04699.xml     |   2 +-
 .../game/data/stats/items/94200-94299.xml     | 152 +++++++++++---
 .../dist/game/data/stats/npcs/25000-25099.xml |  42 ++--
 .../dist/game/data/stats/npcs/25900-25999.xml |  72 ++++---
 .../game/data/stats/skills/40100-40199.xml    |  73 ++++++-
 .../game/data/stats/skills/50400-50499.xml    |  95 ++++++++-
 .../dist/game/data/buylists/3008101.xml       | 131 ++++++------
 .../dist/game/data/buylists/3083901.xml       | 131 ++++++------
 .../game/data/stats/items/01300-01399.xml     |   2 +-
 .../game/data/stats/items/04600-04699.xml     |   2 +-
 .../game/data/stats/items/94200-94299.xml     | 152 +++++++++++---
 .../game/data/stats/items/94600-94699.xml     |  10 +-
 .../game/data/stats/items/95500-95599.xml     | 190 ++++++++++++++++++
 .../dist/game/data/stats/npcs/25000-25099.xml |  42 ++--
 .../dist/game/data/stats/npcs/25900-25999.xml |  90 ++++++---
 .../game/data/stats/skills/40100-40199.xml    |  73 ++++++-
 .../game/data/stats/skills/50400-50499.xml    | 141 ++++++++++---
 18 files changed, 1093 insertions(+), 309 deletions(-)

diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/01300-01399.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/01300-01399.xml
index 0228b4a1c7..d35a1b1a7c 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/01300-01399.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/01300-01399.xml
@@ -782,7 +782,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="SILVER" />
 		<set name="weight" val="4" />
-		<set name="price" val="7" />
+		<set name="price" val="2" />
 		<set name="crystal_type" val="B" />
 		<set name="enchant_enabled" val="true" />
 		<set name="commissionItemType" val="OTHER_ITEM" />
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/04600-04699.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/04600-04699.xml
index a38a5205bb..a3657c5c23 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/04600-04699.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/04600-04699.xml
@@ -1059,7 +1059,7 @@
 			<skill id="2075" level="1" /> <!-- Scroll: Decrease Hate -->
 		</skills>
 	</item>
-	<item id="4679" name="Eva's Blessing" type="EtcItem">
+	<item id="4679" name="Blessing of Eva" type="EtcItem">
 		<!-- Allows one to breathe under water for extended periods. -->
 		<set name="icon" val="icon.etc_bless_of_eva_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/94200-94299.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/94200-94299.xml
index d2f1e6d9bb..950074b7b2 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/94200-94299.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/94200-94299.xml
@@ -859,7 +859,7 @@
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
 	</item>
-	<item id="94271" name="Scroll: Enchant Protection" type="EtcItem">
+	<item id="94271" name="Scroll: Boost Defense" type="EtcItem">
 		<!-- Applies a buff when used. <Buff effect>. P. Def. +500. M. Def. +500. Max MP +800. Speed +2. All Critical Rate +30. Duration: 20 min. Cooldown: 1 min. The effect remains after death. -->
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="etcitem_type" val="SCROLL" />
@@ -909,122 +909,212 @@
 	<item id="94275" name="Chocolate Doll" additionalName="Lv. 1" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 1>. - Soulshot and Spiritshot damage +1%. - Acquired XP/ SP +1%. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="1" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94276" name="Chocolate Doll" additionalName="Lv. 2" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 2>. - Soulshot and Spiritshot damage +2%. - Acquired XP/ SP +2%. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="2" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94277" name="Chocolate Doll" additionalName="Lv. 3" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 3>. - Soulshot and Spiritshot damage +3%. - Acquired XP/ SP +3%. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="3" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94278" name="Chocolate Doll" additionalName="Lv. 4" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 4>. - Soulshot and Spiritshot damage +4%. - Acquired XP/ SP +5%. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="4" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94279" name="Chocolate Doll" additionalName="Lv. 5" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 5>. - Soulshot and Spiritshot damage +5%. - Acquired XP/ SP +7%. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="5" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94280" name="Chocolate Doll" additionalName="Lv. 6" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 6>. - Soulshot and Spiritshot damage +6%. - Acquired XP/ SP +10%. - P./ M. Atk. +10. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="6" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94281" name="Chocolate Doll" additionalName="Lv. 7" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 7>. - Soulshot and Spiritshot damage +7%. - Acquired XP/ SP +11%. - P./ M. Atk. +30. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="7" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94282" name="Chocolate Doll" additionalName="Lv. 8" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 8>. - Soulshot and Spiritshot damage +8%. - Acquired XP/ SP +13%. - P./ M. Atk. +50. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="8" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94283" name="Chocolate Doll" additionalName="Lv. 9" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 9>. - Soulshot and Spiritshot damage +9%. - Acquired XP/ SP +15%. - P./ M. Atk. +80. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="9" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94284" name="Chocolate Doll" additionalName="Lv. 10" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 10>. - Soulshot and Spiritshot damage +10%. - Acquired XP/ SP +17%. - P./ M. Atk. +120. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="10" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94285" name="Chocolate Doll" additionalName="Lv. 11" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 11>. - Soulshot and Spiritshot damage +11%. - Acquired XP/ SP +20%. - P./ M. Atk. +170. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="11" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94286" name="Chocolate Doll" additionalName="Lv. 12" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 12>. - Soulshot and Spiritshot damage +12%. - Acquired XP/ SP +21%. - P./ M. Atk. +230. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="12" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94287" name="Chocolate Doll" additionalName="Lv. 13" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 13>. - Soulshot and Spiritshot damage +13%. - Acquired XP/ SP +23%. - P./ M. Atk. +300. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="13" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94288" name="Chocolate Doll" additionalName="Lv. 14" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 14>. - Soulshot and Spiritshot damage +14%. - Acquired XP/ SP +25%. - P./ M. Atk. +380. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="14" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94289" name="Chocolate Doll" additionalName="Lv. 15" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 15>. - Soulshot and Spiritshot damage +15%. - Acquired XP/ SP +30%. - P./ M. Atk. +700 -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="15" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94290" name="Valentine's Day Gift Basket" additionalName="Event" type="EtcItem">
 		<!-- A Dark Chocolate's gift basket that has to be delivered to Marshmallow. You may look what's inside. -->
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/npcs/25000-25099.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/npcs/25000-25099.xml
index 8c544fef77..4b8cd5a95d 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/npcs/25000-25099.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/npcs/25000-25099.xml
@@ -169,7 +169,11 @@
 			<skill id="4739" level="3" /> <!-- BOSS Strike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
-		<ai type="BALANCED" clanHelpRange="300" />
+		<ai type="BALANCED" clanHelpRange="300">
+			<clanList>
+				<clan>ORC</clan>
+			</clanList>
+		</ai>
 		<collision>
 			<radius normal="24" grown="12" />
 			<height normal="47" grown="27.6" />
@@ -216,7 +220,11 @@
 			<skill id="4754" level="2" /> <!-- BOSS Power Shot -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
-		<ai type="ARCHER" clanHelpRange="300" dodge="15" />
+		<ai type="ARCHER" clanHelpRange="300" dodge="15">
+			<clanList>
+				<clan>ORC</clan>
+			</clanList>
+		</ai>
 		<collision>
 			<radius normal="24" />
 			<height normal="61.5" />
@@ -251,7 +259,11 @@
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
-		<ai clanHelpRange="300" />
+		<ai clanHelpRange="300">
+			<clanList>
+				<clan>ORC</clan>
+			</clanList>
+		</ai>
 		<collision>
 			<radius normal="15" grown="14" />
 			<height normal="33" grown="26.4" />
@@ -1101,7 +1113,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25027" level="48" type="Monster" name="Ketra Marksman" title="Raid Fighter">
+	<npc id="25027" level="74" type="Monster" name="Ketra Marksman" title="Raid Fighter">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4761" level="4" />
 		</parameters>
@@ -1140,7 +1152,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25028" level="48" type="Monster" name="Ketra Raider" title="Raid Fighter">
+	<npc id="25028" level="74" type="Monster" name="Ketra Raider" title="Raid Fighter">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="128" /> <!-- Knight's Sword -->
@@ -1890,7 +1902,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25045" level="46" type="Monster" name="Barion's Dark Wizard" title="Raid Fighter">
+	<npc id="25045" level="74" type="Monster" name="Barion's Dark Wizard" title="Raid Fighter">
 		<parameters>
 			<skill name="HealMagic_a" id="4781" level="4" />
 			<skill name="SelfRangeBuff_a" id="4213" level="4" />
@@ -1931,7 +1943,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="25046" level="46" type="Monster" name="Barion's Soldier" title="Raid Fighter">
+	<npc id="25046" level="74" type="Monster" name="Barion's Soldier" title="Raid Fighter">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="129" /> <!-- Sword of Revolution -->
@@ -2194,7 +2206,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25052" level="64" type="Monster" name="Priestess of Rahha" title="Raid Fighter">
+	<npc id="25052" level="74" type="Monster" name="Priestess of Rahha" title="Raid Fighter">
 		<parameters>
 			<skill name="HealMagic_a" id="4785" level="6" />
 			<skill name="SelfRangeBuff_a" id="4213" level="6" />
@@ -2234,7 +2246,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="25053" level="64" type="Monster" name="Fanatics of Rahha" title="Raid Fighter">
+	<npc id="25053" level="74" type="Monster" name="Fanatics of Rahha" title="Raid Fighter">
 		<race>BEAST</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -2374,7 +2386,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25055" level="79" type="Monster" name="Taliadon" title="Raid Fighter">
+	<npc id="25055" level="81" type="Monster" name="Taliadon" title="Raid Fighter">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4168" level="7" />
 		</parameters>
@@ -2415,7 +2427,7 @@
 			<height normal="45" grown="52" />
 		</collision>
 	</npc>
-	<npc id="25056" level="79" type="Monster" name="Vemsk" title="Raid Fighter">
+	<npc id="25056" level="82" type="Monster" name="Vemsk" title="Raid Fighter">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="142" /> <!-- Keshanberk -->
@@ -2499,7 +2511,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25058" level="44" type="Monster" name="Beacon's Shooter" title="Raid Fighter">
+	<npc id="25058" level="79" type="Monster" name="Beacon's Shooter" title="Raid Fighter">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4757" level="5" />
 		</parameters>
@@ -2540,7 +2552,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25059" level="44" type="Monster" name="Beacon's Warrior" title="Raid Fighter">
+	<npc id="25059" level="79" type="Monster" name="Beacon's Warrior" title="Raid Fighter">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="78" /> <!-- Elemental Sword -->
@@ -4258,7 +4270,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25096" level="28" type="Monster" name="Renoa's Elpy" title="Raid Fighter">
+	<npc id="25096" level="74" type="Monster" name="Renoa's Elpy" title="Raid Fighter">
 		<parameters>
 			<skill name="DDMagic_a" id="4193" level="2" />
 			<skill name="Debuff_a" id="4199" level="2" />
@@ -4297,7 +4309,7 @@
 			<height normal="4.5" />
 		</collision>
 	</npc>
-	<npc id="25097" level="28" type="Monster" name="Renoa's Hog" title="Raid Fighter">
+	<npc id="25097" level="74" type="Monster" name="Renoa's Hog" title="Raid Fighter">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4727" level="2" />
 		</parameters>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/npcs/25900-25999.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/npcs/25900-25999.xml
index fed2e32b23..d063722896 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/npcs/25900-25999.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/npcs/25900-25999.xml
@@ -4,7 +4,7 @@
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="37500000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
 			<speed>
 				<walk ground="45" />
@@ -23,7 +23,7 @@
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="2000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
@@ -43,7 +43,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5800" lhand="5799" />
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="2000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
 			<speed>
 				<walk ground="56" />
@@ -62,7 +62,7 @@
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="37500000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
 			<speed>
 				<walk ground="45" />
@@ -81,7 +81,7 @@
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="2000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
@@ -100,7 +100,7 @@
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="2000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
 			<speed>
 				<walk ground="65" />
@@ -119,7 +119,7 @@
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="2000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
 			<speed>
 				<walk ground="65" />
@@ -138,7 +138,7 @@
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
@@ -155,7 +155,7 @@
 	</npc>
 	<npc id="25909" level="80" type="Monster" name="Carcs">
 		<race>HUMANOID</race>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="135763.583815029" hpRegen="8.5" mp="4242.24422442244" mpRegen="3" />
 			<speed>
 				<walk ground="60" />
@@ -189,7 +189,7 @@
 	</npc>
 	<npc id="25910" level="80" type="Monster" name="Drak">
 		<race>HUMANOID</race>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="135763.583815029" hpRegen="8.5" mp="4242.24422442244" mpRegen="3" />
 			<speed>
 				<walk ground="60" />
@@ -223,7 +223,7 @@
 	</npc>
 	<npc id="25911" level="80" type="Monster" name="Ourick">
 		<race>HUMANOID</race>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="135763.583815029" hpRegen="8.5" mp="4242.24422442244" mpRegen="3" />
 			<speed>
 				<walk ground="60" />
@@ -257,7 +257,7 @@
 	</npc>
 	<npc id="25912" level="85" type="Monster" name="Monster">
 		<race>DRAGON</race>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="15606936.416185" hpRegen="9.5" mp="22800" mpRegen="3.3" />
 			<speed>
 				<walk ground="60" />
@@ -324,7 +324,7 @@
 	</npc>
 	<npc id="25913" level="85" type="Monster" name="Karim">
 		<race>DEMONIC</race>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="2623786.12716763" hpRegen="9.5" mp="4677.88778877888" mpRegen="3.3" />
 			<speed>
 				<walk ground="60" />
@@ -702,16 +702,22 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25925" level="85" type="Monster" name="Jisra">
-		<race>ETC</race>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="704396.648044693" hpRegen="9.5" mp="5766.47681041497" mpRegen="3.3" />
-			<speed>
-				<walk ground="60" />
-				<run ground="160" />
-			</speed>
-			<attack physical="9327.04039041932" magical="2885.11628279205" critical="4.75" attackSpeed="253" range="40" />
-			<defence physical="1210.919540229885" magical="868.885085528838" />
+	<npc id="25925" level="85" type="RaidBoss" name="Jisra">
+		<parameters>
+			<param name="RaidSpawnMusic" value="Rm02_A" />
+			<skill name="RangeDDMagic_a" id="4178" level="2" />
+		</parameters>
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="2" /> <!-- Long Sword -->
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+		<vitals hp="3812812.68374633" hpRegen="43.8368677449012" mp="3539.96003996004" mpRegen="1.5" />
+		<attack physical="2743.69799488095" magical="219.514950783644" random="10" critical="4.75" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+		<defence physical="310.919540229885" magical="165.064820237234" evasion="-18" />
+		<speed>
+			<walk ground="56" />
+			<run ground="190" />
+		</speed>
 		</stats>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -735,15 +741,21 @@
 		</dropLists>
 	</npc>
 	<npc id="25926" level="85" type="Monster" name="Kuka">
-		<race>ETC</race>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="176099.627560521" hpRegen="9.5" mp="5766.47681041497" mpRegen="3.3" />
+		<parameters>
+			<param name="RaidSpawnMusic" value="Rm02_A" />
+			<skill name="RangeDDMagic_a" id="4178" level="2" />
+		</parameters>
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="2" /> <!-- Long Sword -->
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="3812812.68374633" hpRegen="43.8368677449012" mp="3539.96003996004" mpRegen="1.5" />
+			<attack physical="2743.69799488095" magical="219.514950783644" random="10" critical="4.75" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="310.919540229885" magical="165.064820237234" evasion="-18" />
 			<speed>
-				<walk ground="60" />
-				<run ground="160" />
+				<walk ground="56" />
+				<run ground="190" />
 			</speed>
-			<attack physical="9327.04039041932" magical="2885.11628279205" critical="4.75" attackSpeed="253" range="40" />
-			<defence physical="1210.919540229885" magical="868.885085528838" />
 		</stats>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/40100-40199.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/40100-40199.xml
index accfb6e65f..27d6d483ce 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/40100-40199.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/40100-40199.xml
@@ -91,8 +91,69 @@
 	</skill>
 	<skill id="40106" toLevel="1" name="Battle Scroll (Event)">
 		<!-- For 20 min., P. Atk. +200, M. Atk. +350, P. Critical Rate/ M. Skill Critical Rate +30, Atk./ Casting Spd. +50, P./ M. Def. +200, Max HP/ MP/ CP +500. -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<reuseDelay>60000</reuseDelay>
+		<hitTime>4000</hitTime>
+		<abnormalTime>1200</abnormalTime>
+		<itemConsumeId>91780</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<abnormalTime>1200</abnormalTime>
+		<abnormalType>MULTI_BUFF</abnormalType>
+		<canBeDispelled>false</canBeDispelled>
+		<stayAfterDeath>true</stayAfterDeath>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<abnormalLevel>1</abnormalLevel>
+		<isMagic>1</isMagic> <!-- Magic Skill -->
+		<magicLevel>1</magicLevel>
+		<effects>
+			<effect name="PAtk">
+				<amount>200</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>350</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="CriticalRate">
+				<amount>30</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicCriticalRate">
+				<amount>30</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicalAttackSpeed">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>200</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>200</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MaxHp">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MaxMp">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MaxCp">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="40107" toLevel="1" name="Extra Pass: Transcendent Instance Zone">
 		<icon>icon.skill0000</icon>
@@ -651,11 +712,15 @@
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 	</skill>
-	<skill id="40180" toLevel="1" name="Sayha's Cookie - Event">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
+	<skill id="40180" toLevel="2" name="Sayha's Cookie - Event">
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 		<reuseDelay>300</reuseDelay>
+		<itemConsumeId>
+			<value level="1">93848</value>
+			<value level="2">93274</value>
+		</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<conditions>
 			<condition name="CanUseVitalityIncreaseItem">
 				<amount>35000</amount>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/50400-50499.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/50400-50499.xml
index 8010aa6343..c670efe6ca 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/50400-50499.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/50400-50499.xml
@@ -1276,7 +1276,100 @@
 	<skill id="50440" toLevel="15" name="Chocolate Doll">
 		<!-- Chocolate Doll Effect Soulshot/ Spiritshot Damage +$s1 Acquired XP/ SP +$s2 -->
 		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<stayAfterDeath>true</stayAfterDeath>
+		<effects>
+			<effect name="ShotsBonus">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+					<value level="7">7</value>
+					<value level="8">8</value>
+					<value level="9">9</value>
+					<value level="10">10</value>
+					<value level="11">11</value>
+					<value level="12">12</value>
+					<value level="13">13</value>
+					<value level="14">14</value>
+					<value level="15">15</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="ExpModify">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">5</value>
+					<value level="5">7</value>
+					<value level="6">10</value>
+					<value level="7">11</value>
+					<value level="8">13</value>
+					<value level="9">15</value>
+					<value level="10">17</value>
+					<value level="11">20</value>
+					<value level="12">21</value>
+					<value level="13">23</value>
+					<value level="14">25</value>
+					<value level="15">30</value>
+				</amount>
+			</effect>
+			<effect name="SpModify">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">5</value>
+					<value level="5">7</value>
+					<value level="6">10</value>
+					<value level="7">11</value>
+					<value level="8">13</value>
+					<value level="9">15</value>
+					<value level="10">17</value>
+					<value level="11">20</value>
+					<value level="12">21</value>
+					<value level="13">23</value>
+					<value level="14">25</value>
+					<value level="15">30</value>
+				</amount>
+			</effect>
+			<effect name="PAtk">
+				<amount>
+					<value fromLevel="1" toLevel="5">0</value>
+					<value level="6">10</value>
+					<value level="7">30</value>
+					<value level="8">50</value>
+					<value level="9">80</value>
+					<value level="10">120</value>
+					<value level="11">170</value>
+					<value level="12">230</value>
+					<value level="13">300</value>
+					<value level="14">380</value>
+					<value level="15">700</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>
+					<value fromLevel="1" toLevel="5">0</value>
+					<value level="6">10</value>
+					<value level="7">30</value>
+					<value level="8">50</value>
+					<value level="9">80</value>
+					<value level="10">120</value>
+					<value level="11">170</value>
+					<value level="12">230</value>
+					<value level="13">300</value>
+					<value level="14">380</value>
+					<value level="15">700</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50441" toLevel="4" name="Earring: Antharas' Earring">
 		<!-- An earring imbued with the Earth Dragon's power. <Effect> Max MP $s1 Bleed Atk. Rate $s2 Stun Atk. Rate $s3 Silence Atk. Rate $s4 Fear Atk. Rate $s5 Bleed Resistance $s6 Stun Resistance $s7 Silence Resistance $s8 Fear Resistance $s9 Received Healing $s10 Skill MP Consumption $s11 Absorbs $s12 of the inflicted damage as HP. -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/buylists/3008101.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/buylists/3008101.xml
index 9adae38d72..9c96a0f890 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/buylists/3008101.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/buylists/3008101.xml
@@ -3,65 +3,76 @@
 	<npcs>
 		<npc>30081</npc> <!-- Helvetia -->
 	</npcs>
-	<item id="91927" price="24" /> <!-- Soulshot -->
-	<item id="91930" price="75" /> <!-- Blessed Spiritshot -->
-	<item id="6645" price="24" /> <!-- Beast Soulshot -->
-	<item id="6646" price="60" /> <!-- Beast Spiritshot -->
-	<item id="93966" price="2400" /> <!-- Pet food -->
-	<item id="93967" price="144" /> <!-- Pet HP Potion (Tradable) -->
-	<item id="17" price="3" /> <!-- Wooden Arrow -->
-	<item id="1341" price="4" /> <!-- Bone Arrow -->
-	<item id="1342" price="6" /> <!-- Steel Arrow -->
-	<item id="1343" price="9" /> <!-- Silver Arrow -->
-	<item id="1344" price="10" /> <!-- Mithril Arrow -->
-	<item id="1831" price="90" /> <!-- Antidote -->
-	<item id="1832" price="216" /> <!-- Greater Antiddote -->
-	<item id="1833" price="90" /> <!-- Bandage -->
-	<item id="1834" price="216" /> <!-- Big Bandage -->
-	<item id="734" price="1440" /> <!-- Haste Potion -->
-	<item id="735" price="2880" /> <!-- Haste Potion Atk. -->
-	<item id="6035" price="2880" /> <!-- Speed ​​Increase Potion Magician -->
-	<item id="6037" price="120" /> <!-- Scroll of Awakening -->
-	<item id="736" price="480" /> <!-- Scroll of Teleport -->
-	<item id="1829" price="600" /> <!-- Scroll of Escape: Clan Hall -->
-	<item id="1830" price="600" /> <!-- Scroll of Escape: Castle -->
-	<item id="3031" price="480" /> <!-- Spirit Ore -->
-	<item id="1785" price="300" /> <!-- Soul Ore -->
-	<item id="5589" price="120" /> <!-- Energy Stone -->
-	<item id="5192" price="120" /> <!-- Magic Rope: D-grade -->
-	<item id="5193" price="180" /> <!-- Magic Rope: C-grade -->
-	<item id="5194" price="300" /> <!-- Magic Rope: B-grade -->
-	<item id="5195" price="480" /> <!-- Magic Rope: A-grade -->
-	<item id="2130" price="1200" /> <!-- Gemstone (D-grade) -->
-	<item id="2131" price="3600" /> <!-- Gemstone (C-grade) -->
-	<item id="2132" price="12000" /> <!-- Gemstone (B-grade) -->
-	<item id="8615" price="42000" /> <!-- Summoning Crystal -->
-	<item id="4679" price="600" /> <!-- Eve's Gift -->
-	<item id="91912" price="36" /> <!-- HP Potion (Tradable) -->
-	<item id="2508" price="360" /> <!-- Cursed Bone -->
-	<item id="94187" price="1080000" /> <!-- Life Stone Lv. 1 - Armor -->
+	<item id="91927" price="28" /> <!-- Soulshot -->
+	<item id="91930" price="84" /> <!-- Blessed Spiritshot -->
+	<item id="6645" price="28" /> <!-- Beast Soulshot -->
+	<item id="6646" price="70" /> <!-- Beast Spiritshot -->
+	<item id="91912" price="42" /> <!-- HP Potion (Tradable) -->
+	<item id="3031" price="560" /> <!-- Spirit Ore -->
+	<item id="2508" price="420" /> <!-- Cursed Bone -->
+	<item id="736" price="560" /> <!-- Scroll of Teleport -->
+	<item id="1829" price="700" /> <!-- Scroll of Escape: Clan Hall -->
+	<item id="1830" price="700" /> <!-- Scroll of Escape: Castle -->
+	<item id="93966" price="2800" /> <!-- Pet food -->
+	<item id="93967" price="168" /> <!-- Pet HP Potion (Tradable) -->
+	<item id="2130" price="1400" /> <!-- Gemstone (D-grade) -->
+	<item id="2131" price="4200" /> <!-- Gemstone (C-grade) -->
+	<item id="2132" price="14000" /> <!-- Gemstone (B-grade) -->
+	<item id="2133" price="210000" /> <!-- Gemstone (A-grade) -->
+	<item id="93406" price="2100000" /> <!-- Scroll: Enchant B-grade Weapon -->
+	<item id="93407" price="336000" /> <!-- Scroll: Enchant B-grade Armor -->
+	<item id="93408" price="462000" /> <!-- Scroll: Enchant C-grade Weapon -->
+	<item id="93409" price="63000" /> <!-- Scroll: Enchant C-grade Armor -->
+	<item id="93410" price="210000" /> <!-- Scroll: Enchant D-grade Weapon -->
+	<item id="93411" price="215200" /> <!-- Scroll: Enchant D-grade Armor -->
+	<item id="17" price="1" /> <!-- Wooden Arrow -->
+	<item id="1341" price="1" /> <!-- Bone Arrow -->
+	<item id="1342" price="2" /> <!-- Steel Arrow -->
+	<item id="1343" price="2" /> <!-- Silver Arrow -->
+	<item id="1344" price="4" /> <!-- Mithril Arrow -->
+	<item id="94891" price="140000" /> <!-- No-grade Elemental Orb (Sealed) -->
+	<item id="94892" price="280000" /> <!-- D-grade Elemental Orb (Sealed) -->
+	<item id="94893" price="420000" /> <!-- C-grade Elemental Orb (Sealed) -->
+	<item id="94894" price="700000" /> <!-- B-grade Elemental Orb (Sealed) -->
+	<item id="94895" price="1400000" /> <!-- A-grade Elemental Orb (Sealed) -->
+	<item id="95490" price="70000" /> <!-- Infinite Wooden Quiver (Sealed) -->
+	<item id="95491" price="420000" /> <!-- Infinite Bone Quiver (Sealed) -->
+	<item id="95497" price="1400000" /> <!-- Infinite Steel Quiver (Sealed) -->
+	<item id="95493" price="7000000" /> <!-- Infinite Silver Quiver (Sealed) -->
+	<item id="95494" price="28000000" /> <!-- Infinite Mithril Quiver (Sealed) -->
+	<item id="92004" price="14000000" /> <!-- Inventory Expansion Ticket Lv. 1 -->
+	<item id="92005" price="14000000" /> <!-- Inventory Expansion Ticket Lv. 2 -->
+	<item id="92006" price="14000000" /> <!-- Inventory Expansion Ticket Lv. 3 -->
+	<item id="95495" price="28000000" /> <!-- Buff Expansion Book Lv. 1 -->
+	<item id="95496" price="28000000" /> <!-- Buff Expansion Book Lv. 2 -->
 	<item id="94185" price="24000000" /> <!-- Life Stone Lv. 1 - Weapon -->
-	<item id="93099" price="1380000" /> <!-- Life Stone Lv. 1 - Shield / Symbol -->
-	<item id="2133" price="180000" /> <!-- Gemstone (A-grade) -->
-	<item id="93406" price="1800000" /> <!-- Scroll: Enchant B-grade Weapon -->
-	<item id="93407" price="288000" /> <!-- Scroll: Enchant B-grade Armor -->
-	<item id="93408" price="396000" /> <!-- Scroll: Enchant C-grade Weapon -->
-	<item id="93409" price="54000" /> <!-- Scroll: Enchant C-grade Armor -->
-	<item id="93410" price="180000" /> <!-- Scroll: Enchant D-grade Weapon -->
-	<item id="93411" price="21600" /> <!-- Scroll: Enchant D-grade Armor -->
-	<item id="93662" price="840" /> <!-- Appearance Potion - A -->
-	<item id="93663" price="840" /> <!-- Appearance Potion - B -->
-	<item id="93664" price="840" /> <!-- Appearance Potion - C -->
-	<item id="93665" price="840" /> <!-- Dye Potion - A -->
-	<item id="93666" price="840" /> <!-- Dye Potion - B -->
-	<item id="93667" price="840" /> <!-- Dye Potion - C -->
-	<item id="93668" price="840" /> <!-- Dye Potion - D -->
-	<item id="93669" price="840" /> <!-- Hair Style Potion - A -->
-	<item id="93670" price="840" /> <!-- Hair Style Potion - B -->
-	<item id="93671" price="840" /> <!-- Hair Style Potion - C -->
-	<item id="93672" price="840" /> <!-- Hair Style Potion - D -->
-	<item id="93673" price="840" /> <!-- Hair Style Potion - E -->
-	<item id="93674" price="840" /> <!-- Hair Style Potion - F -->
-	<item id="93675" price="840" /> <!-- Hair Style Potion - G -->
-	<item id="94041" price="120000" /> <!-- Scroll of Gear Restoration -->
+ 	<item id="94187" price="1080000" /> <!-- Life Stone Lv. 1 - Armor -->
+ 	<item id="93099" price="1380000" /> <!-- Life Stone Lv. 1 - Shield / Symbol -->
+	<item id="1831" price="105" /> <!-- Antidote -->
+	<item id="1832" price="252" /> <!-- Greater Antiddote -->
+	<item id="1833" price="105" /> <!-- Bandage -->
+	<item id="1834" price="252" /> <!-- Emergency Dressing -->
+	<item id="734" price="1680" /> <!-- Wind Walk Potion -->
+	<item id="735" price="3660" /> <!-- Haste Potion -->
+	<item id="6035" price="3360" /> <!-- Cast Quickening Potion -->
+	<item id="6037" price="140" /> <!-- Scroll: Cancel Sleep -->
+	<item id="1785" price="350" /> <!-- Soulstone -->
+	<item id="5589" price="140" /> <!-- Momentum Stone -->
+	<item id="4679" price="700" /> <!-- Blessing of Eva -->
+	<item id="8615" price="49000" /> <!-- Summoning Crystal -->
+	<item id="93662" price="980" /> <!-- Facelifting Potion A -->
+	<item id="93663" price="980" /> <!-- Facelifting Potion B -->
+	<item id="93664" price="980" /> <!-- Facelifting Potion C -->
+	<item id="93665" price="980" /> <!-- Dye Potion - A -->
+	<item id="93666" price="980" /> <!-- Dye Potion - B -->
+	<item id="93667" price="980" /> <!-- Dye Potion - C -->
+	<item id="93668" price="980" /> <!-- Dye Potion - D -->
+	<item id="93669" price="980" /> <!-- Hair Style Potion - A -->
+	<item id="93670" price="980" /> <!-- Hair Style Potion - B -->
+	<item id="93671" price="980" /> <!-- Hair Style Potion - C -->
+	<item id="93672" price="980" /> <!-- Hair Style Potion - D -->
+	<item id="93673" price="980" /> <!-- Hair Style Potion - E -->
+	<item id="93674" price="980" /> <!-- Hair Style Potion - F -->
+	<item id="93675" price="980" /> <!-- Hair Style Potion - G -->
+	<item id="94041" price="140000" /> <!-- Scroll of Gear Restoration -->
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/buylists/3083901.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/buylists/3083901.xml
index 26f298a5bb..8f28f950c0 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/buylists/3083901.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/buylists/3083901.xml
@@ -3,65 +3,76 @@
 	<npcs>
 		<npc>30839</npc> <!-- Holly -->
 	</npcs>
-	<item id="91927" price="24" /> <!-- Soulshot -->
-	<item id="91930" price="75" /> <!-- Blessed Spiritshot -->
-	<item id="6645" price="24" /> <!-- Beast Soulshot -->
-	<item id="6646" price="60" /> <!-- Beast Spiritshot -->
-	<item id="93966" price="2400" /> <!-- Pet food -->
-	<item id="93967" price="144" /> <!-- Pet HP Potion (Tradable) -->
-	<item id="17" price="3" /> <!-- Wooden Arrow -->
-	<item id="1341" price="4" /> <!-- Bone Arrow -->
-	<item id="1342" price="6" /> <!-- Steel Arrow -->
-	<item id="1343" price="9" /> <!-- Silver Arrow -->
-	<item id="1344" price="10" /> <!-- Mithril Arrow -->
-	<item id="1831" price="90" /> <!-- Antidote -->
-	<item id="1832" price="216" /> <!-- Greater Antiddote -->
-	<item id="1833" price="90" /> <!-- Bandage -->
-	<item id="1834" price="216" /> <!-- Big Bandage -->
-	<item id="734" price="1440" /> <!-- Haste Potion -->
-	<item id="735" price="2880" /> <!-- Haste Potion Atk. -->
-	<item id="6035" price="2880" /> <!-- Speed ​​Increase Potion Magician -->
-	<item id="6037" price="120" /> <!-- Scroll of Awakening -->
-	<item id="736" price="480" /> <!-- Scroll of Teleport -->
-	<item id="1829" price="600" /> <!-- Scroll of Escape: Clan Hall -->
-	<item id="1830" price="600" /> <!-- Scroll of Escape: Castle -->
-	<item id="3031" price="480" /> <!-- Spirit Ore -->
-	<item id="1785" price="300" /> <!-- Soul Ore -->
-	<item id="5589" price="120" /> <!-- Energy Stone -->
-	<item id="5192" price="120" /> <!-- Magic Rope: D-grade -->
-	<item id="5193" price="180" /> <!-- Magic Rope: C-grade -->
-	<item id="5194" price="300" /> <!-- Magic Rope: B-grade -->
-	<item id="5195" price="480" /> <!-- Magic Rope: A-grade -->
-	<item id="2130" price="1200" /> <!-- Gemstone (D-grade) -->
-	<item id="2131" price="3600" /> <!-- Gemstone (C-grade) -->
-	<item id="2132" price="12000" /> <!-- Gemstone (B-grade) -->
-	<item id="8615" price="42000" /> <!-- Summoning Crystal -->
-	<item id="4679" price="600" /> <!-- Eve's Gift -->
-	<item id="91912" price="36" /> <!-- HP Potion (Tradable) -->
-	<item id="2508" price="360" /> <!-- Cursed Bone -->
-	<item id="94187" price="1080000" /> <!-- Life Stone Lv. 1 - Armor -->
+	<item id="91927" price="28" /> <!-- Soulshot -->
+	<item id="91930" price="84" /> <!-- Blessed Spiritshot -->
+	<item id="6645" price="28" /> <!-- Beast Soulshot -->
+	<item id="6646" price="70" /> <!-- Beast Spiritshot -->
+	<item id="91912" price="42" /> <!-- HP Potion (Tradable) -->
+	<item id="3031" price="560" /> <!-- Spirit Ore -->
+	<item id="2508" price="420" /> <!-- Cursed Bone -->
+	<item id="736" price="560" /> <!-- Scroll of Teleport -->
+	<item id="1829" price="700" /> <!-- Scroll of Escape: Clan Hall -->
+	<item id="1830" price="700" /> <!-- Scroll of Escape: Castle -->
+	<item id="93966" price="2800" /> <!-- Pet food -->
+	<item id="93967" price="168" /> <!-- Pet HP Potion (Tradable) -->
+	<item id="2130" price="1400" /> <!-- Gemstone (D-grade) -->
+	<item id="2131" price="4200" /> <!-- Gemstone (C-grade) -->
+	<item id="2132" price="14000" /> <!-- Gemstone (B-grade) -->
+	<item id="2133" price="210000" /> <!-- Gemstone (A-grade) -->
+	<item id="93406" price="2100000" /> <!-- Scroll: Enchant B-grade Weapon -->
+	<item id="93407" price="336000" /> <!-- Scroll: Enchant B-grade Armor -->
+	<item id="93408" price="462000" /> <!-- Scroll: Enchant C-grade Weapon -->
+	<item id="93409" price="63000" /> <!-- Scroll: Enchant C-grade Armor -->
+	<item id="93410" price="210000" /> <!-- Scroll: Enchant D-grade Weapon -->
+	<item id="93411" price="215200" /> <!-- Scroll: Enchant D-grade Armor -->
+	<item id="17" price="1" /> <!-- Wooden Arrow -->
+	<item id="1341" price="1" /> <!-- Bone Arrow -->
+	<item id="1342" price="2" /> <!-- Steel Arrow -->
+	<item id="1343" price="2" /> <!-- Silver Arrow -->
+	<item id="1344" price="4" /> <!-- Mithril Arrow -->
+	<item id="94891" price="140000" /> <!-- No-grade Elemental Orb (Sealed) -->
+	<item id="94892" price="280000" /> <!-- D-grade Elemental Orb (Sealed) -->
+	<item id="94893" price="420000" /> <!-- C-grade Elemental Orb (Sealed) -->
+	<item id="94894" price="700000" /> <!-- B-grade Elemental Orb (Sealed) -->
+	<item id="94895" price="1400000" /> <!-- A-grade Elemental Orb (Sealed) -->
+	<item id="95490" price="70000" /> <!-- Infinite Wooden Quiver (Sealed) -->
+	<item id="95491" price="420000" /> <!-- Infinite Bone Quiver (Sealed) -->
+	<item id="95497" price="1400000" /> <!-- Infinite Steel Quiver (Sealed) -->
+	<item id="95493" price="7000000" /> <!-- Infinite Silver Quiver (Sealed) -->
+	<item id="95494" price="28000000" /> <!-- Infinite Mithril Quiver (Sealed) -->
+	<item id="92004" price="14000000" /> <!-- Inventory Expansion Ticket Lv. 1 -->
+	<item id="92005" price="14000000" /> <!-- Inventory Expansion Ticket Lv. 2 -->
+	<item id="92006" price="14000000" /> <!-- Inventory Expansion Ticket Lv. 3 -->
+	<item id="95495" price="28000000" /> <!-- Buff Expansion Book Lv. 1 -->
+	<item id="95496" price="28000000" /> <!-- Buff Expansion Book Lv. 2 -->
 	<item id="94185" price="24000000" /> <!-- Life Stone Lv. 1 - Weapon -->
-	<item id="93099" price="1380000" /> <!-- Life Stone Lv. 1 - Shield / Symbol -->
-	<item id="2133" price="180000" /> <!-- Gemstone (A-grade) -->
-	<item id="93406" price="1800000" /> <!-- Scroll: Enchant B-grade Weapon -->
-	<item id="93407" price="288000" /> <!-- Scroll: Enchant B-grade Armor -->
-	<item id="93408" price="396000" /> <!-- Scroll: Enchant C-grade Weapon -->
-	<item id="93409" price="54000" /> <!-- Scroll: Enchant C-grade Armor -->
-	<item id="93410" price="180000" /> <!-- Scroll: Enchant D-grade Weapon -->
-	<item id="93411" price="21600" /> <!-- Scroll: Enchant D-grade Armor -->
-	<item id="93662" price="840" /> <!-- Appearance Potion - A -->
-	<item id="93663" price="840" /> <!-- Appearance Potion - B -->
-	<item id="93664" price="840" /> <!-- Appearance Potion - C -->
-	<item id="93665" price="840" /> <!-- Dye Potion - A -->
-	<item id="93666" price="840" /> <!-- Dye Potion - B -->
-	<item id="93667" price="840" /> <!-- Dye Potion - C -->
-	<item id="93668" price="840" /> <!-- Dye Potion - D -->
-	<item id="93669" price="840" /> <!-- Hair Style Potion - A -->
-	<item id="93670" price="840" /> <!-- Hair Style Potion - B -->
-	<item id="93671" price="840" /> <!-- Hair Style Potion - C -->
-	<item id="93672" price="840" /> <!-- Hair Style Potion - D -->
-	<item id="93673" price="840" /> <!-- Hair Style Potion - E -->
-	<item id="93674" price="840" /> <!-- Hair Style Potion - F -->
-	<item id="93675" price="840" /> <!-- Hair Style Potion - G -->
-	<item id="94041" price="120000" /> <!-- Scroll of Gear Restoration -->
+ 	<item id="94187" price="1080000" /> <!-- Life Stone Lv. 1 - Armor -->
+ 	<item id="93099" price="1380000" /> <!-- Life Stone Lv. 1 - Shield / Symbol -->
+	<item id="1831" price="105" /> <!-- Antidote -->
+	<item id="1832" price="252" /> <!-- Greater Antiddote -->
+	<item id="1833" price="105" /> <!-- Bandage -->
+	<item id="1834" price="252" /> <!-- Emergency Dressing -->
+	<item id="734" price="1680" /> <!-- Wind Walk Potion -->
+	<item id="735" price="3660" /> <!-- Haste Potion -->
+	<item id="6035" price="3360" /> <!-- Cast Quickening Potion -->
+	<item id="6037" price="140" /> <!-- Scroll: Cancel Sleep -->
+	<item id="1785" price="350" /> <!-- Soulstone -->
+	<item id="5589" price="140" /> <!-- Momentum Stone -->
+	<item id="4679" price="700" /> <!-- Blessing of Eva -->
+	<item id="8615" price="49000" /> <!-- Summoning Crystal -->
+	<item id="93662" price="980" /> <!-- Facelifting Potion A -->
+	<item id="93663" price="980" /> <!-- Facelifting Potion B -->
+	<item id="93664" price="980" /> <!-- Facelifting Potion C -->
+	<item id="93665" price="980" /> <!-- Dye Potion - A -->
+	<item id="93666" price="980" /> <!-- Dye Potion - B -->
+	<item id="93667" price="980" /> <!-- Dye Potion - C -->
+	<item id="93668" price="980" /> <!-- Dye Potion - D -->
+	<item id="93669" price="980" /> <!-- Hair Style Potion - A -->
+	<item id="93670" price="980" /> <!-- Hair Style Potion - B -->
+	<item id="93671" price="980" /> <!-- Hair Style Potion - C -->
+	<item id="93672" price="980" /> <!-- Hair Style Potion - D -->
+	<item id="93673" price="980" /> <!-- Hair Style Potion - E -->
+	<item id="93674" price="980" /> <!-- Hair Style Potion - F -->
+	<item id="93675" price="980" /> <!-- Hair Style Potion - G -->
+	<item id="94041" price="140000" /> <!-- Scroll of Gear Restoration -->
 </list>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/01300-01399.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/01300-01399.xml
index 0228b4a1c7..d35a1b1a7c 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/01300-01399.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/01300-01399.xml
@@ -782,7 +782,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="SILVER" />
 		<set name="weight" val="4" />
-		<set name="price" val="7" />
+		<set name="price" val="2" />
 		<set name="crystal_type" val="B" />
 		<set name="enchant_enabled" val="true" />
 		<set name="commissionItemType" val="OTHER_ITEM" />
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/04600-04699.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/04600-04699.xml
index a38a5205bb..a3657c5c23 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/04600-04699.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/04600-04699.xml
@@ -1059,7 +1059,7 @@
 			<skill id="2075" level="1" /> <!-- Scroll: Decrease Hate -->
 		</skills>
 	</item>
-	<item id="4679" name="Eva's Blessing" type="EtcItem">
+	<item id="4679" name="Blessing of Eva" type="EtcItem">
 		<!-- Allows one to breathe under water for extended periods. -->
 		<set name="icon" val="icon.etc_bless_of_eva_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/94200-94299.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/94200-94299.xml
index d2f1e6d9bb..950074b7b2 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/94200-94299.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/94200-94299.xml
@@ -859,7 +859,7 @@
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
 	</item>
-	<item id="94271" name="Scroll: Enchant Protection" type="EtcItem">
+	<item id="94271" name="Scroll: Boost Defense" type="EtcItem">
 		<!-- Applies a buff when used. <Buff effect>. P. Def. +500. M. Def. +500. Max MP +800. Speed +2. All Critical Rate +30. Duration: 20 min. Cooldown: 1 min. The effect remains after death. -->
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="etcitem_type" val="SCROLL" />
@@ -909,122 +909,212 @@
 	<item id="94275" name="Chocolate Doll" additionalName="Lv. 1" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 1>. - Soulshot and Spiritshot damage +1%. - Acquired XP/ SP +1%. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="1" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94276" name="Chocolate Doll" additionalName="Lv. 2" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 2>. - Soulshot and Spiritshot damage +2%. - Acquired XP/ SP +2%. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="2" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94277" name="Chocolate Doll" additionalName="Lv. 3" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 3>. - Soulshot and Spiritshot damage +3%. - Acquired XP/ SP +3%. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="3" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94278" name="Chocolate Doll" additionalName="Lv. 4" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 4>. - Soulshot and Spiritshot damage +4%. - Acquired XP/ SP +5%. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="4" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94279" name="Chocolate Doll" additionalName="Lv. 5" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 5>. - Soulshot and Spiritshot damage +5%. - Acquired XP/ SP +7%. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="5" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94280" name="Chocolate Doll" additionalName="Lv. 6" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 6>. - Soulshot and Spiritshot damage +6%. - Acquired XP/ SP +10%. - P./ M. Atk. +10. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="6" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94281" name="Chocolate Doll" additionalName="Lv. 7" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 7>. - Soulshot and Spiritshot damage +7%. - Acquired XP/ SP +11%. - P./ M. Atk. +30. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="7" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94282" name="Chocolate Doll" additionalName="Lv. 8" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 8>. - Soulshot and Spiritshot damage +8%. - Acquired XP/ SP +13%. - P./ M. Atk. +50. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="8" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94283" name="Chocolate Doll" additionalName="Lv. 9" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 9>. - Soulshot and Spiritshot damage +9%. - Acquired XP/ SP +15%. - P./ M. Atk. +80. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="9" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94284" name="Chocolate Doll" additionalName="Lv. 10" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 10>. - Soulshot and Spiritshot damage +10%. - Acquired XP/ SP +17%. - P./ M. Atk. +120. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="10" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94285" name="Chocolate Doll" additionalName="Lv. 11" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 11>. - Soulshot and Spiritshot damage +11%. - Acquired XP/ SP +20%. - P./ M. Atk. +170. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="11" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94286" name="Chocolate Doll" additionalName="Lv. 12" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 12>. - Soulshot and Spiritshot damage +12%. - Acquired XP/ SP +21%. - P./ M. Atk. +230. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="12" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94287" name="Chocolate Doll" additionalName="Lv. 13" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 13>. - Soulshot and Spiritshot damage +13%. - Acquired XP/ SP +23%. - P./ M. Atk. +300. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="13" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94288" name="Chocolate Doll" additionalName="Lv. 14" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 14>. - Soulshot and Spiritshot damage +14%. - Acquired XP/ SP +25%. - P./ M. Atk. +380. Can be upgraded through Chocolate compounding. -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="14" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94289" name="Chocolate Doll" additionalName="Lv. 15" type="EtcItem">
 		<!-- <Chocolate Doll Lv. 15>. - Soulshot and Spiritshot damage +15%. - Acquired XP/ SP +30%. - P./ M. Atk. +700 -->
 		<set name="icon" val="icon.gomdori_chest_change" />
-		<set name="is_tradable" val="false" />
+		<set name="material" val="PAPER" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
-		<set name="material" val="PAPER" />
+		<set name="is_tradable" val="false" />
+		<set name="etcitem_type" val="ENCHT_ATTR_RUNE" />
+		<set name="immediate_effect" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="50440" level="15" /> <!-- Chocolate Doll -->
+		</skills>
 	</item>
 	<item id="94290" name="Valentine's Day Gift Basket" additionalName="Event" type="EtcItem">
 		<!-- A Dark Chocolate's gift basket that has to be delivered to Marshmallow. You may look what's inside. -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/94600-94699.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/94600-94699.xml
index f337a37474..6ddea4b0f8 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/94600-94699.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/94600-94699.xml
@@ -1065,6 +1065,12 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="ENCHT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="40252" level="1" /> <!-- Scroll: Enchant Necklace of Spirits -->
+		</skills>
 	</item>
 	<item id="94684" name="Mark of Unity" additionalName="Event" type="EtcItem">
 		<!-- A proof of the clan's unity. Allows to learn clan skills from High Priest. -->
@@ -1150,7 +1156,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="handler" val="ExtractableItems" />
 		<capsuled_items>
-			<item id="44380" min="10" max="10" chance="100" /> <!-- Scroll: Boost Attack -->
+			<item id="94380" min="10" max="10" chance="100" /> <!-- Scroll: Boost Attack -->
 		</capsuled_items>
 	</item>
 	<item id="94691" name="Package: Scroll: Boost Defense (10 pcs.)" type="EtcItem">
@@ -1164,7 +1170,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="handler" val="ExtractableItems" />
 		<capsuled_items>
-			<item id="44381" min="10" max="10" chance="100" /> <!-- Scroll: Boost Attack -->
+			<item id="94271" min="10" max="10" chance="100" /> <!-- Scroll: Boost Attack -->
 		</capsuled_items>
 	</item>
 	<item id="94692" name="Test - Lady's Hairpin" additionalName="Test" type="Armor">
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95500-95599.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95500-95599.xml
index 8c1961100d..d3c0bac626 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95500-95599.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95500-95599.xml
@@ -652,6 +652,7 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true"/>
 	</item>
 	<item id="95572" name="+0~+5 Armor Pack - Full Plate Helmet" additionalName="Heavy Armor" type="EtcItem">
 		<!-- Double-click to obtain one of the following items. -->
@@ -662,6 +663,21 @@
 		<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="2414" min="1" max="1" chance="8.33"/>
+			<item id="2414" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="2414" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="2414" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="2414" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="2414" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+			<item id="93639" min="1" max="1" chance="8.33"/>
+			<item id="93639" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="93639" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="93639" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="93639" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="93639" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+		</capsuled_items>
 	</item>
 	<item id="95573" name="+0~+5 Armor Pack - Full Plate Boots" additionalName="Heavy Armor" type="EtcItem">
 		<!-- Double-click to obtain one of the following items. -->
@@ -672,6 +688,21 @@
 		<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="2438" min="1" max="1" chance="8.33"/>
+			<item id="2438" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="2438" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="2438" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="2438" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="2438" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+			<item id="93640" min="1" max="1" chance="8.33"/>
+			<item id="93640" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="93640" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="93640" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="93640" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="93640" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+		</capsuled_items>
 	</item>
 	<item id="95574" name="+0~+5 Armor Pack - Full Plate Gauntlets" additionalName="Heavy Armor" type="EtcItem">
 		<!-- Double-click to obtain one of the following items. -->
@@ -682,6 +713,21 @@
 		<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="2462" min="1" max="1" chance="8.33"/>
+			<item id="2462" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="2462" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="2462" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="2462" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="2462" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+			<item id="93641" min="1" max="1" chance="8.33"/>
+			<item id="93641" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="93641" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="93641" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="93641" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="93641" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+		</capsuled_items>
 	</item>
 	<item id="95575" name="+0~+5 Armor Pack - Full Plate Armor" additionalName="Heavy Armor" type="EtcItem">
 		<!-- Double-click to obtain one of the following items. -->
@@ -692,6 +738,21 @@
 		<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="356" min="1" max="1" chance="8.33"/>
+			<item id="356" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="356" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="356" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="356" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="356" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+			<item id="93642" min="1" max="1" chance="8.33"/>
+			<item id="93642" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="93642" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="93642" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="93642" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="93642" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+		</capsuled_items>
 	</item>
 	<item id="95576" name="+0~+5 Armor Pack - Drake Leather Armor" additionalName="Light Armor" type="EtcItem">
 		<!-- Double-click to obtain one of the following items. -->
@@ -702,6 +763,21 @@
 		<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="401" min="1" max="1" chance="8.33"/>
+			<item id="401" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="401" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="401" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="401" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="401" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+			<item id="93643" min="1" max="1" chance="8.33"/>
+			<item id="93643" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="93643" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="93643" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="93643" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="93643" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+		</capsuled_items>
 	</item>
 	<item id="95577" name="+0~+5 Armor Pack - Drake Leather Boots" additionalName="Light Armor" type="EtcItem">
 		<!-- Double-click to obtain one of the following items. -->
@@ -712,6 +788,21 @@
 		<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="2437" min="1" max="1" chance="8.33"/>
+			<item id="2437" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="2437" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="2437" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="2437" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="2437" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+			<item id="93644" min="1" max="1" chance="8.33"/>
+			<item id="93644" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="93644" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="93644" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="93644" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="93644" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+		</capsuled_items>
 	</item>
 	<item id="95578" name="+0~+5 Armor Pack - Drake Leather Gloves" additionalName="Light Armor" type="EtcItem">
 		<!-- Double-click to obtain one of the following items. -->
@@ -722,6 +813,21 @@
 		<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="2461" min="1" max="1" chance="8.33"/>
+			<item id="2461" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="2461" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="2461" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="2461" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="2461" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+			<item id="93645" min="1" max="1" chance="8.33"/>
+			<item id="93645" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="93645" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="93645" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="93645" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="93645" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+		</capsuled_items>
 	</item>
 	<item id="95579" name="+0~+5 Armor Pack - Karmian Tunic" additionalName="Light Armor" type="EtcItem">
 		<!-- Double-click to obtain one of the following items. -->
@@ -732,6 +838,21 @@
 		<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="439" min="1" max="1" chance="8.33"/>
+			<item id="439" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="439" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="439" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="439" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="439" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+			<item id="93646" min="1" max="1" chance="8.33"/>
+			<item id="93646" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="93646" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="93646" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="93646" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="93646" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+		</capsuled_items>
 	</item>
 	<item id="95580" name="+0~+5 Armor Pack - Karmian Stockings" additionalName="Robe" type="EtcItem">
 		<!-- Double-click to obtain one of the following items. -->
@@ -742,6 +863,21 @@
 		<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="471" min="1" max="1" chance="8.33"/>
+			<item id="471" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="471" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="471" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="471" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="471" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+			<item id="93647" min="1" max="1" chance="8.33"/>
+			<item id="93647" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="93647" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="93647" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="93647" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="93647" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+		</capsuled_items>
 	</item>
 	<item id="95581" name="+0~+5 Armor Pack - Karmian Boots" additionalName="Robe" type="EtcItem">
 		<!-- Double-click to obtain one of the following items. -->
@@ -752,6 +888,21 @@
 		<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="2430" min="1" max="1" chance="8.33"/>
+			<item id="2430" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="2430" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="2430" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="2430" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="2430" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+			<item id="93648" min="1" max="1" chance="8.33"/>
+			<item id="93648" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="93648" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="93648" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="93648" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="93648" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+		</capsuled_items>
 	</item>
 	<item id="95582" name="+0~+5 Armor Pack - Karmian Gloves" additionalName="Robe" type="EtcItem">
 		<!-- Double-click to obtain one of the following items. -->
@@ -762,6 +913,21 @@
 		<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="2454" min="1" max="1" chance="8.33"/>
+			<item id="2454" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="2454" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="2454" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="2454" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="2454" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+			<item id="93649" min="1" max="1" chance="8.33"/>
+			<item id="93649" min="1" max="1" chance="8.33" maxEnchant="1" minEnchant="1" />
+			<item id="93649" min="1" max="1" chance="8.33" maxEnchant="2" minEnchant="2" />
+			<item id="93649" min="1" max="1" chance="8.33" maxEnchant="3" minEnchant="3" />
+			<item id="93649" min="1" max="1" chance="8.33" maxEnchant="4" minEnchant="4" />
+			<item id="93649" min="1" max="1" chance="8.33" maxEnchant="5" minEnchant="5" />
+		</capsuled_items>
 	</item>
 	<item id="95583" name="Hardin's Notes - Page 1" type="EtcItem">
 		<!-- Required for crafting spellbooks. <Spellbooks to craft> Master's Book: Empower Master's Book: Focus Master's Book: Magic Barrier Master's Book: Acumen Master's Book: Shield Master's Book: Death Whisper Master's Book: Haste Master's Book: Might Master's Book: Wind Walk Spellbook: Pa'agrio's Medicine Spellbook: Chant of Healing Spellbook: Amazing Thunder Storm Mastery Spellbook: Amazing Spike Thrust Mastery Spellbook: Buff Thief Spellbook: Knight's Help Spellbook: Wild Beat Spellbook: Crazy Waltz Spellbook: Frantic Pace Spellbook: Bone Cage Spellbook: Death Guard Spellbook: Drain Magic Energy Spellbook: Dark Sense Spellbook: Esprit Spellbook: Pain of Sagittarius -->
@@ -956,6 +1122,12 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="40330" level="1" /> <!-- 17th Anniversary Scroll: Enchant Dragon Belt -->
+		</skills>
 	</item>
 	<item id="95597" name="Scroll: Enchant Cloak of Protection" type="EtcItem">
 		<!-- Required for enchanting Cloak of Protection. <font color=eeaa22><Can be used for enchanting up to +9.></font> <font color=ff6666><In case of failure the item's enchant value remains the same.></font> -->
@@ -965,6 +1137,12 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="40229" level="1" /> <!-- 17th Anniversary Scroll: Enchant Cloak of Protection -->
+		</skills>
 	</item>
 	<item id="95598" name="Scroll: Enchant Circlet of Hero" type="EtcItem">
 		<!-- Required for enchanting Circlet of Hero. <font color=eeaa22><Can be used for enchanting up to +9.></font> <font color=ff6666><In case of failure the item's enchant value remains the same.></font> -->
@@ -974,6 +1152,12 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="40210" level="1" /> <!-- Scroll: Enchant Circlet of Hero -->
+		</skills>
 	</item>
 	<item id="95599" name="Random Craft: Create +7 Kite Shield" type="EtcItem">
 		<!-- Double-click to create one of the following items. -->
@@ -984,5 +1168,11 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="40228" level="1" /> <!-- 17th Anniversary Scroll: Enchant Circlet of Hero -->
+		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/npcs/25000-25099.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/npcs/25000-25099.xml
index 8c544fef77..4b8cd5a95d 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/npcs/25000-25099.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/npcs/25000-25099.xml
@@ -169,7 +169,11 @@
 			<skill id="4739" level="3" /> <!-- BOSS Strike -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
-		<ai type="BALANCED" clanHelpRange="300" />
+		<ai type="BALANCED" clanHelpRange="300">
+			<clanList>
+				<clan>ORC</clan>
+			</clanList>
+		</ai>
 		<collision>
 			<radius normal="24" grown="12" />
 			<height normal="47" grown="27.6" />
@@ -216,7 +220,11 @@
 			<skill id="4754" level="2" /> <!-- BOSS Power Shot -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
-		<ai type="ARCHER" clanHelpRange="300" dodge="15" />
+		<ai type="ARCHER" clanHelpRange="300" dodge="15">
+			<clanList>
+				<clan>ORC</clan>
+			</clanList>
+		</ai>
 		<collision>
 			<radius normal="24" />
 			<height normal="61.5" />
@@ -251,7 +259,11 @@
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 		</skillList>
 		<exCrtEffect>true</exCrtEffect>
-		<ai clanHelpRange="300" />
+		<ai clanHelpRange="300">
+			<clanList>
+				<clan>ORC</clan>
+			</clanList>
+		</ai>
 		<collision>
 			<radius normal="15" grown="14" />
 			<height normal="33" grown="26.4" />
@@ -1101,7 +1113,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25027" level="48" type="Monster" name="Ketra Marksman" title="Raid Fighter">
+	<npc id="25027" level="74" type="Monster" name="Ketra Marksman" title="Raid Fighter">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4761" level="4" />
 		</parameters>
@@ -1140,7 +1152,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25028" level="48" type="Monster" name="Ketra Raider" title="Raid Fighter">
+	<npc id="25028" level="74" type="Monster" name="Ketra Raider" title="Raid Fighter">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="128" /> <!-- Knight's Sword -->
@@ -1890,7 +1902,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25045" level="46" type="Monster" name="Barion's Dark Wizard" title="Raid Fighter">
+	<npc id="25045" level="74" type="Monster" name="Barion's Dark Wizard" title="Raid Fighter">
 		<parameters>
 			<skill name="HealMagic_a" id="4781" level="4" />
 			<skill name="SelfRangeBuff_a" id="4213" level="4" />
@@ -1931,7 +1943,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="25046" level="46" type="Monster" name="Barion's Soldier" title="Raid Fighter">
+	<npc id="25046" level="74" type="Monster" name="Barion's Soldier" title="Raid Fighter">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="129" /> <!-- Sword of Revolution -->
@@ -2194,7 +2206,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25052" level="64" type="Monster" name="Priestess of Rahha" title="Raid Fighter">
+	<npc id="25052" level="74" type="Monster" name="Priestess of Rahha" title="Raid Fighter">
 		<parameters>
 			<skill name="HealMagic_a" id="4785" level="6" />
 			<skill name="SelfRangeBuff_a" id="4213" level="6" />
@@ -2234,7 +2246,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="25053" level="64" type="Monster" name="Fanatics of Rahha" title="Raid Fighter">
+	<npc id="25053" level="74" type="Monster" name="Fanatics of Rahha" title="Raid Fighter">
 		<race>BEAST</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -2374,7 +2386,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25055" level="79" type="Monster" name="Taliadon" title="Raid Fighter">
+	<npc id="25055" level="81" type="Monster" name="Taliadon" title="Raid Fighter">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4168" level="7" />
 		</parameters>
@@ -2415,7 +2427,7 @@
 			<height normal="45" grown="52" />
 		</collision>
 	</npc>
-	<npc id="25056" level="79" type="Monster" name="Vemsk" title="Raid Fighter">
+	<npc id="25056" level="82" type="Monster" name="Vemsk" title="Raid Fighter">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="142" /> <!-- Keshanberk -->
@@ -2499,7 +2511,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25058" level="44" type="Monster" name="Beacon's Shooter" title="Raid Fighter">
+	<npc id="25058" level="79" type="Monster" name="Beacon's Shooter" title="Raid Fighter">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4757" level="5" />
 		</parameters>
@@ -2540,7 +2552,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25059" level="44" type="Monster" name="Beacon's Warrior" title="Raid Fighter">
+	<npc id="25059" level="79" type="Monster" name="Beacon's Warrior" title="Raid Fighter">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="78" /> <!-- Elemental Sword -->
@@ -4258,7 +4270,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25096" level="28" type="Monster" name="Renoa's Elpy" title="Raid Fighter">
+	<npc id="25096" level="74" type="Monster" name="Renoa's Elpy" title="Raid Fighter">
 		<parameters>
 			<skill name="DDMagic_a" id="4193" level="2" />
 			<skill name="Debuff_a" id="4199" level="2" />
@@ -4297,7 +4309,7 @@
 			<height normal="4.5" />
 		</collision>
 	</npc>
-	<npc id="25097" level="28" type="Monster" name="Renoa's Hog" title="Raid Fighter">
+	<npc id="25097" level="74" type="Monster" name="Renoa's Hog" title="Raid Fighter">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4727" level="2" />
 		</parameters>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/npcs/25900-25999.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/npcs/25900-25999.xml
index 69ef2783d1..21c606ad8b 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/npcs/25900-25999.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/npcs/25900-25999.xml
@@ -702,16 +702,22 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25925" level="85" type="Monster" name="Jisra">
-		<race>ETC</race>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="704396.648044693" hpRegen="9.5" mp="5766.47681041497" mpRegen="3.3" />
-			<speed>
-				<walk ground="60" />
-				<run ground="160" />
-			</speed>
-			<attack physical="9327.04039041932" magical="2885.11628279205" critical="4.75" attackSpeed="253" range="40" />
-			<defence physical="1210.919540229885" magical="868.885085528838" />
+	<npc id="25925" level="85" type="RaidBoss" name="Jisra">
+		<parameters>
+			<param name="RaidSpawnMusic" value="Rm02_A" />
+			<skill name="RangeDDMagic_a" id="4178" level="2" />
+		</parameters>
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="2" /> <!-- Long Sword -->
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+		<vitals hp="3812812.68374633" hpRegen="43.8368677449012" mp="3539.96003996004" mpRegen="1.5" />
+		<attack physical="2743.69799488095" magical="219.514950783644" random="10" critical="4.75" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+		<defence physical="310.919540229885" magical="165.064820237234" evasion="-18" />
+		<speed>
+			<walk ground="56" />
+			<run ground="190" />
+		</speed>
 		</stats>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -735,15 +741,21 @@
 		</dropLists>
 	</npc>
 	<npc id="25926" level="85" type="Monster" name="Kuka">
-		<race>ETC</race>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="176099.627560521" hpRegen="9.5" mp="5766.47681041497" mpRegen="3.3" />
+		<parameters>
+			<param name="RaidSpawnMusic" value="Rm02_A" />
+			<skill name="RangeDDMagic_a" id="4178" level="2" />
+		</parameters>
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<equipment rhand="2" /> <!-- Long Sword -->
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="3812812.68374633" hpRegen="43.8368677449012" mp="3539.96003996004" mpRegen="1.5" />
+			<attack physical="2743.69799488095" magical="219.514950783644" random="10" critical="4.75" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="310.919540229885" magical="165.064820237234" evasion="-18" />
 			<speed>
-				<walk ground="60" />
-				<run ground="160" />
+				<walk ground="56" />
+				<run ground="190" />
 			</speed>
-			<attack physical="9327.04039041932" magical="2885.11628279205" critical="4.75" attackSpeed="253" range="40" />
-			<defence physical="1210.919540229885" magical="868.885085528838" />
 		</stats>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -860,24 +872,46 @@
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="25932" level="85" type="Npc" name="Katuba" title="High Elite">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+	<npc id="25932" level="85" type="RaidBoss" name="Katuba" title="High Elite">
+		<parameters>
+			<param name="RaidSpawnMusic" value="Rm02_A" />
+			<skill name="RangeDDMagic_a" id="4178" level="2" />
+		</parameters>
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
+		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
+			<vitals hp="3812812.68374633" hpRegen="43.8368677449012" mp="3539.96003996004" mpRegen="1.5" />
+			<attack physical="2743.69799488095" magical="219.514950783644" random="10" critical="4.75" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="310.919540229885" magical="165.064820237234" evasion="-18" />
 			<speed>
-				<walk ground="60" />
-				<run ground="120" />
+				<walk ground="56" />
+				<run ground="190" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="false" />
+		<skillList>
+			<skill id="4416" level="6" /> <!-- Humanoids -->
+		</skillList>
 		<collision>
 			<radius normal="5" />
 			<height normal="12" />
 		</collision>
+		<ai aggroRange="450" clanHelpRange="300">
+			<clanList>
+				<clan>DRAGON</clan>
+			</clanList>
+		</ai>
+		<dropLists>
+			<drop>
+				<item id="93002" min="1" max="2" chance="100" /> <!-- Sayha's Blessing Pouch -->
+				<item id="948" min="1" max="2" chance="88.13" /> <!-- Scroll: Enchant B-grade Armor (Exchangeable) -->
+				<item id="947" min="1" max="1" chance="10.005" /> <!-- Scroll: Enchant B-grade Weapon (Exchangeable) -->
+				<item id="91033" min="1" max="1" chance="0.3" /> <!-- Wind Spirit Evolution Stone -->
+				<item id="91032" min="1" max="1" chance="0.3" /> <!-- Fire Spirit Evolution Stone -->
+				<item id="92989" min="1" max="1" chance="0.3" /> <!-- Orc King's Treasure -->
+				<item id="91031" min="1" max="1" chance="0.3" /> <!-- Water Spirit Evolution Stone -->
+				<item id="91034" min="1" max="1" chance="0.3" /> <!-- Earth Spirit Evolution Stone -->
+			</drop>
+		</dropLists>
 	</npc>
 	<npc id="25933" level="85" type="Npc" name="Deiman" title="Mutant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40100-40199.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40100-40199.xml
index 81f5faf87c..365be13e75 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40100-40199.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40100-40199.xml
@@ -91,8 +91,69 @@
 	</skill>
 	<skill id="40106" toLevel="1" name="Battle Scroll (Event)">
 		<!-- For 20 min., P. Atk. +200, M. Atk. +350, P. Critical Rate/ M. Skill Critical Rate +30, Atk./ Casting Spd. +50, P./ M. Def. +200, Max HP/ MP/ CP +500. -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<reuseDelay>60000</reuseDelay>
+		<hitTime>4000</hitTime>
+		<abnormalTime>1200</abnormalTime>
+		<itemConsumeId>91780</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<abnormalTime>1200</abnormalTime>
+		<abnormalType>MULTI_BUFF</abnormalType>
+		<canBeDispelled>false</canBeDispelled>
+		<stayAfterDeath>true</stayAfterDeath>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<abnormalLevel>1</abnormalLevel>
+		<isMagic>1</isMagic> <!-- Magic Skill -->
+		<magicLevel>1</magicLevel>
+		<effects>
+			<effect name="PAtk">
+				<amount>200</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>350</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="CriticalRate">
+				<amount>30</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicCriticalRate">
+				<amount>30</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicalAttackSpeed">
+				<amount>50</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>200</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>200</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MaxHp">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MaxMp">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MaxCp">
+				<amount>500</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="40107" toLevel="1" name="Extra Pass: Transcendent Instance Zone">
 		<icon>icon.skill0000</icon>
@@ -651,11 +712,15 @@
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 	</skill>
-	<skill id="40180" toLevel="1" name="Sayha's Cookie - Event">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
+	<skill id="40180" toLevel="2" name="Sayha's Cookie - Event">
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 		<reuseDelay>300</reuseDelay>
+		<itemConsumeId>
+			<value level="1">93848</value>
+			<value level="2">93274</value>
+		</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<conditions>
 			<condition name="CanUseVitalityIncreaseItem">
 				<amount>35000</amount>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/50400-50499.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/50400-50499.xml
index 6666944877..446727e3bd 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/50400-50499.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/50400-50499.xml
@@ -1276,7 +1276,100 @@
 	<skill id="50440" toLevel="15" name="Chocolate Doll">
 		<!-- Chocolate Doll's effect Soulshot/ Spiritshot damage +$s1 Acquired XP/ SP +$s2 -->
 		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<stayAfterDeath>true</stayAfterDeath>
+		<effects>
+			<effect name="ShotsBonus">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">4</value>
+					<value level="5">5</value>
+					<value level="6">6</value>
+					<value level="7">7</value>
+					<value level="8">8</value>
+					<value level="9">9</value>
+					<value level="10">10</value>
+					<value level="11">11</value>
+					<value level="12">12</value>
+					<value level="13">13</value>
+					<value level="14">14</value>
+					<value level="15">15</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="ExpModify">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">5</value>
+					<value level="5">7</value>
+					<value level="6">10</value>
+					<value level="7">11</value>
+					<value level="8">13</value>
+					<value level="9">15</value>
+					<value level="10">17</value>
+					<value level="11">20</value>
+					<value level="12">21</value>
+					<value level="13">23</value>
+					<value level="14">25</value>
+					<value level="15">30</value>
+				</amount>
+			</effect>
+			<effect name="SpModify">
+				<amount>
+					<value level="1">1</value>
+					<value level="2">2</value>
+					<value level="3">3</value>
+					<value level="4">5</value>
+					<value level="5">7</value>
+					<value level="6">10</value>
+					<value level="7">11</value>
+					<value level="8">13</value>
+					<value level="9">15</value>
+					<value level="10">17</value>
+					<value level="11">20</value>
+					<value level="12">21</value>
+					<value level="13">23</value>
+					<value level="14">25</value>
+					<value level="15">30</value>
+				</amount>
+			</effect>
+			<effect name="PAtk">
+				<amount>
+					<value fromLevel="1" toLevel="5">0</value>
+					<value level="6">10</value>
+					<value level="7">30</value>
+					<value level="8">50</value>
+					<value level="9">80</value>
+					<value level="10">120</value>
+					<value level="11">170</value>
+					<value level="12">230</value>
+					<value level="13">300</value>
+					<value level="14">380</value>
+					<value level="15">700</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>
+					<value fromLevel="1" toLevel="5">0</value>
+					<value level="6">10</value>
+					<value level="7">30</value>
+					<value level="8">50</value>
+					<value level="9">80</value>
+					<value level="10">120</value>
+					<value level="11">170</value>
+					<value level="12">230</value>
+					<value level="13">300</value>
+					<value level="14">380</value>
+					<value level="15">700</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="50441" toLevel="4" name="Antharas' Earring">
 		<!-- An earring imbued with the Earth Dragon's power. <Effect> Max MP $s1 Bleed Atk. Rate $s2 Stun Atk. Rate $s3 Silence Atk. Rate $s4 Fear Atk. Rate $s5 Bleed Resistance $s6 Stun Resistance $s7 Silence Resistance $s8 Fear Resistance $s9 Received Healing $s10 Skill MP Consumption $s11 Absorbs $s12 of the inflicted damage as HP. -->
@@ -3441,7 +3534,7 @@
 					<value level="8">50</value>
 					<value level="9">50</value>
 					<value level="10">50</value>
-					<value level="11">50</value>					
+					<value level="11">50</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -3458,8 +3551,8 @@
 					<value level="9">300</value>
 					<value level="10">500</value>
 					<value level="11">800</value>
-				</amount>		
-				<mode>DIFF</mode>			
+				</amount>
+				<mode>DIFF</mode>
 			</effect>
 			<effect name="MAtk">
 				<amount>
@@ -3474,8 +3567,8 @@
 					<value level="9">300</value>
 					<value level="10">500</value>
 					<value level="11">800</value>
-				</amount>		
-				<mode>DIFF</mode>			
+				</amount>
+				<mode>DIFF</mode>
 			</effect>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -3490,8 +3583,8 @@
 					<value level="9">70</value>
 					<value level="10">100</value>
 					<value level="11">150</value>
-				</amount>		
-				<mode>DIFF</mode>			
+				</amount>
+				<mode>DIFF</mode>
 			</effect>
 			<effect name="MagicalDefence">
 				<amount>
@@ -3506,8 +3599,8 @@
 					<value level="9">70</value>
 					<value level="10">100</value>
 					<value level="11">150</value>
-				</amount>		
-				<mode>DIFF</mode>			
+				</amount>
+				<mode>DIFF</mode>
 			</effect>
 			<effect name="PhysicalAttackSpeed">
 				<amount>
@@ -3522,8 +3615,8 @@
 					<value level="9">30</value>
 					<value level="10">40</value>
 					<value level="11">50</value>
-				</amount>		
-				<mode>DIFF</mode>			
+				</amount>
+				<mode>DIFF</mode>
 			</effect>
 			<effect name="MagicalAttackSpeed">
 				<amount>
@@ -3538,8 +3631,8 @@
 					<value level="9">30</value>
 					<value level="10">40</value>
 					<value level="11">50</value>
-				</amount>		
-				<mode>DIFF</mode>			
+				</amount>
+				<mode>DIFF</mode>
 			</effect>
 			<effect name="StatUp">
 				<amount>
@@ -3548,7 +3641,7 @@
 					<value level="10">2</value>
 					<value level="11">3</value>
 				</amount>
-				<stat>STR</stat>							
+				<stat>STR</stat>
 			</effect>
 			<effect name="StatUp">
 				<amount>
@@ -3557,7 +3650,7 @@
 					<value level="10">2</value>
 					<value level="11">3</value>
 				</amount>
-				<stat>INT</stat>							
+				<stat>INT</stat>
 			</effect>
 			<effect name="CriticalDamage">
 				<amount>
@@ -3567,8 +3660,8 @@
 					<value level="9">50</value>
 					<value level="10">100</value>
 					<value level="11">300</value>
-				</amount>		
-				<mode>DIFF</mode>			
+				</amount>
+				<mode>DIFF</mode>
 			</effect>
 			<effect name="MagicCriticalDamage">
 				<amount>
@@ -3578,8 +3671,8 @@
 					<value level="9">50</value>
 					<value level="10">100</value>
 					<value level="11">300</value>
-				</amount>		
-				<mode>DIFF</mode>			
+				</amount>
+				<mode>DIFF</mode>
 			</effect>
 		</effects>
 	</skill>
@@ -3707,7 +3800,7 @@
 			</effect>
 			<effect name="MagicalAttackSpeed">
 				<amount>
-				<value fromLevel="1" toLevel="4">0</value>
+					<value fromLevel="1" toLevel="4">0</value>
 					<value level="5">35</value>
 					<value level="6">50</value>
 					<value level="7">70</value>
@@ -3719,7 +3812,7 @@
 			</effect>
 			<effect name="Speed">
 				<amount>
-					<value fromLevel="1" toLevel="5">0</value>			
+					<value fromLevel="1" toLevel="5">0</value>
 					<value level="6">1</value>
 					<value level="7">2</value>
 					<value level="8">5</value>
@@ -3750,7 +3843,7 @@
 					<value level="3">0</value>
 					<value level="4">0</value>
 					<value level="5">0</value>
-					<value level="6">0</value>	
+					<value level="6">0</value>
 					<value level="7">3</value>
 					<value level="8">7</value>
 					<value level="9">12</value>
@@ -3775,7 +3868,7 @@
 			</effect>
 			<effect name="ResistAbnormalByCategory">
 				<amount>
-					<value fromLevel="1" toLevel="7">0</value>			
+					<value fromLevel="1" toLevel="7">0</value>
 					<value level="8">-2</value>
 					<value level="9">-5</value>
 					<value level="10">-10</value>