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

Adjusted Formulas calcCrit method.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-04-09 01:16:29 +00:00
parent 6eadc7344e
commit 733926aa60
11 changed files with 88 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,36 +200,35 @@ public final class Formulas
*/ */
public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill) public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
{ {
// Skill critical rate is calculated up to the first decimal, thats why multiply by 10 and compare to 1000.
if (skill != null) if (skill != null)
{ {
// Magic Critical Rate // Magic Critical Rate.
if (skill.isMagic()) if (skill.isMagic())
{ {
rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE); rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE);
if ((target == null) || !skill.isBad()) if ((target == null) || !skill.isBad())
{ {
return Math.min(rate, 320) > Rnd.get(1000); return Math.min(rate, 32) > Rnd.get(100);
} }
double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0); double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0);
if ((creature.getLevel() >= 78) && (target.getLevel() >= 78)) if ((creature.getLevel() >= 78) && (target.getLevel() >= 78))
{ {
finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25); finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25);
return Math.min(finalRate, 320) > Rnd.get(1000); return Math.min(finalRate, 32) > Rnd.get(100);
} }
return Math.min(finalRate, 200) > Rnd.get(1000); return Math.min(finalRate, 20) > Rnd.get(100);
} }
// Physical skill critical rate // Physical skill critical rate.
final double statBonus; final double statBonus;
// There is a chance that activeChar has altered base stat for skill critical. // There is a chance that activeChar has altered base stat for skill critical.
byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL); byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL);
if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length)) if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length))
{ {
// Best tested // Best tested.
statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature); statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature);
} }
else else
@@ -239,8 +238,8 @@ public final class Formulas
} }
final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1); final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1);
double finalRate = rate * statBonus * rateBonus * 10; double finalRate = rate * statBonus * rateBonus;
return finalRate > Rnd.get(1000); return Math.min(finalRate, 99) <= Rnd.get(100);
} }
// Autoattack critical rate. // Autoattack critical rate.

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

@@ -200,36 +200,35 @@ public final class Formulas
*/ */
public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill) public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
{ {
// Skill critical rate is calculated up to the first decimal, thats why multiply by 10 and compare to 1000.
if (skill != null) if (skill != null)
{ {
// Magic Critical Rate // Magic Critical Rate.
if (skill.isMagic()) if (skill.isMagic())
{ {
rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE); rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE);
if ((target == null) || !skill.isBad()) if ((target == null) || !skill.isBad())
{ {
return Math.min(rate, 320) > Rnd.get(1000); return Math.min(rate, 32) > Rnd.get(100);
} }
double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0); double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0);
if ((creature.getLevel() >= 78) && (target.getLevel() >= 78)) if ((creature.getLevel() >= 78) && (target.getLevel() >= 78))
{ {
finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25); finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25);
return Math.min(finalRate, 320) > Rnd.get(1000); return Math.min(finalRate, 32) > Rnd.get(100);
} }
return Math.min(finalRate, 200) > Rnd.get(1000); return Math.min(finalRate, 20) > Rnd.get(100);
} }
// Physical skill critical rate // Physical skill critical rate.
final double statBonus; final double statBonus;
// There is a chance that activeChar has altered base stat for skill critical. // There is a chance that activeChar has altered base stat for skill critical.
byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL); byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL);
if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length)) if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length))
{ {
// Best tested // Best tested.
statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature); statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature);
} }
else else
@@ -239,8 +238,8 @@ public final class Formulas
} }
final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1); final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1);
double finalRate = rate * statBonus * rateBonus * 10; double finalRate = rate * statBonus * rateBonus;
return finalRate > Rnd.get(1000); return Math.min(finalRate, 99) <= Rnd.get(100);
} }
// Autoattack critical rate. // Autoattack critical rate.

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

