From 2d8ed0855164cbf842198468723e776a391891f1 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <mobius@cyber-wizard.com>
Date: Sun, 16 Feb 2025 03:00:01 +0200
Subject: [PATCH] Various consumable item adjustments. Contributed by shifu.

---
 .../game/data/stats/items/48600-48699.xml     |  5 ++-
 .../game/data/stats/items/80700-80799.xml     |  2 +-
 .../game/data/stats/items/81000-81099.xml     |  5 ++-
 .../game/data/stats/items/82100-82199.xml     |  3 ++
 .../game/data/stats/items/82300-82399.xml     |  1 -
 .../game/data/stats/skills/39500-39599.xml    | 32 +++++++++++++++++++
 .../game/data/stats/skills/39700-39799.xml    |  5 ++-
 .../game/data/stats/items/48600-48699.xml     |  5 ++-
 .../game/data/stats/items/80700-80799.xml     |  2 +-
 .../game/data/stats/items/81000-81099.xml     |  5 ++-
 .../game/data/stats/items/82100-82199.xml     |  3 ++
 .../game/data/stats/items/82300-82399.xml     |  1 -
 .../game/data/stats/skills/39500-39599.xml    | 32 +++++++++++++++++++
 .../game/data/stats/skills/39700-39799.xml    |  5 ++-
 14 files changed, 84 insertions(+), 22 deletions(-)

diff --git a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/48600-48699.xml b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/48600-48699.xml
index be44cacd7f..21c1b7785d 100644
--- a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/48600-48699.xml
+++ b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/48600-48699.xml
@@ -527,11 +527,10 @@
 		<set name="material" val="LIQUID" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="etcitem_type" val="POTION" />
 		<set name="handler" val="ItemSkills" />
-		<set name="reuse_delay" val="300" />
+		<set name="reuse_delay" val="300000" />
 		<skills>
-			<skill id="39245" level="1" /> <!-- Shining Nevit's Gold Hourglass -->
+			<skill id="39571" level="1" /> <!-- Shining Nevit's Gold Hourglass -->
 		</skills>
 	</item>
 	<item id="48643" name="Angel's Gift Bundle Lv. 5" type="EtcItem">
diff --git a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/80700-80799.xml b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/80700-80799.xml
index 4d9ee410af..d4d2dda67f 100644
--- a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/80700-80799.xml
+++ b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/80700-80799.xml
@@ -1851,7 +1851,7 @@
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<skills>
-			<skill id="39503" level="1" /> <!-- Shining Nevit's Gold Hourglass -->
+			<skill id="39245" level="1" /> <!-- Shining Nevit's Gold Hourglass -->
 		</skills>
 	</item>
 	<item id="80798" name="Special Orc Chest" type="EtcItem">
diff --git a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/81000-81099.xml b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/81000-81099.xml
index 588e67b498..bedc0be392 100644
--- a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/81000-81099.xml
+++ b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/81000-81099.xml
@@ -223,7 +223,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<skills>
-			<skill id="39569" level="1" /> <!-- Emperor's Special Cocktail -->
+			<skill id="39520" level="1" /> <!-- Emperor's Special Cocktail -->
 		</skills>
 	</item>
 	<item id="81013" name="Shining Nevit's Gold Hourglass" additionalName="Event" type="EtcItem">
@@ -237,10 +237,9 @@
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="reuse_delay" val="300000" />
-		<set name="etcitem_type" val="SCROLL" />
 		<set name="immediate_effect" val="true" />
 		<skills>
-			<skill id="39571" level="1" /> <!-- Shining Nevit's Gold Hourglass -->
+			<skill id="39503" level="1" /> <!-- Shining Nevit's Gold Hourglass -->
 		</skills>
 	</item>
 	<item id="81014" name="PA Event Appearance Potion - Bear" type="EtcItem">
diff --git a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/82100-82199.xml b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/82100-82199.xml
index 85f8c010c5..d2d8d6f637 100644
--- a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/82100-82199.xml
+++ b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/82100-82199.xml
@@ -996,6 +996,7 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="is_event_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
+		<set name="reuse_delay" val="300000" />
 		<skills>
 			<skill id="39756" level="1" /> <!-- Swift Growth Cookie -->
 		</skills>
@@ -1013,6 +1014,7 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="is_event_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
+		<set name="reuse_delay" val="300000" />
 		<skills>
 			<skill id="39757" level="1" /> <!-- Swift Attack Cookie -->
 		</skills>
@@ -1243,6 +1245,7 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="is_event_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
+		<set name="reuse_delay" val="300000" />
 		<skills>
 			<skill id="39774" level="1" /> <!-- Swift Defense Cookie -->
 		</skills>
diff --git a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/82300-82399.xml b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/82300-82399.xml
index 36bfe537b6..8967e0d110 100644
--- a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/82300-82399.xml
+++ b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/items/82300-82399.xml
@@ -78,7 +78,6 @@
 		<!-- The embodiment of the ancient Elven queen's wisdom. Recovers 1 of the 4 Vitality bars. Cannot be used in the Olympiad. -->
 		<set name="icon" val="icon.new_recall_drink" />
 		<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="price" val="10030020" />
