From 929ef8c7cccb2e2052586c4a98c413274d399256 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 12 Mar 2019 02:33:16 +0000
Subject: [PATCH] Potion of Protection implementation. Contributed by facab.

---
 .../game/data/stats/items/37700-37799.xml     |  64 +++
 .../game/data/stats/items/37800-37899.xml     |   9 +
 .../game/data/stats/items/40200-40299.xml     |  71 +++
 .../game/data/stats/skills/17100-17199.xml    |  85 ++++
 .../game/data/stats/skills/17200-17299.xml    |  82 ++++
 .../game/data/stats/skills/18100-18199.xml    | 404 +++++++++++++++++-
 .../gameserver/model/skills/AbnormalType.java |   1 +
 .../game/data/stats/items/37700-37799.xml     |  64 +++
 .../game/data/stats/items/37800-37899.xml     |   7 +
 .../game/data/stats/items/40200-40299.xml     |  71 +++
 .../game/data/stats/skills/17100-17199.xml    |  85 ++++
 .../game/data/stats/skills/17200-17299.xml    |  82 ++++
 .../game/data/stats/skills/18100-18199.xml    | 404 +++++++++++++++++-
 .../gameserver/model/skills/AbnormalType.java |   1 +
 .../game/data/stats/items/37700-37799.xml     |  64 +++
 .../game/data/stats/items/37800-37899.xml     |   7 +
 .../game/data/stats/items/40200-40299.xml     |  71 +++
 .../game/data/stats/skills/17100-17199.xml    |  85 ++++
 .../game/data/stats/skills/17200-17299.xml    |  82 ++++
 .../game/data/stats/skills/18100-18199.xml    | 404 +++++++++++++++++-
 .../gameserver/model/skills/AbnormalType.java |   1 +
 .../game/data/stats/items/37700-37799.xml     |  64 +++
 .../game/data/stats/items/37800-37899.xml     |   7 +
 .../game/data/stats/items/40200-40299.xml     |  71 +++
 .../game/data/stats/items/47600-47699.xml     |  39 +-
 .../game/data/stats/skills/17100-17199.xml    |  85 ++++
 .../game/data/stats/skills/17200-17299.xml    |  69 +++
 .../game/data/stats/skills/18100-18199.xml    | 262 ++++++++++++
 .../game/data/stats/skills/18600-18699.xml    |  97 ++++-
 .../gameserver/model/skills/AbnormalType.java |   1 +
 .../game/data/stats/items/37700-37799.xml     |  64 +++
 .../game/data/stats/items/37800-37899.xml     |   7 +
 .../game/data/stats/items/40200-40299.xml     |  71 +++
 .../game/data/stats/items/47600-47699.xml     |  39 +-
 .../game/data/stats/skills/17100-17199.xml    |  85 ++++
 .../game/data/stats/skills/17200-17299.xml    |  69 +++
 .../game/data/stats/skills/18100-18199.xml    | 262 ++++++++++++
 .../game/data/stats/skills/18600-18699.xml    |  97 ++++-
 .../gameserver/model/skills/AbnormalType.java |   1 +
 .../game/data/stats/items/37700-37799.xml     |  64 +++
 .../game/data/stats/items/37800-37899.xml     |   7 +
 .../game/data/stats/items/40200-40299.xml     |  71 +++
 .../game/data/stats/items/47600-47699.xml     |  39 +-
 .../game/data/stats/skills/17100-17199.xml    |  85 ++++
 .../game/data/stats/skills/17200-17299.xml    |  69 +++
 .../game/data/stats/skills/18100-18199.xml    | 262 ++++++++++++
 .../game/data/stats/skills/18600-18699.xml    |  97 ++++-
 .../gameserver/model/skills/AbnormalType.java |   1 +
 .../game/data/stats/items/37700-37799.xml     |  64 +++
 .../game/data/stats/items/37800-37899.xml     |   7 +
 .../game/data/stats/items/40200-40299.xml     |  71 +++
 .../game/data/stats/items/47600-47699.xml     |  39 +-
 .../game/data/stats/skills/17100-17199.xml    |  85 ++++
 .../game/data/stats/skills/17200-17299.xml    |  69 +++
 .../game/data/stats/skills/18100-18199.xml    | 262 ++++++++++++
 .../game/data/stats/skills/18600-18699.xml    |  97 ++++-
 .../gameserver/model/skills/AbnormalType.java |   1 +
 57 files changed, 4843 insertions(+), 81 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37700-37799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37700-37799.xml
index b86fc93ba8..7c560c277d 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37700-37799.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37700-37799.xml
@@ -1258,6 +1258,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17195" level="1" /> <!-- Potion of Protection: Stun -->
+		</skills>
 	</item>
 	<item id="37793" name="Potion of Protection: Hold" type="EtcItem">
 		<!-- Increases hold resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1265,6 +1273,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17196" level="1" /> <!-- Potion of Protection: Hold -->
+		</skills>
 	</item>
 	<item id="37794" name="Potion of Protection: Bleed" type="EtcItem">
 		<!-- Increases Bleed Resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1272,6 +1288,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17197" level="1" /> <!-- Potion of Protection: Bleed -->
+		</skills>
 	</item>
 	<item id="37795" name="Potion of Protection: Paralyze" type="EtcItem">
 		<!-- Increases paralysis resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1279,6 +1303,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17198" level="1" /> <!-- Potion of Protection: Paralyze -->
+		</skills>
 	</item>
 	<item id="37796" name="Potion of Protection: Mental" type="EtcItem">
 		<!-- Increases Mental resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1286,6 +1318,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17199" level="1" /> <!-- Potion of Protection: Mental -->
+		</skills>
 	</item>
 	<item id="37797" name="Potion of Protection: Sleep" type="EtcItem">
 		<!-- Increases Sleep Resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1293,6 +1333,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17200" level="1" /> <!-- Potion of Protection: Sleep -->
+		</skills>
 	</item>
 	<item id="37798" name="Potion of Protection: Poison" type="EtcItem">
 		<!-- Increases Poison Resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1300,6 +1348,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17201" level="1" /> <!-- Potion of Protection: Poison -->
+		</skills>
 	</item>
 	<item id="37799" name="Potion of Protection: Knock Back/ Knock Down" type="EtcItem">
 		<!-- Increases Knock Back / Knock Down resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1307,5 +1363,13 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17202" level="1" /> <!-- Potion of Protection: Knock Back/ Knock Down -->
+		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37800-37899.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37800-37899.xml
index 2f46f6cb5e..dfb2e729d7 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37800-37899.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/37800-37899.xml
@@ -6,6 +6,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17203" level="1" /> <!-- Potion of Protection: Aerial Yoke -->
+		</skills>
 	</item>
 	<item id="37801" name="Bloody Eternal Enhancement Stone Fragment" type="EtcItem">
 		<!-- Bring 10 fragments to the Black of mammon to obtain a Bloody Eternal Enhancement Stone. -->
@@ -24,6 +32,7 @@
 		<set name="is_mailable" val="false" />
 		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
 		<set name="is_stackable" val="true" />
+		<set name="default_action" val="SKILL_REDUCE" />
 	</item>
 	<item id="37804" name="Golden Noblesse Tiara" type="Armor">
 		<set name="icon" val="icon.accessory_noblesse2_tiara_i00" />
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/40200-40299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/40200-40299.xml
index c3dd3e29cb..71c53262ea 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/40200-40299.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/40200-40299.xml
@@ -810,6 +810,13 @@
 		<set name="is_stackable" val="true" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18156" level="1" /> <!-- Potion of Protection: Stun -->
+		</skills>
 	</item>
 	<item id="40254" name="Potion of Protection: Hold" additionalName="Top-grade" type="EtcItem">
 		<!-- Hold Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -817,6 +824,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18157" level="1" /> <!-- Potion of Protection: Hold -->
+		</skills>
 	</item>
 	<item id="40255" name="Potion of Protection: Bleed" additionalName="Top-grade" type="EtcItem">
 		<!-- Bleed Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -824,6 +839,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18158" level="1" /> <!-- Potion of Protection: Bleed -->
+		</skills>
 	</item>
 	<item id="40256" name="Potion of Protection: Paralyze" additionalName="Top-grade" type="EtcItem">
 		<!-- Paralyze Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -831,6 +854,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18159" level="1" /> <!-- Potion of Protection: Paralyze -->
+		</skills>
 	</item>
 	<item id="40257" name="Potion of Protection: Mental" additionalName="Top-grade" type="EtcItem">
 		<!-- Mental Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -839,6 +870,14 @@
 		<set name="is_stackable" val="true" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="commissionItemType" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18160" level="1" /> <!-- Potion of Protection: Mental -->
+		</skills>
 	</item>
 	<item id="40258" name="Potion of Protection: Sleep" additionalName="Top-grade" type="EtcItem">
 		<!-- Sleep Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -846,6 +885,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18161" level="1" /> <!-- Potion of Protection: Sleep -->
+		</skills>
 	</item>
 	<item id="40259" name="Potion of Protection: Poison" additionalName="Top-grade" type="EtcItem">
 		<!-- Poison Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -853,6 +900,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18162" level="1" /> <!-- Potion of Protection: Poison -->
+		</skills>
 	</item>
 	<item id="40260" name="Potion of Protection: Knock Back / Knock Down" additionalName="Top-grade" type="EtcItem">
 		<!-- Knock Back / Knock Down Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -860,6 +915,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18163" level="1" /> <!-- Potion of Protection: Knock Back / Knock Down -->
+		</skills>
 	</item>
 	<item id="40261" name="Potion of Protection: Aerial Yoke" additionalName="Top-grade" type="EtcItem">
 		<!-- Aerial Yoke Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -867,6 +930,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18164" level="1" /> <!-- Potion of Protection: Aerial Yoke -->
+		</skills>
 	</item>
 	<item id="40262" name="Faeron Support Box" additionalName="Ertheia Fighter" type="EtcItem">
 		<!-- Karla's gift for those who are struggling to make it in the Material Realm. Double-click to use. -->
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17100-17199.xml
index 85f182595d..7b2ce044d3 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17100-17199.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17100-17199.xml
@@ -1061,25 +1061,110 @@
 		<!-- When used, increases stun resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i01</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37792</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SHOCK>5</SHOCK>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17196" toLevel="1" name="Potion of Protection: Hold">
 		<!-- When used, increases hold resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i06</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37793</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<HOLD>5</HOLD>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17197" toLevel="1" name="Potion of Protection: Bleed">
 		<!-- When used, increases bleed resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i00</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37794</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BLEED>5</BLEED>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17198" toLevel="1" name="Potion of Protection: Paralyze">
 		<!-- When used, increases paralysis resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i07</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37795</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PARALYZE>5</PARALYZE>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17199" toLevel="1" name="Potion of Protection: Mental">
 		<!-- When used, increases mental attack resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37796</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT>
+			</effect>
+		</effects>
 	</skill>
 </list>
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 8da74ced17..f57bd2376c 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
@@ -4,21 +4,90 @@
 		<!-- When used, increases sleep resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i05</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37797</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SLEEP>5</SLEEP>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17201" toLevel="1" name="Potion of Protection: Poison">
 		<!-- When used, increases poison resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i02</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37798</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<POISON>5</POISON>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17202" toLevel="1" name="Potion of Protection: Knock Back/ Knock Down">
 		<!-- When used, increases knock-back and knock-down resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i10</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37799</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<KNOCKBACK>5</KNOCKBACK>
