From d02fe581040c0b1c03fcadb27413d381f690db1d Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 16 Oct 2017 18:32:28 +0000
Subject: [PATCH] Various item fixes. Contributed by Hope.

---
 .../game/data/stats/items/36300-36399.xml     | 28 +++++++++-
 .../game/data/stats/skills/09700-09799.xml    | 55 +++++++++++++++++++
 .../game/data/stats/skills/17200-17299.xml    |  1 +
 .../game/data/stats/items/36300-36399.xml     | 28 +++++++++-
 .../game/data/stats/skills/09700-09799.xml    | 55 +++++++++++++++++++
 .../game/data/stats/skills/17200-17299.xml    |  1 +
 .../game/data/stats/items/36300-36399.xml     | 28 +++++++++-
 .../game/data/stats/skills/09700-09799.xml    | 55 +++++++++++++++++++
 .../game/data/stats/skills/17200-17299.xml    |  1 +
 9 files changed, 249 insertions(+), 3 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/36300-36399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/36300-36399.xml
index 692b018c96..63183c6aa1 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/36300-36399.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/36300-36399.xml
@@ -425,6 +425,7 @@
 		<set name="icon" val="icon.etc_oblivion_yellow_i00" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="etcitem_type" val="ELIXIR" />
 		<set name="commissionItemType" val="POTION" />
@@ -438,6 +439,7 @@
 		<set name="icon" val="icon.etc_oblivion_green_i00" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="etcitem_type" val="ELIXIR" />
 		<set name="commissionItemType" val="POTION" />
@@ -451,6 +453,7 @@
 		<set name="icon" val="icon.etc_oblivion_blue_i00" />
 		<set name="is_freightable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="etcitem_type" val="ELIXIR" />
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ItemSkills" />
@@ -464,6 +467,7 @@
 		<set name="is_freightable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="etcitem_type" val="ELIXIR" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<skills>
@@ -475,6 +479,7 @@
 		<set name="icon" val="icon.etc_oblivion_white_i00" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="etcitem_type" val="ELIXIR" />
 		<set name="commissionItemType" val="POTION" />
@@ -1057,9 +1062,30 @@
 	<item id="36396" name="Energy Drink Pack" type="EtcItem">
 		<!-- Each energy drink pack randomly contains 1 of 5 different energy drinks. Open the pack to receive 3 units of one energy drink. -->
 		<set name="icon" val="icon.etc_treasure_box_i01" />
-		<set name="is_freightable" val="false" />
+		<set name="default_action" val="PEEL" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="FISH" />
+		<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="is_premium" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
+		<set name="is_freightable" val="false" />
+		<set name="is_destroyable" val="true" />
+		<set name="is_commissionable" val="false" />
+		<set name="is_private_storeable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<capsuled_items>
+			<item id="36334" min="3" max="3" chance="20" /> 
+			<item id="36335" min="3" max="3" chance="20" /> 
+			<item id="36336" min="3" max="3" chance="20" /> 
+			<item id="36337" min="3" max="3" chance="20" /> 
+			<item id="36338" min="3" max="3" chance="20" /> 
+		</capsuled_items>
 	</item>
 	<item id="36397" name="Chest of Glory" type="EtcItem">
 		<!-- Chest of Glory given by Cocoring to celebrate the winning of the glorious gold medal. Double-click to receive a Medal of Glory/Victory/Friendship at a certain probability. -->
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/09700-09799.xml
index 0e71d02e48..3d205e88a0 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/09700-09799.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/09700-09799.xml
@@ -2462,47 +2462,102 @@
 	<skill id="9786" toLevel="1" name="Adrenaline Energy Drink">
 		<!-- For 30 min., Speed + 15. -->
 		<icon>icon.etc_london_olympic_scroll_i02</icon>
+		<abnormalType>FISH_STEW</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<itemConsumeId>36334</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<operateType>A2</operateType>
 		<reuseDelay>1000</reuseDelay>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<abnormalTime>1800</abnormalTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<effects>
+			<effect name="Speed">
+				<amount>15</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9787" toLevel="1" name="Caffeine Energy Drink">
 		<!-- For 30 min., DEX + 10. -->
 		<icon>icon.etc_london_olympic_scroll_i02</icon>
+		<abnormalType>FISH_STEW</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<itemConsumeId>36335</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<operateType>A2</operateType>
 		<reuseDelay>1000</reuseDelay>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<abnormalTime>1800</abnormalTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<effects>
