Addition of ReuseSkillById effect.

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -265,6 +265,7 @@ public final class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("Resurrection", Resurrection::new);
 		EffectHandler.getInstance().registerHandler("ResurrectionSpecial", ResurrectionSpecial::new);
 		EffectHandler.getInstance().registerHandler("Reuse", Reuse::new);
+		EffectHandler.getInstance().registerHandler("ReuseSkillById", ReuseSkillById::new);
 		EffectHandler.getInstance().registerHandler("RewardItemOnExit", RewardItemOnExit::new);
 		EffectHandler.getInstance().registerHandler("Root", Root::new);
 		EffectHandler.getInstance().registerHandler("SacrificeSummon", SacrificeSummon::new);

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java

@@ -0,0 +1,60 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import com.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.effects.AbstractEffect;
+import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.model.skills.Skill;
+import com.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
+
+/**
+ * @author Mobius
+ */
+public class ReuseSkillById extends AbstractEffect
+{
+	private final int _skillId;
+	
+	public ReuseSkillById(StatsSet params)
+	{
+		_skillId = params.getInt("skillId", 0);
+	}
+	
+	@Override
+	public boolean isInstant()
+	{
+		return true;
+	}
+	
+	@Override
+	public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
+	{
+		final L2PcInstance player = effector.getActingPlayer();
+		if (player != null)
+		{
+			final Skill s = player.getKnownSkill(_skillId);
+			if (s != null)
+			{
+				player.removeTimeStamp(s);
+				player.enableSkill(s);
+				player.sendPacket(new SkillCoolTime(player));
+			}
+		}
+	}
+}

L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/documentation.txt

@@ -232,6 +232,7 @@ 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.
+ReuseSkillById: Resets reuse time for the skill with the specific id. (l2jmobius)
 RewardItemOnExit: Reward an item when effect ends. (l2jmobius)
 Root: Stops movement.
 SacrificeSummon: Sacrifices the players summon. (l2jmobius)

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -265,6 +265,7 @@ public final class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("Resurrection", Resurrection::new);
 		EffectHandler.getInstance().registerHandler("ResurrectionSpecial", ResurrectionSpecial::new);
 		EffectHandler.getInstance().registerHandler("Reuse", Reuse::new);
+		EffectHandler.getInstance().registerHandler("ReuseSkillById", ReuseSkillById::new);
 		EffectHandler.getInstance().registerHandler("RewardItemOnExit", RewardItemOnExit::new);
 		EffectHandler.getInstance().registerHandler("Root", Root::new);
 		EffectHandler.getInstance().registerHandler("SacrificeSummon", SacrificeSummon::new);

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java

@@ -0,0 +1,60 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import com.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.effects.AbstractEffect;
+import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.model.skills.Skill;
+import com.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
+
+/**
+ * @author Mobius
+ */
+public class ReuseSkillById extends AbstractEffect
+{
+	private final int _skillId;
+	
+	public ReuseSkillById(StatsSet params)
+	{
+		_skillId = params.getInt("skillId", 0);
+	}
+	
+	@Override
+	public boolean isInstant()
+	{
+		return true;
+	}
+	
+	@Override
+	public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
+	{
+		final L2PcInstance player = effector.getActingPlayer();
+		if (player != null)
+		{
+			final Skill s = player.getKnownSkill(_skillId);
+			if (s != null)
+			{
+				player.removeTimeStamp(s);
+				player.enableSkill(s);
+				player.sendPacket(new SkillCoolTime(player));
+			}
+		}
+	}
+}

L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/documentation.txt

@@ -232,6 +232,7 @@ 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.
+ReuseSkillById: Resets reuse time for the skill with the specific id. (l2jmobius)
 RewardItemOnExit: Reward an item when effect ends. (l2jmobius)
 Root: Stops movement.
 SacrificeSummon: Sacrifices the players summon. (l2jmobius)

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -265,6 +265,7 @@ public final class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("Resurrection", Resurrection::new);
 		EffectHandler.getInstance().registerHandler("ResurrectionSpecial", ResurrectionSpecial::new);
 		EffectHandler.getInstance().registerHandler("Reuse", Reuse::new);
