From 1741dc17fa72019ca35345149ee133467aa4b1b9 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 26 Nov 2019 19:34:27 +0000
Subject: [PATCH] Various skill adjustments. Contributed by gamelike85.

---
 .../game/data/stats/skills/01900-01999.xml    | 28 +++++--
 .../game/data/stats/skills/16100-16199.xml    |  1 +
 .../game/data/stats/skills/19100-19199.xml    | 74 ++++++++++++++++++-
 .../game/data/stats/skills/01900-01999.xml    | 28 +++++--
 .../game/data/stats/skills/16100-16199.xml    |  1 +
 .../game/data/stats/skills/19100-19199.xml    | 74 ++++++++++++++++++-
 .../game/data/stats/skills/01900-01999.xml    | 28 +++++--
 .../game/data/stats/skills/16100-16199.xml    |  1 +
 .../game/data/stats/skills/19100-19199.xml    | 74 ++++++++++++++++++-
 .../game/data/stats/skills/01900-01999.xml    | 25 +++----
 .../game/data/stats/skills/16100-16199.xml    |  1 +
 .../game/data/stats/skills/19100-19199.xml    | 74 ++++++++++++++++++-
 .../game/data/stats/skills/01900-01999.xml    | 25 +++----
 .../game/data/stats/skills/10200-10299.xml    |  3 +
 .../game/data/stats/skills/16100-16199.xml    |  1 +
 .../game/data/stats/skills/19100-19199.xml    | 14 ++++
 .../game/data/stats/skills/01900-01999.xml    | 25 +++----
 .../game/data/stats/skills/10200-10299.xml    |  3 +
 .../game/data/stats/skills/16100-16199.xml    |  1 +
 .../game/data/stats/skills/19100-19199.xml    | 14 ++++
 .../game/data/stats/skills/01900-01999.xml    | 25 +++----
 .../game/data/stats/skills/10200-10299.xml    |  3 +
 .../game/data/stats/skills/16100-16199.xml    |  1 +
 .../game/data/stats/skills/19100-19199.xml    | 14 ++++
 .../game/data/stats/skills/01900-01999.xml    | 25 +++----
 .../game/data/stats/skills/10200-10299.xml    |  5 +-
 .../game/data/stats/skills/16100-16199.xml    |  1 +
 .../game/data/stats/skills/19100-19199.xml    | 14 ++++
 .../game/data/stats/skills/01900-01999.xml    | 25 +++----
 .../game/data/stats/skills/16100-16199.xml    |  1 +
 .../game/data/stats/skills/19100-19199.xml    | 74 ++++++++++++++++++-
 31 files changed, 574 insertions(+), 109 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/01900-01999.xml
index 1cd92fc3f2..aafe8eaa4c 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/01900-01999.xml
@@ -2324,23 +2324,33 @@
 	<skill id="1996" toLevel="2" name="Hurricane Shackle">
 		<!-- For 60 sec., blocks target from using escape items and skills. -->
 		<icon>icon.skill1996</icon>
-		<operateType>A2</operateType>
+		<operateType>A3</operateType>
 		<castRange>600</castRange>
 		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>-100</effectPoint>
-		<abnormalLvl>1</abnormalLvl>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+		</abnormalLvl>
 		<abnormalTime>60</abnormalTime>
 		<abnormalType>BLOCK_ESCAPE</abnormalType>
 		<isDebuff>true</isDebuff>
+		<targetType>ENEMY_ONLY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
 		<excludedFromCheck>true</excludedFromCheck>
-		<conditions>
-			<condition name="OpTargetPc" />
-		</conditions>
+		<magicLvl>4</magicLvl>
 		<effects>
 			<effect name="BlockEscape" />
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19199</skillId> <!-- Hurricane Sign -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="1997" toLevel="2" name="Gravity Exile">
 		<!-- For 30 sec., blocks target from being resurrected by another character. -->
@@ -2369,6 +2379,14 @@
 		</conditions>
 		<effects>
 			<effect name="BlockResurrection" />
