Use validateValue method for maximum pAtk and mAtk configurations.
This commit is contained in:
parent
b6f9da52e2
commit
51b98f1a1c
@ -55,7 +55,7 @@ public class MAttackFinalizer implements IStatsFunction
|
||||
// Calculate modifiers Magic Attack
|
||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||
baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072);
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -54,7 +54,7 @@ public class PAttackFinalizer implements IStatsFunction
|
||||
}
|
||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||
baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -55,7 +55,7 @@ public class MAttackFinalizer implements IStatsFunction
|
||||
// Calculate modifiers Magic Attack
|
||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||
baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072);
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -54,7 +54,7 @@ public class PAttackFinalizer implements IStatsFunction
|
||||
}
|
||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||
baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -55,7 +55,7 @@ public class MAttackFinalizer implements IStatsFunction
|
||||
// Calculate modifiers Magic Attack
|
||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||
baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072);
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -54,7 +54,7 @@ public class PAttackFinalizer implements IStatsFunction
|
||||
}
|
||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||
baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -55,7 +55,7 @@ public class MAttackFinalizer implements IStatsFunction
|
||||
// Calculate modifiers Magic Attack
|
||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||
baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072);
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -54,7 +54,7 @@ public class PAttackFinalizer implements IStatsFunction
|
||||
}
|
||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||
baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -55,7 +55,7 @@ public class MAttackFinalizer implements IStatsFunction
|
||||
// Calculate modifiers Magic Attack
|
||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||
baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072);
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -54,7 +54,7 @@ public class PAttackFinalizer implements IStatsFunction
|
||||
}
|
||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||
baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -55,7 +55,7 @@ public class MAttackFinalizer implements IStatsFunction
|
||||
// Calculate modifiers Magic Attack
|
||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||
baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072);
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -54,7 +54,7 @@ public class PAttackFinalizer implements IStatsFunction
|
||||
}
|
||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||
baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -55,7 +55,7 @@ public class MAttackFinalizer implements IStatsFunction
|
||||
// Calculate modifiers Magic Attack
|
||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||
baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072);
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -54,7 +54,7 @@ public class PAttackFinalizer implements IStatsFunction
|
||||
}
|
||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||
baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -54,7 +54,7 @@ public class MAttackFinalizer implements IStatsFunction
|
||||
|
||||
// Calculate modifiers Magic Attack
|
||||
baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2.2072);
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -53,7 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
|
||||
baseValue *= Config.RAID_PATTACK_MULTIPLIER;
|
||||
}
|
||||
baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod();
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -54,7 +54,7 @@ public class MAttackFinalizer implements IStatsFunction
|
||||
|
||||
// Calculate modifiers Magic Attack
|
||||
baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2.2072);
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -53,7 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
|
||||
baseValue *= Config.RAID_PATTACK_MULTIPLIER;
|
||||
}
|
||||
baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod();
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -54,7 +54,7 @@ public class MAttackFinalizer implements IStatsFunction
|
||||
|
||||
// Calculate modifiers Magic Attack
|
||||
baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2.2072);
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -53,7 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
|
||||
baseValue *= Config.RAID_PATTACK_MULTIPLIER;
|
||||
}
|
||||
baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod();
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -54,7 +54,7 @@ public class MAttackFinalizer implements IStatsFunction
|
||||
|
||||
// Calculate modifiers Magic Attack
|
||||
baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2.2072);
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -53,7 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
|
||||
baseValue *= Config.RAID_PATTACK_MULTIPLIER;
|
||||
}
|
||||
baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod();
|
||||
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
|
||||
return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Loading…
Reference in New Issue
Block a user