From b2470aeab8c7297558b3eb93672add58bef7d18c Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 9 Dec 2019 11:37:51 +0000
Subject: [PATCH] Shadow Hide cancel for debuff and skill attacks. Contributed
 by gamelike85.

---
 .../game/data/stats/skills/10500-10599.xml    | 47 ++++++++++++++++++-
 .../game/data/stats/skills/14800-14899.xml    |  2 +-
 .../game/data/stats/skills/10500-10599.xml    | 47 ++++++++++++++++++-
 .../game/data/stats/skills/14800-14899.xml    |  2 +-
 .../game/data/stats/skills/10500-10599.xml    | 47 ++++++++++++++++++-
 .../game/data/stats/skills/14800-14899.xml    |  2 +-
 .../game/data/stats/skills/10500-10599.xml    | 47 ++++++++++++++++++-
 .../game/data/stats/skills/11500-11599.xml    |  2 +-
 .../game/data/stats/skills/14800-14899.xml    |  2 +-
 .../game/data/stats/skills/19200-19299.xml    |  5 ++
 .../game/data/stats/skills/19300-19399.xml    | 10 ++++
 .../game/data/stats/skills/10500-10599.xml    | 47 ++++++++++++++++++-
 .../game/data/stats/skills/10700-10799.xml    |  3 ++
 .../game/data/stats/skills/11500-11599.xml    |  2 +-
 .../game/data/stats/skills/14800-14899.xml    |  2 +-
 .../game/data/stats/skills/19200-19299.xml    |  5 ++
 .../game/data/stats/skills/19300-19399.xml    | 10 ++++
 .../game/data/stats/skills/10500-10599.xml    | 47 ++++++++++++++++++-
 .../game/data/stats/skills/10700-10799.xml    |  3 ++
 .../game/data/stats/skills/11500-11599.xml    |  2 +-
 .../game/data/stats/skills/14800-14899.xml    |  2 +-
 .../game/data/stats/skills/19200-19299.xml    |  5 ++
 .../game/data/stats/skills/19300-19399.xml    | 10 ++++
 .../game/data/stats/skills/10500-10599.xml    | 47 ++++++++++++++++++-
 .../game/data/stats/skills/10700-10799.xml    |  3 ++
 .../game/data/stats/skills/11500-11599.xml    |  2 +-
 .../game/data/stats/skills/14800-14899.xml    |  2 +-
 .../game/data/stats/skills/19200-19299.xml    |  5 ++
 .../game/data/stats/skills/19300-19399.xml    | 10 ++++
 .../game/data/stats/skills/10500-10599.xml    | 47 ++++++++++++++++++-
 .../game/data/stats/skills/10700-10799.xml    |  3 ++
 .../game/data/stats/skills/11500-11599.xml    |  2 +-
 .../game/data/stats/skills/14800-14899.xml    |  2 +-
 .../game/data/stats/skills/19200-19299.xml    |  5 ++
 .../game/data/stats/skills/19300-19399.xml    | 10 ++++
 .../game/data/stats/skills/30700-30799.xml    |  5 ++
 .../game/data/stats/skills/10500-10599.xml    | 47 ++++++++++++++++++-
 .../game/data/stats/skills/11500-11599.xml    |  2 +-
 .../game/data/stats/skills/14800-14899.xml    |  2 +-
 .../game/data/stats/skills/19200-19299.xml    |  5 ++
 .../game/data/stats/skills/19300-19399.xml    | 10 ++++
 41 files changed, 536 insertions(+), 24 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml
index 9376a445ec..7b591a367d 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml
@@ -1153,6 +1153,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>10515</skillId> <!-- Paralyzed -->
@@ -1280,6 +1285,11 @@
 				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10517" toLevel="1" name="Shadow Hide">
 		<!-- You go into Hide state, cancel debuffs and Hold effects on you, increase HP Recovery Bonus, and eliminate enemy enmity toward you. -->
@@ -1339,7 +1349,10 @@
 				<minDamage>1</minDamage>
 				<chance>100</chance>
 				<targetType>SELF</targetType>
-				<allowWeapons>ALL</allowWeapons>
+				<allowNormalAttack>true</allowNormalAttack>
+				<allowSkillAttack>true</allowSkillAttack>
+				<isCritical>true</isCritical>
+				<allowWeapons>DAGGER,DUALDAGGER</allowWeapons>
 				<skillId>14839</skillId> <!-- Cancel Hide -->
 				<skillLevel>1</skillLevel>
 			</effect>
@@ -1520,6 +1533,11 @@
 				<npcCount>1</npcCount>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10523" toLevel="9" name="Poisoned">
 		<!-- Poisoned by a toxin cloud. Decreases Speed, P. Atk., Shield Defense, P. Def., and M. Def., and blocks the use of magic. Decreases HP by 687 per second. -->
@@ -1919,6 +1937,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10528" toLevel="1" name="Shadow Fake Death">
 		<!-- Acts dead to stop monsters from attacking. Cannot be targeted until you get back up. Consumes 300 MP per second. -->
@@ -1927,6 +1950,8 @@
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<mpConsume>200</mpConsume>
+		<reuseDelay>1500</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<mpInitialConsume>200</mpInitialConsume>
 		<hitTime>800</hitTime>
 		<targetType>NONE</targetType>
@@ -1990,6 +2015,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10530" toLevel="1" name="Blind Spot">
 		<!-- Increases P. Atk., Critical Rate, Critical Damage and Vital Spot Attack Rate. -->