+			<effect name="PhysicalDefence" fromLevel="2" toLevel="2">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence" fromLevel="2" toLevel="2">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/16100-16199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/16100-16199.xml
index 88ac079c33..95dec4f088 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/16100-16199.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/16100-16199.xml
@@ -362,6 +362,7 @@
 		<affectLimit>9-10</affectLimit>
 		<affectRange>200</affectRange>
 		<basicProperty>MAGIC</basicProperty>
+		<removedOnDamage>true</removedOnDamage>
 		<effectPoint>
 			<value level="1">-418</value>
 			<value level="2">-532</value>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml
index 0bb9651fc5..311b1b66df 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/19100-19199.xml
@@ -255,32 +255,86 @@
 		<!-- Teleports nearby clan members to town. Cannot be used in special places such as GM Consultation Services. Consumes 50 Spirit Ores and 2000 Individual Fame. Viscount or above only. -->
 		<icon>icon.skill_pledge_party_recall</icon>
 		<operateType>A1</operateType>
-		<hitTime>3500</hitTime>
+		<coolTime>500</coolTime>
+		<hitTime>2000</hitTime>
 		<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">
 		<!-- For 60 sec., blocks target's Escape. Consumes 100 Spirit Ores and 3000 Individual Fame. Marquis or above only. -->
 		<icon>icon.skill_recall</icon>
 		<operateType>A2</operateType>
+		<coolTime>500</coolTime>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
+		<abnormalType>BLOCK_ESCAPE</abnormalType>
+		<effectRange>600</effectRange>
 		<castRange>600</castRange>
-		<hitTime>2000</hitTime>
+		<hitTime>1000</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">
 		<!-- For 60 sec., blocks target's Resurrection. Consumes 150 Spirit Ores and 1000 Clan Reputation. Marquis or above only. -->
 		<icon>icon.skill_resurrection</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
+		<abnormalType>BLOCK_RESURRECTION</abnormalType>
 		<castRange>600</castRange>
-		<hitTime>2000</hitTime>
+		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>1800000</reuseDelay>
 		<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. -->
@@ -1599,7 +1653,21 @@
 		<!-- For 60 sec., P./M. Atk. + 10%. -->
 		<icon>icon.skill1996</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
 		<effectPoint>2</effectPoint>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/01900-01999.xml
index b226bd712c..e7774125ac 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/01900-01999.xml
@@ -2324,23 +2324,33 @@
 	<skill id="1996" toLevel="2" name="Hurricane Shackle">
 		<!-- For $s1, blocks target from using escape items and skills. -->
 		<icon>icon.skill1996</icon>
-		<operateType>A2</operateType>
+		<operateType>A3</operateType>
 		<castRange>600</castRange>
 		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>-100</effectPoint>
-		<abnormalLvl>1</abnormalLvl>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+		</abnormalLvl>
 		<abnormalTime>60</abnormalTime>
 		<abnormalType>BLOCK_ESCAPE</abnormalType>
 		<isDebuff>true</isDebuff>
+		<targetType>ENEMY_ONLY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
 		<excludedFromCheck>true</excludedFromCheck>
-		<conditions>
-			<condition name="OpTargetPc" />
-		</conditions>
+		<magicLvl>4</magicLvl>
 		<effects>
 			<effect name="BlockEscape" />
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19199</skillId> <!-- Hurricane Sign -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="1997" toLevel="2" name="Gravity Exile">
 		<!-- For $s1, blocks target from being resurrected by another character. -->
@@ -2369,6 +2379,14 @@
 		</conditions>
 		<effects>
 			<effect name="BlockResurrection" />
+			<effect name="PhysicalDefence" fromLevel="2" toLevel="2">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence" fromLevel="2" toLevel="2">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/16100-16199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/16100-16199.xml
index fa7763bd24..0ae0f588c4 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/16100-16199.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/16100-16199.xml
@@ -362,6 +362,7 @@
 		<affectLimit>9-10</affectLimit>
 		<affectRange>200</affectRange>
 		<basicProperty>MAGIC</basicProperty>
