Proper MaxMpFinalizer initial value.
This commit is contained in:
@@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction
|
|||||||
{
|
{
|
||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat));
|
double baseValue = creature.getTemplate().getBaseValue(stat, 0);
|
||||||
if (creature.isPet())
|
if (creature.isPet())
|
||||||
{
|
{
|
||||||
final PetInstance pet = (PetInstance) creature;
|
final PetInstance pet = (PetInstance) creature;
|
||||||
baseValue += pet.getPetLevelData().getPetMaxMP();
|
baseValue = pet.getPetLevelData().getPetMaxMP();
|
||||||
}
|
}
|
||||||
else if (creature.isPlayer())
|
else if (creature.isPlayer())
|
||||||
{
|
{
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
baseValue += player.getTemplate().getBaseMpMax(player.getLevel());
|
baseValue = player.getTemplate().getBaseMpMax(player.getLevel());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||||
|
@@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction
|
|||||||
{
|
{
|
||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat));
|
double baseValue = creature.getTemplate().getBaseValue(stat, 0);
|
||||||
if (creature.isPet())
|
if (creature.isPet())
|
||||||
{
|
{
|
||||||
final PetInstance pet = (PetInstance) creature;
|
final PetInstance pet = (PetInstance) creature;
|
||||||
baseValue += pet.getPetLevelData().getPetMaxMP();
|
baseValue = pet.getPetLevelData().getPetMaxMP();
|
||||||
}
|
}
|
||||||
else if (creature.isPlayer())
|
else if (creature.isPlayer())
|
||||||
{
|
{
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
baseValue += player.getTemplate().getBaseMpMax(player.getLevel());
|
baseValue = player.getTemplate().getBaseMpMax(player.getLevel());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||||
|
@@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction
|
|||||||
{
|
{
|
||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat));
|
double baseValue = creature.getTemplate().getBaseValue(stat, 0);
|
||||||
if (creature.isPet())
|
if (creature.isPet())
|
||||||
{
|
{
|
||||||
final PetInstance pet = (PetInstance) creature;
|
final PetInstance pet = (PetInstance) creature;
|
||||||
baseValue += pet.getPetLevelData().getPetMaxMP();
|
baseValue = pet.getPetLevelData().getPetMaxMP();
|
||||||
}
|
}
|
||||||
else if (creature.isPlayer())
|
else if (creature.isPlayer())
|
||||||
{
|
{
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
baseValue += player.getTemplate().getBaseMpMax(player.getLevel());
|
baseValue = player.getTemplate().getBaseMpMax(player.getLevel());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||||
|
@@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction
|
|||||||
{
|
{
|
||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat));
|
double baseValue = creature.getTemplate().getBaseValue(stat, 0);
|
||||||
if (creature.isPet())
|
if (creature.isPet())
|
||||||
{
|
{
|
||||||
final PetInstance pet = (PetInstance) creature;
|
final PetInstance pet = (PetInstance) creature;
|
||||||
baseValue += pet.getPetLevelData().getPetMaxMP();
|
baseValue = pet.getPetLevelData().getPetMaxMP();
|
||||||
}
|
}
|
||||||
else if (creature.isPlayer())
|
else if (creature.isPlayer())
|
||||||
{
|
{
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
baseValue += player.getTemplate().getBaseMpMax(player.getLevel());
|
baseValue = player.getTemplate().getBaseMpMax(player.getLevel());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||||
|
@@ -35,7 +35,7 @@ public class MaxMpFinalizer implements IStatsFunction
|
|||||||
{
|
{
|
||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat));
|
double baseValue = creature.getTemplate().getBaseValue(stat, 0);
|
||||||
if (creature.isPet())
|
if (creature.isPet())
|
||||||
{
|
{
|
||||||
final PetInstance pet = (PetInstance) creature;
|
final PetInstance pet = (PetInstance) creature;
|
||||||
|
@@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction
|
|||||||
{
|
{
|
||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat));
|
double baseValue = creature.getTemplate().getBaseValue(stat, 0);
|
||||||
if (creature.isPet())
|
if (creature.isPet())
|
||||||
{
|
{
|
||||||
final PetInstance pet = (PetInstance) creature;
|
final PetInstance pet = (PetInstance) creature;
|
||||||
baseValue += pet.getPetLevelData().getPetMaxMP();
|
baseValue = pet.getPetLevelData().getPetMaxMP();
|
||||||
}
|
}
|
||||||
else if (creature.isPlayer())
|
else if (creature.isPlayer())
|
||||||
{
|
{
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
baseValue += player.getTemplate().getBaseMpMax(player.getLevel());
|
baseValue = player.getTemplate().getBaseMpMax(player.getLevel());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||||
|
@@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction
|
|||||||
{
|
{
|
||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat));
|
double baseValue = creature.getTemplate().getBaseValue(stat, 0);
|
||||||
if (creature.isPet())
|
if (creature.isPet())
|
||||||
{
|
{
|
||||||
final PetInstance pet = (PetInstance) creature;
|
final PetInstance pet = (PetInstance) creature;
|
||||||
baseValue += pet.getPetLevelData().getPetMaxMP();
|
baseValue = pet.getPetLevelData().getPetMaxMP();
|
||||||
}
|
}
|
||||||
else if (creature.isPlayer())
|
else if (creature.isPlayer())
|
||||||
{
|
{
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
baseValue += player.getTemplate().getBaseMpMax(player.getLevel());
|
baseValue = player.getTemplate().getBaseMpMax(player.getLevel());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
|
||||||
|
@@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction
|
|||||||
{
|
{
|
||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat));
|
double baseValue = creature.getTemplate().getBaseValue(stat, 0);
|
||||||
if (creature.isPet())
|
if (creature.isPet())
|
||||||
{
|
{
|
||||||
final PetInstance pet = (PetInstance) creature;
|
final PetInstance pet = (PetInstance) creature;
|
||||||
baseValue += pet.getPetLevelData().getPetMaxMP();
|
baseValue = pet.getPetLevelData().getPetMaxMP();
|
||||||
}
|
}
|
||||||
else if (creature.isPlayer())
|
else if (creature.isPlayer())
|
||||||
{
|
{
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
baseValue += player.getTemplate().getBaseMpMax(player.getLevel());
|
baseValue = player.getTemplate().getBaseMpMax(player.getLevel());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
final double menBonus = creature.getMEN() > 0 ? BaseStats.MEN.calcBonus(creature) : 1.;
|
final double menBonus = creature.getMEN() > 0 ? BaseStats.MEN.calcBonus(creature) : 1.;
|
||||||
|
@@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction
|
|||||||
{
|
{
|
||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat));
|
double baseValue = creature.getTemplate().getBaseValue(stat, 0);
|
||||||
if (creature.isPet())
|
if (creature.isPet())
|
||||||
{
|
{
|
||||||
final PetInstance pet = (PetInstance) creature;
|
final PetInstance pet = (PetInstance) creature;
|
||||||
baseValue += pet.getPetLevelData().getPetMaxMP();
|
baseValue = pet.getPetLevelData().getPetMaxMP();
|
||||||
}
|
}
|
||||||
else if (creature.isPlayer())
|
else if (creature.isPlayer())
|
||||||
{
|
{
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
baseValue += player.getTemplate().getBaseMpMax(player.getLevel());
|
baseValue = player.getTemplate().getBaseMpMax(player.getLevel());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
final double menBonus = creature.getMEN() > 0 ? BaseStats.MEN.calcBonus(creature) : 1.;
|
final double menBonus = creature.getMEN() > 0 ? BaseStats.MEN.calcBonus(creature) : 1.;
|
||||||
|
@@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction
|
|||||||
{
|
{
|
||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat));
|
double baseValue = creature.getTemplate().getBaseValue(stat, 0);
|
||||||
if (creature.isPet())
|
if (creature.isPet())
|
||||||
{
|
{
|
||||||
final PetInstance pet = (PetInstance) creature;
|
final PetInstance pet = (PetInstance) creature;
|
||||||
baseValue += pet.getPetLevelData().getPetMaxMP();
|
baseValue = pet.getPetLevelData().getPetMaxMP();
|
||||||
}
|
}
|
||||||
else if (creature.isPlayer())
|
else if (creature.isPlayer())
|
||||||
{
|
{
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
baseValue += player.getTemplate().getBaseMpMax(player.getLevel());
|
baseValue = player.getTemplate().getBaseMpMax(player.getLevel());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
final double menBonus = creature.getMEN() > 0 ? BaseStats.MEN.calcBonus(creature) : 1.;
|
final double menBonus = creature.getMEN() > 0 ? BaseStats.MEN.calcBonus(creature) : 1.;
|
||||||
|
@@ -35,18 +35,18 @@ public class MaxMpFinalizer implements IStatsFunction
|
|||||||
{
|
{
|
||||||
throwIfPresent(base);
|
throwIfPresent(base);
|
||||||
|
|
||||||
double baseValue = creature.getStat().getValue(stat, calcWeaponPlusBaseValue(creature, stat));
|
double baseValue = creature.getTemplate().getBaseValue(stat, 0);
|
||||||
if (creature.isPet())
|
if (creature.isPet())
|
||||||
{
|
{
|
||||||
final PetInstance pet = (PetInstance) creature;
|
final PetInstance pet = (PetInstance) creature;
|
||||||
baseValue += pet.getPetLevelData().getPetMaxMP();
|
baseValue = pet.getPetLevelData().getPetMaxMP();
|
||||||
}
|
}
|
||||||
else if (creature.isPlayer())
|
else if (creature.isPlayer())
|
||||||
{
|
{
|
||||||
final PlayerInstance player = creature.getActingPlayer();
|
final PlayerInstance player = creature.getActingPlayer();
|
||||||
if (player != null)
|
if (player != null)
|
||||||
{
|
{
|
||||||
baseValue += player.getTemplate().getBaseMpMax(player.getLevel());
|
baseValue = player.getTemplate().getBaseMpMax(player.getLevel());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
final double menBonus = creature.getMEN() > 0 ? BaseStats.MEN.calcBonus(creature) : 1.;
|
final double menBonus = creature.getMEN() > 0 ? BaseStats.MEN.calcBonus(creature) : 1.;
|
||||||
|
Reference in New Issue
Block a user