@@ -2478,6 +2508,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10540" toLevel="8" name="Throw Sand">
 		<!-- Hurls poisonous sand at the enemy. For 5 seconds, greatly decreases P. accuracy and lures the enemy to you. Requires a dagger/dual dagger to be equipped. -->
@@ -2622,6 +2657,11 @@
 				<chance>100</chance>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10542" toLevel="1" name="Maximum Critical">
 		<!-- Critical Damage + 609 and vital spot attack success rate + 10%. Side Critical Rate + 30% and Critical Damage + 40%. Rear Critical Rate + 60% and Critical Damage + 70%. -->
@@ -2844,6 +2884,11 @@
 			</effect>
 			<effect name="BlockActions" />
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10547" toLevel="1" name="Shadow Attack">
 		<!-- Not in use. -->
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14800-14899.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14800-14899.xml
index 91ac01f83d..d08f92e362 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14800-14899.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14800-14899.xml
@@ -939,7 +939,7 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="DispelBySlot">
-				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,9</dispel>
+				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,-1</dispel>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml
index 768d70f67d..4546197c24 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml
@@ -1153,6 +1153,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>10515</skillId> <!-- Paralyzed -->
@@ -1280,6 +1285,11 @@
 				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10517" toLevel="1" name="Shadow Hide">
 		<!-- You go into Hide state, cancel debuffs and Hold effects on you, increase HP Recovery Bonus, and eliminate enemy enmity toward you. -->
@@ -1339,7 +1349,10 @@
 				<minDamage>1</minDamage>
 				<chance>100</chance>
 				<targetType>SELF</targetType>
-				<allowWeapons>ALL</allowWeapons>
+				<allowNormalAttack>true</allowNormalAttack>
+				<allowSkillAttack>true</allowSkillAttack>
+				<isCritical>true</isCritical>
+				<allowWeapons>DAGGER,DUALDAGGER</allowWeapons>
 				<skillId>14839</skillId> <!-- Cancel Hide -->
 				<skillLevel>1</skillLevel>
 			</effect>
@@ -1520,6 +1533,11 @@
 				<npcCount>1</npcCount>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10523" toLevel="9" name="Poisoned">
 		<!-- Poisoned by a toxin cloud. Decreases Speed, P. Atk., Shield Defense, P. Def., and M. Def., and blocks the use of magic. Decreases HP by $s1 per second. -->
@@ -1919,6 +1937,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10528" toLevel="1" name="Shadow Fake Death">
 		<!-- Acts dead to stop monsters from attacking. Cannot be targeted until you get back up. Consumes 300 MP per second. -->
@@ -1927,6 +1950,8 @@
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<mpConsume>200</mpConsume>
+		<reuseDelay>1500</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<mpInitialConsume>200</mpInitialConsume>
 		<hitTime>800</hitTime>
 		<targetType>NONE</targetType>
@@ -1990,6 +2015,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10530" toLevel="1" name="Blind Spot">
 		<!-- Increases P. Atk., Critical Rate, Critical Damage and Vital Spot Attack Rate. -->
@@ -2478,6 +2508,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10540" toLevel="8" name="Throw Sand">
 		<!-- Hurls poisonous sand at the enemy. For$s1, greatly decreases P. accuracy and lures the enemy to you. Requires a dagger/dual dagger to be equipped. -->
@@ -2622,6 +2657,11 @@
 				<chance>100</chance>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10542" toLevel="1" name="Maximum Critical">
 		<!-- Critical Damage + 609 and vital spot attack success rate + 10%. Side Critical Rate + 30% and Critical Damage + 40%. Rear Critical Rate + 60% and Critical Damage + 70%. -->
@@ -2844,6 +2884,11 @@
 			</effect>
 			<effect name="BlockActions" />
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10547" toLevel="1" name="Shadow Attack">
 		<!-- Not in use. -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14800-14899.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14800-14899.xml
index 4c7d8c41ac..57ab53d230 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14800-14899.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14800-14899.xml
@@ -939,7 +939,7 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="DispelBySlot">
-				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,9</dispel>
+				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,-1</dispel>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml
index 272246d9b7..0179fe6e09 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml
@@ -1153,6 +1153,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>10515</skillId> <!-- Paralyzed -->
@@ -1280,6 +1285,11 @@
 				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10517" toLevel="1" name="Shadow Hide">
 		<!-- Become hidden for 50 seconds, canceling all buffs and reducing speed by 50. -->
@@ -1339,7 +1349,10 @@
 				<minDamage>1</minDamage>
 				<chance>100</chance>
 				<targetType>SELF</targetType>
-				<allowWeapons>ALL</allowWeapons>
+				<allowNormalAttack>true</allowNormalAttack>
+				<allowSkillAttack>true</allowSkillAttack>
+				<isCritical>true</isCritical>
+				<allowWeapons>DAGGER,DUALDAGGER</allowWeapons>
 				<skillId>14839</skillId> <!-- Cancel Hide -->
 				<skillLevel>1</skillLevel>
 			</effect>
@@ -1520,6 +1533,11 @@
 				<npcCount>1</npcCount>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10523" toLevel="9" name="Poisoned">
 		<!-- Poisoned by a toxin cloud. Decreases Speed, P. Atk., Shield Defense, P. Def., and M. Def., and blocks the use of magic. Decreases HP by $s1 per second. -->
