From 385b642bef66c83c0bd23d90644763c9f2a926a7 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 10 May 2019 15:00:51 +0000
Subject: [PATCH] Clan skill corrections. Contributed by Liamxroy.

---
 .../game/data/stats/skills/19000-19099.xml    | 136 ++++++++++--------
 .../game/data/stats/skills/19100-19199.xml    |  52 +++++++
 .../game/data/stats/skills/19200-19299.xml    |   4 +-
 .../game/data/stats/skills/19500-19599.xml    |  37 ++++-
 .../game/data/stats/skills/19000-19099.xml    |  34 +++--
 .../game/data/stats/skills/19100-19199.xml    |  52 +++++++
 .../game/data/stats/skills/19200-19299.xml    |   4 +-
 .../game/data/stats/skills/19500-19599.xml    |  37 ++++-
 .../game/data/stats/skills/19000-19099.xml    |  34 +++--
 .../game/data/stats/skills/19100-19199.xml    |  52 +++++++
 .../game/data/stats/skills/19200-19299.xml    |   4 +-
 .../game/data/stats/skills/19500-19599.xml    |  37 ++++-
 12 files changed, 393 insertions(+), 90 deletions(-)

diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19000-19099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19000-19099.xml
index a9f9cc8cfc..555625c7a2 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19000-19099.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19000-19099.xml
@@ -185,6 +185,7 @@
 		<magicLvl>85</magicLvl>
 		<isMagic>2</isMagic>
 		<reuseDelay>1800000</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<famePointConsume>900</famePointConsume>
 		<itemConsumeCount>5</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
@@ -197,40 +198,46 @@
 				<includeMe>false</includeMe>
 			</condition>
 		</conditions>
-        <effects>
+		<effects>
 			<effect name="CallPc" />
-        </effects>
+		</effects>
 	</skill>
 	<skill id="19008" toLevel="1" name="Clan Guardian">
 		<!-- Uses the clan guardian's power to restore nearby clan members' HP/ MP/ CP. Consumes 1000 Spirit Ore. Only available for the clan leader. -->
 		<icon>icon.skill19008</icon>
 		<operateType>A1</operateType>
 		<hitTime>1500</hitTime>
-		<coolTime>500</coolTime>
-		<effectPoint>100</effectPoint>
+		<hitCancelTime>0</hitCancelTime>
+		<coolTime>200</coolTime>
 		<magicCriticalRate>5</magicCriticalRate>
-		<magicLvl>85</magicLvl>
-		<isMagic>2</isMagic>
-		<reuseDelay>3600000</reuseDelay>
+		<abnormalTime>1</abnormalTime>
+		<isMagic>1</isMagic>
+		<reuseDelay>1800000</reuseDelay>
+		<staticReuse>true</staticReuse>
+		<effectPoint>100</effectPoint>
 		<targetType>SELF</targetType>
-		<affectScope>SINGLE</affectScope>
-		<clanRepConsume>1000</clanRepConsume>
-		<itemConsumeCount>100</itemConsumeCount>
+		<affectScope>PLEDGE</affectScope>
+		<affectObject>FRIEND</affectObject>
+		<affectRange>1000</affectRange>
+		<itemConsumeCount>1000</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<conditions>
-			<condition name="CanUseInBattlefield" />
+			<condition name="OpSocialClass">
+				<socialClass>8</socialClass>
+			</condition>
 		</conditions>
-        <effects>
-            <effect name="HealPercent">
-                <power>100</power>
-            </effect>
-            <effect name="CpHealPercent">
-                <power>100</power>
-            </effect>
-            <effect name="ManaHealPercent">
-                <power>100</power>
-            </effect>
-        </effects>
+		<effects>
+			<effect name="HealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="CpHealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="ManaHealPercent">
+				<power>100</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19009" toLevel="1" name="Clan Advent">
 		<!-- Increases clan members' P. Atk. by $s1, M. Atk. by $s2, P. Def/ M. Def by $s3, and HP/ MP Recovery Bonus by $s4. This effect is activated only when the clan leader and/ or an elite clan member is online. -->
