Removed duplicate element AbnornalLvl in favor of AbnormalLevel.
This commit is contained in:
@@ -172,9 +172,9 @@ public class Maguen extends AbstractNpcAI
|
||||
final BuffInfo bInfo = player.getEffectList().getFirstBuffInfoByAbnormalType(B_PLASMA1.getSkill().getAbnormalType());
|
||||
final BuffInfo cInfo = player.getEffectList().getFirstBuffInfoByAbnormalType(C_PLASMA1.getSkill().getAbnormalType());
|
||||
final BuffInfo rInfo = player.getEffectList().getFirstBuffInfoByAbnormalType(R_PLASMA1.getSkill().getAbnormalType());
|
||||
final int b = bInfo == null ? 0 : bInfo.getSkill().getAbnormalLvl();
|
||||
final int c = cInfo == null ? 0 : cInfo.getSkill().getAbnormalLvl();
|
||||
final int r = rInfo == null ? 0 : rInfo.getSkill().getAbnormalLvl();
|
||||
final int b = bInfo == null ? 0 : bInfo.getSkill().getAbnormalLevel();
|
||||
final int c = cInfo == null ? 0 : cInfo.getSkill().getAbnormalLevel();
|
||||
final int r = rInfo == null ? 0 : rInfo.getSkill().getAbnormalLevel();
|
||||
if ((b == 3) && (c == 0) && (r == 0))
|
||||
{
|
||||
showOnScreenMsg(player, NpcStringId.ENOUGH_MAGUEN_PLASMA_BISTAKON_HAVE_GATHERED, 2, 4000);
|
||||
@@ -262,9 +262,9 @@ public class Maguen extends AbstractNpcAI
|
||||
final BuffInfo i1Info = caster.getEffectList().getFirstBuffInfoByAbnormalType(B_PLASMA1.getSkill().getAbnormalType());
|
||||
final BuffInfo i2Info = caster.getEffectList().getFirstBuffInfoByAbnormalType(C_PLASMA1.getSkill().getAbnormalType());
|
||||
final BuffInfo i3Info = caster.getEffectList().getFirstBuffInfoByAbnormalType(R_PLASMA1.getSkill().getAbnormalType());
|
||||
final int i1 = i1Info == null ? 0 : i1Info.getSkill().getAbnormalLvl();
|
||||
final int i2 = i2Info == null ? 0 : i2Info.getSkill().getAbnormalLvl();
|
||||
final int i3 = i3Info == null ? 0 : i3Info.getSkill().getAbnormalLvl();
|
||||
final int i1 = i1Info == null ? 0 : i1Info.getSkill().getAbnormalLevel();
|
||||
final int i2 = i2Info == null ? 0 : i2Info.getSkill().getAbnormalLevel();
|
||||
final int i3 = i3Info == null ? 0 : i3Info.getSkill().getAbnormalLevel();
|
||||
caster.getEffectList().stopEffects(B_PLASMA1.getSkill().getAbnormalType());
|
||||
caster.getEffectList().stopEffects(C_PLASMA1.getSkill().getAbnormalType());
|
||||
caster.getEffectList().stopEffects(R_PLASMA1.getSkill().getAbnormalType());
|
||||
|
@@ -94,7 +94,7 @@ public class DispelBySlot extends AbstractEffect
|
||||
}
|
||||
|
||||
final Short abnormalLevel = _dispelAbnormals.get(info.getSkill().getAbnormalType());
|
||||
return (abnormalLevel != null) && ((abnormalLevel.shortValue() < 0) || (abnormalLevel.shortValue() >= info.getSkill().getAbnormalLvl()));
|
||||
return (abnormalLevel != null) && ((abnormalLevel.shortValue() < 0) || (abnormalLevel.shortValue() >= info.getSkill().getAbnormalLevel()));
|
||||
}, true, true);
|
||||
}
|
||||
}
|
||||
|
@@ -49,13 +49,13 @@ public class OpCheckAbnormalSkillCondition implements ISkillCondition
|
||||
{
|
||||
case CASTER:
|
||||
{
|
||||
return caster.getEffectList().hasAbnormalType(_type, info -> (info.getSkill().getAbnormalLvl() >= _level)) == _hasAbnormal;
|
||||
return caster.getEffectList().hasAbnormalType(_type, info -> (info.getSkill().getAbnormalLevel() >= _level)) == _hasAbnormal;
|
||||
}
|
||||
case TARGET:
|
||||
{
|
||||
if ((target != null) && target.isCreature())
|
||||
{
|
||||
return ((Creature) target).getEffectList().hasAbnormalType(_type, info -> (info.getSkill().getAbnormalLvl() >= _level)) == _hasAbnormal;
|
||||
return ((Creature) target).getEffectList().hasAbnormalType(_type, info -> (info.getSkill().getAbnormalLevel() >= _level)) == _hasAbnormal;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -163,7 +163,7 @@ public class Nursery extends AbstractInstance
|
||||
}
|
||||
|
||||
final BuffInfo energyInfo = player.getEffectList().getFirstBuffInfoByAbnormalType(ENERGY_SKILL_1.getSkill().getAbnormalType());
|
||||
final int energyLv = energyInfo == null ? 0 : energyInfo.getSkill().getAbnormalLvl();
|
||||
final int energyLv = energyInfo == null ? 0 : energyInfo.getSkill().getAbnormalLevel();
|
||||
if ((energyLv > 0) && (gameStage == 1))
|
||||
{
|
||||
int addPoints = 0;
|
||||
|
Reference in New Issue
Block a user