Vitality related skill condition handlers rework.
Thanks to CostyKiller.
This commit is contained in:
@@ -36,7 +36,6 @@ public class SkillConditionMasterHandler
|
||||
SkillConditionHandler.getInstance().registerHandler("CanMountForEvent", CanMountForEventSkillCondition::new);
|
||||
SkillConditionHandler.getInstance().registerHandler("CannotUseInTransform", CannotUseInTransformSkillCondition::new);
|
||||
SkillConditionHandler.getInstance().registerHandler("CanRefuelAirship", CanRefuelAirshipSkillCondition::new);
|
||||
SkillConditionHandler.getInstance().registerHandler("CanRestoreVitalPoint", CanRestoreVitalPointSkillCondition::new);
|
||||
SkillConditionHandler.getInstance().registerHandler("CanSummon", CanSummonSkillCondition::new);
|
||||
SkillConditionHandler.getInstance().registerHandler("CanSummonCubic", CanSummonCubicSkillCondition::new);
|
||||
SkillConditionHandler.getInstance().registerHandler("CanSummonMulti", CanSummonMultiSkillCondition::new);
|
||||
@@ -48,7 +47,8 @@ public class SkillConditionMasterHandler
|
||||
SkillConditionHandler.getInstance().registerHandler("CanUseInBattlefield", CanUseInBattlefieldSkillCondition::new);
|
||||
SkillConditionHandler.getInstance().registerHandler("CanUseInDragonLair", CanUseInDragonLairSkillCondition::new);
|
||||
SkillConditionHandler.getInstance().registerHandler("CanUseSwoopCannon", CanUseSwoopCannonSkillCondition::new);
|
||||
SkillConditionHandler.getInstance().registerHandler("CanUseVitalityConsumeItem", CanUseVitalityConsumeItemSkillCondition::new);
|
||||
SkillConditionHandler.getInstance().registerHandler("HasVitalityPoints", HasVitalityPointsSkillCondition::new);
|
||||
SkillConditionHandler.getInstance().registerHandler("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new);
|
||||
SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new);
|
||||
SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new);
|
||||
SkillConditionHandler.getInstance().registerHandler("ConsumeBody", ConsumeBodySkillCondition::new);
|
||||
|
@@ -19,18 +19,25 @@ package handlers.skillconditionhandlers;
|
||||
import org.l2jmobius.gameserver.model.StatSet;
|
||||
import org.l2jmobius.gameserver.model.WorldObject;
|
||||
import org.l2jmobius.gameserver.model.actor.Creature;
|
||||
import org.l2jmobius.gameserver.model.actor.stat.PlayerStat;
|
||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
||||
import org.l2jmobius.gameserver.model.skills.Skill;
|
||||
|
||||
public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition
|
||||
/**
|
||||
* @author Mode
|
||||
*/
|
||||
public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition
|
||||
{
|
||||
public CanUseVitalityConsumeItemSkillCondition(StatSet params)
|
||||
private final int _amount;
|
||||
|
||||
public CanUseVitalityIncreaseItemSkillCondition(StatSet params)
|
||||
{
|
||||
_amount = params.getInt("amount", 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||
{
|
||||
return true;
|
||||
return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS);
|
||||
}
|
||||
}
|
@@ -22,15 +22,21 @@ import org.l2jmobius.gameserver.model.actor.Creature;
|
||||
import org.l2jmobius.gameserver.model.skills.ISkillCondition;
|
||||
import org.l2jmobius.gameserver.model.skills.Skill;
|
||||
|
||||
public class CanRestoreVitalPointSkillCondition implements ISkillCondition
|
||||
/**
|
||||
* @author Mode
|
||||
*/
|
||||
public class HasVitalityPointsSkillCondition implements ISkillCondition
|
||||
{
|
||||
public CanRestoreVitalPointSkillCondition(StatSet params)
|
||||
private final int _amount;
|
||||
|
||||
public HasVitalityPointsSkillCondition(StatSet params)
|
||||
{
|
||||
_amount = params.getInt("amount", 1);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canUse(Creature caster, Skill skill, WorldObject target)
|
||||
{
|
||||
return true;
|
||||
return caster.isPlayer() && (caster.getActingPlayer().getVitalityPoints() >= _amount);
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user