@@ -287,6 +294,7 @@
 		<magicLvl>74</magicLvl>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<reuseDelay>3600000</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<famePointConsume>1500</famePointConsume>
@@ -339,21 +347,27 @@
 		<affectLimit>50-50</affectLimit>
 		<staticReuse>true</staticReuse>
 		<abnormalVisualEffect>STEALTH</abnormalVisualEffect>
+		<removedOnAnyActionExceptMove>true</removedOnAnyActionExceptMove>
+		<removedOnDamage>true</removedOnDamage>
 		<isMagic>2</isMagic>
 		<reuseDelay>14400000</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
 		<affectScope>PLEDGE</affectScope>
 		<affectObject>FRIEND</affectObject>
 		<clanRepConsume>1000</clanRepConsume>
 		<itemConsumeCount>150</itemConsumeCount>
 		<itemConsumeId>1785</itemConsumeId> <!-- Soulstone -->
-        <effects>
-            <effect name="Hide" />
-            <effect name="Speed">
-                <amount>0.5</amount>
-                <mode>PER</mode>
-            </effect>
-        </effects>
+		<effects>
+			<effect name="Hide" />
+			<effect name="Speed">
+				<amount>0.5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="SilentMove">
+				<chance>100</chance>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19013" toLevel="1" name="Clan Un-debuff">
 		<!-- Removes all debuffs from nearby clan members. Consumes 300 Spirit Ore. Available only for the clan leader and elite clan members. -->
@@ -369,6 +383,7 @@
 		<affectLimit>50-50</affectLimit>
 		<isMagic>2</isMagic>
 		<reuseDelay>3600000</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
 		<affectScope>PLEDGE</affectScope>
 		<affectObject>FRIEND</affectObject>
@@ -405,19 +420,19 @@
 		<clanRepConsume>1000</clanRepConsume>
 		<itemConsumeCount>30</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
-        <effects>
-            <effect name="DamageBlock">
-                <type>BLOCK_HP</type>
-            </effect>
-            <effect name="DamageBlock">
-                <type>BLOCK_MP</type>
-            </effect>
-            <effect name="DebuffBlock" />
-            <effect name="ResistDispelByCategory">
-                <amount>-100</amount>
-                <slot>ALL</slot>
-            </effect>
-        </effects>
+		<effects>
+			<effect name="DamageBlock">
+				<type>BLOCK_HP</type>
+			</effect>
+			<effect name="DamageBlock">
+				<type>BLOCK_MP</type>
+			</effect>
+			<effect name="DebuffBlock" />
+			<effect name="ResistDispelByCategory">
+				<amount>-100</amount>
+				<slot>ALL</slot>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19015" toLevel="1" name="Clan Friendly">
 		<!-- Increases nearby clan members' P. Critical Rate by 3% and M. Critical Rate by 20. Consumes 50 Spirit Ore. Consumes 3500 Individual Fame. Applies after the marquis stage. -->
@@ -436,6 +451,7 @@
 		<affectLimit>50-50</affectLimit>
 		<isMagic>2</isMagic>
 		<reuseDelay>3600000</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
 		<affectScope>PLEDGE</affectScope>
 		<affectObject>FRIEND</affectObject>
@@ -478,13 +494,13 @@
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<effects>
 			<effect name="PAtk">
-                <amount>3</amount>
-                <mode>PER</mode>
-            </effect>
-            <effect name="PhysicalDefence">
-                <amount>3</amount>
-                <mode>PER</mode>
-            </effect>
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalDefence">
+				<amount>3</amount>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19017" toLevel="1" name="Clan Prison">
@@ -537,17 +553,17 @@
 		<targetType>SELF</targetType>
 		<affectScope>POINT_BLANK</affectScope>
 		<affectObject>FRIEND</affectObject>
