lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper calculateReuseTime Formulas method.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-03-29 15:40:53 +00:00
parent 439dff1703
commit 03f0eb0bcc
11 changed files with 44 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1503,7 +1503,7 @@ public final class Formulas
/** /**
* @param creature * @param creature
* @param weapon * @param weapon
* @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed} * @return {@code 900000 / PAttackSpeed}
*/ */
public static int calculateReuseTime(Creature creature, Weapon weapon) public static int calculateReuseTime(Creature creature, Weapon weapon)
{ {
@@ -1514,18 +1514,14 @@ public final class Formulas
final WeaponType defaultAttackType = weapon.getItemType(); final WeaponType defaultAttackType = weapon.getItemType();
final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType); final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
int reuse = weapon.getReuseDelay();
// only bows should continue for now // Only ranged weapons should continue for now.
if ((reuse == 0) || !weaponType.isRanged()) if (!weaponType.isRanged())
{ {
return 0; return 0;
} }
reuse *= creature.getStat().getWeaponReuseModifier(); return 900000 / creature.getStat().getPAtkSpd();
double atkSpd = creature.getStat().getPAtkSpd();
return (int) ((500000 + (333 * reuse)) / atkSpd);
} }
public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit) public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)

12
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1503,7 +1503,7 @@ public final class Formulas
/** /**
* @param creature * @param creature
* @param weapon * @param weapon
* @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed} * @return {@code 900000 / PAttackSpeed}
*/ */
public static int calculateReuseTime(Creature creature, Weapon weapon) public static int calculateReuseTime(Creature creature, Weapon weapon)
{ {
@@ -1514,18 +1514,14 @@ public final class Formulas
final WeaponType defaultAttackType = weapon.getItemType(); final WeaponType defaultAttackType = weapon.getItemType();
final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType); final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
int reuse = weapon.getReuseDelay();
// only bows should continue for now // Only ranged weapons should continue for now.
if ((reuse == 0) || !weaponType.isRanged()) if (!weaponType.isRanged())
{ {
return 0; return 0;
} }
reuse *= creature.getStat().getWeaponReuseModifier(); return 900000 / creature.getStat().getPAtkSpd();
double atkSpd = creature.getStat().getPAtkSpd();
return (int) ((500000 + (333 * reuse)) / atkSpd);
} }
public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit) public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)

12
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1503,7 +1503,7 @@ public final class Formulas
/** /**
* @param creature * @param creature
* @param weapon * @param weapon
* @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed} * @return {@code 900000 / PAttackSpeed}
*/ */
public static int calculateReuseTime(Creature creature, Weapon weapon) public static int calculateReuseTime(Creature creature, Weapon weapon)
{ {
@@ -1514,18 +1514,14 @@ public final class Formulas
final WeaponType defaultAttackType = weapon.getItemType(); final WeaponType defaultAttackType = weapon.getItemType();
final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType); final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
int reuse = weapon.getReuseDelay();
// only bows should continue for now // Only ranged weapons should continue for now.
if ((reuse == 0) || !weaponType.isRanged()) if (!weaponType.isRanged())
{ {
return 0; return 0;
} }
reuse *= creature.getStat().getWeaponReuseModifier(); return 900000 / creature.getStat().getPAtkSpd();
double atkSpd = creature.getStat().getPAtkSpd();
return (int) ((500000 + (333 * reuse)) / atkSpd);
} }
public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit) public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)

12
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1503,7 +1503,7 @@ public final class Formulas
/** /**
* @param creature * @param creature
* @param weapon * @param weapon
* @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed} * @return {@code 900000 / PAttackSpeed}
*/ */
public static int calculateReuseTime(Creature creature, Weapon weapon) public static int calculateReuseTime(Creature creature, Weapon weapon)
{ {
@@ -1514,18 +1514,14 @@ public final class Formulas
final WeaponType defaultAttackType = weapon.getItemType(); final WeaponType defaultAttackType = weapon.getItemType();
final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType); final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
int reuse = weapon.getReuseDelay();
// only bows should continue for now // Only ranged weapons should continue for now.
if ((reuse == 0) || !weaponType.isRanged()) if (!weaponType.isRanged())
{ {
return 0; return 0;
} }
reuse *= creature.getStat().getWeaponReuseModifier(); return 900000 / creature.getStat().getPAtkSpd();
double atkSpd = creature.getStat().getPAtkSpd();
return (int) ((500000 + (333 * reuse)) / atkSpd);
} }
public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit) public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)