+				<KNOCKDOWN>5</KNOCKDOWN>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17203" toLevel="1" name="Potion of Protection: Aerial Yoke">
 		<!-- When used, increases aerial yoke resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i11</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37800</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<AIRBIND>5</AIRBIND>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17204" toLevel="1" name="Scroll: 100,000 SP">
 		<!-- Restores 100,000 SP. -->
@@ -392,6 +461,19 @@
 		<operateType>A1</operateType>
 		<hitTime>200</hitTime>
 		<reuseDelay>3000</reuseDelay>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>37904</itemConsumeId> <!-- Scroll: 1,000,000,000 SP -->
+		<magicLvl>1</magicLvl>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="GiveSp">
+				<sp>1000000000</sp>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17271" toLevel="1" name="Kat the Cat's Surprise Gift">
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/18100-18199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/18100-18199.xml
index ea670e6003..af8dfbd3e3 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/18100-18199.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/18100-18199.xml
@@ -493,46 +493,308 @@
 		<!-- Stun Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i01</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40253</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SHOCK>5</SHOCK>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18157" toLevel="1" name="Potion of Protection: Hold">
 		<!-- Hold Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i06</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40254</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<HOLD>5</HOLD>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18158" toLevel="1" name="Potion of Protection: Bleed">
 		<!-- Bleed Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i00</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40255</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BLEED>5</BLEED>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18159" toLevel="1" name="Potion of Protection: Paralyze">
 		<!-- Paralysis Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i07</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40256</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PARALYZE>5</PARALYZE>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18160" toLevel="1" name="Potion of Protection: Mental">
 		<!-- Mental Attack Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40257</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18161" toLevel="1" name="Potion of Protection: Sleep">
 		<!-- Sleep Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i05</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40258</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SLEEP>5</SLEEP>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18162" toLevel="1" name="Potion of Protection: Poison">
 		<!-- Poison Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i02</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40259</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<POISON>5</POISON>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18163" toLevel="1" name="Potion of Protection: Knock Back / Knock Down">
 		<!-- Knock Back / Knock Down Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i10</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40260</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<KNOCKBACK>5</KNOCKBACK>
+				<KNOCKDOWN>5</KNOCKDOWN>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18164" toLevel="1" name="Potion of Protection: Aerial Yoke">
 		<!-- Aerial Yoke Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i11</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40261</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<AIRBIND>5</AIRBIND>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18165" toLevel="1" name="Entrance Pass: Spezion (Normal)">
 		<operateType>A1</operateType>
@@ -592,31 +854,159 @@
 		<!-- For 30 min., XP/SP Gain + 10%, Attack Attribute + 100, P. Atk. + 20%, M. Atk. + 30%, Speed + 10%, Atk./Casting Spd. + 10%, Speed + 10, P./M. Accuracy + 4, Max HP/MP/CP + 10%, P./M. Def. + 10%, and Skill MP Consumption - 10%. Cannot be stacked with Art of Seduction. Buff remains after death. -->
 		<icon>icon.buff_joon_power_skill</icon>
 		<operateType>A2</operateType>
-		<reuseDelay>15000</reuseDelay>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitTime>3000</hitTime>
+		<coolTime>3000</coolTime>
+		<reuseDelay>300000</reuseDelay>
 		<effectPoint>1</effectPoint>
-		<isMagic>4</isMagic>
+		<isMagic>2</isMagic>
+		<stayAfterDeath>true</stayAfterDeath>
+		<effects>
+			<effect name="ExpModify">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="SpModify">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxHp">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxMp">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxCp">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PAtk">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicAccuracy">
+				<amount>4</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="Accuracy">
+				<amount>4</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicalAttackSpeed">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>10</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>DARK</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18173" toLevel="1" name="Joon's Resurrection">
 		<!-- Can use Blessed Resurrection. Cooldown is 3 hr. -->
 		<icon>icon.skill_agathion_special</icon>
-		<operateType>A1</operateType>
 		<castRange>400</castRange>
-		<hitTime>3000</hitTime>
-		<reuseDelay>10800000</reuseDelay>
 		<effectPoint>1</effectPoint>
-		<isMagic>4</isMagic>
+		<effectRange>600</effectRange>
+		<hitTime>1000</hitTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<coolTime>500</coolTime>
+		<reuseDelay>10800</reuseDelay>
+		<targetType>PC_BODY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpResurrection" />
+		</conditions>
+		<effects>
+			<effect name="Resurrection">
+				<power>100</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18174" toLevel="1" name="Agathion - Joon">
 		<!-- Releases Agathion's seal. -->
 		<icon>icon.etc_summon_aga_agit_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>85</magicLvl>
 		<operateType>A1</operateType>
-		<hitTime>3000</hitTime>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="SummonAgathion">
+				<npcId>13447</npcId> <!-- Joon -->
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18175" toLevel="1" name="Joon's Cute Trick">
 		<!-- See Agathion's cute trick. -->
 		<icon>icon.skill_agathion_cute</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>85</magicLvl>
 		<operateType>A1</operateType>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
 		<hitTime>3000</hitTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpNeedAgathion" />
+		</conditions>
 	</skill>
 	<skill id="18176" toLevel="1" name="Presentation Skill">
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
index 6842b358c8..6ea6b4138f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -514,6 +514,7 @@ public enum AbnormalType
 	AIRBIND(365),
 	KNOCKDOWN(367),
 	EARTHWORM_DEBUFF(424),
+	POTION_OF_PROTECTION(552),
 	INSIDE_POSITION(593),
 	STEEL_MIND(596);
 	
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37700-37799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37700-37799.xml
index 2946604da6..9b3ace2d8c 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37700-37799.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37700-37799.xml
@@ -1262,6 +1262,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17195" level="1" /> <!-- Potion of Protection: Stun -->
+		</skills>
 	</item>
 	<item id="37793" name="Potion of Protection: Hold" type="EtcItem">
 		<!-- Increases hold resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1269,6 +1277,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17196" level="1" /> <!-- Potion of Protection: Hold -->
+		</skills>
 	</item>
 	<item id="37794" name="Potion of Protection: Bleed" type="EtcItem">
 		<!-- Increases Bleed Resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1276,6 +1292,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17197" level="1" /> <!-- Potion of Protection: Bleed -->
+		</skills>
 	</item>
 	<item id="37795" name="Potion of Protection: Paralyze" type="EtcItem">
 		<!-- Increases paralysis resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1283,6 +1307,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17198" level="1" /> <!-- Potion of Protection: Paralyze -->
+		</skills>
 	</item>
 	<item id="37796" name="Potion of Protection: Mental" type="EtcItem">
 		<!-- Increases Mental resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1290,6 +1322,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17199" level="1" /> <!-- Potion of Protection: Mental -->
+		</skills>
 	</item>
 	<item id="37797" name="Potion of Protection: Sleep" type="EtcItem">
 		<!-- Increases Sleep Resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1297,6 +1337,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17200" level="1" /> <!-- Potion of Protection: Sleep -->
+		</skills>
 	</item>
 	<item id="37798" name="Potion of Protection: Poison" type="EtcItem">
 		<!-- Increases Poison Resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1304,6 +1352,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17201" level="1" /> <!-- Potion of Protection: Poison -->
+		</skills>
 	</item>
 	<item id="37799" name="Potion of Protection: Knock Back/ Knock Down" type="EtcItem">
 		<!-- Increases Knock Back / Knock Down resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1311,5 +1367,13 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17202" level="1" /> <!-- Potion of Protection: Knock Back/ Knock Down -->
+		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37800-37899.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37800-37899.xml
index caa9dbb7c8..1abee64cb3 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37800-37899.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/37800-37899.xml
@@ -6,7 +6,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17203" level="1" /> <!-- Potion of Protection: Aerial Yoke -->
+		</skills>
 	</item>
 	<item id="37801" name="Bloody Eternal Enhancement Stone Fragment" type="EtcItem">
 		<!-- Bring 10 fragments to the Black of mammon to obtain a Bloody Eternal Enhancement Stone. -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/40200-40299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/40200-40299.xml
index c347c8116c..4ee853e265 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/40200-40299.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/40200-40299.xml
@@ -810,6 +810,13 @@
 		<set name="is_stackable" val="true" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18156" level="1" /> <!-- Potion of Protection: Stun -->
+		</skills>
 	</item>
 	<item id="40254" name="Potion of Protection: Hold" additionalName="Top-grade" type="EtcItem">
 		<!-- Hold Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -817,6 +824,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18157" level="1" /> <!-- Potion of Protection: Hold -->
+		</skills>
 	</item>
 	<item id="40255" name="Potion of Protection: Bleed" additionalName="Top-grade" type="EtcItem">
 		<!-- Bleed Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -824,6 +839,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18158" level="1" /> <!-- Potion of Protection: Bleed -->
+		</skills>
 	</item>
 	<item id="40256" name="Potion of Protection: Paralyze" additionalName="Top-grade" type="EtcItem">
 		<!-- Paralyze Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -831,6 +854,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18159" level="1" /> <!-- Potion of Protection: Paralyze -->
+		</skills>
 	</item>
 	<item id="40257" name="Potion of Protection: Mental" additionalName="Top-grade" type="EtcItem">
 		<!-- Mental Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -839,6 +870,14 @@
 		<set name="is_stackable" val="true" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="commissionItemType" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18160" level="1" /> <!-- Potion of Protection: Mental -->
+		</skills>
 	</item>
 	<item id="40258" name="Potion of Protection: Sleep" additionalName="Top-grade" type="EtcItem">
 		<!-- Sleep Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -846,6 +885,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18161" level="1" /> <!-- Potion of Protection: Sleep -->
+		</skills>
 	</item>
 	<item id="40259" name="Potion of Protection: Poison" additionalName="Top-grade" type="EtcItem">
 		<!-- Poison Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -853,6 +900,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18162" level="1" /> <!-- Potion of Protection: Poison -->
+		</skills>
 	</item>
 	<item id="40260" name="Potion of Protection: Knock Back / Knock Down" additionalName="Top-grade" type="EtcItem">
 		<!-- Knock Back / Knock Down Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -860,6 +915,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18163" level="1" /> <!-- Potion of Protection: Knock Back / Knock Down -->
+		</skills>
 	</item>
 	<item id="40261" name="Potion of Protection: Aerial Yoke" additionalName="Top-grade" type="EtcItem">
 		<!-- Aerial Yoke Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -867,6 +930,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18164" level="1" /> <!-- Potion of Protection: Aerial Yoke -->
+		</skills>
 	</item>
 	<item id="40262" name="Faeron Support Box" additionalName="Ertheia Fighter" type="EtcItem">
 		<!-- Karla's gift for those who are struggling to make it in the Material Realm. Double-click to use. -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17100-17199.xml
