From 38e9f81e9cc2b7d0db690db8ed1853e9ebd35b62 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 19 Dec 2021 00:19:59 +0000
Subject: [PATCH] Proper naming for ReuseSkillIdByDamage effect.

---
 .../scripts/handlers/EffectMasterHandler.java |  2 +-
 ...amageId.java => ReuseSkillIdByDamage.java} |  4 +-
 .../game/data/stats/skills/30900-30999.xml    | 44 +++++++++----------
 .../game/data/stats/skills/documentation.txt  |  2 +-
 .../scripts/handlers/EffectMasterHandler.java |  2 +-
 ...amageId.java => ReuseSkillIdByDamage.java} |  4 +-
 .../game/data/stats/skills/documentation.txt  |  2 +-
 7 files changed, 30 insertions(+), 30 deletions(-)
 rename L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/{ReuseSkillByDamageId.java => ReuseSkillIdByDamage.java} (94%)
 rename L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/{ReuseSkillByDamageId.java => ReuseSkillIdByDamage.java} (94%)

diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 046cc65905..bc12b89b60 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -314,8 +314,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("Resurrection", Resurrection::new);
 		EffectHandler.getInstance().registerHandler("ResurrectionSpecial", ResurrectionSpecial::new);
 		EffectHandler.getInstance().registerHandler("Reuse", Reuse::new);
-		EffectHandler.getInstance().registerHandler("ReuseSkillByDamageId", ReuseSkillByDamageId::new);
 		EffectHandler.getInstance().registerHandler("ReuseSkillById", ReuseSkillById::new);
+		EffectHandler.getInstance().registerHandler("ReuseSkillIdByDamage", ReuseSkillIdByDamage::new);
 		EffectHandler.getInstance().registerHandler("Root", Root::new);
 		EffectHandler.getInstance().registerHandler("SacrificeSummon", SacrificeSummon::new);
 		EffectHandler.getInstance().registerHandler("SafeFallHeight", SafeFallHeight::new);
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillByDamageId.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillIdByDamage.java
similarity index 94%
rename from L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillByDamageId.java
rename to L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillIdByDamage.java
index 6b63080adb..e38919a68c 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillByDamageId.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillIdByDamage.java
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 /**
  * @author NasSeKa
  */
