From 6a689f3b78534b481186b12f9581ee5eb78834bf Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 16 Jan 2019 17:11:49 +0000
Subject: [PATCH] Emperor's Dessert Set buff items. Contributed by champzix1.

---
 .../game/data/stats/items/47400-47499.xml     | 48 +++++++++++++++++++
 .../game/data/stats/skills/09500-09599.xml    |  6 +++
 .../game/data/stats/skills/17200-17299.xml    |  3 --
 .../game/data/stats/items/47400-47499.xml     | 48 +++++++++++++++++++
 .../game/data/stats/skills/09500-09599.xml    |  6 +++
 .../game/data/stats/skills/17200-17299.xml    |  3 --
 .../game/data/stats/items/47400-47499.xml     | 48 +++++++++++++++++++
 .../game/data/stats/skills/09500-09599.xml    |  6 +++
 .../game/data/stats/skills/17200-17299.xml    |  3 --
 .../game/data/stats/items/47400-47499.xml     | 48 +++++++++++++++++++
 .../game/data/stats/skills/09500-09599.xml    |  6 +++
 .../game/data/stats/skills/17200-17299.xml    |  3 --
 12 files changed, 216 insertions(+), 12 deletions(-)

diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/47400-47499.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/47400-47499.xml
index c9c6b4e550..e33f85e82b 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/47400-47499.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/47400-47499.xml
@@ -53,6 +53,22 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="9281" level="1" /> <!-- Drum Melody - Heavenly Cocktail -->
+			<skill id="9282" level="1" /> <!-- Lute Melody - Heavenly Cocktail -->
+			<skill id="9283" level="1" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
+			<skill id="9284" level="1" /> <!-- Guitar Melody - Heavenly Cocktail -->
+			<skill id="9285" level="1" /> <!-- Harp Melody - Heavenly Cocktail -->
+			<skill id="9280" level="1" /> <!-- Horn Melody - Heavenly Cocktail -->
+			<skill id="17297" level="1" /> <!-- Emperor's Cookie: Prevailing Sonata -->
+			<skill id="17298" level="1" /> <!-- Emperor's Cookie: Daring Sonata -->
+			<skill id="17299" level="1" /> <!-- Emperor's Cookie: Refreshing Sonata -->
+			<skill id="9569" level="1" /> <!-- Heavenly P. Atk. Cookie -->
+		</skills>
 	</item>
 	<item id="47403" name="Emperor's Dessert Set (Magic Type)" type="EtcItem">
 		<!-- Use to feel the effects of the Heavenly Cocktail, Heavenly Magic Attack, and Emperor's Cookie. Cannot be used in the Olympiad. -->
@@ -65,6 +81,22 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="9281" level="1" /> <!-- Drum Melody - Heavenly Cocktail -->
+			<skill id="9282" level="1" /> <!-- Lute Melody - Heavenly Cocktail -->
+			<skill id="9283" level="1" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
+			<skill id="9284" level="1" /> <!-- Guitar Melody - Heavenly Cocktail -->
+			<skill id="9285" level="1" /> <!-- Harp Melody - Heavenly Cocktail -->
+			<skill id="9280" level="1" /> <!-- Horn Melody - Heavenly Cocktail -->
+			<skill id="17297" level="1" /> <!-- Emperor's Cookie: Prevailing Sonata -->
+			<skill id="17298" level="1" /> <!-- Emperor's Cookie: Daring Sonata -->
+			<skill id="17299" level="1" /> <!-- Emperor's Cookie: Refreshing Sonata -->
+			<skill id="9571" level="1" /> <!-- Heavenly Magic Cookie -->
+		</skills>
 	</item>
 	<item id="47404" name="Emperor's Dessert Set (Defense Type)" type="EtcItem">
 		<!-- Use to feel the effects of the Heavenly Cocktail, Heavenly Defense Cookie, and Emperor's Cookie. Cannot be used in the Olympiad. -->
