Minor code cleanup.
Thanks to nasseka.
This commit is contained in:
@ -1419,7 +1419,7 @@ public class Formulas
|
||||
}
|
||||
case SHIELD_DEFENSE_PERFECT_BLOCK:
|
||||
{
|
||||
return 1.;
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -53,7 +53,7 @@ public class MAttackFinalizer implements IStatFunction
|
||||
}
|
||||
|
||||
// Calculate modifiers Magic Attack
|
||||
final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.;
|
||||
final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1;
|
||||
baseValue *= Math.pow(BaseStat.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072);
|
||||
return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_MATK : Double.MAX_VALUE);
|
||||
}
|
||||
|
@ -40,8 +40,8 @@ public class MAttackSpeedFinalizer implements IStatFunction
|
||||
baseValue *= Config.CHAMPION_SPD_ATK;
|
||||
}
|
||||
|
||||
final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.;
|
||||
final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1.;
|
||||
final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1;
|
||||
final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
|
||||
baseValue *= witBonus * chaBonus;
|
||||
return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_MATK_SPEED : Double.MAX_VALUE);
|
||||
}
|
||||
|
@ -42,7 +42,7 @@ public class MCritRateFinalizer implements IStatFunction
|
||||
baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
|
||||
}
|
||||
|
||||
final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1.;
|
||||
final double witBonus = creature.getWIT() > 0 ? BaseStat.WIT.calcBonus(creature) : 1;
|
||||
return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * witBonus * 10), 0, creature.isPlayable() ? creature.getStat().getValue(Stat.MAX_MAGIC_CRITICAL_RATE, Config.MAX_MCRIT_RATE) : Double.MAX_VALUE);
|
||||
}
|
||||
|
||||
|
@ -86,7 +86,7 @@ public class MDefenseFinalizer implements IStatFunction
|
||||
baseValue *= Config.RAID_MDEFENCE_MULTIPLIER;
|
||||
}
|
||||
|
||||
final double bonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1.;
|
||||
final double bonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1;
|
||||
baseValue *= bonus * creature.getLevelMod();
|
||||
return defaultValue(creature, stat, baseValue);
|
||||
}
|
||||
|
@ -40,8 +40,8 @@ public class MaxCpFinalizer implements IStatFunction
|
||||
{
|
||||
baseValue = player.getTemplate().getBaseCpMax(player.getLevel());
|
||||
}
|
||||
final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.;
|
||||
final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.;
|
||||
final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1;
|
||||
final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1;
|
||||
baseValue *= conBonus * chaBonus;
|
||||
return Stat.defaultValue(creature, stat, baseValue);
|
||||
}
|
||||
|
@ -54,8 +54,8 @@ public class MaxHpFinalizer implements IStatFunction
|
||||
}
|
||||
}
|
||||
|
||||
final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.;
|
||||
final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1.;
|
||||
final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1;
|
||||
final double conBonus = creature.getCON() > 0 ? BaseStat.CON.calcBonus(creature) : 1;
|
||||
baseValue *= conBonus * chaBonus;
|
||||
|
||||
return defaultValue(creature, stat, baseValue);
|
||||
|
@ -52,8 +52,8 @@ public class MaxMpFinalizer implements IStatFunction
|
||||
}
|
||||
}
|
||||
|
||||
final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.;
|
||||
final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1.;
|
||||
final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1;
|
||||
final double menBonus = creature.getMEN() > 0 ? BaseStat.MEN.calcBonus(creature) : 1;
|
||||
baseValue *= menBonus * chaBonus;
|
||||
|
||||
return defaultValue(creature, stat, baseValue);
|
||||
|
@ -51,7 +51,7 @@ public class PAttackFinalizer implements IStatFunction
|
||||
{
|
||||
baseValue *= Config.RAID_PATTACK_MULTIPLIER;
|
||||
}
|
||||
final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.;
|
||||
final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1;
|
||||
baseValue *= BaseStat.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
|
||||
return validateValue(creature, Stat.defaultValue(creature, stat, baseValue), 0, creature.isPlayable() ? Config.MAX_PATK : Double.MAX_VALUE);
|
||||
}
|
||||
|
@ -38,8 +38,8 @@ public class PAttackSpeedFinalizer implements IStatFunction
|
||||
{
|
||||
baseValue *= Config.CHAMPION_SPD_ATK;
|
||||
}
|
||||
final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1.;
|
||||
final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1.;
|
||||
final double chaBonus = creature.isPlayer() ? BaseStat.CHA.calcBonus(creature) : 1;
|
||||
final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
|
||||
baseValue *= dexBonus * chaBonus;
|
||||
return validateValue(creature, defaultValue(creature, stat, baseValue), 1, creature.isPlayable() ? Config.MAX_PATK_SPEED : Double.MAX_VALUE);
|
||||
}
|
||||
|
@ -41,7 +41,7 @@ public class PCriticalRateFinalizer implements IStatFunction
|
||||
// Enchanted legs bonus
|
||||
baseValue += calcEnchantBodyPart(creature, ItemTemplate.SLOT_LEGS);
|
||||
}
|
||||
final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1.;
|
||||
final double dexBonus = creature.getDEX() > 0 ? BaseStat.DEX.calcBonus(creature) : 1;
|
||||
return validateValue(creature, Stat.defaultValue(creature, stat, baseValue * dexBonus * 10), 0, creature.isPlayable() ? Config.MAX_PCRIT_RATE : Double.MAX_VALUE);
|
||||
}
|
||||
|
||||
|
@ -34,6 +34,6 @@ public class VampiricChanceFinalizer implements IStatFunction
|
||||
|
||||
final double amount = creature.getStat().getValue(Stat.ABSORB_DAMAGE_PERCENT, 0) * 100;
|
||||
final double vampiricSum = creature.getStat().getVampiricSum();
|
||||
return amount > 0 ? Stat.defaultValue(creature, stat, Math.min(1.0, vampiricSum / amount / 100)) : 0;
|
||||
return amount > 0 ? Stat.defaultValue(creature, stat, Math.min(1, vampiricSum / amount / 100)) : 0;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user