lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored MaxVitalityItemsUsed to MinimumVitalityPoints.

Browse Source
This commit is contained in:
MobiusDev
2018-07-29 10:32:55 +00:00
parent 86fc4f43ed
commit 4a1a3ba909
17 changed files with 171 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/engines/DocumentBase.java
View File

@@ -50,6 +50,7 @@ import com.l2jmobius.gameserver.model.conditions.ConditionLogicAnd;
import com.l2jmobius.gameserver.model.conditions.ConditionLogicNot;
import com.l2jmobius.gameserver.model.conditions.ConditionLogicOr;
import com.l2jmobius.gameserver.model.conditions.ConditionMinDistance;
import com.l2jmobius.gameserver.model.conditions.ConditionMinimumVitalityPoints;
import com.l2jmobius.gameserver.model.conditions.ConditionPlayerActiveEffectId;
import com.l2jmobius.gameserver.model.conditions.ConditionPlayerActiveSkillId;
import com.l2jmobius.gameserver.model.conditions.ConditionPlayerAgathionId;
@@ -132,7 +133,6 @@ import com.l2jmobius.gameserver.model.conditions.ConditionTargetWeight;
import com.l2jmobius.gameserver.model.conditions.ConditionUsingItemType;
import com.l2jmobius.gameserver.model.conditions.ConditionUsingSkill;
import com.l2jmobius.gameserver.model.conditions.ConditionUsingSlotType;
import com.l2jmobius.gameserver.model.conditions.ConditionMaxVitalityItemsUsed;
import com.l2jmobius.gameserver.model.conditions.ConditionWithSkill;
import com.l2jmobius.gameserver.model.items.L2Item;
import com.l2jmobius.gameserver.model.items.type.ArmorType;
@@ -1084,10 +1084,10 @@ public abstract class DocumentBase
cond = joinAnd(cond, new ConditionTargetCheckCrtEffect(Boolean.parseBoolean(a.getNodeValue())));
break;
}
case "maxvitalityitemsused":
case "minimumvitalitypoints":
{
final int count = Integer.decode(getValue(a.getNodeValue(), null));
cond = joinAnd(cond, new ConditionMaxVitalityItemsUsed(count));
cond = joinAnd(cond, new ConditionMinimumVitalityPoints(count));
break;
}
}

6
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/conditions/ConditionMaxVitalityItemsUsed.java → L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/conditions/ConditionMinimumVitalityPoints.java
View File

@@ -24,11 +24,11 @@ import com.l2jmobius.gameserver.model.skills.Skill;
/**
* @author Mobius
*/
public class ConditionMaxVitalityItemsUsed extends Condition
public class ConditionMinimumVitalityPoints extends Condition
{
private final int _count;
public ConditionMaxVitalityItemsUsed(int count)
public ConditionMinimumVitalityPoints(int count)
{
_count = count;
}
@@ -39,7 +39,7 @@ public class ConditionMaxVitalityItemsUsed extends Condition
final L2PcInstance player = effector.getActingPlayer();
if (player != null)
{
return player.getVitalityItemsUsed() < _count;
return player.getVitalityPoints() >= _count;
}
return false;
}