index d154664295..b529599147 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17100-17199.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17100-17199.xml
@@ -1061,25 +1061,110 @@
 		<!-- When used, increases stun resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i01</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37792</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SHOCK>5</SHOCK>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17196" toLevel="1" name="Potion of Protection: Hold">
 		<!-- When used, increases hold resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i06</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37793</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<HOLD>5</HOLD>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17197" toLevel="1" name="Potion of Protection: Bleed">
 		<!-- When used, increases bleed resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i00</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37794</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BLEED>5</BLEED>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17198" toLevel="1" name="Potion of Protection: Paralyze">
 		<!-- When used, increases paralysis resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i07</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37795</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PARALYZE>5</PARALYZE>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17199" toLevel="1" name="Potion of Protection: Mental">
 		<!-- When used, increases mental attack resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37796</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT>
+			</effect>
+		</effects>
 	</skill>
 </list>
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 fcb39ba1f5..c839234b6a 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
@@ -4,21 +4,90 @@
 		<!-- When used, increases sleep resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i05</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37797</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SLEEP>5</SLEEP>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17201" toLevel="1" name="Potion of Protection: Poison">
 		<!-- When used, increases poison resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i02</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37798</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<POISON>5</POISON>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17202" toLevel="1" name="Potion of Protection: Knock Back/ Knock Down">
 		<!-- When used, increases knock-back and knock-down resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i10</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37799</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<KNOCKBACK>5</KNOCKBACK>
+				<KNOCKDOWN>5</KNOCKDOWN>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17203" toLevel="1" name="Potion of Protection: Aerial Yoke">
 		<!-- When used, increases aerial yoke resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i11</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37800</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<AIRBIND>5</AIRBIND>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17204" toLevel="1" name="Scroll: 100,000 SP">
 		<!-- Restores 100,000 SP. -->
@@ -392,6 +461,19 @@
 		<operateType>A1</operateType>
 		<hitTime>200</hitTime>
 		<reuseDelay>3000</reuseDelay>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>37904</itemConsumeId> <!-- Scroll: 1,000,000,000 SP -->
+		<magicLvl>1</magicLvl>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="GiveSp">
+				<sp>1000000000</sp>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17271" toLevel="1" name="Kat the Cat's Surprise Gift">
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/18100-18199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/18100-18199.xml
index ea670e6003..af8dfbd3e3 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/18100-18199.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/18100-18199.xml
@@ -493,46 +493,308 @@
 		<!-- Stun Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i01</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40253</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SHOCK>5</SHOCK>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18157" toLevel="1" name="Potion of Protection: Hold">
 		<!-- Hold Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i06</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40254</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<HOLD>5</HOLD>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18158" toLevel="1" name="Potion of Protection: Bleed">
 		<!-- Bleed Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i00</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40255</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BLEED>5</BLEED>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18159" toLevel="1" name="Potion of Protection: Paralyze">
 		<!-- Paralysis Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i07</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40256</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PARALYZE>5</PARALYZE>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18160" toLevel="1" name="Potion of Protection: Mental">
 		<!-- Mental Attack Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40257</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18161" toLevel="1" name="Potion of Protection: Sleep">
 		<!-- Sleep Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i05</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40258</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SLEEP>5</SLEEP>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18162" toLevel="1" name="Potion of Protection: Poison">
 		<!-- Poison Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i02</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40259</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<POISON>5</POISON>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18163" toLevel="1" name="Potion of Protection: Knock Back / Knock Down">
 		<!-- Knock Back / Knock Down Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i10</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40260</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<KNOCKBACK>5</KNOCKBACK>
+				<KNOCKDOWN>5</KNOCKDOWN>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18164" toLevel="1" name="Potion of Protection: Aerial Yoke">
 		<!-- Aerial Yoke Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i11</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40261</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<AIRBIND>5</AIRBIND>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18165" toLevel="1" name="Entrance Pass: Spezion (Normal)">
 		<operateType>A1</operateType>
@@ -592,31 +854,159 @@
 		<!-- For 30 min., XP/SP Gain + 10%, Attack Attribute + 100, P. Atk. + 20%, M. Atk. + 30%, Speed + 10%, Atk./Casting Spd. + 10%, Speed + 10, P./M. Accuracy + 4, Max HP/MP/CP + 10%, P./M. Def. + 10%, and Skill MP Consumption - 10%. Cannot be stacked with Art of Seduction. Buff remains after death. -->
 		<icon>icon.buff_joon_power_skill</icon>
 		<operateType>A2</operateType>
-		<reuseDelay>15000</reuseDelay>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitTime>3000</hitTime>
+		<coolTime>3000</coolTime>
+		<reuseDelay>300000</reuseDelay>
 		<effectPoint>1</effectPoint>
-		<isMagic>4</isMagic>
+		<isMagic>2</isMagic>
+		<stayAfterDeath>true</stayAfterDeath>
+		<effects>
+			<effect name="ExpModify">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="SpModify">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxHp">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxMp">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxCp">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PAtk">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicAccuracy">
+				<amount>4</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="Accuracy">
+				<amount>4</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicalAttackSpeed">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>10</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>DARK</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18173" toLevel="1" name="Joon's Resurrection">
 		<!-- Can use Blessed Resurrection. Cooldown is 3 hr. -->
 		<icon>icon.skill_agathion_special</icon>
-		<operateType>A1</operateType>
 		<castRange>400</castRange>
-		<hitTime>3000</hitTime>
-		<reuseDelay>10800000</reuseDelay>
 		<effectPoint>1</effectPoint>
-		<isMagic>4</isMagic>
+		<effectRange>600</effectRange>
+		<hitTime>1000</hitTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<coolTime>500</coolTime>
+		<reuseDelay>10800</reuseDelay>
+		<targetType>PC_BODY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpResurrection" />
+		</conditions>
+		<effects>
+			<effect name="Resurrection">
+				<power>100</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18174" toLevel="1" name="Agathion - Joon">
 		<!-- Releases Agathion's seal. -->
 		<icon>icon.etc_summon_aga_agit_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>85</magicLvl>
 		<operateType>A1</operateType>
-		<hitTime>3000</hitTime>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="SummonAgathion">
+				<npcId>13447</npcId> <!-- Joon -->
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18175" toLevel="1" name="Joon's Cute Trick">
 		<!-- See Agathion's cute trick. -->
 		<icon>icon.skill_agathion_cute</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>85</magicLvl>
 		<operateType>A1</operateType>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
 		<hitTime>3000</hitTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpNeedAgathion" />
+		</conditions>
 	</skill>
 	<skill id="18176" toLevel="1" name="Presentation Skill">
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
index 6842b358c8..6ea6b4138f 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -514,6 +514,7 @@ public enum AbnormalType
 	AIRBIND(365),
 	KNOCKDOWN(367),
 	EARTHWORM_DEBUFF(424),
+	POTION_OF_PROTECTION(552),
 	INSIDE_POSITION(593),
 	STEEL_MIND(596);
 	
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37700-37799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37700-37799.xml
index 21a0eb6fec..6add5c0763 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37700-37799.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37700-37799.xml
@@ -1262,6 +1262,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17195" level="1" /> <!-- Potion of Protection: Stun -->
+		</skills>
 	</item>
 	<item id="37793" name="Potion of Protection: Hold" type="EtcItem">
 		<!-- Increases hold resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1269,6 +1277,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17196" level="1" /> <!-- Potion of Protection: Hold -->
+		</skills>
 	</item>
 	<item id="37794" name="Potion of Protection: Bleed" type="EtcItem">
 		<!-- Increases Bleed Resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1276,6 +1292,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17197" level="1" /> <!-- Potion of Protection: Bleed -->
+		</skills>
 	</item>
 	<item id="37795" name="Potion of Protection: Paralyze" type="EtcItem">
 		<!-- Increases paralysis resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1283,6 +1307,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17198" level="1" /> <!-- Potion of Protection: Paralyze -->
+		</skills>
 	</item>
 	<item id="37796" name="Potion of Protection: Mental" type="EtcItem">
 		<!-- Increases Mental resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1290,6 +1322,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17199" level="1" /> <!-- Potion of Protection: Mental -->
+		</skills>
 	</item>
 	<item id="37797" name="Potion of Protection: Sleep" type="EtcItem">
 		<!-- Increases Sleep Resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1297,6 +1337,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17200" level="1" /> <!-- Potion of Protection: Sleep -->
+		</skills>
 	</item>
 	<item id="37798" name="Potion of Protection: Poison" type="EtcItem">
 		<!-- Increases Poison Resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1304,6 +1352,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17201" level="1" /> <!-- Potion of Protection: Poison -->
+		</skills>
 	</item>
 	<item id="37799" name="Potion of Protection: Knock Back/ Knock Down" type="EtcItem">
 		<!-- Increases Knock Back / Knock Down resistance by 5% when used. Cannot be used in the Olympiad or the Ceremony of Chaos. When used with other types of protection potions, the effects do not overlap. -->
@@ -1311,5 +1367,13 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17202" level="1" /> <!-- Potion of Protection: Knock Back/ Knock Down -->
+		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37800-37899.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37800-37899.xml
index caa9dbb7c8..1abee64cb3 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37800-37899.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/37800-37899.xml
@@ -6,7 +6,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17203" level="1" /> <!-- Potion of Protection: Aerial Yoke -->
+		</skills>
 	</item>
 	<item id="37801" name="Bloody Eternal Enhancement Stone Fragment" type="EtcItem">
 		<!-- Bring 10 fragments to the Black of mammon to obtain a Bloody Eternal Enhancement Stone. -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/40200-40299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/40200-40299.xml
index a28cb85d59..782c94ed8e 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/40200-40299.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/40200-40299.xml
@@ -810,6 +810,13 @@
 		<set name="is_stackable" val="true" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18156" level="1" /> <!-- Potion of Protection: Stun -->
+		</skills>
 	</item>
 	<item id="40254" name="Potion of Protection: Hold" additionalName="Top-grade" type="EtcItem">
 		<!-- Hold Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -817,6 +824,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18157" level="1" /> <!-- Potion of Protection: Hold -->
+		</skills>
 	</item>
 	<item id="40255" name="Potion of Protection: Bleed" additionalName="Top-grade" type="EtcItem">
 		<!-- Bleed Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -824,6 +839,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18158" level="1" /> <!-- Potion of Protection: Bleed -->
+		</skills>
 	</item>
 	<item id="40256" name="Potion of Protection: Paralyze" additionalName="Top-grade" type="EtcItem">
 		<!-- Paralyze Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -831,6 +854,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18159" level="1" /> <!-- Potion of Protection: Paralyze -->
+		</skills>
 	</item>
 	<item id="40257" name="Potion of Protection: Mental" additionalName="Top-grade" type="EtcItem">
 		<!-- Mental Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -839,6 +870,14 @@
 		<set name="is_stackable" val="true" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="commissionItemType" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18160" level="1" /> <!-- Potion of Protection: Mental -->
+		</skills>
 	</item>
 	<item id="40258" name="Potion of Protection: Sleep" additionalName="Top-grade" type="EtcItem">
 		<!-- Sleep Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -846,6 +885,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18161" level="1" /> <!-- Potion of Protection: Sleep -->
+		</skills>
 	</item>
 	<item id="40259" name="Potion of Protection: Poison" additionalName="Top-grade" type="EtcItem">
 		<!-- Poison Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -853,6 +900,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18162" level="1" /> <!-- Potion of Protection: Poison -->
