From e404cd212a2b5c403e1007d519a26d3cdca95f54 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 12 Oct 2017 02:48:55 +0000
Subject: [PATCH] Halloween Cookie. Contributed by gamelike85.

---
 .../game/data/stats/items/22300-22399.xml     | 20 +++++++++++--------
 .../game/data/stats/skills/22400-22499.xml    |  9 ++++++++-
 .../game/data/stats/items/22300-22399.xml     | 20 +++++++++++--------
 .../game/data/stats/skills/22400-22499.xml    |  9 ++++++++-
 .../game/data/stats/items/22300-22399.xml     | 20 +++++++++++--------
 .../game/data/stats/skills/22400-22499.xml    |  9 ++++++++-
 6 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/22300-22399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/22300-22399.xml
index 1befa97bbe..cf1082c4ec 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/22300-22399.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/22300-22399.xml
@@ -1695,19 +1695,23 @@
 	<item id="22385" name="Halloween Cookie" additionalName="Event" type="EtcItem">
 		<!-- Cookie that can be obtained on Halloween. Speed increases by 33 for 60 min. -->
 		<set name="icon" val="BranchSys3.Icon.ev_halloween_cookie" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="3600000" />
+		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="120" />
-		<set name="is_clan_depositable" val="false" />
+		<set name="is_freightable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_sellable" val="false" />	
+		<set name="is_private_storeable" val="false" />		
 		<set name="is_commissionable" val="false" />
-		<set name="is_private_storeable" val="false" />
-		<set name="is_oly_restricted" val="true" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="SCROLL" />
-		<set name="handler" val="ItemSkills" />
-		<set name="is_stackable" val="true" />
+		<set name="is_clan_depositable" val="false" />		
 		<skills>
 			<skill id="22415" level="1" /> <!-- Halloween Cookie -->
 		</skills>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/22400-22499.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/22400-22499.xml
index 541abc0b9f..d401d4d65f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/22400-22499.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/22400-22499.xml
@@ -623,7 +623,6 @@
 		</effects>
 	</skill>
 	<skill id="22415" toLevel="1" name="Halloween Cookie">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Speed by 33 for 60 minutes. -->
 		<icon>BranchSys3.Icon.ev_halloween_cookie</icon>
 		<operateType>A2</operateType>
@@ -642,6 +641,14 @@
 		<reuseDelay>3600000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<itemConsumeId>22385</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<effects>
+			<effect name="Speed">
+				<amount>33</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="22416" toLevel="1" name="Halloween Special Cookie">
 		<!-- AUTO GENERATED SKILL -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/22300-22399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/22300-22399.xml
index 8ab8404ca6..188f9a9ce9 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/22300-22399.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/22300-22399.xml
@@ -1695,19 +1695,23 @@
 	<item id="22385" name="Halloween Cookie" additionalName="Event" type="EtcItem">
 		<!-- Cookie that can be obtained on Halloween. Speed increases by 33 for 60 min. -->
 		<set name="icon" val="BranchSys3.Icon.ev_halloween_cookie" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="3600000" />
+		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="120" />
-		<set name="is_clan_depositable" val="false" />
+		<set name="is_freightable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_sellable" val="false" />	
+		<set name="is_private_storeable" val="false" />		
 		<set name="is_commissionable" val="false" />
-		<set name="is_private_storeable" val="false" />
-		<set name="is_oly_restricted" val="true" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="SCROLL" />
-		<set name="handler" val="ItemSkills" />
-		<set name="is_stackable" val="true" />
+		<set name="is_clan_depositable" val="false" />		
 		<skills>
 			<skill id="22415" level="1" /> <!-- Halloween Cookie -->
 		</skills>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/22400-22499.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/22400-22499.xml
index 2df1a4ca2b..18d3f1f34b 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/22400-22499.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/22400-22499.xml
@@ -623,7 +623,6 @@
 		</effects>
 	</skill>
 	<skill id="22415" toLevel="1" name="Halloween Cookie">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Speed by 33 for 60 minutes. -->
 		<icon>BranchSys3.Icon.ev_halloween_cookie</icon>
 		<operateType>A2</operateType>
@@ -642,6 +641,14 @@
 		<reuseDelay>3600000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<itemConsumeId>22385</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<effects>
+			<effect name="Speed">
+				<amount>33</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="22416" toLevel="1" name="Halloween Special Cookie">
 		<!-- AUTO GENERATED SKILL -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/22300-22399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/22300-22399.xml
index 88cd8358b5..667d442335 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/22300-22399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/22300-22399.xml
@@ -1695,19 +1695,23 @@
 	<item id="22385" name="Halloween Cookie" additionalName="Event" type="EtcItem">
 		<!-- Cookie that can be obtained on Halloween. Speed increases by 33 for 60 min. -->
 		<set name="icon" val="BranchSys3.Icon.ev_halloween_cookie" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="3600000" />
+		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="120" />
-		<set name="is_clan_depositable" val="false" />
+		<set name="is_freightable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="is_sellable" val="false" />	
+		<set name="is_private_storeable" val="false" />		
 		<set name="is_commissionable" val="false" />
-		<set name="is_private_storeable" val="false" />
-		<set name="is_oly_restricted" val="true" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="SCROLL" />
-		<set name="handler" val="ItemSkills" />
-		<set name="is_stackable" val="true" />
+		<set name="is_clan_depositable" val="false" />		
 		<skills>
 			<skill id="22415" level="1" /> <!-- Halloween Cookie -->
 		</skills>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/22400-22499.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/22400-22499.xml
index 2df1a4ca2b..18d3f1f34b 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/22400-22499.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/22400-22499.xml
@@ -623,7 +623,6 @@
 		</effects>
 	</skill>
 	<skill id="22415" toLevel="1" name="Halloween Cookie">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Increases Speed by 33 for 60 minutes. -->
 		<icon>BranchSys3.Icon.ev_halloween_cookie</icon>
 		<operateType>A2</operateType>
@@ -642,6 +641,14 @@
 		<reuseDelay>3600000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<itemConsumeId>22385</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<effects>
+			<effect name="Speed">
+				<amount>33</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="22416" toLevel="1" name="Halloween Special Cookie">
 		<!-- AUTO GENERATED SKILL -->