-        <effects>
-            <effect name="HealPercent">
-                <power>100</power>
-            </effect>
-            <effect name="CpHealPercent">
-                <power>100</power>
-            </effect>
-            <effect name="ManaHealPercent">
-                <power>100</power>
-            </effect>
-        </effects>
+		<effects>
+			<effect name="HealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="CpHealPercent">
+				<power>100</power>
+			</effect>
+			<effect name="ManaHealPercent">
+				<power>100</power>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19019" toLevel="1" name="Revolution Blade">
 		<!-- Inflicts physical damage on target. Can only be used in a castle siege area by characters between lv 40 - 84. Soulshots and Spiritshots are not consumed. -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19100-19199.xml
index a3c0d774a4..7dd3f63194 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19100-19199.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19100-19199.xml
@@ -257,21 +257,60 @@
 		<reuseDelay>1800000</reuseDelay>
 		<effectPoint>100</effectPoint>
 		<isMagic>1</isMagic>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<itemConsumeCount>300</itemConsumeCount>
+		<targetType>SELF</targetType>
+		<affectScope>PLEDGE</affectScope>
+		<affectObject>FRIEND</affectObject>
+		<blockedInOlympiad>true</blockedInOlympiad>
+		<conditions>
+			<condition name="OpCanEscape" />
+			<condition name="OpSocialClass">
+				<socialClass>8</socialClass>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="Escape">
+				<escapeType>TOWN</escapeType>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19113" toLevel="1" name="Clan Escape Lock">
 		<!-- Prevents the target from using the Scroll of Escape for 60 sec. Consumes 300 Spirit Ore. Available only for the clan leader and elite clan members. -->
 		<icon>icon.skill_recall</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
+		<abnormalType>BLOCK_ESCAPE</abnormalType>
+		<effectRange>600</effectRange>
 		<castRange>600</castRange>
 		<hitTime>2000</hitTime>
 		<reuseDelay>1800000</reuseDelay>
 		<effectPoint>-100</effectPoint>
 		<isDebuff>true</isDebuff>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<itemConsumeCount>300</itemConsumeCount>
+		<targetType>ENEMY_ONLY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<stayAfterDeath>true</stayAfterDeath>
+		<conditions>
+			<condition name="OpTargetPc" />
+			<condition name="OpSocialClass">
+				<socialClass>8</socialClass>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="BlockEscape" />
+		</effects>
 	</skill>
 	<skill id="19114" toLevel="1" name="Clan Resurrection Lock">
 		<!-- Prevents the target from resurrecting for 60 sec. Consumes 300 Spirit Ore. Available only for the clan leader and elite clan members. -->
 		<icon>icon.skill_resurrection</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
+		<abnormalType>BLOCK_RESURRECTION</abnormalType>
 		<castRange>600</castRange>
 		<hitTime>2000</hitTime>
 		<coolTime>500</coolTime>
@@ -279,6 +318,19 @@
 		<isMagic>1</isMagic>
 		<effectPoint>-100</effectPoint>
 		<isDebuff>true</isDebuff>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<itemConsumeCount>300</itemConsumeCount>
+		<targetType>PC_BODY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<conditions>
+			<condition name="OpSocialClass">
+				<socialClass>8</socialClass>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="BlockResurrection" />
+		</effects>
 	</skill>
 	<skill id="19115" toLevel="1" name="Air Bike">
 		<!-- Can mount the Air Bike. Must belong to a clan Lv. 5 or above. -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19200-19299.xml
index 38fe3530d3..1af87333b5 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19200-19299.xml
@@ -1653,8 +1653,8 @@
 		<effects>
 			<effect name="DefenceCriticalDamage">
 				<amount>
-					<value level="1">10</value>
-					<value level="2">20</value>
+					<value level="1">-10</value>
+					<value level="2">-20</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
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 34ffa25b70..559b5ec88f 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
@@ -409,16 +409,49 @@
 		</effects>
 	</skill>
 	<skill id="19536" toLevel="1" name="Clan Battlefield">
-		<!-- For $s1, Max HP/ MP/ CP +$s2, P. Atk. +$s3, M. Atk. +$s4, and Speed +$s5. Consumes $s6 Spirit Ore. Only available in the battlefield. -->
+		<!-- For 5min, Max HP/ MP/ CP +5, P. Atk. +5%, M. Atk. +10%, and Speed +7. Consumes 5 Spirit Ore. Only available in the battlefield. -->
 		<icon>icon.skill19536</icon>