+			<effect name="StatUp">
+				<stat>DEX</stat>
+				<amount>10</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9788" toLevel="1" name="Protein Energy Drink">
 		<!-- For 30 min., STR + 10. -->
 		<icon>icon.etc_london_olympic_scroll_i02</icon>
+		<abnormalType>FISH_STEW</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<itemConsumeId>36336</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<operateType>A2</operateType>
 		<reuseDelay>1000</reuseDelay>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<abnormalTime>1800</abnormalTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<effects>
+			<effect name="StatUp">
+				<stat>STR</stat>
+				<amount>10</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9789" toLevel="1" name="DHA Energy Drink">
 		<!-- For 30 min., INT + 10. -->
 		<icon>icon.etc_london_olympic_scroll_i02</icon>
+		<abnormalType>FISH_STEW</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<itemConsumeId>36337</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<operateType>A2</operateType>
 		<reuseDelay>1000</reuseDelay>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<abnormalTime>1800</abnormalTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<effects>
+			<effect name="StatUp">
+				<stat>INT</stat>
+				<amount>10</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9790" toLevel="1" name="Omega 3 Energy Drink">
 		<!-- For 30 min., WIT + 10. -->
 		<icon>icon.etc_london_olympic_scroll_i02</icon>
+		<abnormalType>FISH_STEW</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<itemConsumeId>36338</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<operateType>A2</operateType>
 		<reuseDelay>1000</reuseDelay>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<abnormalTime>1800</abnormalTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<effects>
+			<effect name="StatUp">
+				<stat>WIT</stat>
+				<amount>10</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9791" toLevel="1" name="Golden Chest">
 		<!-- AUTO GENERATED SKILL -->
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17200-17299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17200-17299.xml
index 31a48e8509..f0ff267c41 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17200-17299.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17200-17299.xml
@@ -158,6 +158,7 @@
 		<icon>icon.etc_cave_page_i00</icon>
 		<operateType>A2</operateType>
 		<abnormalLvl>1</abnormalLvl>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<abnormalType>BR_EVENT_BUF2</abnormalType>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<reuseDelay>300000</reuseDelay>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/36300-36399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/36300-36399.xml
index bb511e73c6..0b04297269 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/36300-36399.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/36300-36399.xml
@@ -425,6 +425,7 @@
 		<set name="icon" val="icon.etc_oblivion_yellow_i00" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="etcitem_type" val="ELIXIR" />
 		<set name="commissionItemType" val="POTION" />
@@ -438,6 +439,7 @@
 		<set name="icon" val="icon.etc_oblivion_green_i00" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="etcitem_type" val="ELIXIR" />
 		<set name="commissionItemType" val="POTION" />
@@ -451,6 +453,7 @@
 		<set name="icon" val="icon.etc_oblivion_blue_i00" />
 		<set name="is_freightable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="etcitem_type" val="ELIXIR" />
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ItemSkills" />
@@ -464,6 +467,7 @@
 		<set name="is_freightable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="etcitem_type" val="ELIXIR" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<skills>
@@ -475,6 +479,7 @@
 		<set name="icon" val="icon.etc_oblivion_white_i00" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="etcitem_type" val="ELIXIR" />
 		<set name="commissionItemType" val="POTION" />
@@ -1057,9 +1062,30 @@
 	<item id="36396" name="Energy Drink Pack" type="EtcItem">
 		<!-- Each energy drink pack randomly contains 1 of 5 different energy drinks. Open the pack to receive 3 units of one energy drink. -->
 		<set name="icon" val="icon.etc_treasure_box_i01" />
-		<set name="is_freightable" val="false" />
+		<set name="default_action" val="PEEL" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="FISH" />
+		<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="is_premium" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
+		<set name="is_freightable" val="false" />
+		<set name="is_destroyable" val="true" />
+		<set name="is_commissionable" val="false" />
+		<set name="is_private_storeable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<capsuled_items>
+			<item id="36334" min="3" max="3" chance="20" /> 
+			<item id="36335" min="3" max="3" chance="20" /> 
+			<item id="36336" min="3" max="3" chance="20" /> 
+			<item id="36337" min="3" max="3" chance="20" /> 
+			<item id="36338" min="3" max="3" chance="20" /> 
+		</capsuled_items>
 	</item>
 	<item id="36397" name="Chest of Glory" type="EtcItem">
 		<!-- Chest of Glory given by Cocoring to celebrate the winning of the glorious gold medal. Double-click to receive a Medal of Glory/Victory/Friendship at a certain probability. -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/09700-09799.xml