@@ -77,6 +109,22 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="9281" level="1" /> <!-- Drum Melody - Heavenly Cocktail -->
+			<skill id="9282" level="1" /> <!-- Lute Melody - Heavenly Cocktail -->
+			<skill id="9283" level="1" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
+			<skill id="9284" level="1" /> <!-- Guitar Melody - Heavenly Cocktail -->
+			<skill id="9285" level="1" /> <!-- Harp Melody - Heavenly Cocktail -->
+			<skill id="9280" level="1" /> <!-- Horn Melody - Heavenly Cocktail -->
+			<skill id="17297" level="1" /> <!-- Emperor's Cookie: Prevailing Sonata -->
+			<skill id="17298" level="1" /> <!-- Emperor's Cookie: Daring Sonata -->
+			<skill id="17299" level="1" /> <!-- Emperor's Cookie: Refreshing Sonata -->
+			<skill id="9570" level="1" /> <!-- Heavenly P. Def. Cookie -->
+		</skills>
 	</item>
 	<item id="47405" name="Scroll of Experience - Lv1 (Main Class)" type="EtcItem">
 		<!-- Use to gain 31 billion EXP and 40 million SP. Can be used by characters with Lv. 94 or above. -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/09500-09599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/09500-09599.xml
index a40d24ea6a..7745f83932 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/09500-09599.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/09500-09599.xml
@@ -1599,6 +1599,8 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<stayAfterDeath>true</stayAfterDeath>
+		<itemConsumeId>35999</itemConsumeId> <!-- Heavenly P. Atk. Cookie -->
+		<itemConsumeCount>1</itemConsumeCount>
 		<effects>
 			<effect name="PAtk">
 				<amount>35</amount>
@@ -1648,6 +1650,8 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<stayAfterDeath>true</stayAfterDeath>
+		<itemConsumeId>36000</itemConsumeId> <!-- Heavenly P. Def. Cookie -->
+		<itemConsumeCount>1</itemConsumeCount>
 		<effects>
 			<effect name="PAtk">
 				<amount>35</amount>
@@ -1693,6 +1697,8 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<stayAfterDeath>true</stayAfterDeath>
+		<itemConsumeId>36001</itemConsumeId> <!-- Heavenly Magic Cookie -->
+		<itemConsumeCount>1</itemConsumeCount>
 		<effects>
 			<effect name="MAtk">
 				<amount>40</amount>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17200-17299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17200-17299.xml
index b1f9e090f5..15a3662b60 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17200-17299.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17200-17299.xml
@@ -884,7 +884,6 @@
 		<affectRange>1000</affectRange>
 		<hitTime>700</hitTime>
 		<coolTime>300</coolTime>
-		<reuseDelay>3600000</reuseDelay>
 		<isMagic>22</isMagic>
 		<magicLvl>85</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -940,7 +939,6 @@
 		<affectRange>1000</affectRange>
 		<hitTime>700</hitTime>
 		<coolTime>300</coolTime>
-		<reuseDelay>3600000</reuseDelay>
 		<isMagic>22</isMagic>
 		<magicLvl>85</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -1005,7 +1003,6 @@
 		<affectRange>1000</affectRange>
 		<hitTime>700</hitTime>
 		<coolTime>300</coolTime>
-		<reuseDelay>3600000</reuseDelay>
 		<isMagic>22</isMagic>
 		<magicLvl>85</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47400-47499.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47400-47499.xml
index 7a1302cbc8..08620dde07 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47400-47499.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47400-47499.xml
@@ -53,6 +53,22 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="9281" level="1" /> <!-- Drum Melody - Heavenly Cocktail -->
+			<skill id="9282" level="1" /> <!-- Lute Melody - Heavenly Cocktail -->
+			<skill id="9283" level="1" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
+			<skill id="9284" level="1" /> <!-- Guitar Melody - Heavenly Cocktail -->
+			<skill id="9285" level="1" /> <!-- Harp Melody - Heavenly Cocktail -->
+			<skill id="9280" level="1" /> <!-- Horn Melody - Heavenly Cocktail -->
+			<skill id="17297" level="1" /> <!-- Emperor's Cookie: Prevailing Sonata -->
+			<skill id="17298" level="1" /> <!-- Emperor's Cookie: Daring Sonata -->
+			<skill id="17299" level="1" /> <!-- Emperor's Cookie: Refreshing Sonata -->
+			<skill id="9569" level="1" /> <!-- Heavenly P. Atk. Cookie -->
+		</skills>
 	</item>
 	<item id="47403" name="Emperor's Dessert Set (Magic Type)" type="EtcItem">
 		<!-- Use to feel the effects of the Heavenly Cocktail, Heavenly Magic Attack, and Emperor's Cookie. Cannot be used in the Olympiad. -->