12
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1503,7 +1503,7 @@ public final class Formulas
/** /**
* @param creature * @param creature
* @param weapon * @param weapon
* @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed} * @return {@code 900000 / PAttackSpeed}
*/ */
public static int calculateReuseTime(Creature creature, Weapon weapon) public static int calculateReuseTime(Creature creature, Weapon weapon)
{ {
@@ -1514,18 +1514,14 @@ public final class Formulas
final WeaponType defaultAttackType = weapon.getItemType(); final WeaponType defaultAttackType = weapon.getItemType();
final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType); final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
int reuse = weapon.getReuseDelay();
// only bows should continue for now // Only ranged weapons should continue for now.
if ((reuse == 0) || !weaponType.isRanged()) if (!weaponType.isRanged())
{ {
return 0; return 0;
} }
reuse *= creature.getStat().getWeaponReuseModifier(); return 900000 / creature.getStat().getPAtkSpd();
double atkSpd = creature.getStat().getPAtkSpd();
return (int) ((500000 + (333 * reuse)) / atkSpd);
} }
public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit) public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)

12
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1503,7 +1503,7 @@ public final class Formulas
/** /**
* @param creature * @param creature
* @param weapon * @param weapon
* @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed} * @return {@code 900000 / PAttackSpeed}
*/ */
public static int calculateReuseTime(Creature creature, Weapon weapon) public static int calculateReuseTime(Creature creature, Weapon weapon)
{ {
@@ -1514,18 +1514,14 @@ public final class Formulas
final WeaponType defaultAttackType = weapon.getItemType(); final WeaponType defaultAttackType = weapon.getItemType();
final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType); final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
int reuse = weapon.getReuseDelay();
// only bows should continue for now // Only ranged weapons should continue for now.
if ((reuse == 0) || !weaponType.isRanged()) if (!weaponType.isRanged())
{ {
return 0; return 0;
} }
reuse *= creature.getStat().getWeaponReuseModifier(); return 900000 / creature.getStat().getPAtkSpd();
double atkSpd = creature.getStat().getPAtkSpd();
return (int) ((500000 + (333 * reuse)) / atkSpd);
} }
public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit) public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)

12
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1503,7 +1503,7 @@ public final class Formulas
/** /**
* @param creature * @param creature
* @param weapon * @param weapon
* @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed} * @return {@code 900000 / PAttackSpeed}
*/ */
public static int calculateReuseTime(Creature creature, Weapon weapon) public static int calculateReuseTime(Creature creature, Weapon weapon)
{ {
@@ -1514,18 +1514,14 @@ public final class Formulas
final WeaponType defaultAttackType = weapon.getItemType(); final WeaponType defaultAttackType = weapon.getItemType();
final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType); final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
int reuse = weapon.getReuseDelay();
// only bows should continue for now // Only ranged weapons should continue for now.
if ((reuse == 0) || !weaponType.isRanged()) if (!weaponType.isRanged())
{ {
return 0; return 0;
} }
reuse *= creature.getStat().getWeaponReuseModifier(); return 900000 / creature.getStat().getPAtkSpd();
double atkSpd = creature.getStat().getPAtkSpd();
return (int) ((500000 + (333 * reuse)) / atkSpd);
} }
public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit) public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)