+		<removedOnDamage>true</removedOnDamage>
 		<effectPoint>
 			<value level="1">-418</value>
 			<value level="2">-532</value>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19100-19199.xml
index 804c128fc2..ed0d8a3e0d 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19100-19199.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/19100-19199.xml
@@ -255,32 +255,86 @@
 		<!-- Teleports nearby clan members to town. Cannot be used in special places such as GM Consultation Services. Consumes 50 Spirit Ores and 2000 Individual Fame. Viscount or above only. -->
 		<icon>icon.skill_pledge_party_recall</icon>
 		<operateType>A1</operateType>
-		<hitTime>3500</hitTime>
+		<coolTime>500</coolTime>
+		<hitTime>2000</hitTime>
 		<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">
 		<!-- For 60 sec., blocks target's Escape. Consumes 100 Spirit Ores and 3000 Individual Fame. Marquis or above only. -->
 		<icon>icon.skill_recall</icon>
 		<operateType>A2</operateType>
+		<coolTime>500</coolTime>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
+		<abnormalType>BLOCK_ESCAPE</abnormalType>
+		<effectRange>600</effectRange>
 		<castRange>600</castRange>
-		<hitTime>2000</hitTime>
+		<hitTime>1000</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">
 		<!-- For 60 sec., blocks target's Resurrection. Consumes 150 Spirit Ores and 1000 Clan Reputation. Marquis or above only. -->
 		<icon>icon.skill_resurrection</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
+		<abnormalType>BLOCK_RESURRECTION</abnormalType>
 		<castRange>600</castRange>
-		<hitTime>2000</hitTime>
+		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>1800000</reuseDelay>
 		<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. -->
@@ -1602,7 +1656,21 @@
 		<!-- For 60 sec., P./M. Atk. + 10%. -->
 		<icon>icon.skill1996</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
 		<effectPoint>2</effectPoint>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/01900-01999.xml
index 8e2157b555..673732437b 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/01900-01999.xml
@@ -2324,23 +2324,33 @@
 	<skill id="1996" toLevel="2" name="Hurricane Shackle">
 		<!-- For $s1, blocks target from using escape items and skills. -->
 		<icon>icon.skill1996</icon>
-		<operateType>A2</operateType>
+		<operateType>A3</operateType>
 		<castRange>600</castRange>
 		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>-100</effectPoint>
-		<abnormalLvl>1</abnormalLvl>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+		</abnormalLvl>
 		<abnormalTime>60</abnormalTime>
 		<abnormalType>BLOCK_ESCAPE</abnormalType>
 		<isDebuff>true</isDebuff>
+		<targetType>ENEMY_ONLY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
 		<excludedFromCheck>true</excludedFromCheck>
-		<conditions>
-			<condition name="OpTargetPc" />
-		</conditions>
+		<magicLvl>4</magicLvl>
 		<effects>
 			<effect name="BlockEscape" />
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19199</skillId> <!-- Hurricane Sign -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="1997" toLevel="2" name="Gravity Exile">
 		<!-- For $s1, blocks target from being resurrected by another character. -->
@@ -2369,6 +2379,14 @@
 		</conditions>
 		<effects>
 			<effect name="BlockResurrection" />
+			<effect name="PhysicalDefence" fromLevel="2" toLevel="2">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence" fromLevel="2" toLevel="2">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
 		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/16100-16199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/16100-16199.xml
index fa7763bd24..0ae0f588c4 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/16100-16199.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/16100-16199.xml
@@ -362,6 +362,7 @@
 		<affectLimit>9-10</affectLimit>
 		<affectRange>200</affectRange>
 		<basicProperty>MAGIC</basicProperty>
+		<removedOnDamage>true</removedOnDamage>
 		<effectPoint>
 			<value level="1">-418</value>
 			<value level="2">-532</value>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19100-19199.xml