+		</skills>
 	</item>
 	<item id="40260" name="Potion of Protection: Knock Back / Knock Down" additionalName="Top-grade" type="EtcItem">
 		<!-- Knock Back / Knock Down Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -860,6 +915,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18163" level="1" /> <!-- Potion of Protection: Knock Back / Knock Down -->
+		</skills>
 	</item>
 	<item id="40261" name="Potion of Protection: Aerial Yoke" additionalName="Top-grade" type="EtcItem">
 		<!-- Aerial Yoke Resistance + 5%, and damage received in PvP - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. Does not stack with other Potions of Protection. -->
@@ -867,6 +930,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18164" level="1" /> <!-- Potion of Protection: Aerial Yoke -->
+		</skills>
 	</item>
 	<item id="40262" name="Faeron Support Box" additionalName="Ertheia Fighter" type="EtcItem">
 		<!-- Karla's gift for those who are struggling to make it in the Material Realm. Double-click to use. -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17100-17199.xml
index 45cbe44036..e8bc952ee5 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17100-17199.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17100-17199.xml
@@ -1060,25 +1060,110 @@
 		<!-- When used, increases stun resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i01</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37792</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SHOCK>5</SHOCK>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17196" toLevel="1" name="Potion of Protection: Hold">
 		<!-- When used, increases hold resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i06</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37793</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<HOLD>5</HOLD>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17197" toLevel="1" name="Potion of Protection: Bleed">
 		<!-- When used, increases bleed resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i00</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37794</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BLEED>5</BLEED>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17198" toLevel="1" name="Potion of Protection: Paralyze">
 		<!-- When used, increases paralysis resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i07</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37795</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PARALYZE>5</PARALYZE>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17199" toLevel="1" name="Potion of Protection: Mental">
 		<!-- When used, increases mental attack resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37796</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT>
+			</effect>
+		</effects>
 	</skill>
 </list>
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 15a3662b60..47838a0b4b 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
@@ -4,21 +4,90 @@
 		<!-- When used, increases sleep resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i05</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37797</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SLEEP>5</SLEEP>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17201" toLevel="1" name="Potion of Protection: Poison">
 		<!-- When used, increases poison resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i02</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37798</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<POISON>5</POISON>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17202" toLevel="1" name="Potion of Protection: Knock Back/ Knock Down">
 		<!-- When used, increases knock-back and knock-down resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i10</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37799</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<KNOCKBACK>5</KNOCKBACK>
+				<KNOCKDOWN>5</KNOCKDOWN>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17203" toLevel="1" name="Potion of Protection: Aerial Yoke">
 		<!-- When used, increases aerial yoke resistance + 5%. Cannot be used in the Olympiad or the Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i11</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37800</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<AIRBIND>5</AIRBIND>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17204" toLevel="1" name="Scroll: 100,000 SP">
 		<!-- Restores 100,000 SP. -->
@@ -392,6 +461,19 @@
 		<operateType>A1</operateType>
 		<hitTime>200</hitTime>
 		<reuseDelay>3000</reuseDelay>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>37904</itemConsumeId> <!-- Scroll: 1,000,000,000 SP -->
+		<magicLvl>1</magicLvl>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="GiveSp">
+				<sp>1000000000</sp>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17271" toLevel="1" name="Kat the Cat's Surprise Gift">
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18100-18199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18100-18199.xml
index eb64f8a7a9..361ff26ce6 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18100-18199.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18100-18199.xml
@@ -493,46 +493,308 @@
 		<!-- Stun Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i01</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40253</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SHOCK>5</SHOCK>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18157" toLevel="1" name="Potion of Protection: Hold">
 		<!-- Hold Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i06</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40254</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<HOLD>5</HOLD>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18158" toLevel="1" name="Potion of Protection: Bleed">
 		<!-- Bleed Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i00</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40255</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BLEED>5</BLEED>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18159" toLevel="1" name="Potion of Protection: Paralyze">
 		<!-- Paralysis Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i07</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40256</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PARALYZE>5</PARALYZE>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18160" toLevel="1" name="Potion of Protection: Mental">
 		<!-- Mental Attack Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40257</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18161" toLevel="1" name="Potion of Protection: Sleep">
 		<!-- Sleep Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i05</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40258</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SLEEP>5</SLEEP>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18162" toLevel="1" name="Potion of Protection: Poison">
 		<!-- Poison Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i02</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40259</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<POISON>5</POISON>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18163" toLevel="1" name="Potion of Protection: Knock Back / Knock Down">
 		<!-- Knock Back / Knock Down Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i10</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40260</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<KNOCKBACK>5</KNOCKBACK>
+				<KNOCKDOWN>5</KNOCKDOWN>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18164" toLevel="1" name="Potion of Protection: Aerial Yoke">
 		<!-- Aerial Yoke Resistance + 5%, Received PvP Damage - 3%. Cannot be used in the Olympiad or Ceremony of Chaos. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i11</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40261</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<AIRBIND>5</AIRBIND>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18165" toLevel="1" name="Entrance Pass: Spezion (Normal)">
 		<operateType>A1</operateType>
@@ -592,31 +854,159 @@
 		<!-- For 30 min., XP/SP Gain + 10%, Attack Attribute + 100, P. Atk. + 20%, M. Atk. + 30%, Speed + 10, Atk./Casting Spd. + 10%, P./M. Accuracy + 4, Max HP/MP/CP + 10%, P./M. Def. + 10%, and Skill MP Consumption - 10%. Cannot be stacked with Art of Seduction. Buff remains after death. -->
 		<icon>icon.buff_joon_power_skill</icon>
 		<operateType>A2</operateType>
-		<reuseDelay>15000</reuseDelay>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitTime>3000</hitTime>
+		<coolTime>3000</coolTime>
+		<reuseDelay>300000</reuseDelay>
 		<effectPoint>1</effectPoint>
-		<isMagic>4</isMagic>
+		<isMagic>2</isMagic>
+		<stayAfterDeath>true</stayAfterDeath>
+		<effects>
+			<effect name="ExpModify">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="SpModify">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxHp">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxMp">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxCp">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PAtk">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>30</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicAccuracy">
+				<amount>4</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="Accuracy">
+				<amount>4</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicalAttackSpeed">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>10</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicMpCost">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="AttackAttribute">
+				<amount>100</amount>
+				<attribute>DARK</attribute>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18173" toLevel="1" name="Joon's Resurrection">
 		<!-- Can use Blessed Resurrection. Cooldown is 3 hr. -->
 		<icon>icon.skill_agathion_special</icon>
-		<operateType>A1</operateType>
 		<castRange>400</castRange>
-		<hitTime>3000</hitTime>
-		<reuseDelay>10800000</reuseDelay>
 		<effectPoint>1</effectPoint>
-		<isMagic>4</isMagic>
+		<effectRange>600</effectRange>
+		<hitTime>1000</hitTime>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<coolTime>500</coolTime>
+		<reuseDelay>10800</reuseDelay>
+		<targetType>PC_BODY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpResurrection" />
+		</conditions>
+		<effects>
+			<effect name="Resurrection">
+				<power>100</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18174" toLevel="1" name="Agathion - Joon">
 		<!-- Releases Agathion's seal. -->
 		<icon>icon.etc_summon_aga_agit_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>85</magicLvl>
 		<operateType>A1</operateType>
-		<hitTime>3000</hitTime>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="SummonAgathion">
+				<npcId>13447</npcId> <!-- Joon -->
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18175" toLevel="1" name="Joon's Cute Trick">
 		<!-- See Agathion's cute trick. -->
 		<icon>icon.skill_agathion_cute</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>85</magicLvl>
 		<operateType>A1</operateType>
+		<magicCriticalRate>-5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
 		<hitTime>3000</hitTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="OpNeedAgathion" />
+		</conditions>
 	</skill>
 	<skill id="18176" toLevel="1" name="Presentation Skill">
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
index d9e360fc7f..1373c998db 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -515,6 +515,7 @@ public enum AbnormalType
 	AIRBIND(365),
 	KNOCKDOWN(367),
 	EARTHWORM_DEBUFF(424),
+	POTION_OF_PROTECTION(552),
 	INSIDE_POSITION(593),
 	STEEL_MIND(596);
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37700-37799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37700-37799.xml
index 68e794d7ce..82549a8a43 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37700-37799.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37700-37799.xml
@@ -1262,6 +1262,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17195" level="1" /> <!-- Potion of Protection: Stun -->
+		</skills>
 	</item>
 	<item id="37793" name="Potion of Protection: Hold" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Hold Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1269,6 +1277,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17196" level="1" /> <!-- Potion of Protection: Hold -->
+		</skills>
 	</item>
 	<item id="37794" name="Potion of Protection: Bleed" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Bleed Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1276,6 +1292,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17197" level="1" /> <!-- Potion of Protection: Bleed -->
+		</skills>
 	</item>
 	<item id="37795" name="Potion of Protection: Paralyze" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Paralysis Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1283,6 +1307,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17198" level="1" /> <!-- Potion of Protection: Paralyze -->
+		</skills>
 	</item>
 	<item id="37796" name="Potion of Protection: Mental" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to MEN Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1290,6 +1322,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17199" level="1" /> <!-- Potion of Protection: Mental -->
+		</skills>
 	</item>
 	<item id="37797" name="Potion of Protection: Sleep" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Sleep Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1297,6 +1337,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17200" level="1" /> <!-- Potion of Protection: Sleep -->
+		</skills>
 	</item>
 	<item id="37798" name="Potion of Protection: Poison" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Poison Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1304,6 +1352,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17201" level="1" /> <!-- Potion of Protection: Poison -->
+		</skills>
 	</item>
 	<item id="37799" name="Potion of Protection: Knock Back/ Knock Down" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Knock back/Knock Down Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1311,5 +1367,13 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17202" level="1" /> <!-- Potion of Protection: Knock Back/ Knock Down -->
+		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37800-37899.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37800-37899.xml
index e1b3ef8b84..140d2819ec 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37800-37899.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/37800-37899.xml
@@ -6,7 +6,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17203" level="1" /> <!-- Potion of Protection: Aerial Yoke -->
+		</skills>
 	</item>
 	<item id="37801" name="Bloody Eternal Enhancement Stone Fragment" type="EtcItem">
 		<!-- Bring 10 fragments to the Black of mammon to obtain a Bloody Eternal Enhancement Stone. -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/40200-40299.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/40200-40299.xml
index 9ca3b5ada8..8becf6498a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/40200-40299.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/40200-40299.xml
@@ -810,6 +810,13 @@
 		<set name="is_stackable" val="true" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18156" level="1" /> <!-- Potion of Protection: Stun -->
+		</skills>
 	</item>
 	<item id="40254" name="Potion of Protection: Hold" type="EtcItem">
 		<!-- When used, increases Resistance to Hold Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -817,6 +824,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18157" level="1" /> <!-- Potion of Protection: Hold -->
+		</skills>
 	</item>
 	<item id="40255" name="Potion of Protection: Bleed" type="EtcItem">
 		<!-- When used, increases Resistance to Bleed Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -824,6 +839,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18158" level="1" /> <!-- Potion of Protection: Bleed -->
