diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index 2a4a196ddd..601e08d73f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1503,7 +1503,7 @@ public final class Formulas
 	/**
 	 * @param creature
 	 * @param weapon
-	 * @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed}
+	 * @return {@code 900000 / PAttackSpeed}
 	 */
 	public static int calculateReuseTime(Creature creature, Weapon weapon)
 	{
@@ -1514,18 +1514,14 @@ public final class Formulas
 		
 		final WeaponType defaultAttackType = weapon.getItemType();
 		final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
-		int reuse = weapon.getReuseDelay();
 		
-		// only bows should continue for now
-		if ((reuse == 0) || !weaponType.isRanged())
+		// Only ranged weapons should continue for now.
+		if (!weaponType.isRanged())
 		{
 			return 0;
 		}
 		
-		reuse *= creature.getStat().getWeaponReuseModifier();
-		double atkSpd = creature.getStat().getPAtkSpd();
-		
-		return (int) ((500000 + (333 * reuse)) / atkSpd);
+		return 900000 / creature.getStat().getPAtkSpd();
 	}
 	
 	public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index 2a4a196ddd..601e08d73f 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1503,7 +1503,7 @@ public final class Formulas
 	/**
 	 * @param creature
 	 * @param weapon
-	 * @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed}
+	 * @return {@code 900000 / PAttackSpeed}
 	 */
 	public static int calculateReuseTime(Creature creature, Weapon weapon)
 	{
@@ -1514,18 +1514,14 @@ public final class Formulas
 		
 		final WeaponType defaultAttackType = weapon.getItemType();
 		final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
-		int reuse = weapon.getReuseDelay();
 		
-		// only bows should continue for now
-		if ((reuse == 0) || !weaponType.isRanged())
+		// Only ranged weapons should continue for now.
+		if (!weaponType.isRanged())
 		{
 			return 0;
 		}
 		
-		reuse *= creature.getStat().getWeaponReuseModifier();
-		double atkSpd = creature.getStat().getPAtkSpd();
-		
-		return (int) ((500000 + (333 * reuse)) / atkSpd);
+		return 900000 / creature.getStat().getPAtkSpd();
 	}
 	
 	public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index 2a4a196ddd..601e08d73f 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1503,7 +1503,7 @@ public final class Formulas
 	/**
 	 * @param creature
 	 * @param weapon
-	 * @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed}
+	 * @return {@code 900000 / PAttackSpeed}
 	 */
 	public static int calculateReuseTime(Creature creature, Weapon weapon)
 	{
@@ -1514,18 +1514,14 @@ public final class Formulas
 		
 		final WeaponType defaultAttackType = weapon.getItemType();
 		final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
-		int reuse = weapon.getReuseDelay();
 		
-		// only bows should continue for now
-		if ((reuse == 0) || !weaponType.isRanged())
+		// Only ranged weapons should continue for now.
+		if (!weaponType.isRanged())
 		{
 			return 0;
 		}
 		
-		reuse *= creature.getStat().getWeaponReuseModifier();
-		double atkSpd = creature.getStat().getPAtkSpd();
-		
-		return (int) ((500000 + (333 * reuse)) / atkSpd);
+		return 900000 / creature.getStat().getPAtkSpd();
 	}
 	
 	public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index 652bd98eda..83af6bb4ec 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1503,7 +1503,7 @@ public final class Formulas
 	/**
 	 * @param creature
 	 * @param weapon
-	 * @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed}
+	 * @return {@code 900000 / PAttackSpeed}
 	 */
 	public static int calculateReuseTime(Creature creature, Weapon weapon)
 	{
@@ -1514,18 +1514,14 @@ public final class Formulas
 		
 		final WeaponType defaultAttackType = weapon.getItemType();
 		final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
-		int reuse = weapon.getReuseDelay();
 		
-		// only bows should continue for now
-		if ((reuse == 0) || !weaponType.isRanged())
+		// Only ranged weapons should continue for now.
+		if (!weaponType.isRanged())
 		{
 			return 0;
 		}
 		
-		reuse *= creature.getStat().getWeaponReuseModifier();
-		double atkSpd = creature.getStat().getPAtkSpd();
-		
-		return (int) ((500000 + (333 * reuse)) / atkSpd);
+		return 900000 / creature.getStat().getPAtkSpd();
 	}
 	
 	public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index 652bd98eda..83af6bb4ec 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1503,7 +1503,7 @@ public final class Formulas
 	/**
 	 * @param creature
 	 * @param weapon
-	 * @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed}
+	 * @return {@code 900000 / PAttackSpeed}
 	 */
 	public static int calculateReuseTime(Creature creature, Weapon weapon)
 	{
@@ -1514,18 +1514,14 @@ public final class Formulas
 		
 		final WeaponType defaultAttackType = weapon.getItemType();
 		final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
-		int reuse = weapon.getReuseDelay();
 		
-		// only bows should continue for now
-		if ((reuse == 0) || !weaponType.isRanged())
+		// Only ranged weapons should continue for now.
+		if (!weaponType.isRanged())
 		{
 			return 0;
 		}
 		
-		reuse *= creature.getStat().getWeaponReuseModifier();
-		double atkSpd = creature.getStat().getPAtkSpd();
-		
-		return (int) ((500000 + (333 * reuse)) / atkSpd);
+		return 900000 / creature.getStat().getPAtkSpd();
 	}
 	
 	public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index 652bd98eda..83af6bb4ec 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1503,7 +1503,7 @@ public final class Formulas
 	/**
 	 * @param creature
 	 * @param weapon
-	 * @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed}
+	 * @return {@code 900000 / PAttackSpeed}
 	 */
 	public static int calculateReuseTime(Creature creature, Weapon weapon)
 	{
@@ -1514,18 +1514,14 @@ public final class Formulas
 		
 		final WeaponType defaultAttackType = weapon.getItemType();
 		final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
-		int reuse = weapon.getReuseDelay();
 		
-		// only bows should continue for now
-		if ((reuse == 0) || !weaponType.isRanged())
+		// Only ranged weapons should continue for now.
+		if (!weaponType.isRanged())
 		{
 			return 0;
 		}
 		
-		reuse *= creature.getStat().getWeaponReuseModifier();
-		double atkSpd = creature.getStat().getPAtkSpd();
-		
-		return (int) ((500000 + (333 * reuse)) / atkSpd);
+		return 900000 / creature.getStat().getPAtkSpd();
 	}
 	
 	public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)
diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index 652bd98eda..83af6bb4ec 100644
--- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1503,7 +1503,7 @@ public final class Formulas
 	/**
 	 * @param creature
 	 * @param weapon
-	 * @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed}
+	 * @return {@code 900000 / PAttackSpeed}
 	 */
 	public static int calculateReuseTime(Creature creature, Weapon weapon)
 	{
@@ -1514,18 +1514,14 @@ public final class Formulas
 		
 		final WeaponType defaultAttackType = weapon.getItemType();
 		final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
-		int reuse = weapon.getReuseDelay();
 		
-		// only bows should continue for now
-		if ((reuse == 0) || !weaponType.isRanged())
+		// Only ranged weapons should continue for now.
+		if (!weaponType.isRanged())
 		{
 			return 0;
 		}
 		
-		reuse *= creature.getStat().getWeaponReuseModifier();
-		double atkSpd = creature.getStat().getPAtkSpd();
-		
-		return (int) ((500000 + (333 * reuse)) / atkSpd);
+		return 900000 / creature.getStat().getPAtkSpd();
 	}
 	
 	public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index e1873bd4f4..f1a0a8ff7d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1503,7 +1503,7 @@ public final class Formulas
 	/**
 	 * @param creature
 	 * @param weapon
-	 * @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed}
+	 * @return {@code 900000 / PAttackSpeed}
 	 */
 	public static int calculateReuseTime(Creature creature, Weapon weapon)
 	{
@@ -1514,18 +1514,14 @@ public final class Formulas
 		
 		final WeaponType defaultAttackType = weapon.getItemType();
 		final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
-		int reuse = weapon.getReuseDelay();
 		
-		// only bows should continue for now
-		if ((reuse == 0) || !weaponType.isRanged())
+		// Only ranged weapons should continue for now.
+		if (!weaponType.isRanged())
 		{
 			return 0;
 		}
 		
-		reuse *= creature.getStat().getWeaponReuseModifier();
-		double atkSpd = creature.getStat().getPAtkSpd();
-		
-		return (int) ((500000 + (333 * reuse)) / atkSpd);
+		return 900000 / creature.getStat().getPAtkSpd();
 	}
 	
 	public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index e1873bd4f4..f1a0a8ff7d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1503,7 +1503,7 @@ public final class Formulas
 	/**
 	 * @param creature
 	 * @param weapon
-	 * @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed}
+	 * @return {@code 900000 / PAttackSpeed}
 	 */
 	public static int calculateReuseTime(Creature creature, Weapon weapon)
 	{
@@ -1514,18 +1514,14 @@ public final class Formulas
 		
 		final WeaponType defaultAttackType = weapon.getItemType();
 		final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
-		int reuse = weapon.getReuseDelay();
 		
-		// only bows should continue for now
-		if ((reuse == 0) || !weaponType.isRanged())
+		// Only ranged weapons should continue for now.
+		if (!weaponType.isRanged())
 		{
 			return 0;
 		}
 		
-		reuse *= creature.getStat().getWeaponReuseModifier();
-		double atkSpd = creature.getStat().getPAtkSpd();
-		
-		return (int) ((500000 + (333 * reuse)) / atkSpd);
+		return 900000 / creature.getStat().getPAtkSpd();
 	}
 	
 	public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index e1873bd4f4..f1a0a8ff7d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1503,7 +1503,7 @@ public final class Formulas
 	/**
 	 * @param creature
 	 * @param weapon
-	 * @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed}
+	 * @return {@code 900000 / PAttackSpeed}
 	 */
 	public static int calculateReuseTime(Creature creature, Weapon weapon)
 	{
@@ -1514,18 +1514,14 @@ public final class Formulas
 		
 		final WeaponType defaultAttackType = weapon.getItemType();
 		final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
-		int reuse = weapon.getReuseDelay();
 		
-		// only bows should continue for now
-		if ((reuse == 0) || !weaponType.isRanged())
+		// Only ranged weapons should continue for now.
+		if (!weaponType.isRanged())
 		{
 			return 0;
 		}
 		
-		reuse *= creature.getStat().getWeaponReuseModifier();
-		double atkSpd = creature.getStat().getPAtkSpd();
-		
-		return (int) ((500000 + (333 * reuse)) / atkSpd);
+		return 900000 / creature.getStat().getPAtkSpd();
 	}
 	
 	public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index e1873bd4f4..f1a0a8ff7d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1503,7 +1503,7 @@ public final class Formulas
 	/**
 	 * @param creature
 	 * @param weapon
-	 * @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed}
+	 * @return {@code 900000 / PAttackSpeed}
 	 */
 	public static int calculateReuseTime(Creature creature, Weapon weapon)
 	{
@@ -1514,18 +1514,14 @@ public final class Formulas
 		
 		final WeaponType defaultAttackType = weapon.getItemType();
 		final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
-		int reuse = weapon.getReuseDelay();
 		
-		// only bows should continue for now
-		if ((reuse == 0) || !weaponType.isRanged())
+		// Only ranged weapons should continue for now.
+		if (!weaponType.isRanged())
 		{
 			return 0;
 		}
 		
-		reuse *= creature.getStat().getWeaponReuseModifier();
-		double atkSpd = creature.getStat().getPAtkSpd();
-		
-		return (int) ((500000 + (333 * reuse)) / atkSpd);
+		return 900000 / creature.getStat().getPAtkSpd();
 	}
 	
 	public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)