From bc2b13876705b4a4cdcdbcc099a0dd499777f991 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 9 Aug 2019 22:57:44 +0000
Subject: [PATCH] Prevent some skills used in olympiad. Contributed by
 Liamxroy.

---
 .../game/data/stats/skills/09700-09799.xml    |   3 +
 .../game/data/stats/skills/15000-15099.xml    |   1 +
 .../game/data/stats/skills/27300-27399.xml    |   1 +
 .../game/data/stats/skills/09700-09799.xml    |   3 +
 .../game/data/stats/skills/15000-15099.xml    |   1 +
 .../game/data/stats/skills/18400-18499.xml    |   1 +
 .../game/data/stats/skills/18500-18599.xml    |  38 ++++
 .../game/data/stats/skills/27300-27399.xml    |   1 +
 .../game/data/stats/skills/09700-09799.xml    |   3 +
 .../game/data/stats/skills/15000-15099.xml    |   1 +
 .../game/data/stats/skills/18400-18499.xml    |   1 +
 .../game/data/stats/skills/18500-18599.xml    |   1 +
 .../game/data/stats/skills/18700-18799.xml    | 180 +++++++++++++++++-
 .../game/data/stats/skills/27300-27399.xml    |   1 +
 .../game/data/stats/skills/09700-09799.xml    |   3 +
 .../game/data/stats/skills/15000-15099.xml    |   1 +
 .../game/data/stats/skills/18400-18499.xml    |   1 +
 .../game/data/stats/skills/18500-18599.xml    |   1 +
 .../game/data/stats/skills/18700-18799.xml    |   6 +
 .../game/data/stats/skills/27300-27399.xml    |   1 +
 .../game/data/stats/skills/09700-09799.xml    |   3 +
 .../game/data/stats/skills/15000-15099.xml    |   1 +
 .../game/data/stats/skills/18400-18499.xml    |   1 +
 .../game/data/stats/skills/18500-18599.xml    |   1 +
 .../game/data/stats/skills/18700-18799.xml    |   6 +
 .../game/data/stats/skills/19500-19599.xml    |   4 +
 .../game/data/stats/skills/27300-27399.xml    |   1 +
 .../game/data/stats/skills/28000-28099.xml    |   2 +
 .../game/data/stats/skills/32100-32199.xml    |   8 +-
 .../game/data/stats/skills/09700-09799.xml    |   3 +
 .../game/data/stats/skills/15000-15099.xml    |   1 +
 .../game/data/stats/skills/18400-18499.xml    |   1 +
 .../game/data/stats/skills/18500-18599.xml    |   1 +
 .../game/data/stats/skills/18700-18799.xml    |   6 +
 .../game/data/stats/skills/19500-19599.xml    |   4 +
 .../game/data/stats/skills/27300-27399.xml    |   1 +
 .../game/data/stats/skills/28000-28099.xml    |   2 +
 .../game/data/stats/skills/32100-32199.xml    |   2 +
 .../game/data/stats/skills/39300-39399.xml    |   2 +
 .../game/data/stats/skills/09700-09799.xml    |   3 +
 .../game/data/stats/skills/15000-15099.xml    |   1 +
 .../game/data/stats/skills/18400-18499.xml    |   1 +
 .../game/data/stats/skills/18500-18599.xml    |   1 +
 .../game/data/stats/skills/18700-18799.xml    |   6 +
 .../game/data/stats/skills/19500-19599.xml    |   4 +
 .../game/data/stats/skills/27300-27399.xml    |   1 +
 .../game/data/stats/skills/28000-28099.xml    |   2 +
 .../game/data/stats/skills/32100-32199.xml    |   2 +
 .../game/data/stats/skills/39300-39399.xml    |   2 +
 49 files changed, 317 insertions(+), 5 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/09700-09799.xml
index 0949986f7c..c252d2a8ac 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/09700-09799.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/09700-09799.xml
@@ -2193,6 +2193,9 @@
 		<reuseDelay>1000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="CanUseInBattlefield" />
+		</conditions>
 		<effects>
 			<effect name="HpCpHeal">
 				<power>2500</power>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15000-15099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15000-15099.xml
index 6ba82a3a3c..5bedcfb376 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15000-15099.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15000-15099.xml
@@ -2787,6 +2787,7 @@
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
 			</condition>