@@ -1919,6 +1937,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10528" toLevel="1" name="Shadow Fake Death">
 		<!-- The player feigns death to prevent monsters from attacking. The player is not detected by the target until further movement. Consumes 100 MP per second. -->
@@ -1927,6 +1950,8 @@
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<mpConsume>200</mpConsume>
+		<reuseDelay>1500</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<mpInitialConsume>200</mpInitialConsume>
 		<hitTime>800</hitTime>
 		<targetType>NONE</targetType>
@@ -1988,6 +2013,11 @@
 				<slot>HIDE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10530" toLevel="1" name="Blind Spot">
 		<!-- Increases P. Atk., Critical Rate, Critical Damage and Vital Spot Attack Rate. -->
@@ -2476,6 +2506,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10540" toLevel="8" name="Throw Sand">
 		<!-- Hurls poisonous sand at the enemy. For$s1, greatly decreases P. accuracy and lures the enemy to you. Requires a dagger/dual dagger to be equipped. -->
@@ -2620,6 +2655,11 @@
 				<chance>100</chance>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10542" toLevel="1" name="Maximum Critical">
 		<!-- Critical Damage + 609 and vital spot attack success rate + 10%. Side Critical Rate + 30% and Critical Damage + 40%. Rear Critical Rate + 60% and Critical Damage + 70%. -->
@@ -2842,6 +2882,11 @@
 			</effect>
 			<effect name="BlockActions" />
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10547" toLevel="1" name="Shadow Attack">
 		<!-- Not in use. -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14800-14899.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14800-14899.xml
index 4c7d8c41ac..57ab53d230 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14800-14899.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14800-14899.xml
@@ -939,7 +939,7 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="DispelBySlot">
-				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,9</dispel>
+				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,-1</dispel>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10500-10599.xml
index fd953c6643..3534561bb8 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/10500-10599.xml
@@ -1175,6 +1175,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>10515</skillId> <!-- Paralyzed -->
@@ -1302,6 +1307,11 @@
 				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10517" toLevel="1" name="Shadow Hide">
 		<!-- Cancels all debuff effects inflicted on you by teleporting to the front a distance of 250 and enter the Stealth mode for 20 seconds. Additionally, decreases Speed by 50. -->
@@ -1361,7 +1371,10 @@
 				<minDamage>1</minDamage>
 				<chance>100</chance>
 				<targetType>SELF</targetType>
-				<allowWeapons>ALL</allowWeapons>
+				<allowNormalAttack>true</allowNormalAttack>
+				<allowSkillAttack>true</allowSkillAttack>
+				<isCritical>true</isCritical>
+				<allowWeapons>DAGGER,DUALDAGGER</allowWeapons>
 				<skillId>14839</skillId> <!-- Cancel Hide -->
 				<skillLevel>1</skillLevel>
 			</effect>
@@ -1541,6 +1554,11 @@
 				<npcCount>1</npcCount>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10523" toLevel="9" name="Thrown Poison Swarm">
 		<!-- Poisoned. Decreases Speed/Attack/P. Defense/M. Defense/Shield Defense, blocks magical skills and drains HP by $s1 every second. -->
@@ -1940,6 +1958,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10528" toLevel="1" name="Shadow Fake Death">
 		<!-- The player feigns death to prevent monsters from attacking. The player is not detected by the target until further movement. Consumes 100 MP per second. -->
@@ -1948,6 +1971,8 @@
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<mpConsume>200</mpConsume>
+		<reuseDelay>1500</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<mpInitialConsume>200</mpInitialConsume>
 		<hitTime>800</hitTime>
 		<targetType>NONE</targetType>
@@ -2009,6 +2034,11 @@
 				<slot>HIDE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10530" toLevel="1" name="Blind Spot">
 		<!-- Increases P. Atk., Critical Rate, Critical Damage and Vital Spot Attack Rate. -->
@@ -2483,6 +2513,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10540" toLevel="8" name="Throw Sand">
 		<!-- Hurls poisonous sand at the enemy. For$s1, greatly decreases P. accuracy and lures the enemy to you. Requires a dagger/dual dagger to be equipped. -->
@@ -2627,6 +2662,11 @@
 				<chance>100</chance>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10542" toLevel="1" name="Maximum Critical">
 		<!-- Critical Damage + 609 and vital spot attack success rate + 10%. Side Critical Rate + 30% and Critical Damage + 40%. Rear Critical Rate + 60% and Critical Damage + 70%. -->
@@ -2849,6 +2889,11 @@
 			</effect>
 			<effect name="BlockActions" />
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10547" toLevel="1" name="Shadow Attack">
 		<!-- Not in use. -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11500-11599.xml
index 19a79b4a98..5820703ca4 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11500-11599.xml
@@ -3656,7 +3656,7 @@
 		<removedOnDamage>true</removedOnDamage>
 		<targetType>SELF</targetType>
 		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectObject>FRIEND_PC</affectObject>
 		<effects>
 			<effect name="SilentMove" />
 			<effect name="DispelBySlot">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/14800-14899.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/14800-14899.xml
index d3bbb845ea..6944f51308 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/14800-14899.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/14800-14899.xml
@@ -950,7 +950,7 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="DispelBySlot">
-				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,9</dispel>
+				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,-1</dispel>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19200-19299.xml
index 2af9abb01a..9b4dc34e96 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19200-19299.xml
@@ -2456,6 +2456,11 @@
 			</effect>
 			<effect name="BlockActions" />
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19299" toLevel="7" name="Reverse Mana">
 		<!-- Attempts Deadly Attack with $s1 power added to P. Attack and recovers your MP by $s2. Half-kill is possible. Requires dagger/dual dagger. -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19300-19399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19300-19399.xml