-public class ReuseSkillByDamageId extends AbstractEffect
+public class ReuseSkillIdByDamage extends AbstractEffect
 {
 	private final int _minAttackerLevel;
 	private final int _maxAttackerLevel;
@@ -43,7 +43,7 @@ public class ReuseSkillByDamageId extends AbstractEffect
 	private final int _amount;
 	private final InstanceType _attackerType;
 	
-	public ReuseSkillByDamageId(StatSet params)
+	public ReuseSkillIdByDamage(StatSet params)
 	{
 		_minAttackerLevel = params.getInt("minAttackerLevel", 1);
 		_maxAttackerLevel = params.getInt("maxAttackerLevel", Integer.MAX_VALUE);
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30900-30999.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30900-30999.xml
index e5862b5c04..c24f2ed147 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30900-30999.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30900-30999.xml
@@ -1040,15 +1040,15 @@
 			<effect name="GetDamageLimit">
 				<amount>500</amount>
 			</effect>
-			<effect name="ReuseSkillByDamageId">
+			<effect name="ReuseSkillIdByDamage">
 				<skillId>30963</skillId>
 				<chance>70</chance>
 			</effect>
-			<effect name="ReuseSkillByDamageId">
+			<effect name="ReuseSkillIdByDamage">
 				<skillId>30964</skillId>
 				<chance>70</chance>
 			</effect>
-			<effect name="ReuseSkillByDamageId">
+			<effect name="ReuseSkillIdByDamage">
 				<skillId>30965</skillId>
 				<chance>70</chance>
 			</effect>
@@ -2628,25 +2628,25 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="30989" toLevel="1" name="Mocking Barrier">
-        <icon>icon.skill0000</icon>
-        <operateType>A2</operateType>
-        <basicProperty>NONE</basicProperty>
-        <magicCriticalRate>5</magicCriticalRate>
-        <abnormalLevel>1</abnormalLevel>
-        <abnormalTime>5</abnormalTime>
-        <targetType>SELF</targetType>
-        <affectScope>SINGLE</affectScope>
-        <effects>
-            <effect name="PhysicalDefence">
-                <amount>20</amount>
-                <mode>PER</mode>
-            </effect>
-            <effect name="MagicalDefence">
-                <amount>20</amount>
-                <mode>PER</mode>
-            </effect>
-        </effects>
-    </skill>
+		<icon>icon.skill0000</icon>
+		<operateType>A2</operateType>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<abnormalLevel>1</abnormalLevel>
+		<abnormalTime>5</abnormalTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="PhysicalDefence">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicalDefence">
+				<amount>20</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
+	</skill>
 	<skill id="30990" toLevel="2" name="Test - Acquired XP/ SP_Level Difference_Sum">
 		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
 		<icon>icon.skill0000</icon>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/documentation.txt
index 5a240a3185..05a42fb735 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/documentation.txt
@@ -281,8 +281,8 @@ RestorationRandom: Creates items randomly from a specified list. Its multiplied
 Resurrection: Resurrects target Player or Summon.
 ResurrectionSpecial: Resurrects target Player or Summon only in specified instance IDs.
 Reuse: Decreases skill reuse time based on its magic type.
-ReuseSkillByDamageId: Resets reuse time for the skill with the specific damage id. (l2jmobius)
 ReuseSkillById: Resets reuse time for the skill with the specific id. (l2jmobius)
+ReuseSkillIdByDamage: Resets reuse time for the skill with the specific id when damage is taken. (l2jmobius)
 Root: Stops movement.
 SacrificeSummon: Sacrifices the players summon. (l2jmobius)
 SafeFallHeight: Minimum falling height for taking damage stat.
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 9cb4bc8819..f20ca866e5 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -311,8 +311,8 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("Resurrection", Resurrection::new);
 		EffectHandler.getInstance().registerHandler("ResurrectionSpecial", ResurrectionSpecial::new);
 		EffectHandler.getInstance().registerHandler("Reuse", Reuse::new);
-		EffectHandler.getInstance().registerHandler("ReuseSkillByDamageId", ReuseSkillByDamageId::new);
 		EffectHandler.getInstance().registerHandler("ReuseSkillById", ReuseSkillById::new);
+		EffectHandler.getInstance().registerHandler("ReuseSkillIdByDamage", ReuseSkillIdByDamage::new);
 		EffectHandler.getInstance().registerHandler("Root", Root::new);
 		EffectHandler.getInstance().registerHandler("SacrificeSummon", SacrificeSummon::new);
 		EffectHandler.getInstance().registerHandler("SafeFallHeight", SafeFallHeight::new);
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillByDamageId.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillIdByDamage.java
similarity index 94%
rename from L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillByDamageId.java
rename to L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillIdByDamage.java
index 6b63080adb..e38919a68c 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillByDamageId.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillIdByDamage.java
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 /**
  * @author NasSeKa
  */
-public class ReuseSkillByDamageId extends AbstractEffect
+public class ReuseSkillIdByDamage extends AbstractEffect
 {
 	private final int _minAttackerLevel;
 	private final int _maxAttackerLevel;
@@ -43,7 +43,7 @@ public class ReuseSkillByDamageId extends AbstractEffect
 	private final int _amount;
 	private final InstanceType _attackerType;
 	
-	public ReuseSkillByDamageId(StatSet params)
+	public ReuseSkillIdByDamage(StatSet params)
 	{
 		_minAttackerLevel = params.getInt("minAttackerLevel", 1);
 		_maxAttackerLevel = params.getInt("maxAttackerLevel", Integer.MAX_VALUE);
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/documentation.txt
index b4988437ce..8060f1f319 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/documentation.txt
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/documentation.txt
@@ -279,8 +279,8 @@ RestorationRandom: Creates items randomly from a specified list. Its multiplied
 Resurrection: Resurrects target Player or Summon.
 ResurrectionSpecial: Resurrects target Player or Summon only in specified instance IDs.
 Reuse: Decreases skill reuse time based on its magic type.
-ReuseSkillByDamageId: Resets reuse time for the skill with the specific damage id. (l2jmobius)
 ReuseSkillById: Resets reuse time for the skill with the specific id. (l2jmobius)
+ReuseSkillIdByDamage: Resets reuse time for the skill with the specific id when damage is taken. (l2jmobius)
 Root: Stops movement.
 SacrificeSummon: Sacrifices the players summon. (l2jmobius)
 SafeFallHeight: Minimum falling height for taking damage stat.