+			<condition name="CanUseInBattlefield" />
 		</conditions>
 		<effects>
 			<effect name="SummonNpc">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/27300-27399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/27300-27399.xml
index 99a6aa3b3c..ad95e54744 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/27300-27399.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/27300-27399.xml
@@ -1046,6 +1046,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<reuseDelay>
 			<value level="1">2250000</value>
 			<value level="2">2100000</value>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/09700-09799.xml
index cf8d3a0776..0c71067bb0 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/09700-09799.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/09700-09799.xml
@@ -2191,6 +2191,9 @@
 		<reuseDelay>1000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="CanUseInBattlefield" />
+		</conditions>
 		<effects>
 			<effect name="HpCpHeal">
 				<power>2500</power>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/15000-15099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/15000-15099.xml
index 8b75e35035..e5da6ec964 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/15000-15099.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/15000-15099.xml
@@ -2787,6 +2787,7 @@
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
 			</condition>
+			<condition name="CanUseInBattlefield" />
 		</conditions>
 		<effects>
 			<effect name="SummonNpc">
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/18400-18499.xml
index 2b2d9fa9fd..f1fccb7c7e 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/18400-18499.xml
@@ -856,6 +856,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/18500-18599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/18500-18599.xml
index 108927a326..fad561c601 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/18500-18599.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/18500-18599.xml
@@ -156,10 +156,48 @@
 	<skill id="18517" toLevel="1" name="Top-grade Love Potion - Party">
 		<!-- A strange sensation envelopes you. For 15 seconds, P./M. Atk. And Atk./Casting Spd. increase. A strange power transforms your weapon. Cannot be stacked with Battle Rhapsody Dance.. -->
 		<icon>icon.love_potion_party</icon>
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<operateType>A2</operateType>
 		<hitTime>100</hitTime>
 		<effectPoint>100</effectPoint>
+		<abnormalLvl>4</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>MULTI_BUFF_A</abnormalType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>PARTY</affectScope>
+		<affectObject>FRIEND</affectObject>
 		<reuseDelay>600000</reuseDelay>
+		<staticReuse>true</staticReuse>
+		<effects>
+			<effect name="DispelBySlotProbability">
+				<dispel>RHAPSODY</dispel>
+				<rate>100</rate>
+			</effect>
+			<effect name="BlockAbnormalSlot">
+				<slot>RHAPSODY</slot>
+			</effect>
+			<effect name="PAtk">
+				<amount>150</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>150</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>150</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalAttackSpeed">
+				<amount>150</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="18518" toLevel="1" name="Flash Grenade">
 		<!-- Throws a flare that will identify traps and targets who are hiding. -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/27300-27399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/27300-27399.xml
index 59c0f43d17..7d549fa41c 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/27300-27399.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/27300-27399.xml
@@ -1018,6 +1018,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<reuseDelay>
 			<value level="1">2250000</value>
 			<value level="2">2100000</value>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/09700-09799.xml
index 2f1e554717..3ca986c985 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/09700-09799.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/09700-09799.xml
@@ -2191,6 +2191,9 @@
 		<reuseDelay>1000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="CanUseInBattlefield" />
+		</conditions>
 		<effects>
 			<effect name="HpCpHeal">
 				<power>2500</power>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/15000-15099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/15000-15099.xml
index 8b75e35035..e5da6ec964 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/15000-15099.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/15000-15099.xml
@@ -2787,6 +2787,7 @@
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
 			</condition>
+			<condition name="CanUseInBattlefield" />
 		</conditions>
 		<effects>
 			<effect name="SummonNpc">
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18400-18499.xml
index 870124f104..110ed41570 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18400-18499.xml
@@ -856,6 +856,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18500-18599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18500-18599.xml
index fbfd265992..b492fdcfd4 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18500-18599.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18500-18599.xml
@@ -1096,6 +1096,7 @@
 		<reuseDelay>2000</reuseDelay>
 		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>15</amount>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18700-18799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18700-18799.xml
index 6f4b2241c6..52e40f85b6 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18700-18799.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/18700-18799.xml
@@ -15,6 +15,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -107,6 +108,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -161,20 +163,190 @@
 	<skill id="18702" toLevel="1" name="Pa'agrio's Blessing">
 		<!-- Dimensional Item\nFor 30 min., Max HP/MP/CP + 10%, P. Atk. + 20%, M. Atk. + 30%, P./M. Def + 10%, P. Accuracy+ 4, M. Accuracy + 4, Atk./Casting Spd. + 10%, Speed + 10, Attack Attribute + 100, Skill MP Consumption - 10%.\nAdditionally, Damage + 10%, Skill Power + 10.\nBuff remains in place after death. -->
 		<icon>icon.nshop_bless_of_paagrio</icon>