+		</skills>
 	</item>
 	<item id="40256" name="Potion of Protection: Paralyze" type="EtcItem">
 		<!-- When used, increases Resistance to Paralysis Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -831,6 +854,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18159" level="1" /> <!-- Potion of Protection: Paralyze -->
+		</skills>
 	</item>
 	<item id="40257" name="Potion of Protection: Mental" type="EtcItem">
 		<!-- When used, increases Resistance to MEN Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -839,6 +870,14 @@
 		<set name="is_stackable" val="true" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="commissionItemType" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18160" level="1" /> <!-- Potion of Protection: Mental -->
+		</skills>
 	</item>
 	<item id="40258" name="Potion of Protection: Sleep" type="EtcItem">
 		<!-- When used, increases Resistance to Sleep Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -846,6 +885,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18161" level="1" /> <!-- Potion of Protection: Sleep -->
+		</skills>
 	</item>
 	<item id="40259" name="Potion of Protection: Poison" type="EtcItem">
 		<!-- When used, increases Resistance to Poison Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -853,6 +900,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18162" level="1" /> <!-- Potion of Protection: Poison -->
+		</skills>
 	</item>
 	<item id="40260" name="Potion of Protection: Knock Back / Knock Down" type="EtcItem">
 		<!-- When used, increases Resistance to Knock Back/Knock Down Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -860,6 +915,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18163" level="1" /> <!-- Potion of Protection: Knock Back / Knock Down -->
+		</skills>
 	</item>
 	<item id="40261" name="Potion of Protection: Aerial Yoke" type="EtcItem">
 		<!-- When used, increases Resistance to Aerial Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -867,6 +930,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18164" level="1" /> <!-- Potion of Protection: Aerial Yoke -->
+		</skills>
 	</item>
 	<item id="40262" name="Faeron Support Box" additionalName="Ertheia Fighter" type="EtcItem">
 		<!-- Karla's gift for those who are struggling to make it in the Material Realm. Double-click to use. -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47600-47699.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47600-47699.xml
index 73cee04081..e0b6e7ce5c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47600-47699.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/47600-47699.xml
@@ -538,41 +538,60 @@
 	<item id="47657" name="Potion of Protection: Pull" type="EtcItem">
 		<!-- When used, increases Resistance to Pull Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i03" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18695" level="1" /> <!-- Potion of Protection: Pull -->
+		</skills>
 	</item>
 	<item id="47658" name="Potion of Protection: Danger Zone" type="EtcItem">
 		<!-- When used, increases Resistance to Danger Zone Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i03" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18696" level="1" /> <!-- Potion of Protection: Danger Zone -->
+		</skills>
 	</item>
 	<item id="47659" name="Potion of Protection: Seduction" type="EtcItem">
 		<!-- When used, increases Resistance to Seduction Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i04" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="47660" name="Potion of Protection: Bluff" type="EtcItem">
 		<!-- When used, increases Resistance to Bluff Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i09" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18698" level="1" /> <!-- Potion of Protection: Bluff -->
+		</skills>
 	</item>
 	<item id="47661" name="Potion of Protection: Faint" type="EtcItem">
 		<!-- When used, increases Resistance to Faint Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i08" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="47662" name="Mysterious Box" type="EtcItem">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17100-17199.xml
index 0118b8162e..f5a2147240 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17100-17199.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/17100-17199.xml
@@ -1060,25 +1060,110 @@
 		<!-- Use this to increase the defense rate against Stun by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i01</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37792</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SHOCK>5</SHOCK>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17196" toLevel="1" name="Potion of Protection: Hold (Low-grade)">
 		<!-- Use this to increase the defense rate against Hold by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i06</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37793</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<HOLD>5</HOLD>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17197" toLevel="1" name="Potion of Protection: Bleed (Low-grade)">
 		<!-- Use this to increase the defense rate against Bleed by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i00</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37794</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BLEED>5</BLEED>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17198" toLevel="1" name="Potion of Protection: Paralyze (Low-grade)">
 		<!-- Use this to increase the defense rate against Paralyze by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i07</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37795</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PARALYZE>5</PARALYZE>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17199" toLevel="1" name="Potion of Protection: Mental (Low-grade)">
 		<!-- Use this to increase the defense rate against Mental by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37796</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT>
+			</effect>
+		</effects>
 	</skill>
 </list>
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 a1b1e7d42d..2c5511014c 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
@@ -4,21 +4,90 @@
 		<!-- Use this to increase the defense rate against Sleep by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i05</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37797</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SLEEP>5</SLEEP>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17201" toLevel="1" name="Potion of Protection: Poison (Low-grade)">
 		<!-- Use this to increase the defense rate against Poison by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i02</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37798</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<POISON>5</POISON>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17202" toLevel="1" name="Potion of Protection: Knock Back/ Knock Down (Low-grade)">
 		<!-- Use this to increase the defense rate against Knock Back/Knock Down by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i10</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37799</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<KNOCKBACK>5</KNOCKBACK>
+				<KNOCKDOWN>5</KNOCKDOWN>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17203" toLevel="1" name="Potion of Protection: Aerial Yoke (Low-grade)">
 		<!-- Use this to increase the defense rate against Aerial Yoke by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i11</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37800</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<AIRBIND>5</AIRBIND>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17204" toLevel="1" name="Scroll: 100,000 SP">
 		<!-- Restores 100,000 SP. -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18100-18199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18100-18199.xml
index 42b511e098..039a05d2a6 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18100-18199.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18100-18199.xml
@@ -493,46 +493,308 @@
 		<!-- Use this to increase the defense rate against Stun by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i01</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40253</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SHOCK>5</SHOCK>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18157" toLevel="1" name="Potion of Protection: Hold">
 		<!-- Use this to increase the defense rate against Hold by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i06</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40254</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<HOLD>5</HOLD>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18158" toLevel="1" name="Potion of Protection: Bleed">
 		<!-- Use this to increase the defense rate against Bleed by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i00</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40255</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BLEED>5</BLEED>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18159" toLevel="1" name="Potion of Protection: Paralyze">
 		<!-- Use this to increase the defense rate against Paralyze by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i07</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40256</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PARALYZE>5</PARALYZE>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18160" toLevel="1" name="Potion of Protection: Mental">
 		<!-- Use this to increase the defense rate against Mental by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40257</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18161" toLevel="1" name="Potion of Protection: Sleep">
 		<!-- Use this to increase the defense rate against Sleep by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i05</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40258</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SLEEP>5</SLEEP>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18162" toLevel="1" name="Potion of Protection: Poison">
 		<!-- Use this to increase the defense rate against Poison by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i02</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40259</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<POISON>5</POISON>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18163" toLevel="1" name="Potion of Protection: Knock Back/ Knock Down">
 		<!-- Use this to increase the defense rate against Knock Back/Knock Down by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i10</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40260</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<KNOCKBACK>5</KNOCKBACK>
+				<KNOCKDOWN>5</KNOCKDOWN>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18164" toLevel="1" name="Potion of Protection: Aerial Yoke">
 		<!-- Use this to increase the defense rate against Aerial Yoke by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i11</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40261</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<AIRBIND>5</AIRBIND>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18165" toLevel="1" name="Entrance Pass: Spezion (Normal)">
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18600-18699.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18600-18699.xml
index e137aa2690..603ee4c6c9 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18600-18699.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18600-18699.xml
@@ -1508,26 +1508,113 @@
 	<skill id="18695" toLevel="1" name="Potion of Protection: Pull">
 		<!-- Use this to increase the defense rate against Pull by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i03</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<itemConsumeId>47657</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PULL>5</PULL>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18696" toLevel="1" name="Potion of Protection: Danger Zone">
 		<!-- Use this to increase the defense rate in the Danger Zone by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i03</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<itemConsumeId>47658</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<ZONE>5</ZONE>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18697" toLevel="1" name="Potion of Protection: Seduction">
 		<!-- Use this to increase the defense rate against Seduction by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
 	</skill>
 	<skill id="18698" toLevel="1" name="Potion of Protection: Bluff">
 		<!-- Use this to increase the defense rate against Bluff by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i09</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<itemConsumeId>47660</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT> <!-- Incorrect, there should be TraitType Bluff, but skill Bluff use TraitType DERANGEMENT -->
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18699" toLevel="1" name="Potion of Protection: Faint">
 		<!-- Use this to increase the defense rate against Faint by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i08</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
 	</skill>
 </list>
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
index fc84484c3b..ac4a94b138 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -540,6 +540,7 @@ public enum AbnormalType
 	AIRBIND(365),
 	KNOCKDOWN(367),
 	EARTHWORM_DEBUFF(424),
+	POTION_OF_PROTECTION(552),
 	INSIDE_POSITION(593),
 	STEEL_MIND(596);
 	
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/37700-37799.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/37700-37799.xml
index 6f0d1c1c53..7cb6049637 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/37700-37799.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/37700-37799.xml
@@ -1262,6 +1262,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17195" level="1" /> <!-- Potion of Protection: Stun -->
+		</skills>
 	</item>
 	<item id="37793" name="Potion of Protection: Hold" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Hold Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1269,6 +1277,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17196" level="1" /> <!-- Potion of Protection: Hold -->
+		</skills>
 	</item>
 	<item id="37794" name="Potion of Protection: Bleed" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Bleed Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1276,6 +1292,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17197" level="1" /> <!-- Potion of Protection: Bleed -->
+		</skills>
 	</item>
 	<item id="37795" name="Potion of Protection: Paralyze" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Paralysis Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1283,6 +1307,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17198" level="1" /> <!-- Potion of Protection: Paralyze -->
+		</skills>
 	</item>
 	<item id="37796" name="Potion of Protection: Mental" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to MEN Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1290,6 +1322,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17199" level="1" /> <!-- Potion of Protection: Mental -->
+		</skills>
 	</item>
 	<item id="37797" name="Potion of Protection: Sleep" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Sleep Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1297,6 +1337,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17200" level="1" /> <!-- Potion of Protection: Sleep -->
+		</skills>
 	</item>
 	<item id="37798" name="Potion of Protection: Poison" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Poison Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1304,6 +1352,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17201" level="1" /> <!-- Potion of Protection: Poison -->
+		</skills>
 	</item>
 	<item id="37799" name="Potion of Protection: Knock Back/ Knock Down" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Knock back/ Knock Down Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1311,5 +1367,13 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17202" level="1" /> <!-- Potion of Protection: Knock Back/ Knock Down -->
+		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/37800-37899.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/37800-37899.xml
index 1ab561f875..8f085734bd 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/37800-37899.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/37800-37899.xml
@@ -6,7 +6,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17203" level="1" /> <!-- Potion of Protection: Aerial Yoke -->
+		</skills>
 	</item>
 	<item id="37801" name="Bloody Eternal Enhancement Stone Fragment" type="EtcItem">
 		<!-- Bring 10 fragments to the Black of mammon to obtain a Bloody Eternal Enhancement Stone. -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/40200-40299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/40200-40299.xml
index 56c1415aa2..ab597d0162 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/40200-40299.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/40200-40299.xml
@@ -810,6 +810,13 @@
 		<set name="is_stackable" val="true" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18156" level="1" /> <!-- Potion of Protection: Stun -->
+		</skills>
 	</item>
 	<item id="40254" name="Potion of Protection: Hold" type="EtcItem">
 		<!-- When used, increases Resistance to Hold Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -817,6 +824,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18157" level="1" /> <!-- Potion of Protection: Hold -->