@@ -200,36 +200,35 @@ public final class Formulas
*/ */
public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill) public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
{ {
// Skill critical rate is calculated up to the first decimal, thats why multiply by 10 and compare to 1000.
if (skill != null) if (skill != null)
{ {
// Magic Critical Rate // Magic Critical Rate.
if (skill.isMagic()) if (skill.isMagic())
{ {
rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE); rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE);
if ((target == null) || !skill.isBad()) if ((target == null) || !skill.isBad())
{ {
return Math.min(rate, 320) > Rnd.get(1000); return Math.min(rate, 32) > Rnd.get(100);
} }
double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0); double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0);
if ((creature.getLevel() >= 78) && (target.getLevel() >= 78)) if ((creature.getLevel() >= 78) && (target.getLevel() >= 78))
{ {
finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25); finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25);
return Math.min(finalRate, 320) > Rnd.get(1000); return Math.min(finalRate, 32) > Rnd.get(100);
} }
return Math.min(finalRate, 200) > Rnd.get(1000); return Math.min(finalRate, 20) > Rnd.get(100);
} }
// Physical skill critical rate // Physical skill critical rate.
final double statBonus; final double statBonus;
// There is a chance that activeChar has altered base stat for skill critical. // There is a chance that activeChar has altered base stat for skill critical.
byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL); byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL);
if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length)) if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length))
{ {
// Best tested // Best tested.
statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature); statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature);
} }
else else
@@ -239,8 +238,8 @@ public final class Formulas
} }
final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1); final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1);
double finalRate = rate * statBonus * rateBonus * 10; double finalRate = rate * statBonus * rateBonus;
return finalRate > Rnd.get(1000); return Math.min(finalRate, 99) <= Rnd.get(100);
} }
// Autoattack critical rate. // Autoattack critical rate.

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

@@ -200,36 +200,35 @@ public final class Formulas
*/ */
public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill) public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
{ {
// Skill critical rate is calculated up to the first decimal, thats why multiply by 10 and compare to 1000.
if (skill != null) if (skill != null)
{ {
// Magic Critical Rate // Magic Critical Rate.
if (skill.isMagic()) if (skill.isMagic())
{ {
rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE); rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE);
if ((target == null) || !skill.isBad()) if ((target == null) || !skill.isBad())
{ {
return Math.min(rate, 320) > Rnd.get(1000); return Math.min(rate, 32) > Rnd.get(100);
} }
double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0); double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0);
if ((creature.getLevel() >= 78) && (target.getLevel() >= 78)) if ((creature.getLevel() >= 78) && (target.getLevel() >= 78))
{ {
finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25); finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25);
return Math.min(finalRate, 320) > Rnd.get(1000); return Math.min(finalRate, 32) > Rnd.get(100);
} }
return Math.min(finalRate, 200) > Rnd.get(1000); return Math.min(finalRate, 20) > Rnd.get(100);
} }
// Physical skill critical rate // Physical skill critical rate.
final double statBonus; final double statBonus;
// There is a chance that activeChar has altered base stat for skill critical. // There is a chance that activeChar has altered base stat for skill critical.
byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL); byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL);
if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length)) if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length))
{ {
// Best tested // Best tested.
statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature); statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature);
} }
else else
@@ -239,8 +238,8 @@ public final class Formulas
} }
final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1); final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1);
double finalRate = rate * statBonus * rateBonus * 10; double finalRate = rate * statBonus * rateBonus;
return finalRate > Rnd.get(1000); return Math.min(finalRate, 99) <= Rnd.get(100);
} }
// Autoattack critical rate. // Autoattack critical rate.

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