-		<operateType>A1</operateType>
-		<isMagic>4</isMagic>
+		<operateType>A2</operateType>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 		<hitTime>1000</hitTime>
 		<reuseDelay>300000</reuseDelay>
 		<effectPoint>1</effectPoint>
+		<isMagic>2</isMagic>
+		<stayAfterDeath>true</stayAfterDeath>
+		<effects>
+			<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="PhysicalDefence">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<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="18703" toLevel="1" name="Pa'agrio's Blessing">
 		<!-- Dimensional Item\nFor 30 min., Max HP/MP/CP + 10%, P. Atk. + 20%, M. Atk. + 30%, P./M. Def + 10%, P. Accuracy+ 4, M. Accuracy + 4, Atk./Casting Spd. + 10%, Speed + 10, Attack Attribute + 100, Skill MP Consumption - 10%.\nAdditionally, XP Gain + 30%, Vitality Bonus + 12.\nBuff remains in place after death. -->
 		<icon>icon.nshop_bless_of_paagrio</icon>
-		<operateType>A1</operateType>
-		<isMagic>4</isMagic>
+		<operateType>A2</operateType>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>1800</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 		<hitTime>1000</hitTime>
 		<reuseDelay>300000</reuseDelay>
 		<effectPoint>1</effectPoint>
+		<isMagic>2</isMagic>
+		<stayAfterDeath>true</stayAfterDeath>
+		<effects>
+			<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="PhysicalDefence">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<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="18713" toLevel="6" name="Red Cat's Eye">
 		<!-- P. Critical Damage + $s1, P. Skill Critical Damage + $s2. -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/27300-27399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/27300-27399.xml
index 2d27ff6c21..803f5f661e 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/27300-27399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/27300-27399.xml
@@ -1018,6 +1018,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<reuseDelay>
 			<value level="1">2250000</value>
 			<value level="2">2100000</value>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/09700-09799.xml
index 410aeaed9a..3fe9aca659 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/09700-09799.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/09700-09799.xml
@@ -2191,6 +2191,9 @@
 		<reuseDelay>1000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="CanUseInBattlefield" />
+		</conditions>
 		<effects>
 			<effect name="HpCpHeal">
 				<power>2500</power>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/15000-15099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/15000-15099.xml
index 8b75e35035..e5da6ec964 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/15000-15099.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/15000-15099.xml
@@ -2787,6 +2787,7 @@
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
 			</condition>
+			<condition name="CanUseInBattlefield" />
 		</conditions>
 		<effects>
 			<effect name="SummonNpc">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18400-18499.xml
index 01993aa307..884345c32e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18400-18499.xml
@@ -856,6 +856,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18500-18599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18500-18599.xml
index 8f72c334c7..d411a5c7be 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18500-18599.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18500-18599.xml
@@ -1098,6 +1098,7 @@
 		<reuseDelay>2000</reuseDelay>
 		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>15</amount>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18700-18799.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18700-18799.xml
index 2cfaf196a4..779b5e3287 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18700-18799.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/18700-18799.xml
@@ -15,6 +15,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -107,6 +108,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -607,6 +609,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -699,6 +702,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -1337,6 +1341,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -1429,6 +1434,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/27300-27399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/27300-27399.xml
index c4213925d3..c197215285 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/27300-27399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/27300-27399.xml
@@ -1018,6 +1018,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<reuseDelay>
 			<value level="1">2250000</value>
 			<value level="2">2100000</value>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/09700-09799.xml
index 511d13ecd8..2427985244 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/09700-09799.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/09700-09799.xml
@@ -2159,6 +2159,9 @@
 		<reuseDelay>1000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="CanUseInBattlefield" />
+		</conditions>
 		<effects>
 			<effect name="HpCpHeal">
 				<power>2500</power>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/15000-15099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/15000-15099.xml
index 606fa87923..0af5e631c1 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/15000-15099.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/15000-15099.xml
@@ -2787,6 +2787,7 @@
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
 			</condition>
+			<condition name="CanUseInBattlefield" />
 		</conditions>
 		<effects>
 			<effect name="SummonNpc">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18400-18499.xml