12
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1503,7 +1503,7 @@ public final class Formulas
/** /**
* @param creature * @param creature
* @param weapon * @param weapon
* @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed} * @return {@code 900000 / PAttackSpeed}
*/ */
public static int calculateReuseTime(Creature creature, Weapon weapon) public static int calculateReuseTime(Creature creature, Weapon weapon)
{ {
@@ -1514,18 +1514,14 @@ public final class Formulas
final WeaponType defaultAttackType = weapon.getItemType(); final WeaponType defaultAttackType = weapon.getItemType();
final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType); final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
int reuse = weapon.getReuseDelay();
// only bows should continue for now // Only ranged weapons should continue for now.
if ((reuse == 0) || !weaponType.isRanged()) if (!weaponType.isRanged())
{ {
return 0; return 0;
} }
reuse *= creature.getStat().getWeaponReuseModifier(); return 900000 / creature.getStat().getPAtkSpd();
double atkSpd = creature.getStat().getPAtkSpd();
return (int) ((500000 + (333 * reuse)) / atkSpd);
} }
public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit) public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)

12
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1503,7 +1503,7 @@ public final class Formulas
/** /**
* @param creature * @param creature
* @param weapon * @param weapon
* @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed} * @return {@code 900000 / PAttackSpeed}
*/ */
public static int calculateReuseTime(Creature creature, Weapon weapon) public static int calculateReuseTime(Creature creature, Weapon weapon)
{ {
@@ -1514,18 +1514,14 @@ public final class Formulas
final WeaponType defaultAttackType = weapon.getItemType(); final WeaponType defaultAttackType = weapon.getItemType();
final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType); final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
int reuse = weapon.getReuseDelay();
// only bows should continue for now // Only ranged weapons should continue for now.
if ((reuse == 0) || !weaponType.isRanged()) if (!weaponType.isRanged())
{ {
return 0; return 0;
} }
reuse *= creature.getStat().getWeaponReuseModifier(); return 900000 / creature.getStat().getPAtkSpd();
double atkSpd = creature.getStat().getPAtkSpd();
return (int) ((500000 + (333 * reuse)) / atkSpd);
} }
public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit) public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)

12
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1503,7 +1503,7 @@ public final class Formulas
/** /**
* @param creature * @param creature
* @param weapon * @param weapon
* @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed} * @return {@code 900000 / PAttackSpeed}
*/ */
public static int calculateReuseTime(Creature creature, Weapon weapon) public static int calculateReuseTime(Creature creature, Weapon weapon)
{ {
@@ -1514,18 +1514,14 @@ public final class Formulas
final WeaponType defaultAttackType = weapon.getItemType(); final WeaponType defaultAttackType = weapon.getItemType();
final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType); final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
int reuse = weapon.getReuseDelay();
// only bows should continue for now // Only ranged weapons should continue for now.
if ((reuse == 0) || !weaponType.isRanged()) if (!weaponType.isRanged())
{ {
return 0; return 0;
} }
reuse *= creature.getStat().getWeaponReuseModifier(); return 900000 / creature.getStat().getPAtkSpd();
double atkSpd = creature.getStat().getPAtkSpd();
return (int) ((500000 + (333 * reuse)) / atkSpd);
} }
public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit) public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)

12
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -1503,7 +1503,7 @@ public final class Formulas
/** /**
* @param creature * @param creature
* @param weapon * @param weapon
* @return {@code (500_000 millis + 333 * WeaponItemReuseDelay) / PAttackSpeed} * @return {@code 900000 / PAttackSpeed}
*/ */
public static int calculateReuseTime(Creature creature, Weapon weapon) public static int calculateReuseTime(Creature creature, Weapon weapon)
{ {
@@ -1514,18 +1514,14 @@ public final class Formulas
final WeaponType defaultAttackType = weapon.getItemType(); final WeaponType defaultAttackType = weapon.getItemType();
final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType); final WeaponType weaponType = creature.getTransformation().map(transform -> transform.getBaseAttackType(creature, defaultAttackType)).orElse(defaultAttackType);
int reuse = weapon.getReuseDelay();
// only bows should continue for now // Only ranged weapons should continue for now.
if ((reuse == 0) || !weaponType.isRanged()) if (!weaponType.isRanged())
{ {
return 0; return 0;
} }
reuse *= creature.getStat().getWeaponReuseModifier(); return 900000 / creature.getStat().getPAtkSpd();
double atkSpd = creature.getStat().getPAtkSpd();
return (int) ((500000 + (333 * reuse)) / atkSpd);
} }
public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit) public static double calculatePvpPveBonus(Creature attacker, Creature target, Skill skill, boolean crit)