diff --git a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/skills/39500-39599.xml b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/skills/39500-39599.xml
index e74e9273c3..3bfe5ffa2c 100644
--- a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/skills/39500-39599.xml
+++ b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/skills/39500-39599.xml
@@ -571,6 +571,38 @@
 		<reuseDelay>5000</reuseDelay>
 		<specialLevel>-2</specialLevel>
 		<stayAfterDeath>true</stayAfterDeath>
+		<effects>
+			<effect name="DispelBySlotProbability">
+				<dispel>BUFF_SPECIAL_CLASS;DITTY;BUFF_SPECIAL_ATTACK;BUFF_SPECIAL_AURA;ARMOR_ELEMENT_ALL</dispel>
+				<rate>100</rate>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39514</skillId> <!-- Fantasia Harmony - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39517</skillId> <!-- Fantasia Melody - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39766</skillId> <!-- Musician's Melody - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39771</skillId> <!-- Drum Concert - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39772</skillId> <!-- United Resistance - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</effects>
+		<endEffects>
+			<effect name="DispelBySlotProbability">
+				<dispel>BUFF_SPECIAL_CLASS;DITTY;BUFF_SPECIAL_ATTACK;BUFF_SPECIAL_AURA;ARMOR_ELEMENT_ALL</dispel>
+				<rate>100</rate>
+			</effect>
+		</endEffects>
 	</skill>
 	<skill id="39522" toLevel="1" name="Emperor's Special Cocktail">
 		<!-- For 60 min., applies the following effects: Musician's Melody Lv. 5, Fantasia Harmony Lv. 2, Drum Concert, Fantasia Melody, United Resistance. To remove the effect, press Alt + Left Mouse Button. -->
diff --git a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/skills/39700-39799.xml b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/skills/39700-39799.xml
index 586eeccdd9..d9dbc19018 100644
--- a/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/skills/39700-39799.xml
+++ b/L2J_Mobius_11.3_Shinemaker/dist/game/data/stats/skills/39700-39799.xml
@@ -734,7 +734,6 @@
 		<targetType>SELF</targetType>
 		<abnormalLevel>2</abnormalLevel>
 		<abnormalTime>1800</abnormalTime>
-		<abnormalType>BR_EVENT_BUF1</abnormalType>
 		<affectScope>SINGLE</affectScope>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<canBeDispelled>false</canBeDispelled>
@@ -771,7 +770,7 @@
 		<targetType>SELF</targetType>
 		<abnormalLevel>2</abnormalLevel>
 		<abnormalTime>1800</abnormalTime>
-		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<abnormalType>BR_EVENT_BUF2</abnormalType>
 		<affectScope>SINGLE</affectScope>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<canBeDispelled>false</canBeDispelled>
@@ -1315,7 +1314,7 @@
 		<targetType>SELF</targetType>
 		<abnormalLevel>2</abnormalLevel>
 		<abnormalTime>1800</abnormalTime>
-		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<abnormalType>BR_EVENT_BUF2</abnormalType>
 		<affectScope>SINGLE</affectScope>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<canBeDispelled>false</canBeDispelled>
diff --git a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/48600-48699.xml b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/48600-48699.xml
index be44cacd7f..21c1b7785d 100644
--- a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/48600-48699.xml
+++ b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/48600-48699.xml
@@ -527,11 +527,10 @@
 		<set name="material" val="LIQUID" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="etcitem_type" val="POTION" />
 		<set name="handler" val="ItemSkills" />
-		<set name="reuse_delay" val="300" />
+		<set name="reuse_delay" val="300000" />
 		<skills>
-			<skill id="39245" level="1" /> <!-- Shining Nevit's Gold Hourglass -->
+			<skill id="39571" level="1" /> <!-- Shining Nevit's Gold Hourglass -->
 		</skills>
 	</item>
 	<item id="48643" name="Angel's Gift Bundle Lv. 5" type="EtcItem">
diff --git a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/80700-80799.xml b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/80700-80799.xml
index 7d0069cd01..e4bcd28af6 100644
--- a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/80700-80799.xml
+++ b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/80700-80799.xml
@@ -1851,7 +1851,7 @@
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<skills>
-			<skill id="39503" level="1" /> <!-- Shining Nevit's Gold Hourglass -->
+			<skill id="39245" level="1" /> <!-- Shining Nevit's Gold Hourglass -->
 		</skills>
 	</item>
 	<item id="80798" name="Special Orc Chest" type="EtcItem">
diff --git a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/81000-81099.xml b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/81000-81099.xml
index b77ca35e13..3deea84535 100644
--- a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/81000-81099.xml
+++ b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/81000-81099.xml
@@ -223,7 +223,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<skills>
-			<skill id="39569" level="1" /> <!-- Emperor's Special Cocktail -->
+			<skill id="39520" level="1" /> <!-- Emperor's Special Cocktail -->
 		</skills>
 	</item>
 	<item id="81013" name="Shining Nevit's Gold Hourglass" additionalName="Event" type="EtcItem">