index 0b213dd8bc..ef1eda4c15 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18400-18499.xml
@@ -856,6 +856,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18500-18599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18500-18599.xml
index efa1c8a73c..f1ee424236 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18500-18599.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18500-18599.xml
@@ -1098,6 +1098,7 @@
 		<reuseDelay>2000</reuseDelay>
 		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>15</amount>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18700-18799.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18700-18799.xml
index f6ee12e9c7..de70ab6c10 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18700-18799.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18700-18799.xml
@@ -16,6 +16,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -109,6 +110,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -609,6 +611,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -702,6 +705,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -1341,6 +1345,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -1434,6 +1439,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19500-19599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19500-19599.xml
index 9872ebb1ba..3151758d60 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19500-19599.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19500-19599.xml
@@ -909,6 +909,7 @@
 		<itemConsumeCount>2000</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId>
 		<conditions>
+			<condition name="CanUseInBattlefield" />
 			<condition name="OpCanNotUseAirship" />
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
@@ -936,6 +937,7 @@
 		<itemConsumeCount>2000</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId>
 		<conditions>
+			<condition name="CanUseInBattlefield" />
 			<condition name="OpCanNotUseAirship" />
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
@@ -963,6 +965,7 @@
 		<itemConsumeCount>2000</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId>
 		<conditions>
+			<condition name="CanUseInBattlefield" />
 			<condition name="OpCanNotUseAirship" />
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
@@ -990,6 +993,7 @@
 		<itemConsumeCount>2000</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId>
 		<conditions>
+			<condition name="CanUseInBattlefield" />
 			<condition name="OpCanNotUseAirship" />
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/27300-27399.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/27300-27399.xml
index 4e1ffcdd84..bd8764927b 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/27300-27399.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/27300-27399.xml
@@ -1018,6 +1018,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<reuseDelay>
 			<value level="1">2250000</value>
 			<value level="2">2100000</value>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/28000-28099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/28000-28099.xml
index 3f72b354c0..9f84f21c4c 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/28000-28099.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/28000-28099.xml
@@ -551,6 +551,7 @@
 		<reuseDelay>2250000</reuseDelay>
 		<effectPoint>687</effectPoint>
 		<abnormalType>RHAPSODY</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 	</skill>
 	<skill id="28087" toLevel="12" name="Maiden's Prayer">
 		<!-- Invincible for $s1. -->
@@ -663,6 +664,7 @@
 		<reuseDelay>2250000</reuseDelay>
 		<effectPoint>687</effectPoint>
 		<abnormalType>RHAPSODY</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 	</skill>
 	<skill id="28099" toLevel="12" name="Maiden's Prayer">
 		<!-- Invincible for $s1. -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/32100-32199.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/32100-32199.xml
index bf43a4e8e6..0cca06ba2b 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/32100-32199.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/32100-32199.xml
@@ -286,7 +286,7 @@
 		<reuseDelay>10000</reuseDelay>
 		<effectPoint>-1378</effectPoint>
 	</skill>
-	<skill id="32137" toLevel="1" name="Blathus Superior Aggression Aura">
+	<skill id="32137" toLevel="1" name="Balthus Superior Aggression Aura">
 		<!-- Provokes nearby enemies into attacking the caster. -->
 		<icon>icon.skill10027</icon>
 		<operateType>A1</operateType>
@@ -303,6 +303,9 @@
 		<hitTime>2000</hitTime>
 		<coolTime>500</coolTime>
 		<effectPoint>-3541</effectPoint>
+		<conditions>
+			<condition name="EquipShield" />
+		</conditions>
 	</skill>
 	<skill id="32139" toLevel="1" name="Balthus Sonic Star">
 		<!-- Inflicts damage on nearby enemies and knocks them down. -->
@@ -421,6 +424,7 @@
 		<effectPoint>1734</effectPoint>
 		<effects>
 			<effect name="MagicalAttack">
+				<power>1191</power>
 			</effect>
 		</effects>
 	</skill>
@@ -617,6 +621,7 @@
 		<castRange>900</castRange>
 		<hitTime>500</hitTime>
 		<effectPoint>1</effectPoint>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 	</skill>
 	<skill id="32173" toLevel="1" name="Freya's Art of Seduction EXP - GM's Blessing">
 		<!-- The GM is always by your side. For 1 hour, Max HP/ MP/ CP +30%, P. Atk +10%, M. Atk +20%, P. Def/ M. Def +30%, Speed +20, and Skill MP Consumption -15%. Additionally, XP bonus +30% and Vitality bonus +12%. Buffs are retained even after death. -->
