From 089df6be6ea3722c565116ae5f389e9226599490 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 29 Nov 2021 00:40:02 +0000
Subject: [PATCH] Addition of OpNotAffectedBySkill condition for some skills.
 Contributed by MacuK.

---
 .../game/data/stats/skills/01800-01899.xml    | 33 +++++++++++++++++--
 .../game/data/stats/skills/01800-01899.xml    | 33 +++++++++++++++++--
 2 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/01800-01899.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/01800-01899.xml
index 7efec4ed27..5f8ddc669b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/01800-01899.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/01800-01899.xml
@@ -14,7 +14,8 @@
 		<operateType>A2</operateType>
 		<reuseDelay>7200000</reuseDelay>
 		<stayAfterDeath>true</stayAfterDeath>
-		<hitTime>3500</hitTime>
+		<coolTime>500</coolTime>
+		<hitTime>500</hitTime>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
@@ -22,6 +23,14 @@
 		<affectScope>SINGLE</affectScope>
 		<itemConsumeId>3031</itemConsumeId>
 		<itemConsumeCount>20</itemConsumeCount>
+		<conditions>
+			<condition name="OpNotAffectedBySkill">
+				<skillId>1801</skillId> <!-- Dark Assassin Transformation -->
+			</condition>
+			<condition name="OpNotAffectedBySkill">
+				<skillId>1802</skillId> <!-- White Assassin Transformation -->
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="MaxHp">
 				<amount>3</amount>
@@ -82,8 +91,9 @@
 		<magicLevel>60</magicLevel>
 		<operateType>A2</operateType>
 		<reuseDelay>7200000</reuseDelay>
-		<hitTime>3500</hitTime>
 		<stayAfterDeath>true</stayAfterDeath>
+		<coolTime>500</coolTime>
+		<hitTime>500</hitTime>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
@@ -91,6 +101,14 @@
 		<affectScope>SINGLE</affectScope>
 		<itemConsumeId>3031</itemConsumeId>
 		<itemConsumeCount>20</itemConsumeCount>
+		<conditions>
+			<condition name="OpNotAffectedBySkill">
+				<skillId>1800</skillId> <!-- Pirate Transformation -->
+			</condition>
+			<condition name="OpNotAffectedBySkill">
+				<skillId>1802</skillId> <!-- White Assassin Transformation -->
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="MaxHp">
 				<amount>5</amount>
@@ -151,8 +169,9 @@
 		<magicLevel>70</magicLevel>
 		<operateType>A2</operateType>
 		<reuseDelay>3600000</reuseDelay>
-		<hitTime>3500</hitTime>
 		<stayAfterDeath>true</stayAfterDeath>
+		<coolTime>500</coolTime>
+		<hitTime>500</hitTime>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
@@ -160,6 +179,14 @@
 		<affectScope>SINGLE</affectScope>
 		<itemConsumeId>3031</itemConsumeId>
 		<itemConsumeCount>40</itemConsumeCount>
+		<conditions>
+			<condition name="OpNotAffectedBySkill">
+				<skillId>1800</skillId> <!-- Pirate Transformation -->
+			</condition>
+			<condition name="OpNotAffectedBySkill">
+				<skillId>1801</skillId> <!-- Dark Assassin Transformation -->
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="MaxHp">
 				<amount>7</amount>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/01800-01899.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/01800-01899.xml
index db4951be2e..f8e132b9b1 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/01800-01899.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/01800-01899.xml
@@ -14,7 +14,8 @@
 		<operateType>A2</operateType>
 		<reuseDelay>7200000</reuseDelay>
 		<stayAfterDeath>true</stayAfterDeath>
-		<hitTime>3500</hitTime>
+		<coolTime>500</coolTime>
+		<hitTime>500</hitTime>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
@@ -22,6 +23,14 @@
 		<affectScope>SINGLE</affectScope>
 		<itemConsumeId>3031</itemConsumeId>
 		<itemConsumeCount>20</itemConsumeCount>
+		<conditions>
+			<condition name="OpNotAffectedBySkill">
+				<skillId>1801</skillId> <!-- Dark Assassin Transformation -->
+			</condition>
+			<condition name="OpNotAffectedBySkill">
+				<skillId>1802</skillId> <!-- White Assassin Transformation -->
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="MaxHp">
 				<amount>3</amount>
@@ -82,8 +91,9 @@
 		<magicLevel>60</magicLevel>
 		<operateType>A2</operateType>
 		<reuseDelay>7200000</reuseDelay>
-		<hitTime>3500</hitTime>
 		<stayAfterDeath>true</stayAfterDeath>
+		<coolTime>500</coolTime>
+		<hitTime>500</hitTime>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
@@ -91,6 +101,14 @@
 		<affectScope>SINGLE</affectScope>
 		<itemConsumeId>3031</itemConsumeId>
 		<itemConsumeCount>20</itemConsumeCount>
+		<conditions>
+			<condition name="OpNotAffectedBySkill">
+				<skillId>1800</skillId> <!-- Pirate Transformation -->
+			</condition>
+			<condition name="OpNotAffectedBySkill">
+				<skillId>1802</skillId> <!-- White Assassin Transformation -->
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="MaxHp">
 				<amount>5</amount>
@@ -151,8 +169,9 @@
 		<magicLevel>70</magicLevel>
 		<operateType>A2</operateType>
 		<reuseDelay>3600000</reuseDelay>
-		<hitTime>3500</hitTime>
 		<stayAfterDeath>true</stayAfterDeath>
+		<coolTime>500</coolTime>
+		<hitTime>500</hitTime>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
@@ -160,6 +179,14 @@
 		<affectScope>SINGLE</affectScope>
 		<itemConsumeId>3031</itemConsumeId>
 		<itemConsumeCount>40</itemConsumeCount>
+		<conditions>
+			<condition name="OpNotAffectedBySkill">
+				<skillId>1800</skillId> <!-- Pirate Transformation -->
+			</condition>
+			<condition name="OpNotAffectedBySkill">
+				<skillId>1801</skillId> <!-- Dark Assassin Transformation -->
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="MaxHp">
 				<amount>7</amount>