Vitality related skill condition handlers rework.

Thanks to CostyKiller.
This commit is contained in:
MobiusDevelopment
2021-10-21 14:02:59 +00:00
parent ef9c20e8b4
commit 33e21c1e50
364 changed files with 3630 additions and 3045 deletions

View File

@@ -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);

View File

@@ -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);
}
}

View File

@@ -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);
}
}
}

View File

@@ -2305,8 +2305,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">

View File

@@ -1198,8 +1198,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">
@@ -1221,8 +1220,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">

View File

@@ -3012,10 +3012,6 @@
<irreplacableBuff>true</irreplacableBuff>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
</conditions>
</skill>
<skill id="2884" toLevel="1" name="Vitality Recovering Potion">
<!-- For 20 min., Vitality is recovered when acquiring XP. -->
@@ -3038,10 +3034,6 @@
<irreplacableBuff>true</irreplacableBuff>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
</conditions>
</skill>
<skill id="2885" toLevel="1" name="Shield">
<!-- P. Def. +15% for 60 min. -->
@@ -3240,8 +3232,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="2894" toLevel="1" name="Valentine's Day Candy">
@@ -3258,8 +3249,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">

View File

@@ -2558,8 +2558,7 @@
<targetType>TARGET</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">

View File

@@ -419,8 +419,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="6124" toLevel="1" name="Agathion Cute Trick - Neolithica">
@@ -1722,8 +1721,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="6197" toLevel="1" name="Agathion Cute Trick - Oink Oink">

View File

@@ -687,8 +687,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="9036" toLevel="1" name="Special July 7th Parcel">
@@ -783,8 +782,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">
@@ -806,8 +804,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">
@@ -852,8 +849,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>8</level>
@@ -4611,8 +4607,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">

View File

@@ -720,8 +720,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="9114" toLevel="1" name="Nevit's Voice">
@@ -2345,8 +2344,6 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>8</level>
@@ -3357,8 +3354,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>8</level>
@@ -3386,8 +3382,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>8</level>

View File

@@ -1656,8 +1656,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>8</level>

View File

@@ -92,8 +92,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>8</level>

View File

@@ -1900,8 +1900,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>8</level>

View File

@@ -1725,8 +1725,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">
@@ -1746,8 +1745,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointsRate">
@@ -1770,8 +1768,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">
@@ -1793,8 +1790,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">
@@ -1816,8 +1812,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">
@@ -1839,8 +1834,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">
@@ -1862,8 +1856,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">

View File

@@ -1316,7 +1316,7 @@
<targetType>TARGET</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="15466" toLevel="1" name="Triol's CON Increase">

View File

@@ -129,7 +129,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">
@@ -149,7 +149,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">
@@ -169,7 +169,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">

View File

@@ -897,8 +897,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>1</level>

View File

@@ -942,8 +942,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>26</level>
@@ -975,8 +974,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>26</level>
@@ -1008,8 +1006,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>26</level>

View File

@@ -938,8 +938,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">

View File

@@ -945,8 +945,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="22131" toLevel="1" name="Red Fireworks">
@@ -1141,8 +1140,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">
@@ -1165,8 +1163,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">
@@ -2539,8 +2536,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointsRate">
@@ -2645,8 +2641,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="22188" toLevel="1" name="Summon Big Wedding Cake">

View File

@@ -543,8 +543,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">
@@ -567,8 +566,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">
@@ -1515,8 +1513,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="22253" toLevel="1" name="Prophecy of Water">
@@ -2821,8 +2818,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="CheckLevel">
<minLevel>1</minLevel>
<maxLevel>75</maxLevel>
@@ -2851,8 +2847,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="CheckLevel">
<minLevel>1</minLevel>
<maxLevel>75</maxLevel>
@@ -2881,8 +2876,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="CheckLevel">
<minLevel>1</minLevel>
<maxLevel>75</maxLevel>
@@ -2911,8 +2905,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="CheckLevel">
<minLevel>1</minLevel>
<maxLevel>75</maxLevel>

View File

@@ -66,8 +66,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>8</level>
@@ -297,8 +296,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>8</level>
@@ -1686,8 +1684,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>8</level>
@@ -1747,8 +1744,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
<condition name="OpCheckAbnormal">
<type>VP_UP</type>
<level>8</level>
@@ -2592,8 +2588,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="22398" toLevel="1" name="Allegra Box">

View File

@@ -443,8 +443,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="22408" toLevel="1" name="Enchanting Tool Box">

View File

@@ -1459,8 +1459,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="22596" toLevel="2" name="Scroll: Replenish Vitality">
@@ -1475,8 +1474,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="22597" toLevel="3" name="Scroll: Replenish Vitality">

View File

@@ -409,8 +409,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointsRate">
@@ -452,8 +451,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointsRate">
@@ -1717,8 +1715,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointsRate">
@@ -1746,8 +1743,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="22669" toLevel="1" name="Pretzel">

View File

@@ -210,8 +210,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="22708" toLevel="1" name="Nevit's Hourglass (1-hour)">
@@ -297,10 +296,6 @@
<reuseDelay>3600000</reuseDelay>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
</conditions>
</skill>
<skill id="22712" toLevel="1" name="Vitality Recovering Potion">
<!-- For 30 min., Vitality is replenished with XP gain through hunting. Effect remains even after death. -->
@@ -321,10 +316,6 @@
<isMagic>4</isMagic>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
</conditions>
</skill>
<skill id="22713" toLevel="1" name="Letter Collector's Gift">
<!-- For 2 h., Atk./ Casting Spd. +15%, and Speed +20. -->
@@ -2021,8 +2012,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="22766" toLevel="1" name="Vitality Maintaining Potion">
@@ -2045,8 +2035,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="22767" toLevel="2" name="Vitality Maintaining Potion">
@@ -2069,8 +2058,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="22768" toLevel="1" name="Metal Suit Top Appearance Stone">

View File

@@ -654,7 +654,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="22849" toLevel="1" name="Dragon Vitality Replenishing Potion">
@@ -714,8 +714,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="22852" toLevel="1" name="Piroscki - Replenish Vitality">
@@ -738,8 +737,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="22853" toLevel="1" name="Torun Gingerbread (1-h.)">

View File

@@ -915,8 +915,7 @@
<targetType>TARGET</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointsRate">
@@ -1186,8 +1185,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointsRate">
@@ -1208,8 +1206,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<effect name="VitalityPointUp">
@@ -1327,8 +1324,7 @@
<targetType>TARGET</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
<effects>
<!-- TODO: Need new effect i_dispel_by_name. -->

View File

@@ -771,8 +771,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="23334" toLevel="1" name="Lantern Agathion Cute Trick">
@@ -811,8 +810,7 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="CanRestoreVitalPoint" />
<condition name="CanUseVitalityConsumeItem" />
<condition name="CanUseVitalityIncreaseItem" />
</conditions>
</skill>
<skill id="23336" toLevel="1" name="Agathion Chuchu's Cute Trick">

View File

@@ -602,6 +602,9 @@
<!-- Adena drop rate +3% if you have Vitality. -->
<icon>icon.skill0000</icon>
<operateType>P</operateType>
<conditions>
<condition name="HasVitalityPoints" />
</conditions>
<effects>
<effect name="BonusDropAdena">
<amount>