@@ -626,6 +631,7 @@
 		<castRange>900</castRange>
 		<hitTime>500</hitTime>
 		<effectPoint>1</effectPoint>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 	</skill>
 	<skill id="32174" toLevel="1" name="Pa'agrio's Blessing Might - GM's Blessing">
 		<!-- The GM is always by your side. For 1 hour, Max HP/ MP/ CP +10%, P. Atk +20%, M. Atk +30%, P. Def/ M. Def +10%, P. Accuracy +4, M. Accuracy +4, Atk. Spd./ Casting Spd. +10%, Speed +10, Attack Attribute +1 hour0, and Skill MP Consumption -1 hour1. Additionally, Damage Dealt +1 hour2 and Skill Power +1 hour3. Buffs are retained even after death. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/09700-09799.xml
index bc5860b60e..7884579cb1 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/09700-09799.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/09700-09799.xml
@@ -2159,6 +2159,9 @@
 		<reuseDelay>1000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="CanUseInBattlefield" />
+		</conditions>
 		<effects>
 			<effect name="HpCpHeal">
 				<power>2500</power>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/15000-15099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/15000-15099.xml
index e9672d9539..9df7e3418a 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/15000-15099.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/15000-15099.xml
@@ -2787,6 +2787,7 @@
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
 			</condition>
+			<condition name="CanUseInBattlefield" />
 		</conditions>
 		<effects>
 			<effect name="SummonNpc">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18400-18499.xml
index 60ddd5a42c..e0839b7ad1 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18400-18499.xml
@@ -856,6 +856,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18500-18599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18500-18599.xml
index 2c14206d83..70b674216c 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18500-18599.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18500-18599.xml
@@ -1134,6 +1134,7 @@
 		<reuseDelay>2000</reuseDelay>
 		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>15</amount>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18700-18799.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18700-18799.xml
index b57542831a..a60806061d 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18700-18799.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18700-18799.xml
@@ -16,6 +16,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -109,6 +110,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -633,6 +635,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -726,6 +729,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -1365,6 +1369,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -1458,6 +1463,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19500-19599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19500-19599.xml
index 6966ed0dd1..2f260cc78e 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19500-19599.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19500-19599.xml
@@ -910,6 +910,7 @@
 		<itemConsumeCount>2000</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId>
 		<conditions>
+			<condition name="CanUseInBattlefield" />
 			<condition name="OpCanNotUseAirship" />
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
@@ -937,6 +938,7 @@
 		<itemConsumeCount>2000</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId>
 		<conditions>
+			<condition name="CanUseInBattlefield" />
 			<condition name="OpCanNotUseAirship" />
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
@@ -964,6 +966,7 @@
 		<itemConsumeCount>2000</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId>
 		<conditions>
+			<condition name="CanUseInBattlefield" />
 			<condition name="OpCanNotUseAirship" />
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
@@ -991,6 +994,7 @@
 		<itemConsumeCount>2000</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId>
 		<conditions>
+			<condition name="CanUseInBattlefield" />
 			<condition name="OpCanNotUseAirship" />
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/27300-27399.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/27300-27399.xml
index a8d15593df..80b9ab0d15 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/27300-27399.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/27300-27399.xml
@@ -1018,6 +1018,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<reuseDelay>
 			<value level="1">2250000</value>
 			<value level="2">2100000</value>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/28000-28099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/28000-28099.xml
index 100e52aeed..dbbd220e54 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/28000-28099.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/28000-28099.xml
@@ -551,6 +551,7 @@
 		<reuseDelay>2250000</reuseDelay>
 		<effectPoint>687</effectPoint>
 		<abnormalType>RHAPSODY</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 	</skill>
 	<skill id="28087" toLevel="12" name="Maiden's Prayer">
 		<!-- Invincible for $s1. -->
@@ -663,6 +664,7 @@
 		<reuseDelay>2250000</reuseDelay>
 		<effectPoint>687</effectPoint>
 		<abnormalType>RHAPSODY</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 	</skill>
 	<skill id="28099" toLevel="12" name="Maiden's Prayer">
 		<!-- Invincible for $s1. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/32100-32199.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/32100-32199.xml