@@ -200,36 +200,35 @@ public final class Formulas
*/ */
public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill) public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
{ {
// Skill critical rate is calculated up to the first decimal, thats why multiply by 10 and compare to 1000.
if (skill != null) if (skill != null)
{ {
// Magic Critical Rate // Magic Critical Rate.
if (skill.isMagic()) if (skill.isMagic())
{ {
rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE); rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE);
if ((target == null) || !skill.isBad()) if ((target == null) || !skill.isBad())
{ {
return Math.min(rate, 320) > Rnd.get(1000); return Math.min(rate, 32) > Rnd.get(100);
} }
double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0); double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0);
if ((creature.getLevel() >= 78) && (target.getLevel() >= 78)) if ((creature.getLevel() >= 78) && (target.getLevel() >= 78))
{ {
finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25); finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25);
return Math.min(finalRate, 320) > Rnd.get(1000); return Math.min(finalRate, 32) > Rnd.get(100);
} }
return Math.min(finalRate, 200) > Rnd.get(1000); return Math.min(finalRate, 20) > Rnd.get(100);
} }
// Physical skill critical rate // Physical skill critical rate.
final double statBonus; final double statBonus;
// There is a chance that activeChar has altered base stat for skill critical. // There is a chance that activeChar has altered base stat for skill critical.
byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL); byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL);
if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length)) if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length))
{ {
// Best tested // Best tested.
statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature); statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature);
} }
else else
@@ -239,8 +238,8 @@ public final class Formulas
} }
final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1); final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1);
double finalRate = rate * statBonus * rateBonus * 10; double finalRate = rate * statBonus * rateBonus;
return finalRate > Rnd.get(1000); return Math.min(finalRate, 99) <= Rnd.get(100);
} }
// Autoattack critical rate. // Autoattack critical rate.

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

@@ -200,36 +200,35 @@ public final class Formulas
*/ */
public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill) public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
{ {
// Skill critical rate is calculated up to the first decimal, thats why multiply by 10 and compare to 1000.
if (skill != null) if (skill != null)
{ {
// Magic Critical Rate // Magic Critical Rate.
if (skill.isMagic()) if (skill.isMagic())
{ {
rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE); rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE);
if ((target == null) || !skill.isBad()) if ((target == null) || !skill.isBad())
{ {
return Math.min(rate, 320) > Rnd.get(1000); return Math.min(rate, 32) > Rnd.get(100);
} }
double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0); double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0);
if ((creature.getLevel() >= 78) && (target.getLevel() >= 78)) if ((creature.getLevel() >= 78) && (target.getLevel() >= 78))
{ {
finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25); finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25);
return Math.min(finalRate, 320) > Rnd.get(1000); return Math.min(finalRate, 32) > Rnd.get(100);
} }
return Math.min(finalRate, 200) > Rnd.get(1000); return Math.min(finalRate, 20) > Rnd.get(100);
} }
// Physical skill critical rate // Physical skill critical rate.
final double statBonus; final double statBonus;
// There is a chance that activeChar has altered base stat for skill critical. // There is a chance that activeChar has altered base stat for skill critical.
byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL); byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL);
if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length)) if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length))
{ {
// Best tested // Best tested.
statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature); statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature);
} }
else else
@@ -239,8 +238,8 @@ public final class Formulas
} }
final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1); final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1);
double finalRate = rate * statBonus * rateBonus * 10; double finalRate = rate * statBonus * rateBonus;
return finalRate > Rnd.get(1000); return Math.min(finalRate, 99) <= Rnd.get(100);
} }
// Autoattack critical rate. // Autoattack critical rate.

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

@@ -200,36 +200,35 @@ public final class Formulas
*/ */
public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill) public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
{ {
// Skill critical rate is calculated up to the first decimal, thats why multiply by 10 and compare to 1000.
if (skill != null) if (skill != null)
{ {
// Magic Critical Rate // Magic Critical Rate.
if (skill.isMagic()) if (skill.isMagic())
{ {
rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE); rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE);
if ((target == null) || !skill.isBad()) if ((target == null) || !skill.isBad())
{ {
return Math.min(rate, 320) > Rnd.get(1000); return Math.min(rate, 32) > Rnd.get(100);
} }
double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0); double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0);
if ((creature.getLevel() >= 78) && (target.getLevel() >= 78)) if ((creature.getLevel() >= 78) && (target.getLevel() >= 78))
{ {
finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25); finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25);
return Math.min(finalRate, 320) > Rnd.get(1000); return Math.min(finalRate, 32) > Rnd.get(100);
} }
return Math.min(finalRate, 200) > Rnd.get(1000); return Math.min(finalRate, 20) > Rnd.get(100);
} }
// Physical skill critical rate // Physical skill critical rate.
final double statBonus; final double statBonus;
// There is a chance that activeChar has altered base stat for skill critical. // There is a chance that activeChar has altered base stat for skill critical.
byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL); byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL);
if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length)) if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length))
{ {
// Best tested // Best tested.
statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature); statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature);
} }
else else
@@ -239,8 +238,8 @@ public final class Formulas
} }
final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1); final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1);
double finalRate = rate * statBonus * rateBonus * 10; double finalRate = rate * statBonus * rateBonus;
return finalRate > Rnd.get(1000); return Math.min(finalRate, 99) <= Rnd.get(100);
} }
// Autoattack critical rate. // Autoattack critical rate.

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