-		<itemConsumeId>3031</itemConsumeId>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<itemConsumeCount>5</itemConsumeCount>
 		<operateType>A2</operateType>
 		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>300000</reuseDelay>
 		<effectPoint>100</effectPoint>
+		<staticReuse>true</staticReuse>
+		<abnormalTime>300</abnormalTime>
+		<isMagic>1</isMagic> <!-- Magic Skill -->
+		<conditions>
+			<condition name="CanUseInBattlefield" />
+		</conditions>
+		<effects>
+			<effect name="MaxHp">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxMp">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxCp">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PAtk">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>7</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19537" toLevel="2" name="Clan Iron">
 		<!-- Clan members' PvP Damage Received -$s1. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19000-19099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19000-19099.xml
index dba0d5710b..9591acd105 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19000-19099.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19000-19099.xml
@@ -185,6 +185,7 @@
 		<magicLvl>85</magicLvl>
 		<isMagic>2</isMagic>
 		<reuseDelay>1800000</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<famePointConsume>900</famePointConsume>
 		<itemConsumeCount>5</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
@@ -206,19 +207,25 @@
 		<icon>icon.skill19008</icon>
 		<operateType>A1</operateType>
 		<hitTime>1500</hitTime>
-		<coolTime>500</coolTime>
-		<effectPoint>100</effectPoint>
+		<hitCancelTime>0</hitCancelTime>
+		<coolTime>200</coolTime>
 		<magicCriticalRate>5</magicCriticalRate>
-		<magicLvl>85</magicLvl>
-		<isMagic>2</isMagic>
-		<reuseDelay>3600000</reuseDelay>
+		<abnormalTime>1</abnormalTime>
+		<isMagic>1</isMagic>
+		<reuseDelay>1800000</reuseDelay>
+		<staticReuse>true</staticReuse>
+		<effectPoint>100</effectPoint>
 		<targetType>SELF</targetType>
-		<affectScope>SINGLE</affectScope>
-		<clanRepConsume>1000</clanRepConsume>
-		<itemConsumeCount>100</itemConsumeCount>
+		<affectScope>PLEDGE</affectScope>
+		<affectObject>FRIEND</affectObject>
+		<affectRange>1000</affectRange>
+		<itemConsumeCount>1000</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<conditions>
-			<condition name="CanUseInBattlefield" />
+			<condition name="OpSocialClass">
+				<socialClass>8</socialClass>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="HealPercent">
@@ -287,6 +294,7 @@
 		<magicLvl>74</magicLvl>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<reuseDelay>3600000</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<famePointConsume>1500</famePointConsume>
@@ -339,8 +347,11 @@
 		<affectLimit>50-50</affectLimit>
 		<staticReuse>true</staticReuse>
 		<abnormalVisualEffect>STEALTH</abnormalVisualEffect>
+		<removedOnAnyActionExceptMove>true</removedOnAnyActionExceptMove>
+		<removedOnDamage>true</removedOnDamage>
 		<isMagic>2</isMagic>
 		<reuseDelay>14400000</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
 		<affectScope>PLEDGE</affectScope>
 		<affectObject>FRIEND</affectObject>
@@ -353,6 +364,9 @@
 				<amount>0.5</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="SilentMove">
+				<chance>100</chance>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19013" toLevel="1" name="Clan Un-debuff">
@@ -369,6 +383,7 @@
 		<affectLimit>50-50</affectLimit>
 		<isMagic>2</isMagic>
 		<reuseDelay>3600000</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
 		<affectScope>PLEDGE</affectScope>
 		<affectObject>FRIEND</affectObject>
@@ -436,6 +451,7 @@
 		<affectLimit>50-50</affectLimit>
 		<isMagic>2</isMagic>
 		<reuseDelay>3600000</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
 		<affectScope>PLEDGE</affectScope>
 		<affectObject>FRIEND</affectObject>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19100-19199.xml