index db6573f933..e854312a33 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/32100-32199.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/32100-32199.xml
@@ -621,6 +621,7 @@
 		<castRange>900</castRange>
 		<hitTime>500</hitTime>
 		<effectPoint>1</effectPoint>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 	</skill>
 	<skill id="32173" toLevel="1" name="Freya's Art of Seduction EXP - GM's Blessing">
 		<!-- The GM is always by your side. For 1 hr., Max HP/ MP/ CP +30%, P. Atk +10%, M. Atk +20%, P. Def/ M. Def +30%, Speed +20, and Skill MP Consumption -15%. Additionally, XP bonus +30% and Vitality bonus +12%. Buffs are retained even after death. -->
@@ -630,6 +631,7 @@
 		<castRange>900</castRange>
 		<hitTime>500</hitTime>
 		<effectPoint>1</effectPoint>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 	</skill>
 	<skill id="32174" toLevel="1" name="Pa'agrio's Blessing Might- GM's Blessing">
 		<!-- The GM is always by your side. For 1 hr., Max HP/ MP/ CP +10%, P. Atk +20%, M. Atk +30%, P. Def/ M. Def +10%, P. Accuracy +4, M. Accuracy +4, Atk. Spd./ Casting Spd. +10%, Spd. +10, Atk. Attribute +1 hr.0, and Skill MP Consumption -1 hr.1. Additionally, Damage Dealt +1 hr.2 and Skill Power +1 hr.3. Buffs are retained even after death. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/39300-39399.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/39300-39399.xml
index e17e909de8..2a8fc34802 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/39300-39399.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/39300-39399.xml
@@ -261,6 +261,7 @@
 		<hitTime>1000</hitTime>
 		<reuseDelay>300000</reuseDelay>
 		<effectPoint>1</effectPoint>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 	</skill>
 	<skill id="39351" toLevel="1" name="Merkios' Altar Entrance Pass">
 		<operateType>A1</operateType>
@@ -286,6 +287,7 @@
 		<hitTime>1000</hitTime>
 		<reuseDelay>300000</reuseDelay>
 		<effectPoint>1</effectPoint>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 	</skill>
 	<skill id="39356" toLevel="1" name="Shining Dragon Attribute Tonic (XP)">
 		<!-- Increases Atk. Attribute by 70, Attribute Resistance by 70, and Acquired XP/ SP by 30% for 30 min. Buffs persist after death. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/09700-09799.xml
index ce72ed583c..8d3e4a9d44 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/09700-09799.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/09700-09799.xml
@@ -2159,6 +2159,9 @@
 		<reuseDelay>1000</reuseDelay>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<conditions>
+			<condition name="CanUseInBattlefield" />
+		</conditions>
 		<effects>
 			<effect name="HpCpHeal">
 				<power>2500</power>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/15000-15099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/15000-15099.xml
index a6d54ce996..1f0048b09d 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/15000-15099.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/15000-15099.xml
@@ -2788,6 +2788,7 @@
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
 			</condition>
+			<condition name="CanUseInBattlefield" />
 		</conditions>
 		<effects>
 			<effect name="SummonNpc">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18400-18499.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18400-18499.xml
index fdf376588a..0bddd35937 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18400-18499.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18400-18499.xml
@@ -856,6 +856,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18500-18599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18500-18599.xml
index 8bd9376b00..4174788d64 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18500-18599.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18500-18599.xml
@@ -1130,6 +1130,7 @@
 		<reuseDelay>2000</reuseDelay>
 		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>15</amount>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18700-18799.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18700-18799.xml
index 611136869e..1d3d76d620 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18700-18799.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18700-18799.xml
@@ -16,6 +16,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -109,6 +110,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -648,6 +650,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -741,6 +744,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -1380,6 +1384,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
@@ -1473,6 +1478,7 @@
 		<effectPoint>1</effectPoint>
 		<isMagic>2</isMagic>
 		<stayAfterDeath>true</stayAfterDeath>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<effects>
 			<effect name="MaxHp">
 				<amount>30</amount>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19500-19599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19500-19599.xml
index 11828e5a3d..ef5ac784b9 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19500-19599.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19500-19599.xml
@@ -918,6 +918,7 @@
 		<itemConsumeCount>2000</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId>
 		<conditions>