@@ -65,6 +81,22 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="9281" level="1" /> <!-- Drum Melody - Heavenly Cocktail -->
+			<skill id="9282" level="1" /> <!-- Lute Melody - Heavenly Cocktail -->
+			<skill id="9283" level="1" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
+			<skill id="9284" level="1" /> <!-- Guitar Melody - Heavenly Cocktail -->
+			<skill id="9285" level="1" /> <!-- Harp Melody - Heavenly Cocktail -->
+			<skill id="9280" level="1" /> <!-- Horn Melody - Heavenly Cocktail -->
+			<skill id="17297" level="1" /> <!-- Emperor's Cookie: Prevailing Sonata -->
+			<skill id="17298" level="1" /> <!-- Emperor's Cookie: Daring Sonata -->
+			<skill id="17299" level="1" /> <!-- Emperor's Cookie: Refreshing Sonata -->
+			<skill id="9571" level="1" /> <!-- Heavenly Magic Cookie -->
+		</skills>
 	</item>
 	<item id="47404" name="Emperor's Dessert Set (Defense Type)" type="EtcItem">
 		<!-- Use to feel the effects of the Heavenly Cocktail, Heavenly Defense Cookie, and Emperor's Cookie. Cannot be used in the Olympiad. -->
@@ -77,6 +109,22 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="9281" level="1" /> <!-- Drum Melody - Heavenly Cocktail -->
+			<skill id="9282" level="1" /> <!-- Lute Melody - Heavenly Cocktail -->
+			<skill id="9283" level="1" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
+			<skill id="9284" level="1" /> <!-- Guitar Melody - Heavenly Cocktail -->
+			<skill id="9285" level="1" /> <!-- Harp Melody - Heavenly Cocktail -->
+			<skill id="9280" level="1" /> <!-- Horn Melody - Heavenly Cocktail -->
+			<skill id="17297" level="1" /> <!-- Emperor's Cookie: Prevailing Sonata -->
+			<skill id="17298" level="1" /> <!-- Emperor's Cookie: Daring Sonata -->
+			<skill id="17299" level="1" /> <!-- Emperor's Cookie: Refreshing Sonata -->
+			<skill id="9570" level="1" /> <!-- Heavenly P. Def. Cookie -->
+		</skills>
 	</item>
 	<item id="47405" name="Scroll of Experience - Lv1 (Main Class)" type="EtcItem">
 		<!-- Use to gain 31 billion EXP and 40 million SP. Can be used by characters with Lv. 94 or above. -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/09500-09599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/09500-09599.xml
index a40d24ea6a..7745f83932 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/09500-09599.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/09500-09599.xml
@@ -1599,6 +1599,8 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<stayAfterDeath>true</stayAfterDeath>
+		<itemConsumeId>35999</itemConsumeId> <!-- Heavenly P. Atk. Cookie -->
+		<itemConsumeCount>1</itemConsumeCount>
 		<effects>
 			<effect name="PAtk">
 				<amount>35</amount>
@@ -1648,6 +1650,8 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<stayAfterDeath>true</stayAfterDeath>
+		<itemConsumeId>36000</itemConsumeId> <!-- Heavenly P. Def. Cookie -->
+		<itemConsumeCount>1</itemConsumeCount>
 		<effects>
 			<effect name="PAtk">
 				<amount>35</amount>
@@ -1693,6 +1697,8 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<stayAfterDeath>true</stayAfterDeath>
+		<itemConsumeId>36001</itemConsumeId> <!-- Heavenly Magic Cookie -->
+		<itemConsumeCount>1</itemConsumeCount>
 		<effects>
 			<effect name="MAtk">
 				<amount>40</amount>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17200-17299.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17200-17299.xml
index d1ff623d5b..a1b1e7d42d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17200-17299.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17200-17299.xml
@@ -897,7 +897,6 @@
 		<affectRange>1000</affectRange>
 		<hitTime>700</hitTime>
 		<coolTime>300</coolTime>
-		<reuseDelay>3600000</reuseDelay>
 		<isMagic>22</isMagic>
 		<magicLvl>85</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -953,7 +952,6 @@
 		<affectRange>1000</affectRange>
 		<hitTime>700</hitTime>
 		<coolTime>300</coolTime>