index 520e06dc49..ba25f64292 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19100-19199.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/19100-19199.xml
@@ -255,32 +255,86 @@
 		<!-- Teleports nearby clan members to town. Cannot be used in special places such as GM Consultation Services. Consumes 50 Spirit Ores and 2000 Individual Fame. Viscount or above only. -->
 		<icon>icon.skill_pledge_party_recall</icon>
 		<operateType>A1</operateType>
-		<hitTime>3500</hitTime>
+		<coolTime>500</coolTime>
+		<hitTime>2000</hitTime>
 		<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">
 		<!-- For 60 sec., blocks target's Escape. Consumes 100 Spirit Ores and 3000 Individual Fame. Marquis or above only. -->
 		<icon>icon.skill_recall</icon>
 		<operateType>A2</operateType>
+		<coolTime>500</coolTime>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
+		<abnormalType>BLOCK_ESCAPE</abnormalType>
+		<effectRange>600</effectRange>
 		<castRange>600</castRange>
-		<hitTime>2000</hitTime>
+		<hitTime>1000</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">
 		<!-- For 60 sec., blocks target's Resurrection. Consumes 150 Spirit Ores and 1000 Clan Reputation. Marquis or above only. -->
 		<icon>icon.skill_resurrection</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
+		<abnormalType>BLOCK_RESURRECTION</abnormalType>
 		<castRange>600</castRange>
-		<hitTime>2000</hitTime>
+		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>1800000</reuseDelay>
 		<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. -->
@@ -1602,7 +1656,21 @@
 		<!-- For 60 sec., P./M. Atk. + 10%. -->
 		<icon>icon.skill1996</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
 		<effectPoint>2</effectPoint>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml
index 43456aee77..e7774125ac 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/01900-01999.xml
@@ -2324,13 +2324,16 @@
 	<skill id="1996" toLevel="2" name="Hurricane Shackle">
 		<!-- For $s1, blocks target from using escape items and skills. -->
 		<icon>icon.skill1996</icon>
-		<operateType>A2</operateType>
+		<operateType>A3</operateType>
 		<castRange>600</castRange>
 		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>-100</effectPoint>
-		<abnormalLvl>1</abnormalLvl>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+		</abnormalLvl>
 		<abnormalTime>60</abnormalTime>
 		<abnormalType>BLOCK_ESCAPE</abnormalType>
 		<isDebuff>true</isDebuff>
@@ -2338,20 +2341,16 @@
 		<affectScope>SINGLE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<excludedFromCheck>true</excludedFromCheck>
-		<conditions>
-			<condition name="OpTargetPc" />
-		</conditions>
+		<magicLvl>4</magicLvl>
 		<effects>
 			<effect name="BlockEscape" />
-			<effect name="PAtk" fromLevel="2" toLevel="2">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MAtk" fromLevel="2" toLevel="2">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19199</skillId> <!-- Hurricane Sign -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="1997" toLevel="2" name="Gravity Exile">
 		<!-- For $s1, blocks target from being resurrected by another character. -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/16100-16199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/16100-16199.xml
index e9d1dac340..4029917eb2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/16100-16199.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/16100-16199.xml
@@ -362,6 +362,7 @@
 		<affectLimit>9-10</affectLimit>
 		<affectRange>200</affectRange>
 		<basicProperty>MAGIC</basicProperty>
+		<removedOnDamage>true</removedOnDamage>
 		<effectPoint>
 			<value level="1">-418</value>
 			<value level="2">-532</value>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19100-19199.xml
index b369129979..017641160d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19100-19199.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19100-19199.xml
@@ -255,32 +255,86 @@
 		<!-- Teleports nearby clan members to town. Cannot be used in special places such as GM Consultation Services. Consumes 50 Spirit Ores and 2000 Individual Fame. Viscount or above only. -->
 		<icon>icon.skill_pledge_party_recall</icon>
 		<operateType>A1</operateType>