@@ -200,36 +200,35 @@ public final class Formulas
*/ */
public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill) public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
{ {
// Skill critical rate is calculated up to the first decimal, thats why multiply by 10 and compare to 1000.
if (skill != null) if (skill != null)
{ {
// Magic Critical Rate // Magic Critical Rate.
if (skill.isMagic()) if (skill.isMagic())
{ {
rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE); rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE);
if ((target == null) || !skill.isBad()) if ((target == null) || !skill.isBad())
{ {
return Math.min(rate, 320) > Rnd.get(1000); return Math.min(rate, 32) > Rnd.get(100);
} }
double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0); double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0);
if ((creature.getLevel() >= 78) && (target.getLevel() >= 78)) if ((creature.getLevel() >= 78) && (target.getLevel() >= 78))
{ {
finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25); finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25);
return Math.min(finalRate, 320) > Rnd.get(1000); return Math.min(finalRate, 32) > Rnd.get(100);
} }
return Math.min(finalRate, 200) > Rnd.get(1000); return Math.min(finalRate, 20) > Rnd.get(100);
} }
// Physical skill critical rate // Physical skill critical rate.
final double statBonus; final double statBonus;
// There is a chance that activeChar has altered base stat for skill critical. // There is a chance that activeChar has altered base stat for skill critical.
byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL); byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL);
if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length)) if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length))
{ {
// Best tested // Best tested.
statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature); statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature);
} }
else else
@@ -239,8 +238,8 @@ public final class Formulas
} }
final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1); final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1);
double finalRate = rate * statBonus * rateBonus * 10; double finalRate = rate * statBonus * rateBonus;
return finalRate > Rnd.get(1000); return Math.min(finalRate, 99) <= Rnd.get(100);
} }
// Autoattack critical rate. // Autoattack critical rate.

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

@@ -200,36 +200,35 @@ public final class Formulas
*/ */
public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill) public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
{ {
// Skill critical rate is calculated up to the first decimal, thats why multiply by 10 and compare to 1000.
if (skill != null) if (skill != null)
{ {
// Magic Critical Rate // Magic Critical Rate.
if (skill.isMagic()) if (skill.isMagic())
{ {
rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE); rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE);
if ((target == null) || !skill.isBad()) if ((target == null) || !skill.isBad())
{ {
return Math.min(rate, 320) > Rnd.get(1000); return Math.min(rate, 32) > Rnd.get(100);
} }
double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0); double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0);
if ((creature.getLevel() >= 78) && (target.getLevel() >= 78)) if ((creature.getLevel() >= 78) && (target.getLevel() >= 78))
{ {
finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25); finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25);
return Math.min(finalRate, 320) > Rnd.get(1000); return Math.min(finalRate, 32) > Rnd.get(100);
} }
return Math.min(finalRate, 200) > Rnd.get(1000); return Math.min(finalRate, 20) > Rnd.get(100);
} }
// Physical skill critical rate // Physical skill critical rate.
final double statBonus; final double statBonus;
// There is a chance that activeChar has altered base stat for skill critical. // There is a chance that activeChar has altered base stat for skill critical.
byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL); byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL);
if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length)) if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length))
{ {
// Best tested // Best tested.
statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature); statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature);
} }
else else
@@ -239,8 +238,8 @@ public final class Formulas
} }
final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1); final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1);
double finalRate = rate * statBonus * rateBonus * 10; double finalRate = rate * statBonus * rateBonus;
return finalRate > Rnd.get(1000); return Math.min(finalRate, 99) <= Rnd.get(100);
} }
// Autoattack critical rate. // Autoattack critical rate.

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