index 983e8ff713..f5441de675 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/09700-09799.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/09700-09799.xml
@@ -2462,47 +2462,102 @@
 	<skill id="9786" toLevel="1" name="Adrenaline Energy Drink">
 		<!-- For 30 min., Speed + 15. -->
 		<icon>icon.etc_london_olympic_scroll_i02</icon>
+		<abnormalType>FISH_STEW</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<itemConsumeId>36334</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<operateType>A2</operateType>
 		<reuseDelay>1000</reuseDelay>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<abnormalTime>1800</abnormalTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<effects>
+			<effect name="Speed">
+				<amount>15</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9787" toLevel="1" name="Caffeine Energy Drink">
 		<!-- For 30 min., DEX + 10. -->
 		<icon>icon.etc_london_olympic_scroll_i02</icon>
+		<abnormalType>FISH_STEW</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<itemConsumeId>36335</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<operateType>A2</operateType>
 		<reuseDelay>1000</reuseDelay>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<abnormalTime>1800</abnormalTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<effects>
+			<effect name="StatUp">
+				<stat>DEX</stat>
+				<amount>10</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9788" toLevel="1" name="Protein Energy Drink">
 		<!-- For 30 min., STR + 10. -->
 		<icon>icon.etc_london_olympic_scroll_i02</icon>
+		<abnormalType>FISH_STEW</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<itemConsumeId>36336</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<operateType>A2</operateType>
 		<reuseDelay>1000</reuseDelay>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<abnormalTime>1800</abnormalTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<effects>
+			<effect name="StatUp">
+				<stat>STR</stat>
+				<amount>10</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9789" toLevel="1" name="DHA Energy Drink">
 		<!-- For 30 min., INT + 10. -->
 		<icon>icon.etc_london_olympic_scroll_i02</icon>
+		<abnormalType>FISH_STEW</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<itemConsumeId>36337</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<operateType>A2</operateType>
 		<reuseDelay>1000</reuseDelay>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<abnormalTime>1800</abnormalTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<effects>
+			<effect name="StatUp">
+				<stat>INT</stat>
+				<amount>10</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9790" toLevel="1" name="Omega 3 Energy Drink">
 		<!-- For 30 min., WIT + 10. -->
 		<icon>icon.etc_london_olympic_scroll_i02</icon>
+		<abnormalType>FISH_STEW</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<itemConsumeId>36338</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<operateType>A2</operateType>
 		<reuseDelay>1000</reuseDelay>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<abnormalTime>1800</abnormalTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<effects>
+			<effect name="StatUp">
+				<stat>WIT</stat>
+				<amount>10</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9791" toLevel="1" name="Golden Chest">
 		<!-- AUTO GENERATED SKILL -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17200-17299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17200-17299.xml
index aebc984a84..32af2bbc3e 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17200-17299.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17200-17299.xml
@@ -158,6 +158,7 @@
 		<icon>icon.etc_cave_page_i00</icon>
 		<operateType>A2</operateType>
 		<abnormalLvl>1</abnormalLvl>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<abnormalType>BR_EVENT_BUF2</abnormalType>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<reuseDelay>300000</reuseDelay>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/36300-36399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/36300-36399.xml
index 30b701b916..53477828a9 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/36300-36399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/36300-36399.xml
@@ -425,6 +425,7 @@
 		<set name="icon" val="icon.etc_oblivion_yellow_i00" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="etcitem_type" val="ELIXIR" />
 		<set name="commissionItemType" val="POTION" />
@@ -438,6 +439,7 @@
 		<set name="icon" val="icon.etc_oblivion_green_i00" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="etcitem_type" val="ELIXIR" />
 		<set name="commissionItemType" val="POTION" />
@@ -451,6 +453,7 @@
 		<set name="icon" val="icon.etc_oblivion_blue_i00" />
 		<set name="is_freightable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="etcitem_type" val="ELIXIR" />
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ItemSkills" />
@@ -464,6 +467,7 @@
 		<set name="is_freightable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="etcitem_type" val="ELIXIR" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_stackable" val="true" />
 		<set name="handler" val="ItemSkills" />
 		<skills>
@@ -475,6 +479,7 @@
 		<set name="icon" val="icon.etc_oblivion_white_i00" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="etcitem_type" val="ELIXIR" />
 		<set name="commissionItemType" val="POTION" />