index 6eb4294e47..21623960eb 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19100-19199.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19100-19199.xml
@@ -257,21 +257,60 @@
 		<reuseDelay>1800000</reuseDelay>
 		<effectPoint>100</effectPoint>
 		<isMagic>1</isMagic>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<itemConsumeCount>300</itemConsumeCount>
+		<targetType>SELF</targetType>
+		<affectScope>PLEDGE</affectScope>
+		<affectObject>FRIEND</affectObject>
+		<blockedInOlympiad>true</blockedInOlympiad>
+		<conditions>
+			<condition name="OpCanEscape" />
+			<condition name="OpSocialClass">
+				<socialClass>8</socialClass>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="Escape">
+				<escapeType>TOWN</escapeType>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19113" toLevel="1" name="Clan Escape Lock">
 		<!-- Prevents the target from using the Scroll of Escape for 60 sec. Consumes 300 Spirit Ore. Available only for the clan leader and elite clan members. -->
 		<icon>icon.skill_recall</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
+		<abnormalType>BLOCK_ESCAPE</abnormalType>
+		<effectRange>600</effectRange>
 		<castRange>600</castRange>
 		<hitTime>2000</hitTime>
 		<reuseDelay>1800000</reuseDelay>
 		<effectPoint>-100</effectPoint>
 		<isDebuff>true</isDebuff>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<itemConsumeCount>300</itemConsumeCount>
+		<targetType>ENEMY_ONLY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<stayAfterDeath>true</stayAfterDeath>
+		<conditions>
+			<condition name="OpTargetPc" />
+			<condition name="OpSocialClass">
+				<socialClass>8</socialClass>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="BlockEscape" />
+		</effects>
 	</skill>
 	<skill id="19114" toLevel="1" name="Clan Resurrection Lock">
 		<!-- Prevents the target from resurrecting for 60 sec. Consumes 300 Spirit Ore. Available only for the clan leader and elite clan members. -->
 		<icon>icon.skill_resurrection</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
+		<abnormalType>BLOCK_RESURRECTION</abnormalType>
 		<castRange>600</castRange>
 		<hitTime>2000</hitTime>
 		<coolTime>500</coolTime>
@@ -279,6 +318,19 @@
 		<isMagic>1</isMagic>
 		<effectPoint>-100</effectPoint>
 		<isDebuff>true</isDebuff>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<itemConsumeCount>300</itemConsumeCount>
+		<targetType>PC_BODY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<conditions>
+			<condition name="OpSocialClass">
+				<socialClass>8</socialClass>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="BlockResurrection" />
+		</effects>
 	</skill>
 	<skill id="19115" toLevel="1" name="Air Bike">
 		<!-- Can mount the Air Bike. Must belong to a clan Lv. 5 or above. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml
index f51ed7ca3d..13b0eec410 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19200-19299.xml
@@ -1641,8 +1641,8 @@
 		<effects>
 			<effect name="DefenceCriticalDamage">
 				<amount>
-					<value level="1">10</value>
-					<value level="2">20</value>
+					<value level="1">-10</value>
+					<value level="2">-20</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
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 34ffa25b70..559b5ec88f 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
@@ -409,16 +409,49 @@
 		</effects>
 	</skill>
 	<skill id="19536" toLevel="1" name="Clan Battlefield">
-		<!-- For $s1, Max HP/ MP/ CP +$s2, P. Atk. +$s3, M. Atk. +$s4, and Speed +$s5. Consumes $s6 Spirit Ore. Only available in the battlefield. -->
+		<!-- For 5min, Max HP/ MP/ CP +5, P. Atk. +5%, M. Atk. +10%, and Speed +7. Consumes 5 Spirit Ore. Only available in the battlefield. -->
 		<icon>icon.skill19536</icon>
-		<itemConsumeId>3031</itemConsumeId>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<itemConsumeCount>5</itemConsumeCount>
 		<operateType>A2</operateType>
 		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>300000</reuseDelay>
 		<effectPoint>100</effectPoint>