-		<reuseDelay>3600000</reuseDelay>
 		<isMagic>22</isMagic>
 		<magicLvl>85</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -1018,7 +1016,6 @@
 		<affectRange>1000</affectRange>
 		<hitTime>700</hitTime>
 		<coolTime>300</coolTime>
-		<reuseDelay>3600000</reuseDelay>
 		<isMagic>22</isMagic>
 		<magicLvl>85</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/47400-47499.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/47400-47499.xml
index 7f3e3bf63b..eab9c488be 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/47400-47499.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/47400-47499.xml
@@ -53,6 +53,22 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="9281" level="1" /> <!-- Drum Melody - Heavenly Cocktail -->
+			<skill id="9282" level="1" /> <!-- Lute Melody - Heavenly Cocktail -->
+			<skill id="9283" level="1" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
+			<skill id="9284" level="1" /> <!-- Guitar Melody - Heavenly Cocktail -->
+			<skill id="9285" level="1" /> <!-- Harp Melody - Heavenly Cocktail -->
+			<skill id="9280" level="1" /> <!-- Horn Melody - Heavenly Cocktail -->
+			<skill id="17297" level="1" /> <!-- Emperor's Cookie: Prevailing Sonata -->
+			<skill id="17298" level="1" /> <!-- Emperor's Cookie: Daring Sonata -->
+			<skill id="17299" level="1" /> <!-- Emperor's Cookie: Refreshing Sonata -->
+			<skill id="9569" level="1" /> <!-- Heavenly P. Atk. Cookie -->
+		</skills>
 	</item>
 	<item id="47403" name="Emperor's Dessert Set (Magic Type)" type="EtcItem">
 		<!-- Use to feel the effects of the Heavenly Cocktail, Heavenly Magic Attack, and Emperor's Cookie. Cannot be used in the Olympiad. -->
@@ -65,6 +81,22 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="9281" level="1" /> <!-- Drum Melody - Heavenly Cocktail -->
+			<skill id="9282" level="1" /> <!-- Lute Melody - Heavenly Cocktail -->
+			<skill id="9283" level="1" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
+			<skill id="9284" level="1" /> <!-- Guitar Melody - Heavenly Cocktail -->
+			<skill id="9285" level="1" /> <!-- Harp Melody - Heavenly Cocktail -->
+			<skill id="9280" level="1" /> <!-- Horn Melody - Heavenly Cocktail -->
+			<skill id="17297" level="1" /> <!-- Emperor's Cookie: Prevailing Sonata -->
+			<skill id="17298" level="1" /> <!-- Emperor's Cookie: Daring Sonata -->
+			<skill id="17299" level="1" /> <!-- Emperor's Cookie: Refreshing Sonata -->
+			<skill id="9571" level="1" /> <!-- Heavenly Magic Cookie -->
+		</skills>
 	</item>
 	<item id="47404" name="Emperor's Dessert Set (Defense Type)" type="EtcItem">
 		<!-- Use to feel the effects of the Heavenly Cocktail, Heavenly Defense Cookie, and Emperor's Cookie. Cannot be used in the Olympiad. -->
@@ -77,6 +109,22 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="9281" level="1" /> <!-- Drum Melody - Heavenly Cocktail -->
+			<skill id="9282" level="1" /> <!-- Lute Melody - Heavenly Cocktail -->
+			<skill id="9283" level="1" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
+			<skill id="9284" level="1" /> <!-- Guitar Melody - Heavenly Cocktail -->
+			<skill id="9285" level="1" /> <!-- Harp Melody - Heavenly Cocktail -->
+			<skill id="9280" level="1" /> <!-- Horn Melody - Heavenly Cocktail -->
+			<skill id="17297" level="1" /> <!-- Emperor's Cookie: Prevailing Sonata -->
+			<skill id="17298" level="1" /> <!-- Emperor's Cookie: Daring Sonata -->
+			<skill id="17299" level="1" /> <!-- Emperor's Cookie: Refreshing Sonata -->
+			<skill id="9570" level="1" /> <!-- Heavenly P. Def. Cookie -->
+		</skills>
 	</item>
 	<item id="47405" name="Scroll of Experience - Lv1 (Main Class)" type="EtcItem">
 		<!-- Use to gain 31 billion EXP and 40 million SP. Can be used by main class of Lv. 85 or above. -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/09500-09599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/09500-09599.xml