-		<hitTime>3500</hitTime>
+		<coolTime>500</coolTime>
+		<hitTime>2000</hitTime>
 		<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">
 		<!-- For 60 sec., blocks target's Escape. Consumes 100 Spirit Ores and 3000 Individual Fame. Marquis or above only. -->
 		<icon>icon.skill_recall</icon>
 		<operateType>A2</operateType>
+		<coolTime>500</coolTime>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
+		<abnormalType>BLOCK_ESCAPE</abnormalType>
+		<effectRange>600</effectRange>
 		<castRange>600</castRange>
-		<hitTime>2000</hitTime>
+		<hitTime>1000</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">
 		<!-- For 60 sec., blocks target's Resurrection. Consumes 150 Spirit Ores and 1000 Clan Reputation. Marquis or above only. -->
 		<icon>icon.skill_resurrection</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
+		<abnormalType>BLOCK_RESURRECTION</abnormalType>
 		<castRange>600</castRange>
-		<hitTime>2000</hitTime>
+		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>1800000</reuseDelay>
 		<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. -->
@@ -1602,7 +1656,21 @@
 		<!-- For 60 sec., P./M. Atk. + 10%. -->
 		<icon>icon.skill1996</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
 		<effectPoint>2</effectPoint>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/01900-01999.xml
index ab53d7b2e2..4c790c05fb 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/01900-01999.xml
@@ -2324,13 +2324,16 @@
 	<skill id="1996" toLevel="2" name="Hurricane Shackle">
 		<!-- For $s1, blocks target from using escape items and skills. -->
 		<icon>icon.skill1996</icon>
-		<operateType>A2</operateType>
+		<operateType>A3</operateType>
 		<castRange>600</castRange>
 		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>-100</effectPoint>
-		<abnormalLvl>1</abnormalLvl>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+		</abnormalLvl>
 		<abnormalTime>60</abnormalTime>
 		<abnormalType>BLOCK_ESCAPE</abnormalType>
 		<isDebuff>true</isDebuff>
@@ -2338,20 +2341,16 @@
 		<affectScope>SINGLE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<excludedFromCheck>true</excludedFromCheck>
-		<conditions>
-			<condition name="OpTargetPc" />
-		</conditions>
+		<magicLvl>4</magicLvl>
 		<effects>
 			<effect name="BlockEscape" />
-			<effect name="PAtk" fromLevel="2" toLevel="2">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MAtk" fromLevel="2" toLevel="2">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19199</skillId> <!-- Hurricane Sign -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="1997" toLevel="2" name="Gravity Exile">
 		<!-- For $s1, blocks target from being resurrected by another character. -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10200-10299.xml
index 2a580da297..52a0ee40bc 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10200-10299.xml
@@ -46,6 +46,9 @@
 				<chance>100</chance>
 				<targetType>TARGET</targetType>
 			</effect>
+			<effect name="DisableSkill">
+				<disable>10008;10009;10011;10012;10017;10019;10020;10021;10024;10026</disable>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="10245" toLevel="1" name="Wizard - Individual Passive">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/16100-16199.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/16100-16199.xml
index ec07672f9c..eaeb8ea51c 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/16100-16199.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/16100-16199.xml
@@ -362,6 +362,7 @@
 		<affectLimit>9-10</affectLimit>
 		<affectRange>200</affectRange>
 		<basicProperty>MAGIC</basicProperty>
+		<removedOnDamage>true</removedOnDamage>
 		<effectPoint>
 			<value level="1">-418</value>
 			<value level="2">-532</value>
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 5dc11fd8f6..d9f52a7811 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
@@ -1656,7 +1656,21 @@
 		<!-- For 60 sec., P./ M. Atk. +10%. -->
 		<icon>icon.skill1996</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
 		<effectPoint>2</effectPoint>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/01900-01999.xml
index fff7782a13..5cb5f6f103 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/01900-01999.xml
@@ -2348,13 +2348,16 @@
 	<skill id="1996" toLevel="2" name="Hurricane Shackle">
 		<!-- For $s1, blocks target from using escape items and skills. -->
 		<icon>icon.skill1996</icon>