+		<staticReuse>true</staticReuse>
+		<abnormalTime>300</abnormalTime>
+		<isMagic>1</isMagic> <!-- Magic Skill -->
+		<conditions>
+			<condition name="CanUseInBattlefield" />
+		</conditions>
+		<effects>
+			<effect name="MaxHp">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxMp">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxCp">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PAtk">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>7</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19537" toLevel="2" name="Clan Iron">
 		<!-- Clan members' PvP Damage Received -$s1. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19000-19099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19000-19099.xml
index 5112a9a15c..429d90a678 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19000-19099.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19000-19099.xml
@@ -185,6 +185,7 @@
 		<magicLvl>85</magicLvl>
 		<isMagic>2</isMagic>
 		<reuseDelay>1800000</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<famePointConsume>900</famePointConsume>
 		<itemConsumeCount>5</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
@@ -206,19 +207,25 @@
 		<icon>icon.skill19008</icon>
 		<operateType>A1</operateType>
 		<hitTime>1500</hitTime>
-		<coolTime>500</coolTime>
-		<effectPoint>100</effectPoint>
+		<hitCancelTime>0</hitCancelTime>
+		<coolTime>200</coolTime>
 		<magicCriticalRate>5</magicCriticalRate>
-		<magicLvl>85</magicLvl>
-		<isMagic>2</isMagic>
-		<reuseDelay>3600000</reuseDelay>
+		<abnormalTime>1</abnormalTime>
+		<isMagic>1</isMagic>
+		<reuseDelay>1800000</reuseDelay>
+		<staticReuse>true</staticReuse>
+		<effectPoint>100</effectPoint>
 		<targetType>SELF</targetType>
-		<affectScope>SINGLE</affectScope>
-		<clanRepConsume>1000</clanRepConsume>
-		<itemConsumeCount>100</itemConsumeCount>
+		<affectScope>PLEDGE</affectScope>
+		<affectObject>FRIEND</affectObject>
+		<affectRange>1000</affectRange>
+		<itemConsumeCount>1000</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<blockedInOlympiad>true</blockedInOlympiad>
 		<conditions>
-			<condition name="CanUseInBattlefield" />
+			<condition name="OpSocialClass">
+				<socialClass>8</socialClass>
+			</condition>
 		</conditions>
 		<effects>
 			<effect name="HealPercent">
@@ -287,6 +294,7 @@
 		<magicLvl>74</magicLvl>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<reuseDelay>3600000</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<famePointConsume>1500</famePointConsume>
@@ -339,8 +347,11 @@
 		<affectLimit>50-50</affectLimit>
 		<staticReuse>true</staticReuse>
 		<abnormalVisualEffect>STEALTH</abnormalVisualEffect>
+		<removedOnAnyActionExceptMove>true</removedOnAnyActionExceptMove>
+		<removedOnDamage>true</removedOnDamage>
 		<isMagic>2</isMagic>
 		<reuseDelay>14400000</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
 		<affectScope>PLEDGE</affectScope>
 		<affectObject>FRIEND</affectObject>
@@ -353,6 +364,9 @@
 				<amount>0.5</amount>
 				<mode>PER</mode>
 			</effect>
+			<effect name="SilentMove">
+				<chance>100</chance>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="19013" toLevel="1" name="Clan Purge">
@@ -369,6 +383,7 @@
 		<affectLimit>50-50</affectLimit>
 		<isMagic>2</isMagic>
 		<reuseDelay>3600000</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
 		<affectScope>PLEDGE</affectScope>
 		<affectObject>FRIEND</affectObject>
@@ -436,6 +451,7 @@
 		<affectLimit>50-50</affectLimit>
 		<isMagic>2</isMagic>
 		<reuseDelay>3600000</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<targetType>SELF</targetType>
 		<affectScope>PLEDGE</affectScope>
 		<affectObject>FRIEND</affectObject>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19100-19199.xml
index ca5229e511..be7a8dbb78 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19100-19199.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19100-19199.xml
@@ -257,21 +257,60 @@
 		<reuseDelay>1800000</reuseDelay>
 		<effectPoint>100</effectPoint>
 		<isMagic>1</isMagic>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<itemConsumeCount>300</itemConsumeCount>