index 5f2ffabae3..dfc8d4f941 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19300-19399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/19300-19399.xml
@@ -65,6 +65,11 @@
 				<npcCount>1</npcCount>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19302" toLevel="9" name="Thrown Acid Sworm">
 		<!-- Poisoned. Decreases Speed/Attack/P. Defense/M. Defense/Shield Defense, blocks magical skills and drains HP by $s1 every second. -->
@@ -148,6 +153,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19303" toLevel="7" name="Right Angle Reverse">
 		<!-- Moves to the right side of the target to attempt Deadly Attack with $s1 power added to P. Attack. Causes Bleed on the target for $s2. Half-kill is possible. Requires dagger/dual dagger. -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10500-10599.xml
index e3316bf4ad..cc2b362062 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10500-10599.xml
@@ -1175,6 +1175,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>10515</skillId> <!-- Paralyzed -->
@@ -1302,6 +1307,11 @@
 				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10517" toLevel="1" name="Shadow Hide">
 		<!-- Cancels all debuff effects inflicted on you by teleporting to the front a distance of 250 and making you invisible for 20 seconds. Additionally, decreases Speed by 50. -->
@@ -1361,7 +1371,10 @@
 				<minDamage>1</minDamage>
 				<chance>100</chance>
 				<targetType>SELF</targetType>
-				<allowWeapons>ALL</allowWeapons>
+				<allowNormalAttack>true</allowNormalAttack>
+				<allowSkillAttack>true</allowSkillAttack>
+				<isCritical>true</isCritical>
+				<allowWeapons>DAGGER,DUALDAGGER</allowWeapons>
 				<skillId>14839</skillId> <!-- Cancel Hide -->
 				<skillLevel>1</skillLevel>
 			</effect>
@@ -1541,6 +1554,11 @@
 				<npcCount>1</npcCount>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10523" toLevel="9" name="Thrown Poison Swarm">
 		<!-- Poisoned. P. Atk. -$s1, P. Def./ M. Def. -$s2, Speed -$s3, Shield Def. -$s4, impossible to use magic skills, and HP -$s5 every second. -->
@@ -1940,6 +1958,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10528" toLevel="1" name="Shadow Fake Death">
 		<!-- The player feigns death to prevent monsters from attacking. The player is not detected by the target until further movement. Consumes 100 MP per second. -->
@@ -1948,6 +1971,8 @@
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<mpConsume>200</mpConsume>
+		<reuseDelay>1500</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<mpInitialConsume>200</mpInitialConsume>
 		<hitTime>800</hitTime>
 		<targetType>NONE</targetType>
@@ -2009,6 +2034,11 @@
 				<slot>HIDE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10530" toLevel="1" name="Blind Spot">
 		<!-- Increases P. Atk., Critical Rate, Critical Damage and Vital Spot Attack Rate. -->
@@ -2483,6 +2513,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10540" toLevel="8" name="Throw Sand">
 		<!-- Hurls poisonous sand at the enemy. For$s1, greatly decreases P. accuracy and lures the enemy to you. Requires a dagger/ dual dagger to be equipped. -->
@@ -2627,6 +2662,11 @@
 				<chance>100</chance>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10542" toLevel="1" name="Maximum Critical">
 		<!-- Critical Damage +609 and Vital Spot Attack Rate +10%. Side Critical Rate +30% and Critical Damage +40%. Rear Critical Rate +60% and Critical Damage +70%. -->
@@ -2849,6 +2889,11 @@
 			</effect>
 			<effect name="BlockActions" />
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10547" toLevel="1" name="Shadow Attack">
 		<!-- Not in use. -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10700-10799.xml
index 18a23beca0..b48867fd6c 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10700-10799.xml
@@ -280,6 +280,9 @@
 			<effect name="CallSkill">
 				<skillId>7014</skillId> 
 			</effect>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
 		</selfEffects>
 	</skill>
 	<skill id="10705" toLevel="3" name="Easterly Wind Strike">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml
index 3e75815294..2988f3127d 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml
@@ -3854,7 +3854,7 @@
 		<removedOnDamage>true</removedOnDamage>
 		<targetType>SELF</targetType>
 		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectObject>FRIEND_PC</affectObject>
 		<effects>
 			<effect name="SilentMove" />
 			<effect name="DispelBySlot">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/14800-14899.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/14800-14899.xml
index 581551c5dd..1762a21215 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/14800-14899.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/14800-14899.xml
@@ -950,7 +950,7 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="DispelBySlot">
-				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,9</dispel>
+				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,-1</dispel>
 			</effect>
 		</effects>
 	</skill>
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 b617cec827..13ea1663e6 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
@@ -2500,6 +2500,11 @@
 			</effect>
 			<effect name="BlockActions" />
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19299" toLevel="7" name="Reverse Mana">
 		<!-- Attempts Deadly Attack with $s1 power added to P. Atk. and recovers your MP by $s2. Half-kill is possible. Requires dagger/ dual dagger. -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19300-19399.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19300-19399.xml