-		<operateType>A2</operateType>
+		<operateType>A3</operateType>
 		<castRange>600</castRange>
 		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>-100</effectPoint>
-		<abnormalLvl>1</abnormalLvl>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+		</abnormalLvl>
 		<abnormalTime>60</abnormalTime>
 		<abnormalType>BLOCK_ESCAPE</abnormalType>
 		<isDebuff>true</isDebuff>
@@ -2362,20 +2365,16 @@
 		<affectScope>SINGLE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<excludedFromCheck>true</excludedFromCheck>
-		<conditions>
-			<condition name="OpTargetPc" />
-		</conditions>
+		<magicLvl>4</magicLvl>
 		<effects>
 			<effect name="BlockEscape" />
-			<effect name="PAtk" fromLevel="2" toLevel="2">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MAtk" fromLevel="2" toLevel="2">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19199</skillId> <!-- Hurricane Sign -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="1997" toLevel="2" name="Gravity Exile">
 		<!-- For $s1, blocks target from being resurrected by another character. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10200-10299.xml
index 006c9f21c3..3b6cbc9902 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10200-10299.xml
@@ -46,6 +46,9 @@
 				<chance>100</chance>
 				<targetType>TARGET</targetType>
 			</effect>
+			<effect name="DisableSkill">
+				<disable>10008;10009;10011;10012;10017;10019;10020;10021;10024;10026</disable>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="10245" toLevel="1" name="Wizard - Individual Passive">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/16100-16199.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/16100-16199.xml
index cec3a9f849..2a63658b97 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/16100-16199.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/16100-16199.xml
@@ -362,6 +362,7 @@
 		<affectLimit>9-10</affectLimit>
 		<affectRange>200</affectRange>
 		<basicProperty>MAGIC</basicProperty>
+		<removedOnDamage>true</removedOnDamage>
 		<effectPoint>
 			<value level="1">-418</value>
 			<value level="2">-532</value>
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 d3eb3a8e06..62b2ff09aa 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
@@ -1656,7 +1656,21 @@
 		<!-- For 60 sec., P./ M. Atk. +10%. -->
 		<icon>icon.skill1996</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
 		<effectPoint>2</effectPoint>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml
index a8cf33d871..41094da359 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/01900-01999.xml
@@ -2337,13 +2337,16 @@
 	<skill id="1996" toLevel="2" name="Hurricane Shackle">
 		<!-- For $s1, blocks target from using escape items and skills. -->
 		<icon>icon.skill1996</icon>
-		<operateType>A2</operateType>
+		<operateType>A3</operateType>
 		<castRange>600</castRange>
 		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>-100</effectPoint>
-		<abnormalLvl>1</abnormalLvl>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+		</abnormalLvl>
 		<abnormalTime>60</abnormalTime>
 		<abnormalType>BLOCK_ESCAPE</abnormalType>
 		<isDebuff>true</isDebuff>
@@ -2351,20 +2354,16 @@
 		<affectScope>SINGLE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<excludedFromCheck>true</excludedFromCheck>
-		<conditions>
-			<condition name="OpTargetPc" />
-		</conditions>
+		<magicLvl>4</magicLvl>
 		<effects>
 			<effect name="BlockEscape" />
-			<effect name="PAtk" fromLevel="2" toLevel="2">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MAtk" fromLevel="2" toLevel="2">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19199</skillId> <!-- Hurricane Sign -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="1997" toLevel="2" name="Gravity Exile">
 		<!-- For $s1, blocks target from being resurrected by another character. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10200-10299.xml
index 12127690e8..b16bd289a5 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10200-10299.xml
@@ -46,6 +46,9 @@
 				<chance>100</chance>
 				<targetType>TARGET</targetType>
 			</effect>