@@ -237,10 +237,9 @@
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<set name="reuse_delay" val="300000" />
-		<set name="etcitem_type" val="SCROLL" />
 		<set name="immediate_effect" val="true" />
 		<skills>
-			<skill id="39571" level="1" /> <!-- Shining Nevit's Gold Hourglass -->
+			<skill id="39503" level="1" /> <!-- Shining Nevit's Gold Hourglass -->
 		</skills>
 	</item>
 	<item id="81014" name="PA Event Appearance Potion - Bear" type="EtcItem">
diff --git a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/82100-82199.xml b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/82100-82199.xml
index 85f8c010c5..d2d8d6f637 100644
--- a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/82100-82199.xml
+++ b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/82100-82199.xml
@@ -996,6 +996,7 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="is_event_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
+		<set name="reuse_delay" val="300000" />
 		<skills>
 			<skill id="39756" level="1" /> <!-- Swift Growth Cookie -->
 		</skills>
@@ -1013,6 +1014,7 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="is_event_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
+		<set name="reuse_delay" val="300000" />
 		<skills>
 			<skill id="39757" level="1" /> <!-- Swift Attack Cookie -->
 		</skills>
@@ -1243,6 +1245,7 @@
 		<set name="is_oly_restricted" val="true" />
 		<set name="is_event_restricted" val="true" />
 		<set name="handler" val="ItemSkills" />
+		<set name="reuse_delay" val="300000" />
 		<skills>
 			<skill id="39774" level="1" /> <!-- Swift Defense Cookie -->
 		</skills>
diff --git a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/82300-82399.xml b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/82300-82399.xml
index a4d4416848..c1d23e6bf0 100644
--- a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/82300-82399.xml
+++ b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/items/82300-82399.xml
@@ -78,7 +78,6 @@
 		<!-- The embodiment of the ancient Elven queen's wisdom. Recovers 1 of the 4 Vitality bars. Cannot be used in the Olympiad. -->
 		<set name="icon" val="icon.new_recall_drink" />
 		<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="price" val="10030020" />
diff --git a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/skills/39500-39599.xml b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/skills/39500-39599.xml
index 74c5e7ff2c..01940a815e 100644
--- a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/skills/39500-39599.xml
+++ b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/skills/39500-39599.xml
@@ -571,6 +571,38 @@
 		<reuseDelay>5000</reuseDelay>
 		<specialLevel>-2</specialLevel>
 		<stayAfterDeath>true</stayAfterDeath>
+		<effects>
+			<effect name="DispelBySlotProbability">
+				<dispel>BUFF_SPECIAL_CLASS;DITTY;BUFF_SPECIAL_ATTACK;BUFF_SPECIAL_AURA;ARMOR_ELEMENT_ALL</dispel>
+				<rate>100</rate>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39514</skillId> <!-- Fantasia Harmony - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39517</skillId> <!-- Fantasia Melody - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39766</skillId> <!-- Musician's Melody - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39771</skillId> <!-- Drum Concert - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+			<effect name="CallSkill">
+				<skillId>39772</skillId> <!-- United Resistance - Emperor's Special Cocktail -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</effects>
+		<endEffects>
+			<effect name="DispelBySlotProbability">
+				<dispel>BUFF_SPECIAL_CLASS;DITTY;BUFF_SPECIAL_ATTACK;BUFF_SPECIAL_AURA;ARMOR_ELEMENT_ALL</dispel>
+				<rate>100</rate>
+			</effect>
+		</endEffects>
 	</skill>
 	<skill id="39522" toLevel="1" name="Emperor's Special Cocktail">
 		<!-- For 60 min., applies the following effects: Musician's Melody Lv. 5, Fantasia Harmony Lv. 2, Drum Concert, Fantasia Melody, United Resistance. To remove the effect, press Alt + Left Mouse Button. -->
diff --git a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/skills/39700-39799.xml b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/skills/39700-39799.xml
index 7fdbb1c21f..ab24e6c964 100644
--- a/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/skills/39700-39799.xml
+++ b/L2J_Mobius_12.1_PathOfRogue/dist/game/data/stats/skills/39700-39799.xml
@@ -734,7 +734,6 @@
 		<targetType>SELF</targetType>
 		<abnormalLevel>2</abnormalLevel>
 		<abnormalTime>1800</abnormalTime>
-		<abnormalType>BR_EVENT_BUF1</abnormalType>
 		<affectScope>SINGLE</affectScope>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<canBeDispelled>false</canBeDispelled>
@@ -771,7 +770,7 @@
 		<targetType>SELF</targetType>
 		<abnormalLevel>2</abnormalLevel>
 		<abnormalTime>1800</abnormalTime>
-		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<abnormalType>BR_EVENT_BUF2</abnormalType>
 		<affectScope>SINGLE</affectScope>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<canBeDispelled>false</canBeDispelled>
@@ -1315,7 +1314,7 @@
 		<targetType>SELF</targetType>
 		<abnormalLevel>2</abnormalLevel>
 		<abnormalTime>1800</abnormalTime>
-		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<abnormalType>BR_EVENT_BUF2</abnormalType>
 		<affectScope>SINGLE</affectScope>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<canBeDispelled>false</canBeDispelled>