Use validateValue method for maximum pAtk and mAtk configurations.

This commit is contained in:
MobiusDevelopment 2019-04-20 02:23:19 +00:00
parent b6f9da52e2
commit 51b98f1a1c
22 changed files with 22 additions and 22 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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