+		</skills>
 	</item>
 	<item id="40255" name="Potion of Protection: Bleed" type="EtcItem">
 		<!-- When used, increases Resistance to Bleed Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -824,6 +839,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18158" level="1" /> <!-- Potion of Protection: Bleed -->
+		</skills>
 	</item>
 	<item id="40256" name="Potion of Protection: Paralyze" type="EtcItem">
 		<!-- When used, increases Resistance to Paralysis Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -831,6 +854,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18159" level="1" /> <!-- Potion of Protection: Paralyze -->
+		</skills>
 	</item>
 	<item id="40257" name="Potion of Protection: Mental" type="EtcItem">
 		<!-- When used, increases Resistance to MEN Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -839,6 +870,14 @@
 		<set name="is_stackable" val="true" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="commissionItemType" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18160" level="1" /> <!-- Potion of Protection: Mental -->
+		</skills>
 	</item>
 	<item id="40258" name="Potion of Protection: Sleep" type="EtcItem">
 		<!-- When used, increases Resistance to Sleep Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -846,6 +885,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18161" level="1" /> <!-- Potion of Protection: Sleep -->
+		</skills>
 	</item>
 	<item id="40259" name="Potion of Protection: Poison" type="EtcItem">
 		<!-- When used, increases Resistance to Poison Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -853,6 +900,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18162" level="1" /> <!-- Potion of Protection: Poison -->
+		</skills>
 	</item>
 	<item id="40260" name="Potion of Protection: Knock Back / Knock Down" type="EtcItem">
 		<!-- When used, increases Resistance to Knock Back/ Knock Down Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -860,6 +915,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18163" level="1" /> <!-- Potion of Protection: Knock Back / Knock Down -->
+		</skills>
 	</item>
 	<item id="40261" name="Potion of Protection: Aerial Yoke" type="EtcItem">
 		<!-- When used, increases Resistance to Aerial Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -867,6 +930,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18164" level="1" /> <!-- Potion of Protection: Aerial Yoke -->
+		</skills>
 	</item>
 	<item id="40262" name="Faeron Support Box" additionalName="Ertheia Fighter" type="EtcItem">
 		<!-- Karla's gift for those who are struggling to make it in the Material Realm. Double-click to use. -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/47600-47699.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/47600-47699.xml
index fec1b17cf5..a7e84ea27d 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/47600-47699.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/47600-47699.xml
@@ -538,41 +538,60 @@
 	<item id="47657" name="Potion of Protection: Pull" type="EtcItem">
 		<!-- When used, increases Resistance to Pull Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i03" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18695" level="1" /> <!-- Potion of Protection: Pull -->
+		</skills>
 	</item>
 	<item id="47658" name="Potion of Protection: Danger Zone" type="EtcItem">
 		<!-- When used, increases Resistance to Danger Zone Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i03" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18696" level="1" /> <!-- Potion of Protection: Danger Zone -->
+		</skills>
 	</item>
 	<item id="47659" name="Potion of Protection: Seduction" type="EtcItem">
 		<!-- When used, increases Resistance to Seduction Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i04" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="47660" name="Potion of Protection: Bluff" type="EtcItem">
 		<!-- When used, increases Resistance to Bluff Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i09" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18698" level="1" /> <!-- Potion of Protection: Bluff -->
+		</skills>
 	</item>
 	<item id="47661" name="Potion of Protection: Faint" type="EtcItem">
 		<!-- When used, increases Resistance to Faint Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i08" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="47662" name="Mysterious Box" type="EtcItem">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/17100-17199.xml
index 517a6bcbec..94f08f25ab 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/17100-17199.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/17100-17199.xml
@@ -1060,25 +1060,110 @@
 		<!-- Use this to increase the defense rate against Stun by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i01</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37792</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SHOCK>5</SHOCK>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17196" toLevel="1" name="Potion of Protection: Hold (Low-grade)">
 		<!-- Use this to increase the defense rate against Hold by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i06</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37793</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<HOLD>5</HOLD>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17197" toLevel="1" name="Potion of Protection: Bleed (Low-grade)">
 		<!-- Use this to increase the defense rate against Bleed by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i00</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37794</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BLEED>5</BLEED>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17198" toLevel="1" name="Potion of Protection: Paralyze (Low-grade)">
 		<!-- Use this to increase the defense rate against Paralyze by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i07</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37795</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PARALYZE>5</PARALYZE>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17199" toLevel="1" name="Potion of Protection: Mental (Low-grade)">
 		<!-- Use this to increase the defense rate against Mental by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37796</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT>
+			</effect>
+		</effects>
 	</skill>
 </list>
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 c682a5bbaa..60766dd686 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
@@ -4,21 +4,90 @@
 		<!-- Use this to increase the defense rate against Sleep by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i05</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37797</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SLEEP>5</SLEEP>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17201" toLevel="1" name="Potion of Protection: Poison (Low-grade)">
 		<!-- Use this to increase the defense rate against Poison by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i02</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37798</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<POISON>5</POISON>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17202" toLevel="1" name="Potion of Protection: Knock Back/ Knock Down (Low-grade)">
 		<!-- Use this to increase the defense rate against Knock Back/ Knock Down by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i10</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37799</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<KNOCKBACK>5</KNOCKBACK>
+				<KNOCKDOWN>5</KNOCKDOWN>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17203" toLevel="1" name="Potion of Protection: Aerial Yoke (Low-grade)">
 		<!-- Use this to increase the defense rate against Aerial Yoke by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i11</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37800</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<AIRBIND>5</AIRBIND>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17204" toLevel="1" name="Scroll: 100,000 SP">
 		<!-- Restores 100,000 SP. -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18100-18199.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18100-18199.xml
index 6d65fa2635..ee12e4ce44 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18100-18199.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18100-18199.xml
@@ -493,46 +493,308 @@
 		<!-- Use this to increase the defense rate against Stun by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i01</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40253</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SHOCK>5</SHOCK>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18157" toLevel="1" name="Potion of Protection: Hold">
 		<!-- Use this to increase the defense rate against Hold by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i06</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40254</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<HOLD>5</HOLD>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18158" toLevel="1" name="Potion of Protection: Bleed">
 		<!-- Use this to increase the defense rate against Bleed by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i00</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40255</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BLEED>5</BLEED>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18159" toLevel="1" name="Potion of Protection: Paralyze">
 		<!-- Use this to increase the defense rate against Paralyze by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i07</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40256</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PARALYZE>5</PARALYZE>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18160" toLevel="1" name="Potion of Protection: Mental">
 		<!-- Use this to increase the defense rate against Mental by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40257</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18161" toLevel="1" name="Potion of Protection: Sleep">
 		<!-- Use this to increase the defense rate against Sleep by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i05</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40258</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SLEEP>5</SLEEP>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18162" toLevel="1" name="Potion of Protection: Poison">
 		<!-- Use this to increase the defense rate against Poison by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i02</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40259</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<POISON>5</POISON>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18163" toLevel="1" name="Potion of Protection: Knock Back/ Knock Down">
 		<!-- Use this to increase the defense rate against Knock Back/ Knock Down by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i10</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40260</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<KNOCKBACK>5</KNOCKBACK>
+				<KNOCKDOWN>5</KNOCKDOWN>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18164" toLevel="1" name="Potion of Protection: Aerial Yoke">
 		<!-- Use this to increase the defense rate against Aerial Yoke by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i11</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40261</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<AIRBIND>5</AIRBIND>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18165" toLevel="1" name="Entrance Pass: Spezion (Normal)">
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18600-18699.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18600-18699.xml
index c1c22e7248..9122addd67 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18600-18699.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18600-18699.xml
@@ -1511,26 +1511,113 @@
 	<skill id="18695" toLevel="1" name="Potion of Protection: Pull">
 		<!-- Use this to increase the defense rate against Pull by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i03</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<itemConsumeId>47657</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PULL>5</PULL>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18696" toLevel="1" name="Potion of Protection: Danger Zone">
 		<!-- Use this to increase the defense rate in the Danger Zone by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i03</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<itemConsumeId>47658</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<ZONE>5</ZONE>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18697" toLevel="1" name="Potion of Protection: Seduction">
 		<!-- Use this to increase the defense rate against Seduction by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
 	</skill>
 	<skill id="18698" toLevel="1" name="Potion of Protection: Bluff">
 		<!-- Use this to increase the defense rate against Bluff by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i09</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<itemConsumeId>47660</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT> <!-- Incorrect, there should be TraitType Bluff, but skill Bluff use TraitType DERANGEMENT -->
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18699" toLevel="1" name="Potion of Protection: Faint">
 		<!-- Use this to increase the defense rate against Faint by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i08</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
 	</skill>
 </list>
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
index b2e2aa6db5..0764a1af7a 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -540,6 +540,7 @@ public enum AbnormalType
 	AIRBIND(365),
 	KNOCKDOWN(367),
 	EARTHWORM_DEBUFF(424),
+	POTION_OF_PROTECTION(552),
 	INSIDE_POSITION(593),
 	STEEL_MIND(596),
 	SIGEL_SHIELD(597);
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37700-37799.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37700-37799.xml
index a3d766e195..75ad9a0717 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37700-37799.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37700-37799.xml
@@ -1262,6 +1262,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17195" level="1" /> <!-- Potion of Protection: Stun -->
+		</skills>
 	</item>
 	<item id="37793" name="Potion of Protection: Hold" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Hold Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1269,6 +1277,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17196" level="1" /> <!-- Potion of Protection: Hold -->
+		</skills>
 	</item>
 	<item id="37794" name="Potion of Protection: Bleed" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Bleed Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1276,6 +1292,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17197" level="1" /> <!-- Potion of Protection: Bleed -->
+		</skills>
 	</item>
 	<item id="37795" name="Potion of Protection: Paralyze" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Paralysis Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1283,6 +1307,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17198" level="1" /> <!-- Potion of Protection: Paralyze -->
+		</skills>
 	</item>
 	<item id="37796" name="Potion of Protection: Mental" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to MEN Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1290,6 +1322,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17199" level="1" /> <!-- Potion of Protection: Mental -->
+		</skills>
 	</item>
 	<item id="37797" name="Potion of Protection: Sleep" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Sleep Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1297,6 +1337,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17200" level="1" /> <!-- Potion of Protection: Sleep -->
+		</skills>
 	</item>
 	<item id="37798" name="Potion of Protection: Poison" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Poison Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1304,6 +1352,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17201" level="1" /> <!-- Potion of Protection: Poison -->
+		</skills>
 	</item>
 	<item id="37799" name="Potion of Protection: Knock Back/ Knock Down" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Knock back/ Knock Down Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1311,5 +1367,13 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17202" level="1" /> <!-- Potion of Protection: Knock Back/ Knock Down -->
+		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37800-37899.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37800-37899.xml
index 26a604ab53..5bbaf97606 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37800-37899.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/37800-37899.xml
@@ -6,7 +6,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17203" level="1" /> <!-- Potion of Protection: Aerial Yoke -->
+		</skills>
 	</item>
 	<item id="37801" name="Bloody Eternal Enhancement Stone Fragment" type="EtcItem">
 		<!-- Bring 10 fragments to the Black of mammon to obtain a Bloody Eternal Enhancement Stone. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/40200-40299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/40200-40299.xml