index de94f63b56..2bd8160287 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19300-19399.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/19300-19399.xml
@@ -65,6 +65,11 @@
 				<npcCount>1</npcCount>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19302" toLevel="9" name="Thrown Acid Swarm">
 		<!-- Poisoned. P. Def/ M. Def -$s1 and, Atk. Spd./ Speed/ Shield Def. -$s2, blocks magic skills, and HP -$s3 per second. -->
@@ -148,6 +153,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19303" toLevel="7" name="Right Angle Reverse">
 		<!-- Moves to the right side of the target to attempt the Deadly Attack with $s1 Power added to P. Atk and stun the target for $s2. Half-kill is possible. Requires a dagger or dual dagger to be equipped. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10500-10599.xml
index b179747088..ffef38e3f7 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10500-10599.xml
@@ -1175,6 +1175,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>10515</skillId> <!-- Paralyzed -->
@@ -1302,6 +1307,11 @@
 				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10517" toLevel="1" name="Shadow Hide">
 		<!-- Cancels all debuff effects inflicted on you by teleporting to the front a distance of 250 and making you invisible for 20 sec. Additionally, Speed -50. -->
@@ -1361,7 +1371,10 @@
 				<minDamage>1</minDamage>
 				<chance>100</chance>
 				<targetType>SELF</targetType>
-				<allowWeapons>ALL</allowWeapons>
+				<allowNormalAttack>true</allowNormalAttack>
+				<allowSkillAttack>true</allowSkillAttack>
+				<isCritical>true</isCritical>
+				<allowWeapons>DAGGER,DUALDAGGER</allowWeapons>
 				<skillId>14839</skillId> <!-- Cancel Hide -->
 				<skillLevel>1</skillLevel>
 			</effect>
@@ -1541,6 +1554,11 @@
 				<npcCount>1</npcCount>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10523" toLevel="9" name="Thrown Poison Swarm">
 		<!-- Poisoned. P. Atk. -$s1, P./ M. Def. -$s2, Movement Speed -$s3, Shield Def. -$s4, cannot use magic skills, and HP -$s5 every sec. -->
@@ -1940,6 +1958,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10528" toLevel="1" name="Shadow Fake Death">
 		<!-- The player feigns death to prevent monsters from attacking. The player is not detected by the target until further movement. Consumes 100 MP per sec. -->
@@ -1948,6 +1971,8 @@
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<mpConsume>200</mpConsume>
+		<reuseDelay>1500</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<mpInitialConsume>200</mpInitialConsume>
 		<hitTime>800</hitTime>
 		<targetType>NONE</targetType>
@@ -2009,6 +2034,11 @@
 				<slot>HIDE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10530" toLevel="1" name="Blind Spot">
 		<!-- Increases P. Atk., Critical Rate, Critical Damage and Vital Spot Attack Rate. -->
@@ -2483,6 +2513,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10540" toLevel="8" name="Throw Sand">
 		<!-- Hurls poisonous sand at the enemy. For $s1, greatly decreases P. Accuracy and lures the enemy to you. Requires a dagger/ dual dagger to be equipped. -->
@@ -2627,6 +2662,11 @@
 				<chance>100</chance>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10542" toLevel="1" name="Maximum Critical">
 		<!-- Critical Damage +609 and Vital Spot Attack Rate +10%. Side Critical Rate +30% and Critical Damage +40%. Rear Critical Rate +60% and Critical Damage +70%. -->
@@ -2849,6 +2889,11 @@
 			</effect>
 			<effect name="BlockActions" />
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10547" toLevel="1" name="Shadow Attack">
 		<!-- Not in use. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10700-10799.xml
index e23087a376..26e7ea9cec 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10700-10799.xml
@@ -280,6 +280,9 @@
 			<effect name="CallSkill">
 				<skillId>7014</skillId> 
 			</effect>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
 		</selfEffects>
 	</skill>
 	<skill id="10705" toLevel="3" name="Easterly Wind Strike">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml
index dc010561ea..d83abb0c01 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml
@@ -3854,7 +3854,7 @@
 		<removedOnDamage>true</removedOnDamage>
 		<targetType>SELF</targetType>
 		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectObject>FRIEND_PC</affectObject>
 		<effects>
 			<effect name="SilentMove" />
 			<effect name="DispelBySlot">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/14800-14899.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/14800-14899.xml
index b47878b6fd..3331d4e473 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/14800-14899.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/14800-14899.xml
@@ -950,7 +950,7 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="DispelBySlot">
-				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,9</dispel>
+				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,-1</dispel>
 			</effect>
 		</effects>
 	</skill>
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 660f8da5c2..1ae68685ce 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
@@ -2589,6 +2589,11 @@
 			</effect>
 			<effect name="BlockActions" />
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19299" toLevel="7" name="Reverse Mana">
 		<!-- Attempts Deadly Attack with $s1 power added to P. Atk. and recovers your MP by $s2. Half-kill is possible. Requires dagger/ dual dagger. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19300-19399.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19300-19399.xml
index d990843eba..43908cb066 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19300-19399.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/19300-19399.xml
@@ -65,6 +65,11 @@
 				<npcCount>1</npcCount>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19302" toLevel="9" name="Thrown Acid Swarm">
 		<!-- Damaged by acid. P. Def/ M. Def -$s1 and, Atk. Spd./ Movement Speed/ Shield Def. -$s2, cannot use magic skills, and HP -$s3 per sec. -->
@@ -148,6 +153,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19303" toLevel="7" name="Right Angle Reverse">
 		<!-- Moves to the right side of the target to attempt the Deadly Attack with $s1 Power added to P. Atk and stun the target for $s2. Half-kill is possible. Requires a dagger or dual dagger to be equipped. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10500-10599.xml