+			<effect name="DisableSkill">
+				<disable>10008;10009;10011;10012;10017;10019;10020;10021;10024;10026</disable>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="10245" toLevel="1" name="Wizard - Individual Passive">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/16100-16199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/16100-16199.xml
index 04e926425c..d62e040162 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/16100-16199.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/16100-16199.xml
@@ -362,6 +362,7 @@
 		<affectLimit>9-10</affectLimit>
 		<affectRange>200</affectRange>
 		<basicProperty>MAGIC</basicProperty>
+		<removedOnDamage>true</removedOnDamage>
 		<effectPoint>
 			<value level="1">-418</value>
 			<value level="2">-532</value>
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 417c861cab..4770fef7b3 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
@@ -1656,7 +1656,21 @@
 		<!-- For 60 sec., P./ M. Atk. +10%. -->
 		<icon>icon.skill1996</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
 		<effectPoint>2</effectPoint>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/01900-01999.xml
index 469ab829ba..1a2500640f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/01900-01999.xml
@@ -2308,13 +2308,16 @@
 	<skill id="1996" toLevel="2" name="Hurricane Shackle">
 		<!-- For $s1, blocks target from using escape items and skills. -->
 		<icon>icon.skill1996</icon>
-		<operateType>A2</operateType>
+		<operateType>A3</operateType>
 		<castRange>600</castRange>
 		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>-100</effectPoint>
-		<abnormalLvl>1</abnormalLvl>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+		</abnormalLvl>
 		<abnormalTime>60</abnormalTime>
 		<abnormalType>BLOCK_ESCAPE</abnormalType>
 		<isDebuff>true</isDebuff>
@@ -2322,20 +2325,16 @@
 		<affectScope>SINGLE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<excludedFromCheck>true</excludedFromCheck>
-		<conditions>
-			<condition name="OpTargetPc" />
-		</conditions>
+		<magicLvl>4</magicLvl>
 		<effects>
 			<effect name="BlockEscape" />
-			<effect name="PAtk" fromLevel="2" toLevel="2">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MAtk" fromLevel="2" toLevel="2">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19199</skillId> <!-- Hurricane Sign -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="1997" toLevel="2" name="Gravity Exile">
 		<!-- For $s1, blocks target from being resurrected by another character. -->
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10200-10299.xml
index ab590aaeb2..60d88e343f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10200-10299.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10200-10299.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="10244" toLevel="3" name="Two-Hand Stance">
-		<!-- Holds a weapon with both hands. If the weapon is a sword or blunt weapon, this stance increases P. Critical Rate/ P. Critical Damage by $s1 and P. Atk. by $s2 of Shield Def. but disables you to cast shield skills or defend with the shield. Use the stance again to cancel it. Requires a shield to be equipped. -->
+		<!-- Holds a weapon with both hands. When using a sword or a blunt weapon, P. Critical Rate/ Damage +15%, P. Skill Critical Rate/ Damage +15%, P. Atk. +100% of Shield Defense. You can't cast shield skills or defend with the shield. Using the skill again cancels the effect. Requires a shield. -->
 		<icon>icon.skill10244</icon>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLvl>
@@ -46,6 +46,9 @@
 				<chance>100</chance>
 				<targetType>TARGET</targetType>
 			</effect>
+			<effect name="DisableSkill">
+				<disable>10008;10009;10011;10012;10017;10019;10020;10021;10024;10026</disable>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="10245" toLevel="1" name="Wizard - Individual Passive">
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/16100-16199.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/16100-16199.xml
index 23109bf4fb..50a8df3b09 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/16100-16199.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/16100-16199.xml
@@ -362,6 +362,7 @@
 		<affectLimit>9-10</affectLimit>
 		<affectRange>200</affectRange>
 		<basicProperty>MAGIC</basicProperty>
+		<removedOnDamage>true</removedOnDamage>
 		<effectPoint>
 			<value level="1">-418</value>
 			<value level="2">-532</value>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19100-19199.xml
index a4363c3992..b75cddc187 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19100-19199.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19100-19199.xml
@@ -1656,7 +1656,21 @@
 		<!-- For 60 sec., P./ M. Atk. +10%. -->
 		<icon>icon.skill1996</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
 		<effectPoint>2</effectPoint>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/01900-01999.xml