@@ -200,36 +200,35 @@ public final class Formulas
*/ */
public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill) public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
{ {
// Skill critical rate is calculated up to the first decimal, thats why multiply by 10 and compare to 1000.
if (skill != null) if (skill != null)
{ {
// Magic Critical Rate // Magic Critical Rate.
if (skill.isMagic()) if (skill.isMagic())
{ {
rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE); rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE);
if ((target == null) || !skill.isBad()) if ((target == null) || !skill.isBad())
{ {
return Math.min(rate, 320) > Rnd.get(1000); return Math.min(rate, 32) > Rnd.get(100);
} }
double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0); double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0);
if ((creature.getLevel() >= 78) && (target.getLevel() >= 78)) if ((creature.getLevel() >= 78) && (target.getLevel() >= 78))
{ {
finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25); finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25);
return Math.min(finalRate, 320) > Rnd.get(1000); return Math.min(finalRate, 32) > Rnd.get(100);
} }
return Math.min(finalRate, 200) > Rnd.get(1000); return Math.min(finalRate, 20) > Rnd.get(100);
} }
// Physical skill critical rate // Physical skill critical rate.
final double statBonus; final double statBonus;
// There is a chance that activeChar has altered base stat for skill critical. // There is a chance that activeChar has altered base stat for skill critical.
byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL); byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL);
if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length)) if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length))
{ {
// Best tested // Best tested.
statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature); statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature);
} }
else else
@@ -239,8 +238,8 @@ public final class Formulas
} }
final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1); final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1);
double finalRate = rate * statBonus * rateBonus * 10; double finalRate = rate * statBonus * rateBonus;
return finalRate > Rnd.get(1000); return Math.min(finalRate, 99) <= Rnd.get(100);
} }
// Autoattack critical rate. // Autoattack critical rate.

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

@@ -200,36 +200,35 @@ public final class Formulas
*/ */
public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill) public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
{ {
// Skill critical rate is calculated up to the first decimal, thats why multiply by 10 and compare to 1000.
if (skill != null) if (skill != null)
{ {
// Magic Critical Rate // Magic Critical Rate.
if (skill.isMagic()) if (skill.isMagic())
{ {
rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE); rate = creature.getStat().getValue(Stats.MAGIC_CRITICAL_RATE);
if ((target == null) || !skill.isBad()) if ((target == null) || !skill.isBad())
{ {
return Math.min(rate, 320) > Rnd.get(1000); return Math.min(rate, 32) > Rnd.get(100);
} }
double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0); double finalRate = target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE, rate) + target.getStat().getValue(Stats.DEFENCE_MAGIC_CRITICAL_RATE_ADD, 0);
if ((creature.getLevel() >= 78) && (target.getLevel() >= 78)) if ((creature.getLevel() >= 78) && (target.getLevel() >= 78))
{ {
finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25); finalRate += Math.sqrt(creature.getLevel()) + ((creature.getLevel() - target.getLevel()) / 25);
return Math.min(finalRate, 320) > Rnd.get(1000); return Math.min(finalRate, 32) > Rnd.get(100);
} }
return Math.min(finalRate, 200) > Rnd.get(1000); return Math.min(finalRate, 20) > Rnd.get(100);
} }
// Physical skill critical rate // Physical skill critical rate.
final double statBonus; final double statBonus;
// There is a chance that activeChar has altered base stat for skill critical. // There is a chance that activeChar has altered base stat for skill critical.
byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL); byte skillCritRateStat = (byte) creature.getStat().getValue(Stats.STAT_BONUS_SKILL_CRITICAL);
if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length)) if ((skillCritRateStat >= 0) && (skillCritRateStat < BaseStats.values().length))
{ {
// Best tested // Best tested.
statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature); statBonus = BaseStats.values()[skillCritRateStat].calcBonus(creature);
} }
else else
@@ -239,8 +238,8 @@ public final class Formulas
} }
final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1); final double rateBonus = creature.getStat().getValue(Stats.CRITICAL_RATE_SKILL, 1);
double finalRate = rate * statBonus * rateBonus * 10; double finalRate = rate * statBonus * rateBonus;
return finalRate > Rnd.get(1000); return Math.min(finalRate, 99) <= Rnd.get(100);
} }
// Autoattack critical rate. // Autoattack critical rate.