+			<condition name="CanUseInBattlefield" />
 			<condition name="OpCanNotUseAirship" />
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
@@ -945,6 +946,7 @@
 		<itemConsumeCount>2000</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId>
 		<conditions>
+			<condition name="CanUseInBattlefield" />
 			<condition name="OpCanNotUseAirship" />
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
@@ -972,6 +974,7 @@
 		<itemConsumeCount>2000</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId>
 		<conditions>
+			<condition name="CanUseInBattlefield" />
 			<condition name="OpCanNotUseAirship" />
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
@@ -999,6 +1002,7 @@
 		<itemConsumeCount>2000</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId>
 		<conditions>
+			<condition name="CanUseInBattlefield" />
 			<condition name="OpCanNotUseAirship" />
 			<condition name="OpSocialClass">
 				<socialClass>8</socialClass>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/27300-27399.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/27300-27399.xml
index 682ff6687e..1c81471e43 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/27300-27399.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/27300-27399.xml
@@ -1018,6 +1018,7 @@
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 		<reuseDelay>
 			<value level="1">2250000</value>
 			<value level="2">2100000</value>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/28000-28099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/28000-28099.xml
index 7ea4ef8733..6b4881eb5d 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/28000-28099.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/28000-28099.xml
@@ -551,6 +551,7 @@
 		<reuseDelay>2250000</reuseDelay>
 		<effectPoint>687</effectPoint>
 		<abnormalType>RHAPSODY</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 	</skill>
 	<skill id="28087" toLevel="12" name="Maiden's Prayer">
 		<!-- Invincible for $s1. -->
@@ -663,6 +664,7 @@
 		<reuseDelay>2250000</reuseDelay>
 		<effectPoint>687</effectPoint>
 		<abnormalType>RHAPSODY</abnormalType>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 	</skill>
 	<skill id="28099" toLevel="12" name="Maiden's Prayer">
 		<!-- Invincible for $s1. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/32100-32199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/32100-32199.xml
index 2c5c2a4603..2da48eb889 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/32100-32199.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/32100-32199.xml
@@ -621,6 +621,7 @@
 		<castRange>900</castRange>
 		<hitTime>500</hitTime>
 		<effectPoint>1</effectPoint>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 	</skill>
 	<skill id="32173" toLevel="1" name="Freya's Art of Seduction EXP - GM's Blessing">
 		<!-- The GM is always by your side. For 1 h., Max HP/ MP/ CP +30%, P. Atk. +10%, M. Atk. +20%, P./ M. Def. +30%, Speed +20, and Skill MP Consumption -15%. Additionally, XP bonus +30% and Vitality bonus +12%. Buffs are retained even after death. -->
@@ -630,6 +631,7 @@
 		<castRange>900</castRange>
 		<hitTime>500</hitTime>
 		<effectPoint>1</effectPoint>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 	</skill>
 	<skill id="32174" toLevel="1" name="Pa'agrio's Blessing Might- GM's Blessing">
 		<!-- The GM is always by your side. For 1 h., Max HP/ MP/ CP +10%, P. Atk. +20%, M. Atk. +30%, P./ M. Def. +10%, P. Accuracy +4, M. Accuracy +4, Atk. Spd./ Casting Spd. +10%, Speed +10, Attack Attribute +1 h.0, and Skill MP Consumption -1 h.1. Additionally, Damage Dealt +1 h.2 and Skill Power +1 h.3. Buffs are retained even after death. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/39300-39399.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/39300-39399.xml
index b32011578c..e9e2904208 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/39300-39399.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/39300-39399.xml
@@ -261,6 +261,7 @@
 		<hitTime>1000</hitTime>
 		<reuseDelay>300000</reuseDelay>
 		<effectPoint>1</effectPoint>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 	</skill>
 	<skill id="39351" toLevel="1" name="Merkios' Altar Entrance Pass">
 		<operateType>A1</operateType>
@@ -286,6 +287,7 @@
 		<hitTime>1000</hitTime>
 		<reuseDelay>300000</reuseDelay>
 		<effectPoint>1</effectPoint>
+		<blockedInOlympiad>true</blockedInOlympiad> <!-- Unconfirmed -->
 	</skill>
 	<skill id="39356" toLevel="1" name="Shining Dragon Attribute Tonic (XP)">
 		<!-- Increases Attack Attribute by 70, all Attribute Resistance by 70, and Acquired XP/ SP by 30% for 30 min. Buffs persist after death. -->