Cleanup for latest effect additions.
This commit is contained in:
@@ -28,18 +28,18 @@ import org.l2jmobius.gameserver.model.stats.Stat;
|
|||||||
*/
|
*/
|
||||||
public class StatAddForStat extends AbstractEffect
|
public class StatAddForStat extends AbstractEffect
|
||||||
{
|
{
|
||||||
private final Stat _statCheck;
|
private final Stat _stat;
|
||||||
private final int _min;
|
private final int _min;
|
||||||
private final int _max;
|
private final int _max;
|
||||||
private final Stat _stat;
|
private final Stat _addStat;
|
||||||
private final double _amount;
|
private final double _amount;
|
||||||
|
|
||||||
public StatAddForStat(StatSet params)
|
public StatAddForStat(StatSet params)
|
||||||
{
|
{
|
||||||
_statCheck = params.getEnum("stat", Stat.class);
|
_stat = params.getEnum("stat", Stat.class);
|
||||||
_min = params.getInt("min", 0);
|
_min = params.getInt("min", 0);
|
||||||
_max = params.getInt("max", 2147483647);
|
_max = params.getInt("max", 2147483647);
|
||||||
_stat = params.getEnum("addStat", Stat.class);
|
_addStat = params.getEnum("addStat", Stat.class);
|
||||||
_amount = params.getDouble("amount", 0);
|
_amount = params.getDouble("amount", 0);
|
||||||
if (params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF) != StatModifierType.DIFF)
|
if (params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF) != StatModifierType.DIFF)
|
||||||
{
|
{
|
||||||
@@ -50,10 +50,10 @@ public class StatAddForStat extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
final int currentValue = (int) effected.getStat().getValue(_statCheck);
|
final int currentValue = (int) effected.getStat().getValue(_stat);
|
||||||
if ((currentValue >= _min) && (currentValue <= _max))
|
if ((currentValue >= _min) && (currentValue <= _max))
|
||||||
{
|
{
|
||||||
effected.getStat().mergeAdd(_stat, _amount);
|
effected.getStat().mergeAdd(_addStat, _amount);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -32,7 +32,7 @@ public class StatMulForBaseStat extends AbstractEffect
|
|||||||
private final BaseStat _baseStat;
|
private final BaseStat _baseStat;
|
||||||
private final int _min;
|
private final int _min;
|
||||||
private final int _max;
|
private final int _max;
|
||||||
private final Stat _stat;
|
private final Stat _mulStat;
|
||||||
private final double _amount;
|
private final double _amount;
|
||||||
|
|
||||||
public StatMulForBaseStat(StatSet params)
|
public StatMulForBaseStat(StatSet params)
|
||||||
@@ -40,7 +40,7 @@ public class StatMulForBaseStat extends AbstractEffect
|
|||||||
_baseStat = params.getEnum("baseStat", BaseStat.class);
|
_baseStat = params.getEnum("baseStat", BaseStat.class);
|
||||||
_min = params.getInt("min", 0);
|
_min = params.getInt("min", 0);
|
||||||
_max = params.getInt("max", 2147483647);
|
_max = params.getInt("max", 2147483647);
|
||||||
_stat = params.getEnum("mulStat", Stat.class);
|
_mulStat = params.getEnum("mulStat", Stat.class);
|
||||||
_amount = params.getDouble("amount", 0);
|
_amount = params.getDouble("amount", 0);
|
||||||
if (params.getEnum("mode", StatModifierType.class, StatModifierType.PER) != StatModifierType.PER)
|
if (params.getEnum("mode", StatModifierType.class, StatModifierType.PER) != StatModifierType.PER)
|
||||||
{
|
{
|
||||||
@@ -98,7 +98,7 @@ public class StatMulForBaseStat extends AbstractEffect
|
|||||||
|
|
||||||
if ((currentValue >= _min) && (currentValue <= _max))
|
if ((currentValue >= _min) && (currentValue <= _max))
|
||||||
{
|
{
|
||||||
effected.getStat().mergeMul(_stat, (_amount / 100) + 1);
|
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -28,18 +28,18 @@ import org.l2jmobius.gameserver.model.stats.Stat;
|
|||||||
*/
|
*/
|
||||||
public class StatAddForStat extends AbstractEffect
|
public class StatAddForStat extends AbstractEffect
|
||||||
{
|
{
|
||||||
private final Stat _statCheck;
|
private final Stat _stat;
|
||||||
private final int _min;
|
private final int _min;
|
||||||
private final int _max;
|
private final int _max;
|
||||||
private final Stat _stat;
|
private final Stat _addStat;
|
||||||
private final double _amount;
|
private final double _amount;
|
||||||
|
|
||||||
public StatAddForStat(StatSet params)
|
public StatAddForStat(StatSet params)
|
||||||
{
|
{
|
||||||
_statCheck = params.getEnum("stat", Stat.class);
|
_stat = params.getEnum("stat", Stat.class);
|
||||||
_min = params.getInt("min", 0);
|
_min = params.getInt("min", 0);
|
||||||
_max = params.getInt("max", 2147483647);
|
_max = params.getInt("max", 2147483647);
|
||||||
_stat = params.getEnum("addStat", Stat.class);
|
_addStat = params.getEnum("addStat", Stat.class);
|
||||||
_amount = params.getDouble("amount", 0);
|
_amount = params.getDouble("amount", 0);
|
||||||
if (params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF) != StatModifierType.DIFF)
|
if (params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF) != StatModifierType.DIFF)
|
||||||
{
|
{
|
||||||
@@ -50,10 +50,10 @@ public class StatAddForStat extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
final int currentValue = (int) effected.getStat().getValue(_statCheck);
|
final int currentValue = (int) effected.getStat().getValue(_stat);
|
||||||
if ((currentValue >= _min) && (currentValue <= _max))
|
if ((currentValue >= _min) && (currentValue <= _max))
|
||||||
{
|
{
|
||||||
effected.getStat().mergeAdd(_stat, _amount);
|
effected.getStat().mergeAdd(_addStat, _amount);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -32,7 +32,7 @@ public class StatMulForBaseStat extends AbstractEffect
|
|||||||
private final BaseStat _baseStat;
|
private final BaseStat _baseStat;
|
||||||
private final int _min;
|
private final int _min;
|
||||||
private final int _max;
|
private final int _max;
|
||||||
private final Stat _stat;
|
private final Stat _mulStat;
|
||||||
private final double _amount;
|
private final double _amount;
|
||||||
|
|
||||||
public StatMulForBaseStat(StatSet params)
|
public StatMulForBaseStat(StatSet params)
|
||||||
@@ -40,7 +40,7 @@ public class StatMulForBaseStat extends AbstractEffect
|
|||||||
_baseStat = params.getEnum("baseStat", BaseStat.class);
|
_baseStat = params.getEnum("baseStat", BaseStat.class);
|
||||||
_min = params.getInt("min", 0);
|
_min = params.getInt("min", 0);
|
||||||
_max = params.getInt("max", 2147483647);
|
_max = params.getInt("max", 2147483647);
|
||||||
_stat = params.getEnum("mulStat", Stat.class);
|
_mulStat = params.getEnum("mulStat", Stat.class);
|
||||||
_amount = params.getDouble("amount", 0);
|
_amount = params.getDouble("amount", 0);
|
||||||
if (params.getEnum("mode", StatModifierType.class, StatModifierType.PER) != StatModifierType.PER)
|
if (params.getEnum("mode", StatModifierType.class, StatModifierType.PER) != StatModifierType.PER)
|
||||||
{
|
{
|
||||||
@@ -88,7 +88,7 @@ public class StatMulForBaseStat extends AbstractEffect
|
|||||||
|
|
||||||
if ((currentValue >= _min) && (currentValue <= _max))
|
if ((currentValue >= _min) && (currentValue <= _max))
|
||||||
{
|
{
|
||||||
effected.getStat().mergeMul(_stat, (_amount / 100) + 1);
|
effected.getStat().mergeMul(_mulStat, (_amount / 100) + 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user