@@ -1057,9 +1062,30 @@
 	<item id="36396" name="Energy Drink Pack" type="EtcItem">
 		<!-- Each energy drink pack randomly contains 1 of 5 different energy drinks. Open the pack to receive 3 units of one energy drink. -->
 		<set name="icon" val="icon.etc_treasure_box_i01" />
-		<set name="is_freightable" val="false" />
+		<set name="default_action" val="PEEL" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="FISH" />
+		<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="is_premium" val="true" />
+		<set name="handler" val="ExtractableItems" />
+		<set name="is_clan_depositable" val="false" />
+		<set name="is_mailable" val="false" />
+		<set name="is_freightable" val="false" />
+		<set name="is_destroyable" val="true" />
+		<set name="is_commissionable" val="false" />
+		<set name="is_private_storeable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<capsuled_items>
+			<item id="36334" min="3" max="3" chance="20" /> 
+			<item id="36335" min="3" max="3" chance="20" /> 
+			<item id="36336" min="3" max="3" chance="20" /> 
+			<item id="36337" min="3" max="3" chance="20" /> 
+			<item id="36338" min="3" max="3" chance="20" /> 
+		</capsuled_items>
 	</item>
 	<item id="36397" name="Chest of Glory" type="EtcItem">
 		<!-- Chest of Glory given by Cocoring to celebrate the winning of the glorious gold medal. Double-click to receive a Medal of Glory/Victory/Friendship at a certain probability. -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/09700-09799.xml
index 983e8ff713..f5441de675 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/09700-09799.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/09700-09799.xml
@@ -2462,47 +2462,102 @@
 	<skill id="9786" toLevel="1" name="Adrenaline Energy Drink">
 		<!-- For 30 min., Speed + 15. -->
 		<icon>icon.etc_london_olympic_scroll_i02</icon>
+		<abnormalType>FISH_STEW</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<itemConsumeId>36334</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<operateType>A2</operateType>
 		<reuseDelay>1000</reuseDelay>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<abnormalTime>1800</abnormalTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<effects>
+			<effect name="Speed">
+				<amount>15</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9787" toLevel="1" name="Caffeine Energy Drink">
 		<!-- For 30 min., DEX + 10. -->
 		<icon>icon.etc_london_olympic_scroll_i02</icon>
+		<abnormalType>FISH_STEW</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<itemConsumeId>36335</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<operateType>A2</operateType>
 		<reuseDelay>1000</reuseDelay>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<abnormalTime>1800</abnormalTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<effects>
+			<effect name="StatUp">
+				<stat>DEX</stat>
+				<amount>10</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9788" toLevel="1" name="Protein Energy Drink">
 		<!-- For 30 min., STR + 10. -->
 		<icon>icon.etc_london_olympic_scroll_i02</icon>
+		<abnormalType>FISH_STEW</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<itemConsumeId>36336</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<operateType>A2</operateType>
 		<reuseDelay>1000</reuseDelay>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<abnormalTime>1800</abnormalTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<effects>
+			<effect name="StatUp">
+				<stat>STR</stat>
+				<amount>10</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9789" toLevel="1" name="DHA Energy Drink">
 		<!-- For 30 min., INT + 10. -->
 		<icon>icon.etc_london_olympic_scroll_i02</icon>
+		<abnormalType>FISH_STEW</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<itemConsumeId>36337</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<operateType>A2</operateType>
 		<reuseDelay>1000</reuseDelay>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<abnormalTime>1800</abnormalTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<effects>
+			<effect name="StatUp">
+				<stat>INT</stat>
+				<amount>10</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9790" toLevel="1" name="Omega 3 Energy Drink">
 		<!-- For 30 min., WIT + 10. -->
 		<icon>icon.etc_london_olympic_scroll_i02</icon>
+		<abnormalType>FISH_STEW</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<itemConsumeId>36338</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
 		<operateType>A2</operateType>
 		<reuseDelay>1000</reuseDelay>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<abnormalTime>1800</abnormalTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<effects>
+			<effect name="StatUp">
+				<stat>WIT</stat>
+				<amount>10</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9791" toLevel="1" name="Golden Chest">
 		<!-- AUTO GENERATED SKILL -->
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 7b7a740d3c..2d0bbbb224 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
@@ -158,6 +158,7 @@
 		<icon>icon.etc_cave_page_i00</icon>
 		<operateType>A2</operateType>
 		<abnormalLvl>1</abnormalLvl>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<abnormalType>BR_EVENT_BUF2</abnormalType>
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<reuseDelay>300000</reuseDelay>