index 43456aee77..e7774125ac 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/01900-01999.xml
@@ -2324,13 +2324,16 @@
 	<skill id="1996" toLevel="2" name="Hurricane Shackle">
 		<!-- For $s1, blocks target from using escape items and skills. -->
 		<icon>icon.skill1996</icon>
-		<operateType>A2</operateType>
+		<operateType>A3</operateType>
 		<castRange>600</castRange>
 		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>600000</reuseDelay>
 		<effectPoint>-100</effectPoint>
-		<abnormalLvl>1</abnormalLvl>
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+		</abnormalLvl>
 		<abnormalTime>60</abnormalTime>
 		<abnormalType>BLOCK_ESCAPE</abnormalType>
 		<isDebuff>true</isDebuff>
@@ -2338,20 +2341,16 @@
 		<affectScope>SINGLE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<excludedFromCheck>true</excludedFromCheck>
-		<conditions>
-			<condition name="OpTargetPc" />
-		</conditions>
+		<magicLvl>4</magicLvl>
 		<effects>
 			<effect name="BlockEscape" />
-			<effect name="PAtk" fromLevel="2" toLevel="2">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
-			<effect name="MAtk" fromLevel="2" toLevel="2">
-				<amount>10</amount>
-				<mode>PER</mode>
-			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="CallSkill">
+				<skillId>19199</skillId> <!-- Hurricane Sign -->
+				<skillLevel>1</skillLevel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="1997" toLevel="2" name="Gravity Exile">
 		<!-- For $s1, blocks target from being resurrected by another character. -->
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/16100-16199.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/16100-16199.xml
index e9d1dac340..4029917eb2 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/16100-16199.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/16100-16199.xml
@@ -362,6 +362,7 @@
 		<affectLimit>9-10</affectLimit>
 		<affectRange>200</affectRange>
 		<basicProperty>MAGIC</basicProperty>
+		<removedOnDamage>true</removedOnDamage>
 		<effectPoint>
 			<value level="1">-418</value>
 			<value level="2">-532</value>
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19100-19199.xml
index b369129979..017641160d 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19100-19199.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19100-19199.xml
@@ -255,32 +255,86 @@
 		<!-- Teleports nearby clan members to town. Cannot be used in special places such as GM Consultation Services. Consumes 50 Spirit Ores and 2000 Individual Fame. Viscount or above only. -->
 		<icon>icon.skill_pledge_party_recall</icon>
 		<operateType>A1</operateType>
-		<hitTime>3500</hitTime>
+		<coolTime>500</coolTime>
+		<hitTime>2000</hitTime>
 		<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">
 		<!-- For 60 sec., blocks target's Escape. Consumes 100 Spirit Ores and 3000 Individual Fame. Marquis or above only. -->
 		<icon>icon.skill_recall</icon>
 		<operateType>A2</operateType>
+		<coolTime>500</coolTime>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
+		<abnormalType>BLOCK_ESCAPE</abnormalType>
+		<effectRange>600</effectRange>
 		<castRange>600</castRange>
-		<hitTime>2000</hitTime>
+		<hitTime>1000</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">
 		<!-- For 60 sec., blocks target's Resurrection. Consumes 150 Spirit Ores and 1000 Clan Reputation. Marquis or above only. -->
 		<icon>icon.skill_resurrection</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
+		<abnormalType>BLOCK_RESURRECTION</abnormalType>
 		<castRange>600</castRange>
-		<hitTime>2000</hitTime>
+		<hitTime>1000</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>1800000</reuseDelay>
 		<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. -->
@@ -1602,7 +1656,21 @@
 		<!-- For 60 sec., P./M. Atk. + 10%. -->
 		<icon>icon.skill1996</icon>
 		<operateType>A2</operateType>
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>60</abnormalTime>
 		<effectPoint>2</effectPoint>
 		<isMagic>4</isMagic>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MAtk">
+				<amount>10</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 </list>