index 37371305a8..5ed8e189ce 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10500-10599.xml
@@ -1224,6 +1224,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>10515</skillId> <!-- Paralyzed -->
@@ -1359,6 +1364,11 @@
 				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10517" toLevel="1" name="Shadow Hide">
 		<!-- Cancels all debuff effects inflicted on you by teleporting to the front a distance of 250 and enter the Stealth mode for 20 sec. Additionally, decreases Speed by 50. -->
@@ -1418,7 +1428,10 @@
 				<minDamage>1</minDamage>
 				<chance>100</chance>
 				<targetType>SELF</targetType>
-				<allowWeapons>ALL</allowWeapons>
+				<allowNormalAttack>true</allowNormalAttack>
+				<allowSkillAttack>true</allowSkillAttack>
+				<isCritical>true</isCritical>
+				<allowWeapons>DAGGER,DUALDAGGER</allowWeapons>
 				<skillId>14839</skillId> <!-- Cancel Hide -->
 				<skillLevel>1</skillLevel>
 			</effect>
@@ -1604,6 +1617,11 @@
 				<npcCount>1</npcCount>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10523" toLevel="11" name="Thrown Poison Swarm">
 		<!-- Poisoned. P. Atk. -$s1, P. Def./ M. Def. -$s2, Speed -$s3, Shield Def. -$s4, cannot use magic skills, and HP -$s5 every second. -->
@@ -2029,6 +2047,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10528" toLevel="1" name="Shadow Fake Death">
 		<!-- The player feigns death to prevent monsters from attacking. The player is not detected by the target until further movement. Consumes 100 MP per second. -->
@@ -2037,6 +2060,8 @@
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<mpConsume>200</mpConsume>
+		<reuseDelay>1500</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<mpInitialConsume>200</mpInitialConsume>
 		<hitTime>800</hitTime>
 		<targetType>NONE</targetType>
@@ -2100,6 +2125,11 @@
 				<slot>HIDE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10530" toLevel="1" name="Blind Spot">
 		<!-- Increases P. Atk., Critical Rate, Critical Damage and Vital Spot Attack Rate. -->
@@ -2592,6 +2622,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10540" toLevel="8" name="Throw Sand">
 		<!-- Hurls poisonous sand at the enemy. For $s1, greatly decreases P. Accuracy and lures the enemy to you. Requires a dagger/ dual dagger to be equipped. -->
@@ -2742,6 +2777,11 @@
 				<chance>100</chance>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10542" toLevel="1" name="Maximum Critical">
 		<!-- Critical Damage +609 and vital spot attack success rate +10%. Side Critical Rate +30% and Critical Damage +40%. Rear Critical Rate +60% and Critical Damage +70%. -->
@@ -2970,6 +3010,11 @@
 			</effect>
 			<effect name="BlockActions" />
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10547" toLevel="1" name="Shadow Attack">
 		<!-- Not in use. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10700-10799.xml
index c318d0588b..2bc3d725fa 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/10700-10799.xml
@@ -292,6 +292,9 @@
 			<effect name="CallSkill">
 				<skillId>7014</skillId> 
 			</effect>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
 		</selfEffects>
 	</skill>
 	<skill id="10705" toLevel="5" name="Easterly Wind Strike">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml
index f3bd67e967..412ab4aae5 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml
@@ -3966,7 +3966,7 @@
 		<removedOnDamage>true</removedOnDamage>
 		<targetType>SELF</targetType>
 		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectObject>FRIEND_PC</affectObject>
 		<effects>
 			<effect name="SilentMove" />
 			<effect name="DispelBySlot">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/14800-14899.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/14800-14899.xml
index 9660e49079..111f7f0842 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/14800-14899.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/14800-14899.xml
@@ -950,7 +950,7 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="DispelBySlot">
-				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,9</dispel>
+				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,-1</dispel>
 			</effect>
 		</effects>
 	</skill>
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 95ee87b5c4..789f889299 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
@@ -2605,6 +2605,11 @@
 			</effect>
 			<effect name="BlockActions" />
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19299" toLevel="9" name="Reverse Mana">
 		<!-- Attempts Deadly Attack with 36840 power added to P. Attack and recovers your MP by 3%. Half-kill is possible. Requires dagger/ dual dagger. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19300-19399.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19300-19399.xml
index 7386252b28..6920bb8514 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19300-19399.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/19300-19399.xml
@@ -71,6 +71,11 @@
 				<npcCount>1</npcCount>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19302" toLevel="11" name="Thrown Acid Swarm">
 		<!-- Damaged by acid. P./ M. Def. -$s1 and, Atk. Spd./ Speed/ Shield Def. -$s2, cannot use magic skills, and HP -$s3 per second. -->
@@ -160,6 +165,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19303" toLevel="9" name="Right Angle Reverse">
 		<!-- Moves to the right side of the target to attempt the Deadly Attack with $s1 Power added to P. Atk. and stun the target for $s2. Half-kill is possible. Requires a dagger or dual dagger to be equipped. -->
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10500-10599.xml
index 60f03ca599..c1b17a75e3 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10500-10599.xml
@@ -1224,6 +1224,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>10515</skillId> <!-- Paralyzed -->
@@ -1359,6 +1364,11 @@
 				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10517" toLevel="1" name="Shadow Hide">
 		<!-- Cancels all debuff effects inflicted on you by teleporting to the front a distance of 250 and enter the Stealth mode for 20 sec. Additionally, decreases Speed by 50. -->