index d7c8a2e1bd..8a152fdfa3 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/40200-40299.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/40200-40299.xml
@@ -810,6 +810,13 @@
 		<set name="is_stackable" val="true" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18156" level="1" /> <!-- Potion of Protection: Stun -->
+		</skills>
 	</item>
 	<item id="40254" name="Potion of Protection: Hold" type="EtcItem">
 		<!-- When used, increases Resistance to Hold Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -817,6 +824,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18157" level="1" /> <!-- Potion of Protection: Hold -->
+		</skills>
 	</item>
 	<item id="40255" name="Potion of Protection: Bleed" type="EtcItem">
 		<!-- When used, increases Resistance to Bleed Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -824,6 +839,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18158" level="1" /> <!-- Potion of Protection: Bleed -->
+		</skills>
 	</item>
 	<item id="40256" name="Potion of Protection: Paralyze" type="EtcItem">
 		<!-- When used, increases Resistance to Paralysis Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -831,6 +854,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18159" level="1" /> <!-- Potion of Protection: Paralyze -->
+		</skills>
 	</item>
 	<item id="40257" name="Potion of Protection: Mental" type="EtcItem">
 		<!-- When used, increases Resistance to MEN Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -839,6 +870,14 @@
 		<set name="is_stackable" val="true" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="commissionItemType" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18160" level="1" /> <!-- Potion of Protection: Mental -->
+		</skills>
 	</item>
 	<item id="40258" name="Potion of Protection: Sleep" type="EtcItem">
 		<!-- When used, increases Resistance to Sleep Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -846,6 +885,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18161" level="1" /> <!-- Potion of Protection: Sleep -->
+		</skills>
 	</item>
 	<item id="40259" name="Potion of Protection: Poison" type="EtcItem">
 		<!-- When used, increases Resistance to Poison Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -853,6 +900,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18162" level="1" /> <!-- Potion of Protection: Poison -->
+		</skills>
 	</item>
 	<item id="40260" name="Potion of Protection: Knock Back/ Knock Down" type="EtcItem">
 		<!-- When used, increases Resistance to Knock Back/ Knock Down Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -860,6 +915,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18163" level="1" /> <!-- Potion of Protection: Knock Back / Knock Down -->
+		</skills>
 	</item>
 	<item id="40261" name="Potion of Protection: Aerial Yoke" type="EtcItem">
 		<!-- When used, increases Resistance to Aerial Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -867,6 +930,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18164" level="1" /> <!-- Potion of Protection: Aerial Yoke -->
+		</skills>
 	</item>
 	<item id="40262" name="Faeron Support Box" additionalName="Ertheia Fighter" type="EtcItem">
 		<!-- Karla's gift for those who are struggling to make it in the Material Realm. Double-click to use. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/47600-47699.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/47600-47699.xml
index e66ef4a757..ecf43e3abd 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/47600-47699.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/47600-47699.xml
@@ -538,41 +538,60 @@
 	<item id="47657" name="Potion of Protection: Pull" type="EtcItem">
 		<!-- When used, increases Resistance to Pull Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i03" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18695" level="1" /> <!-- Potion of Protection: Pull -->
+		</skills>
 	</item>
 	<item id="47658" name="Potion of Protection: Danger Zone" type="EtcItem">
 		<!-- When used, increases Resistance to Danger Zone Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i03" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18696" level="1" /> <!-- Potion of Protection: Danger Zone -->
+		</skills>
 	</item>
 	<item id="47659" name="Potion of Protection: Seduction" type="EtcItem">
 		<!-- When used, increases Resistance to Seduction Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i04" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="47660" name="Potion of Protection: Bluff" type="EtcItem">
 		<!-- When used, increases Resistance to Bluff Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i09" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18698" level="1" /> <!-- Potion of Protection: Bluff -->
+		</skills>
 	</item>
 	<item id="47661" name="Potion of Protection: Faint" type="EtcItem">
 		<!-- When used, increases Resistance to Faint Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i08" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="47662" name="Mysterious Box" type="EtcItem">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17100-17199.xml
index 5d75a03751..7db82644b5 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17100-17199.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/17100-17199.xml
@@ -1060,25 +1060,110 @@
 		<!-- Use this to increase the defense rate against Stun by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i01</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37792</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SHOCK>5</SHOCK>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17196" toLevel="1" name="Potion of Protection: Hold (Low-grade)">
 		<!-- Use this to increase the defense rate against Hold by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i06</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37793</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<HOLD>5</HOLD>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17197" toLevel="1" name="Potion of Protection: Bleed (Low-grade)">
 		<!-- Use this to increase the defense rate against Bleed by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i00</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37794</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BLEED>5</BLEED>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17198" toLevel="1" name="Potion of Protection: Paralyze (Low-grade)">
 		<!-- Use this to increase the defense rate against Paralyze by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i07</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37795</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PARALYZE>5</PARALYZE>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17199" toLevel="1" name="Potion of Protection: Mental (Low-grade)">
 		<!-- Use this to increase the defense rate against Mental by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37796</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT>
+			</effect>
+		</effects>
 	</skill>
 </list>
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 4150658710..da88055f33 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
@@ -4,21 +4,90 @@
 		<!-- Use this to increase the defense rate against Sleep by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i05</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37797</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SLEEP>5</SLEEP>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17201" toLevel="1" name="Potion of Protection: Poison (Low-grade)">
 		<!-- Use this to increase the defense rate against Poison by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i02</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37798</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<POISON>5</POISON>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17202" toLevel="1" name="Potion of Protection: Knock Back/ Knock Down (Low-grade)">
 		<!-- Use this to increase the defense rate against Knock Back/ Knock Down by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i10</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37799</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<KNOCKBACK>5</KNOCKBACK>
+				<KNOCKDOWN>5</KNOCKDOWN>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17203" toLevel="1" name="Potion of Protection: Aerial Yoke (Low-grade)">
 		<!-- Use this to increase the defense rate against Aerial Yoke by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i11</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37800</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<AIRBIND>5</AIRBIND>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17204" toLevel="1" name="Scroll: 100,000 SP">
 		<!-- Restores 100,000 SP. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18100-18199.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18100-18199.xml
index b8e64b6f1f..4456092ae4 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18100-18199.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18100-18199.xml
@@ -493,46 +493,308 @@
 		<!-- Use this to increase the defense rate against Stun by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i01</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40253</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SHOCK>5</SHOCK>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18157" toLevel="1" name="Potion of Protection: Hold">
 		<!-- Use this to increase the defense rate against Hold by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i06</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40254</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<HOLD>5</HOLD>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18158" toLevel="1" name="Potion of Protection: Bleed">
 		<!-- Use this to increase the defense rate against Bleed by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i00</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40255</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BLEED>5</BLEED>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18159" toLevel="1" name="Potion of Protection: Paralyze">
 		<!-- Use this to increase the defense rate against Paralyze by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i07</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40256</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PARALYZE>5</PARALYZE>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18160" toLevel="1" name="Potion of Protection: Mental">
 		<!-- Use this to increase the defense rate against Mental by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40257</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18161" toLevel="1" name="Potion of Protection: Sleep">
 		<!-- Use this to increase the defense rate against Sleep by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i05</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40258</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SLEEP>5</SLEEP>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18162" toLevel="1" name="Potion of Protection: Poison">
 		<!-- Use this to increase the defense rate against Poison by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i02</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40259</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<POISON>5</POISON>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18163" toLevel="1" name="Potion of Protection: Knock Back/ Knock Down">
 		<!-- Use this to increase the defense rate against Knock Back/ Knock Down by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i10</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40260</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<KNOCKBACK>5</KNOCKBACK>
+				<KNOCKDOWN>5</KNOCKDOWN>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18164" toLevel="1" name="Potion of Protection: Aerial Yoke">
 		<!-- Use this to increase the defense rate against Aerial Yoke by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i11</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40261</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<AIRBIND>5</AIRBIND>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18165" toLevel="1" name="Entrance Pass: Spezion (Normal)">
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18600-18699.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18600-18699.xml
index baa837c25b..1bf31fa0b4 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18600-18699.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18600-18699.xml
@@ -1511,26 +1511,113 @@
 	<skill id="18695" toLevel="1" name="Potion of Protection: Pull">
 		<!-- Use this to increase the defense rate against Pull by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i03</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<itemConsumeId>47657</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PULL>5</PULL>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18696" toLevel="1" name="Potion of Protection: Danger Zone">
 		<!-- Use this to increase the defense rate in the Danger Zone by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i03</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<itemConsumeId>47658</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<ZONE>5</ZONE>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18697" toLevel="1" name="Potion of Protection: Seduction">
 		<!-- Use this to increase the defense rate against Seduction by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
 	</skill>
 	<skill id="18698" toLevel="1" name="Potion of Protection: Bluff">
 		<!-- Use this to increase the defense rate against Bluff by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i09</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<itemConsumeId>47660</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT> <!-- Incorrect, there should be TraitType Bluff, but skill Bluff use TraitType DERANGEMENT -->
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18699" toLevel="1" name="Potion of Protection: Faint">
 		<!-- Use this to increase the defense rate against Faint by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i08</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
 	</skill>
 </list>
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
index b2e2aa6db5..0764a1af7a 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -540,6 +540,7 @@ public enum AbnormalType
 	AIRBIND(365),
 	KNOCKDOWN(367),
 	EARTHWORM_DEBUFF(424),
+	POTION_OF_PROTECTION(552),
 	INSIDE_POSITION(593),
 	STEEL_MIND(596),
 	SIGEL_SHIELD(597);
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/37700-37799.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/37700-37799.xml
index 3f969150a0..7ccb99100b 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/37700-37799.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/37700-37799.xml
@@ -1262,6 +1262,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17195" level="1" /> <!-- Potion of Protection: Stun -->
+		</skills>
 	</item>
 	<item id="37793" name="Potion of Protection: Hold" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Hold Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1269,6 +1277,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17196" level="1" /> <!-- Potion of Protection: Hold -->
+		</skills>
 	</item>
 	<item id="37794" name="Potion of Protection: Bleed" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Bleed Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1276,6 +1292,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17197" level="1" /> <!-- Potion of Protection: Bleed -->
+		</skills>
 	</item>
 	<item id="37795" name="Potion of Protection: Paralyze" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Paralysis Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1283,6 +1307,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17198" level="1" /> <!-- Potion of Protection: Paralyze -->
+		</skills>
 	</item>
 	<item id="37796" name="Potion of Protection: Mental" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to MEN Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1290,6 +1322,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17199" level="1" /> <!-- Potion of Protection: Mental -->
+		</skills>
 	</item>
 	<item id="37797" name="Potion of Protection: Sleep" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Sleep Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1297,6 +1337,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17200" level="1" /> <!-- Potion of Protection: Sleep -->
+		</skills>
 	</item>
 	<item id="37798" name="Potion of Protection: Poison" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Poison Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1304,6 +1352,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17201" level="1" /> <!-- Potion of Protection: Poison -->