index 4cdbd2bf4e..b52d0e55f8 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/09500-09599.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/09500-09599.xml
@@ -1599,6 +1599,8 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<stayAfterDeath>true</stayAfterDeath>
+		<itemConsumeId>35999</itemConsumeId> <!-- Heavenly P. Atk. Cookie -->
+		<itemConsumeCount>1</itemConsumeCount>
 		<effects>
 			<effect name="PAtk">
 				<amount>35</amount>
@@ -1648,6 +1650,8 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<stayAfterDeath>true</stayAfterDeath>
+		<itemConsumeId>36000</itemConsumeId> <!-- Heavenly P. Def. Cookie -->
+		<itemConsumeCount>1</itemConsumeCount>
 		<effects>
 			<effect name="PAtk">
 				<amount>35</amount>
@@ -1693,6 +1697,8 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<stayAfterDeath>true</stayAfterDeath>
+		<itemConsumeId>36001</itemConsumeId> <!-- Heavenly Magic Cookie -->
+		<itemConsumeCount>1</itemConsumeCount>
 		<effects>
 			<effect name="MAtk">
 				<amount>40</amount>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/17200-17299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/17200-17299.xml
index 234e949055..c682a5bbaa 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/17200-17299.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/17200-17299.xml
@@ -897,7 +897,6 @@
 		<affectRange>1000</affectRange>
 		<hitTime>700</hitTime>
 		<coolTime>300</coolTime>
-		<reuseDelay>3600000</reuseDelay>
 		<isMagic>22</isMagic>
 		<magicLvl>85</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -953,7 +952,6 @@
 		<affectRange>1000</affectRange>
 		<hitTime>700</hitTime>
 		<coolTime>300</coolTime>
-		<reuseDelay>3600000</reuseDelay>
 		<isMagic>22</isMagic>
 		<magicLvl>85</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -1018,7 +1016,6 @@
 		<affectRange>1000</affectRange>
 		<hitTime>700</hitTime>
 		<coolTime>300</coolTime>
-		<reuseDelay>3600000</reuseDelay>
 		<isMagic>22</isMagic>
 		<magicLvl>85</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/47400-47499.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/47400-47499.xml
index e674a14849..df61cf63fe 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/47400-47499.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/47400-47499.xml
@@ -53,6 +53,22 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="9281" level="1" /> <!-- Drum Melody - Heavenly Cocktail -->
+			<skill id="9282" level="1" /> <!-- Lute Melody - Heavenly Cocktail -->
+			<skill id="9283" level="1" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
+			<skill id="9284" level="1" /> <!-- Guitar Melody - Heavenly Cocktail -->
+			<skill id="9285" level="1" /> <!-- Harp Melody - Heavenly Cocktail -->
+			<skill id="9280" level="1" /> <!-- Horn Melody - Heavenly Cocktail -->
+			<skill id="17297" level="1" /> <!-- Emperor's Cookie: Prevailing Sonata -->
+			<skill id="17298" level="1" /> <!-- Emperor's Cookie: Daring Sonata -->
+			<skill id="17299" level="1" /> <!-- Emperor's Cookie: Refreshing Sonata -->
+			<skill id="9569" level="1" /> <!-- Heavenly P. Atk. Cookie -->
+		</skills>
 	</item>
 	<item id="47403" name="Emperor's Dessert Set (Magic Type)" type="EtcItem">
 		<!-- Use to feel the effects of the Heavenly Cocktail, Heavenly Magic Attack, and Emperor's Cookie. Cannot be used in the Olympiad. -->