@@ -1418,7 +1428,10 @@
 				<minDamage>1</minDamage>
 				<chance>100</chance>
 				<targetType>SELF</targetType>
-				<allowWeapons>ALL</allowWeapons>
+				<allowNormalAttack>true</allowNormalAttack>
+				<allowSkillAttack>true</allowSkillAttack>
+				<isCritical>true</isCritical>
+				<allowWeapons>DAGGER,DUALDAGGER</allowWeapons>
 				<skillId>14839</skillId> <!-- Cancel Hide -->
 				<skillLevel>1</skillLevel>
 			</effect>
@@ -1604,6 +1617,11 @@
 				<npcCount>1</npcCount>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10523" toLevel="11" name="Thrown Poison Swarm">
 		<!-- Shrouds the enemy with a poisonous cloud. Their P. Atk. -$s1, P./ M. Def. -$s2, Speed -$s3, Shield Defense -$s4. Prevents them from using magic skills. Their HP -$s5 per sec. Inflicted status: Danger Zone. -->
@@ -2029,6 +2047,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10528" toLevel="1" name="Shadow Fake Death">
 		<!-- The player feigns death to prevent monsters from attacking. The player is not detected by the target until further movement. Consumes 100 MP per second. -->
@@ -2037,6 +2060,8 @@
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<mpConsume>200</mpConsume>
+		<reuseDelay>1500</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<mpInitialConsume>200</mpInitialConsume>
 		<hitTime>800</hitTime>
 		<targetType>NONE</targetType>
@@ -2100,6 +2125,11 @@
 				<slot>HIDE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10530" toLevel="1" name="Blind Spot">
 		<!-- Increases P. Atk., Critical Rate, Critical Damage and Vital Spot Attack Rate. -->
@@ -2592,6 +2622,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10540" toLevel="8" name="Throw Sand">
 		<!-- Hurls poisonous sand at the enemy. For $s1, greatly decreases P. Accuracy and lures the enemy to you. Requires a dagger/ dual dagger to be equipped. -->
@@ -2742,6 +2777,11 @@
 				<chance>100</chance>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10542" toLevel="1" name="Maximum Critical">
 		<!-- Critical Damage +609 and vital spot attack success rate +10%. Side Critical Rate +30% and Critical Damage +40%. Rear Critical Rate +60% and Critical Damage +70%. -->
@@ -2970,6 +3010,11 @@
 			</effect>
 			<effect name="BlockActions" />
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10547" toLevel="1" name="Shadow Attack">
 		<!-- Not in use. Inflicted status: Confusion (Fear, Aerial Yoke, Faint, Charm, Stun, Paralysis, Knockback, Knockdown, Pull). -->
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10700-10799.xml
index 1c29c4a9a8..df31534808 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10700-10799.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/10700-10799.xml
@@ -292,6 +292,9 @@
 			<effect name="CallSkill">
 				<skillId>7014</skillId> 
 			</effect>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
 		</selfEffects>
 	</skill>
 	<skill id="10705" toLevel="5" name="Easterly Wind Strike">
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml
index ff3d07b0f9..9564977764 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/11500-11599.xml
@@ -3959,7 +3959,7 @@
 		<removedOnDamage>true</removedOnDamage>
 		<targetType>SELF</targetType>
 		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectObject>FRIEND_PC</affectObject>
 		<effects>
 			<effect name="SilentMove" />
 			<effect name="DispelBySlot">
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/14800-14899.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/14800-14899.xml
index 5f89232eee..155d94e0dd 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/14800-14899.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/14800-14899.xml
@@ -950,7 +950,7 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="DispelBySlot">
-				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,9</dispel>
+				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,-1</dispel>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml
index 8f71db185e..c95f60bf4c 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19200-19299.xml
@@ -2609,6 +2609,11 @@
 			</effect>
 			<effect name="BlockActions" />
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19299" toLevel="9" name="Reverse Mana">
 		<!-- Attempts Deadly Attack with 36840 power added to P. Attack and recovers your MP by 3%. Half-kill is possible. Requires dagger/ dual dagger. -->
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19300-19399.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19300-19399.xml
index 8c2e19bf77..7f99668743 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19300-19399.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/19300-19399.xml
@@ -71,6 +71,11 @@
 				<npcCount>1</npcCount>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19302" toLevel="11" name="Thrown Acid Swarm">
 		<!-- Creates a poisonous area. Enemies' P./ M. Def. -$s1, Atk. Spd./ Speed/ Shield Defense -$s2, HP -$s3 per sec. Prevents the enemies from using M. skills. Inflicted status: Danger Zone. -->
@@ -160,6 +165,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19303" toLevel="9" name="Right Angle Reverse">
 		<!-- Moves to the right side of the target to attempt the Deadly Attack with $s1 Power added to P. Atk. and stun the target for $s2 Half-kill is possible. Requires a dagger or dual dagger to be equipped. -->
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30700-30799.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30700-30799.xml
index 5d04f76e25..87a7dc86c9 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30700-30799.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/30700-30799.xml
@@ -4517,6 +4517,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="30787" toLevel="9" name="Lightning">
 		<!-- Sends an electric current to attack nearby enemies with $s1 power. Paralyzes them for $s2 Enemies' Received Healing -$s3. Over-hit. Inflicted status: Confusion (Fear, Aerial Yoke, Faint, Charm, Stun, Paralysis, Knockback, Knockdown, Pull). -->
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10500-10599.xml
index fd953c6643..3534561bb8 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10500-10599.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10500-10599.xml
@@ -1175,6 +1175,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 		<endEffects>
 			<effect name="CallSkill">
 				<skillId>10515</skillId> <!-- Paralyzed -->