+		</skills>
 	</item>
 	<item id="37799" name="Potion of Protection: Knock Back/ Knock Down" additionalName="Low-grade" type="EtcItem">
 		<!-- When used, increases Resistance to Knock back/ Knock Down Attacks by 5%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -1311,5 +1367,13 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17202" level="1" /> <!-- Potion of Protection: Knock Back/ Knock Down -->
+		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/37800-37899.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/37800-37899.xml
index 20c0d11044..2dc6cb177e 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/37800-37899.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/37800-37899.xml
@@ -6,7 +6,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="17203" level="1" /> <!-- Potion of Protection: Aerial Yoke -->
+		</skills>
 	</item>
 	<item id="37801" name="Bloody Armor Enhancement Stone Fragment" type="EtcItem">
 		<!-- Bring 10 fragments to the Blacksmith of Mammon to obtain a Bloody Armor Enhancement Stone. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/40200-40299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/40200-40299.xml
index cec70f782a..697791cc75 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/40200-40299.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/40200-40299.xml
@@ -810,6 +810,13 @@
 		<set name="is_stackable" val="true" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18156" level="1" /> <!-- Potion of Protection: Stun -->
+		</skills>
 	</item>
 	<item id="40254" name="Potion of Protection: Hold" type="EtcItem">
 		<!-- When used, increases Resistance to Hold Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -817,6 +824,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18157" level="1" /> <!-- Potion of Protection: Hold -->
+		</skills>
 	</item>
 	<item id="40255" name="Potion of Protection: Bleed" type="EtcItem">
 		<!-- When used, increases Resistance to Bleed Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -824,6 +839,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18158" level="1" /> <!-- Potion of Protection: Bleed -->
+		</skills>
 	</item>
 	<item id="40256" name="Potion of Protection: Paralyze" type="EtcItem">
 		<!-- When used, increases Resistance to Paralysis Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -831,6 +854,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18159" level="1" /> <!-- Potion of Protection: Paralyze -->
+		</skills>
 	</item>
 	<item id="40257" name="Potion of Protection: Mental" type="EtcItem">
 		<!-- When used, increases Resistance to MEN Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -839,6 +870,14 @@
 		<set name="is_stackable" val="true" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="commissionItemType" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18160" level="1" /> <!-- Potion of Protection: Mental -->
+		</skills>
 	</item>
 	<item id="40258" name="Potion of Protection: Sleep" type="EtcItem">
 		<!-- When used, increases Resistance to Sleep Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -846,6 +885,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18161" level="1" /> <!-- Potion of Protection: Sleep -->
+		</skills>
 	</item>
 	<item id="40259" name="Potion of Protection: Poison" type="EtcItem">
 		<!-- When used, increases Resistance to Poison Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -853,6 +900,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18162" level="1" /> <!-- Potion of Protection: Poison -->
+		</skills>
 	</item>
 	<item id="40260" name="Potion of Protection: Knock Back/ Knock Down" type="EtcItem">
 		<!-- When used, increases Resistance to Knock Back/ Knock Down Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -860,6 +915,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18163" level="1" /> <!-- Potion of Protection: Knock Back / Knock Down -->
+		</skills>
 	</item>
 	<item id="40261" name="Potion of Protection: Aerial Yoke" type="EtcItem">
 		<!-- When used, increases Resistance to Aerial Attacks by 5% and reduces PVP damage taken by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
@@ -867,6 +930,14 @@
 		<set name="weight" val="10" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18164" level="1" /> <!-- Potion of Protection: Aerial Yoke -->
+		</skills>
 	</item>
 	<item id="40262" name="Faeron Support Box" additionalName="Ertheia Fighter" type="EtcItem">
 		<!-- Karla's gift for those who are struggling to make it in the Material Realm. Double-click to use. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/47600-47699.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/47600-47699.xml
index 77138b29f4..b43a6cf22f 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/47600-47699.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/47600-47699.xml
@@ -538,41 +538,60 @@
 	<item id="47657" name="Potion of Protection: Pull" type="EtcItem">
 		<!-- When used, increases Resistance to Pull Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i03" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18695" level="1" /> <!-- Potion of Protection: Pull -->
+		</skills>
 	</item>
 	<item id="47658" name="Potion of Protection: Danger Zone" type="EtcItem">
 		<!-- When used, increases Resistance to Danger Zone Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i03" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18696" level="1" /> <!-- Potion of Protection: Danger Zone -->
+		</skills>
 	</item>
 	<item id="47659" name="Potion of Protection: Seduction" type="EtcItem">
 		<!-- When used, increases Resistance to Seduction Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i04" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="47660" name="Potion of Protection: Bluff" type="EtcItem">
 		<!-- When used, increases Resistance to Bluff Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i09" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="commissionItemType" val="POTION" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
+		<set name="is_oly_restricted" val="true" />
+		<skills>
+			<skill id="18698" level="1" /> <!-- Potion of Protection: Bluff -->
+		</skills>
 	</item>
 	<item id="47661" name="Potion of Protection: Faint" type="EtcItem">
 		<!-- When used, increases Resistance to Faint Attacks by 5%, and reduces damage taken in PvP by 3%. Cannot be used in the Olympiad. Does not stack when used with other Potions of Protection. -->
 		<set name="icon" val="icon.etc_fruit_juice_glass_bottle_i08" />
-		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
 		<set name="weight" val="10" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
 	</item>
 	<item id="47662" name="Mysterious Box" type="EtcItem">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/17100-17199.xml
index d765da1174..edc14138fd 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/17100-17199.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/17100-17199.xml
@@ -1060,25 +1060,110 @@
 		<!-- Use this to increase the defense rate against Stun by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i01</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37792</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SHOCK>5</SHOCK>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17196" toLevel="1" name="Potion of Protection: Hold (Low-grade)">
 		<!-- Use this to increase the defense rate against Hold by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i06</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37793</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<HOLD>5</HOLD>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17197" toLevel="1" name="Potion of Protection: Bleed (Low-grade)">
 		<!-- Use this to increase the defense rate against Bleed by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i00</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37794</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BLEED>5</BLEED>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17198" toLevel="1" name="Potion of Protection: Paralyze (Low-grade)">
 		<!-- Use this to increase the defense rate against Paralyze by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i07</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37795</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PARALYZE>5</PARALYZE>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17199" toLevel="1" name="Potion of Protection: Mental (Low-grade)">
 		<!-- Use this to increase the defense rate against Mental by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37796</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/17200-17299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/17200-17299.xml
index 769178d7aa..bc54ab29b9 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/17200-17299.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/17200-17299.xml
@@ -4,21 +4,90 @@
 		<!-- Use this to increase the defense rate against Sleep by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i05</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37797</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SLEEP>5</SLEEP>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17201" toLevel="1" name="Potion of Protection: Poison (Low-grade)">
 		<!-- Use this to increase the defense rate against Poison by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i02</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37798</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<POISON>5</POISON>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17202" toLevel="1" name="Potion of Protection: Knock Back/ Knock Down (Low-grade)">
 		<!-- Use this to increase the defense rate against Knock Back/ Knock Down by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i10</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37799</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<KNOCKBACK>5</KNOCKBACK>
+				<KNOCKDOWN>5</KNOCKDOWN>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17203" toLevel="1" name="Potion of Protection: Aerial Yoke (Low-grade)">
 		<!-- Use this to increase the defense rate against Aerial Yoke by $s1. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i11</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>37800</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<AIRBIND>5</AIRBIND>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17204" toLevel="1" name="Scroll: 100,000 SP">
 		<!-- Restores 100,000 SP. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18100-18199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18100-18199.xml
index 2c83f6e6d6..003f11ed23 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18100-18199.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18100-18199.xml
@@ -493,46 +493,308 @@
 		<!-- Use this to increase the defense rate against Stun by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i01</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40253</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SHOCK>5</SHOCK>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18157" toLevel="1" name="Potion of Protection: Hold">
 		<!-- Use this to increase the defense rate against Hold by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i06</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40254</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<HOLD>5</HOLD>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18158" toLevel="1" name="Potion of Protection: Bleed">
 		<!-- Use this to increase the defense rate against Bleed by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i00</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40255</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<BLEED>5</BLEED>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18159" toLevel="1" name="Potion of Protection: Paralyze">
 		<!-- Use this to increase the defense rate against Paralyze by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i07</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40256</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PARALYZE>5</PARALYZE>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18160" toLevel="1" name="Potion of Protection: Mental">
 		<!-- Use this to increase the defense rate against Mental by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40257</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18161" toLevel="1" name="Potion of Protection: Sleep">
 		<!-- Use this to increase the defense rate against Sleep by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i05</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40258</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<SLEEP>5</SLEEP>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18162" toLevel="1" name="Potion of Protection: Poison">
 		<!-- Use this to increase the defense rate against Poison by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i02</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40259</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<POISON>5</POISON>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18163" toLevel="1" name="Potion of Protection: Knock Back/ Knock Down">
 		<!-- Use this to increase the defense rate against Knock Back/ Knock Down by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i10</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40260</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<KNOCKBACK>5</KNOCKBACK>
+				<KNOCKDOWN>5</KNOCKDOWN>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18164" toLevel="1" name="Potion of Protection: Aerial Yoke">
 		<!-- Use this to increase the defense rate against Aerial Yoke by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i11</icon>
 		<operateType>A2</operateType>
+		<itemConsumeId>40261</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<AIRBIND>5</AIRBIND>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18165" toLevel="1" name="Entrance Pass: Spezion (Normal)">
 		<operateType>A1</operateType>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18600-18699.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18600-18699.xml
index 9fb543b6d0..fe2d765091 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18600-18699.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18600-18699.xml
@@ -1511,26 +1511,113 @@
 	<skill id="18695" toLevel="1" name="Potion of Protection: Pull">
 		<!-- Use this to increase the defense rate against Pull by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i03</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<itemConsumeId>47657</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<PULL>5</PULL>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18696" toLevel="1" name="Potion of Protection: Danger Zone">
 		<!-- Use this to increase the defense rate in the Danger Zone by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i03</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<itemConsumeId>47658</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<ZONE>5</ZONE>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18697" toLevel="1" name="Potion of Protection: Seduction">
 		<!-- Use this to increase the defense rate against Seduction by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i04</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
 	</skill>
 	<skill id="18698" toLevel="1" name="Potion of Protection: Bluff">
 		<!-- Use this to increase the defense rate against Bluff by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i09</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
+		<itemConsumeId>47660</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>POTION_OF_PROTECTION</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="DefenceTrait">
+				<DERANGEMENT>5</DERANGEMENT> <!-- Incorrect, there should be TraitType Bluff, but skill Bluff use TraitType DERANGEMENT -->
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18699" toLevel="1" name="Potion of Protection: Faint">
 		<!-- Use this to increase the defense rate against Faint by $s1. It also decreases damage received by $s2 during PvP. Unavailable to use in Olympiad. -->
 		<icon>icon.etc_fruit_juice_glass_bottle_i08</icon>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
 	</skill>
 </list>
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
index b2e2aa6db5..0764a1af7a 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -540,6 +540,7 @@ public enum AbnormalType
 	AIRBIND(365),
 	KNOCKDOWN(367),
 	EARTHWORM_DEBUFF(424),
+	POTION_OF_PROTECTION(552),
 	INSIDE_POSITION(593),
 	STEEL_MIND(596),
 	SIGEL_SHIELD(597);