+		<targetType>SELF</targetType>
+		<affectScope>PLEDGE</affectScope>
+		<affectObject>FRIEND</affectObject>
+		<blockedInOlympiad>true</blockedInOlympiad>
+		<conditions>
+			<condition name="OpCanEscape" />
+			<condition name="OpSocialClass">
+				<socialClass>8</socialClass>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="Escape">
+				<escapeType>TOWN</escapeType>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19113" toLevel="1" name="Clan Block">
 		<!-- Prevents the target from using the Scroll of Escape for 60 sec. Consumes 300 Spirit Ore. Available only for the clan leader and elite clan members. -->
 		<icon>icon.skill_recall</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
+		<abnormalType>BLOCK_ESCAPE</abnormalType>
+		<effectRange>600</effectRange>
 		<castRange>600</castRange>
 		<hitTime>2000</hitTime>
 		<reuseDelay>1800000</reuseDelay>
 		<effectPoint>-100</effectPoint>
 		<isDebuff>true</isDebuff>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<itemConsumeCount>300</itemConsumeCount>
+		<targetType>ENEMY_ONLY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<stayAfterDeath>true</stayAfterDeath>
+		<conditions>
+			<condition name="OpTargetPc" />
+			<condition name="OpSocialClass">
+				<socialClass>8</socialClass>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="BlockEscape" />
+		</effects>
 	</skill>
 	<skill id="19114" toLevel="1" name="Clan Exclusion">
 		<!-- Prevents the target from resurrecting for 60 sec. Consumes 300 Spirit Ore. Available only for the clan leader and elite clan members. -->
 		<icon>icon.skill_resurrection</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
+		<abnormalType>BLOCK_RESURRECTION</abnormalType>
 		<castRange>600</castRange>
 		<hitTime>2000</hitTime>
 		<coolTime>500</coolTime>
@@ -279,6 +318,19 @@
 		<isMagic>1</isMagic>
 		<effectPoint>-100</effectPoint>
 		<isDebuff>true</isDebuff>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<itemConsumeCount>300</itemConsumeCount>
+		<targetType>PC_BODY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
+		<conditions>
+			<condition name="OpSocialClass">
+				<socialClass>8</socialClass>
+			</condition>
+		</conditions>
+		<effects>
+			<effect name="BlockResurrection" />
+		</effects>
 	</skill>
 	<skill id="19115" toLevel="1" name="Air Bike">
 		<!-- Can mount the Air Bike. Must belong to a clan Lv. 5 or above. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml
index 8c8ddc7d74..2aa7a1ef92 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19200-19299.xml
@@ -1653,8 +1653,8 @@
 		<effects>
 			<effect name="DefenceCriticalDamage">
 				<amount>
-					<value level="1">10</value>
-					<value level="2">20</value>
+					<value level="1">-10</value>
+					<value level="2">-20</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
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 326b40603c..f37f119714 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
@@ -409,16 +409,49 @@
 		</effects>
 	</skill>
 	<skill id="19536" toLevel="1" name="Clan Battlefield">
-		<!-- For $s1, Max HP/ MP/ CP +$s2, P. Atk. +$s3, M. Atk. +$s4, and Speed +$s5. Consumes $s6 Spirit Ore. Only available in the battlefield. -->
+		<!-- For 5min, Max HP/ MP/ CP +5, P. Atk. +5%, M. Atk. +10%, and Speed +7. Consumes 5 Spirit Ore. Only available in the battlefield. -->
 		<icon>icon.skill19536</icon>
-		<itemConsumeId>3031</itemConsumeId>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<itemConsumeCount>5</itemConsumeCount>
 		<operateType>A2</operateType>
 		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>300000</reuseDelay>
 		<effectPoint>100</effectPoint>
+		<staticReuse>true</staticReuse>
+		<abnormalTime>300</abnormalTime>
+		<isMagic>1</isMagic> <!-- Magic Skill -->
+		<conditions>
+			<condition name="CanUseInBattlefield" />
+		</conditions>
+		<effects>
+			<effect name="MaxHp">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxMp">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxCp">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PAtk">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>7</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="19537" toLevel="2" name="Clan Iron">
 		<!-- Clan members' PvP Damage Received -$s1. -->