@@ -1302,6 +1307,11 @@
 				<allowedSkills>10279;10517;10025;10776;11770;1904;11264;11093;13314;1912</allowedSkills>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10517" toLevel="1" name="Shadow Hide">
 		<!-- Cancels all debuff effects inflicted on you by teleporting to the front a distance of 250 and enter the Stealth mode for 20 seconds. Additionally, decreases Speed by 50. -->
@@ -1361,7 +1371,10 @@
 				<minDamage>1</minDamage>
 				<chance>100</chance>
 				<targetType>SELF</targetType>
-				<allowWeapons>ALL</allowWeapons>
+				<allowNormalAttack>true</allowNormalAttack>
+				<allowSkillAttack>true</allowSkillAttack>
+				<isCritical>true</isCritical>
+				<allowWeapons>DAGGER,DUALDAGGER</allowWeapons>
 				<skillId>14839</skillId> <!-- Cancel Hide -->
 				<skillLevel>1</skillLevel>
 			</effect>
@@ -1541,6 +1554,11 @@
 				<npcCount>1</npcCount>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10523" toLevel="9" name="Thrown Poison Swarm">
 		<!-- Poisoned. Decreases Speed/Attack/P. Defense/M. Defense/Shield Defense, blocks magical skills and drains HP by $s1 every second. -->
@@ -1940,6 +1958,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10528" toLevel="1" name="Shadow Fake Death">
 		<!-- The player feigns death to prevent monsters from attacking. The player is not detected by the target until further movement. Consumes 100 MP per second. -->
@@ -1948,6 +1971,8 @@
 		<operateType>T</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<mpConsume>200</mpConsume>
+		<reuseDelay>1500</reuseDelay>
+		<staticReuse>true</staticReuse>
 		<mpInitialConsume>200</mpInitialConsume>
 		<hitTime>800</hitTime>
 		<targetType>NONE</targetType>
@@ -2009,6 +2034,11 @@
 				<slot>HIDE</slot>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10530" toLevel="1" name="Blind Spot">
 		<!-- Increases P. Atk., Critical Rate, Critical Damage and Vital Spot Attack Rate. -->
@@ -2483,6 +2513,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10540" toLevel="8" name="Throw Sand">
 		<!-- Hurls poisonous sand at the enemy. For$s1, greatly decreases P. accuracy and lures the enemy to you. Requires a dagger/dual dagger to be equipped. -->
@@ -2627,6 +2662,11 @@
 				<chance>100</chance>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10542" toLevel="1" name="Maximum Critical">
 		<!-- Critical Damage + 609 and vital spot attack success rate + 10%. Side Critical Rate + 30% and Critical Damage + 40%. Rear Critical Rate + 60% and Critical Damage + 70%. -->
@@ -2849,6 +2889,11 @@
 			</effect>
 			<effect name="BlockActions" />
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="10547" toLevel="1" name="Shadow Attack">
 		<!-- Not in use. -->
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11500-11599.xml
index 19a79b4a98..5820703ca4 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11500-11599.xml
@@ -3656,7 +3656,7 @@
 		<removedOnDamage>true</removedOnDamage>
 		<targetType>SELF</targetType>
 		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectObject>FRIEND_PC</affectObject>
 		<effects>
 			<effect name="SilentMove" />
 			<effect name="DispelBySlot">
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/14800-14899.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/14800-14899.xml
index d3bbb845ea..6944f51308 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/14800-14899.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/14800-14899.xml
@@ -950,7 +950,7 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="DispelBySlot">
-				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,9</dispel>
+				<dispel>INVINCIBILITY_SPECIAL,-1;HIDE,-1</dispel>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19200-19299.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19200-19299.xml
index 2af9abb01a..9b4dc34e96 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19200-19299.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19200-19299.xml
@@ -2456,6 +2456,11 @@
 			</effect>
 			<effect name="BlockActions" />
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19299" toLevel="7" name="Reverse Mana">
 		<!-- Attempts Deadly Attack with $s1 power added to P. Attack and recovers your MP by $s2. Half-kill is possible. Requires dagger/dual dagger. -->
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19300-19399.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19300-19399.xml
index 5f2ffabae3..dfc8d4f941 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19300-19399.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/19300-19399.xml
@@ -65,6 +65,11 @@
 				<npcCount>1</npcCount>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19302" toLevel="9" name="Thrown Acid Sworm">
 		<!-- Poisoned. Decreases Speed/Attack/P. Defense/M. Defense/Shield Defense, blocks magical skills and drains HP by $s1 every second. -->
@@ -148,6 +153,11 @@
 				<mode>PER</mode>
 			</effect>
 		</effects>
+		<selfEffects>
+			<effect name="DispelBySlot">
+				<dispel>HIDE,-1</dispel>
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="19303" toLevel="7" name="Right Angle Reverse">
 		<!-- Moves to the right side of the target to attempt Deadly Attack with $s1 power added to P. Attack. Causes Bleed on the target for $s2. Half-kill is possible. Requires dagger/dual dagger. -->