@@ -65,6 +81,22 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="9281" level="1" /> <!-- Drum Melody - Heavenly Cocktail -->
+			<skill id="9282" level="1" /> <!-- Lute Melody - Heavenly Cocktail -->
+			<skill id="9283" level="1" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
+			<skill id="9284" level="1" /> <!-- Guitar Melody - Heavenly Cocktail -->
+			<skill id="9285" level="1" /> <!-- Harp Melody - Heavenly Cocktail -->
+			<skill id="9280" level="1" /> <!-- Horn Melody - Heavenly Cocktail -->
+			<skill id="17297" level="1" /> <!-- Emperor's Cookie: Prevailing Sonata -->
+			<skill id="17298" level="1" /> <!-- Emperor's Cookie: Daring Sonata -->
+			<skill id="17299" level="1" /> <!-- Emperor's Cookie: Refreshing Sonata -->
+			<skill id="9571" level="1" /> <!-- Heavenly Magic Cookie -->
+		</skills>
 	</item>
 	<item id="47404" name="Emperor's Dessert Set (Defense Type)" type="EtcItem">
 		<!-- Use to feel the effects of the Heavenly Cocktail, Heavenly Defense Cookie, and Emperor's Cookie. Cannot be used in the Olympiad. -->
@@ -77,6 +109,22 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_private_storeable" val="false" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="etcitem_type" val="SCROLL" />
+		<set name="handler" val="ItemSkills" />
+		<set name="immediate_effect" val="true" />
+		<skills>
+			<skill id="9281" level="1" /> <!-- Drum Melody - Heavenly Cocktail -->
+			<skill id="9282" level="1" /> <!-- Lute Melody - Heavenly Cocktail -->
+			<skill id="9283" level="1" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
+			<skill id="9284" level="1" /> <!-- Guitar Melody - Heavenly Cocktail -->
+			<skill id="9285" level="1" /> <!-- Harp Melody - Heavenly Cocktail -->
+			<skill id="9280" level="1" /> <!-- Horn Melody - Heavenly Cocktail -->
+			<skill id="17297" level="1" /> <!-- Emperor's Cookie: Prevailing Sonata -->
+			<skill id="17298" level="1" /> <!-- Emperor's Cookie: Daring Sonata -->
+			<skill id="17299" level="1" /> <!-- Emperor's Cookie: Refreshing Sonata -->
+			<skill id="9570" level="1" /> <!-- Heavenly P. Def. Cookie -->
+		</skills>
 	</item>
 	<item id="47405" name="Scroll of Experience - Lv1 (Main Class)" type="EtcItem">
 		<!-- Use to gain 31 billion EXP and 40 million SP. Can be used by main class of Lv. 85 or above. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/09500-09599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/09500-09599.xml
index 3c8efa579f..9fce34a40d 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/09500-09599.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/09500-09599.xml
@@ -1599,6 +1599,8 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<stayAfterDeath>true</stayAfterDeath>
+		<itemConsumeId>35999</itemConsumeId> <!-- Heavenly P. Atk. Cookie -->
+		<itemConsumeCount>1</itemConsumeCount>
 		<effects>
 			<effect name="PAtk">
 				<amount>35</amount>
@@ -1648,6 +1650,8 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<stayAfterDeath>true</stayAfterDeath>
+		<itemConsumeId>36000</itemConsumeId> <!-- Heavenly P. Def. Cookie -->
+		<itemConsumeCount>1</itemConsumeCount>
 		<effects>
 			<effect name="PAtk">
 				<amount>35</amount>
@@ -1693,6 +1697,8 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<stayAfterDeath>true</stayAfterDeath>
+		<itemConsumeId>36001</itemConsumeId> <!-- Heavenly Magic Cookie -->
+		<itemConsumeCount>1</itemConsumeCount>
 		<effects>
 			<effect name="MAtk">
 				<amount>40</amount>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17200-17299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17200-17299.xml
index fce21f303e..4150658710 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17200-17299.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17200-17299.xml
@@ -897,7 +897,6 @@
 		<affectRange>1000</affectRange>
 		<hitTime>700</hitTime>
 		<coolTime>300</coolTime>
-		<reuseDelay>3600000</reuseDelay>
 		<isMagic>22</isMagic>
 		<magicLvl>85</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -953,7 +952,6 @@
 		<affectRange>1000</affectRange>
 		<hitTime>700</hitTime>
 		<coolTime>300</coolTime>
-		<reuseDelay>3600000</reuseDelay>
 		<isMagic>22</isMagic>
 		<magicLvl>85</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -1018,7 +1016,6 @@
 		<affectRange>1000</affectRange>
 		<hitTime>700</hitTime>
 		<coolTime>300</coolTime>
-		<reuseDelay>3600000</reuseDelay>
 		<isMagic>22</isMagic>
 		<magicLvl>85</magicLvl>
 		<magicCriticalRate>5</magicCriticalRate>