+		EffectHandler.getInstance().registerHandler("ReuseSkillById", ReuseSkillById::new);
 		EffectHandler.getInstance().registerHandler("RewardItemOnExit", RewardItemOnExit::new);
 		EffectHandler.getInstance().registerHandler("Root", Root::new);
 		EffectHandler.getInstance().registerHandler("SacrificeSummon", SacrificeSummon::new);

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java

@@ -0,0 +1,60 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import com.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.effects.AbstractEffect;
+import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.model.skills.Skill;
+import com.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
+
+/**
+ * @author Mobius
+ */
+public class ReuseSkillById extends AbstractEffect
+{
+	private final int _skillId;
+	
+	public ReuseSkillById(StatsSet params)
+	{
+		_skillId = params.getInt("skillId", 0);
+	}
+	
+	@Override
+	public boolean isInstant()
+	{
+		return true;
+	}
+	
+	@Override
+	public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
+	{
+		final L2PcInstance player = effector.getActingPlayer();
+		if (player != null)
+		{
+			final Skill s = player.getKnownSkill(_skillId);
+			if (s != null)
+			{
+				player.removeTimeStamp(s);
+				player.enableSkill(s);
+				player.sendPacket(new SkillCoolTime(player));
+			}
+		}
+	}
+}

L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/documentation.txt

@@ -232,6 +232,7 @@ 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.
+ReuseSkillById: Resets reuse time for the skill with the specific id. (l2jmobius)
 RewardItemOnExit: Reward an item when effect ends. (l2jmobius)
 Root: Stops movement.
 SacrificeSummon: Sacrifices the players summon. (l2jmobius)

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -265,6 +265,7 @@ public final class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("Resurrection", Resurrection::new);
 		EffectHandler.getInstance().registerHandler("ResurrectionSpecial", ResurrectionSpecial::new);
 		EffectHandler.getInstance().registerHandler("Reuse", Reuse::new);
+		EffectHandler.getInstance().registerHandler("ReuseSkillById", ReuseSkillById::new);
 		EffectHandler.getInstance().registerHandler("RewardItemOnExit", RewardItemOnExit::new);
 		EffectHandler.getInstance().registerHandler("Root", Root::new);
 		EffectHandler.getInstance().registerHandler("SacrificeSummon", SacrificeSummon::new);

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReuseSkillById.java

@@ -0,0 +1,60 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import com.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.effects.AbstractEffect;
+import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.model.skills.Skill;
+import com.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
+
+/**
+ * @author Mobius
+ */
+public class ReuseSkillById extends AbstractEffect
+{
+	private final int _skillId;
+	
+	public ReuseSkillById(StatsSet params)
+	{
+		_skillId = params.getInt("skillId", 0);
+	}
+	
+	@Override
+	public boolean isInstant()
+	{
+		return true;
+	}
+	
+	@Override
+	public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
+	{
+		final L2PcInstance player = effector.getActingPlayer();
+		if (player != null)
+		{
+			final Skill s = player.getKnownSkill(_skillId);
+			if (s != null)
+			{
+				player.removeTimeStamp(s);
+				player.enableSkill(s);
+				player.sendPacket(new SkillCoolTime(player));
+			}
+		}
+	}
+}

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/01600-01699.xml

@@ -510,7 +510,7 @@
 	</skill>
 	<skill id="1631" toLevel="1" name="Clear Movements">
 		<icon>icon.skill1631</icon>
-		<operateType>A3</operateType>
+		<operateType>A2</operateType>
 		<effectPoint>1</effectPoint>
 		<basicProperty>NONE</basicProperty>
 		<rideState>NONE</rideState>
@@ -521,11 +521,13 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<reuseDelay>600000</reuseDelay>
+		<isMagic>1</isMagic>
 		<effects>
-			<effect name="Reuse">
+			<effect name="ReuseSkillById">
-				<amount>-100</amount>
+				<skillId>821</skillId>
-				<mode>PER</mode>
+			</effect>
-				<magicType>0</magicType>
+			<effect name="ReuseSkillById">
+				<skillId>922</skillId>
 			</effect>
 		</effects>
 	</skill>

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt

@@ -232,6 +232,7 @@ 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.
+ReuseSkillById: Resets reuse time for the skill with the specific id. (l2jmobius)
 RewardItemOnExit: Reward an item when effect ends. (l2jmobius)
 Root: Stops movement.
 SacrificeSummon: Sacrifices the players summon. (l2jmobius)