diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 4b24edc1fa..95af1dea6b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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,7 @@ 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("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("ConsumeBody", ConsumeBodySkillCondition::new); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java similarity index 70% rename from L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java rename to L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java index ac8f3bb569..521770f12b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -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 CanRestoreVitalPointSkillCondition implements ISkillCondition +/** + * @author Mode + */ +public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition { - public CanRestoreVitalPointSkillCondition(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); } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02500-02599.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02500-02599.xml index 292663de3e..563c165e1f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02500-02599.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02500-02599.xml @@ -2292,8 +2292,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02600-02699.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02600-02699.xml index 05463fbc86..b97b4696cd 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02600-02699.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02600-02699.xml @@ -1198,8 +1198,7 @@ SELF SINGLE - - + @@ -1221,8 +1220,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02800-02899.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02800-02899.xml index ceb5b06e33..97bd5d0aa8 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02800-02899.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/02800-02899.xml @@ -3012,10 +3012,6 @@ true SELF SINGLE - - - - @@ -3038,10 +3034,6 @@ true SELF SINGLE - - - - @@ -3240,8 +3232,7 @@ SELF SINGLE - - + @@ -3258,8 +3249,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/05700-05799.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/05700-05799.xml index 511b9b5c60..0462b75c5d 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/05700-05799.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/05700-05799.xml @@ -2501,8 +2501,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/06100-06199.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/06100-06199.xml index 777d521654..1da9cf18a6 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/06100-06199.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/06100-06199.xml @@ -419,8 +419,7 @@ SELF SINGLE - - + @@ -1688,8 +1687,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09000-09099.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09000-09099.xml index ed4b178f2d..9adefe4a0e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09000-09099.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09000-09099.xml @@ -687,8 +687,7 @@ SELF SINGLE - - + @@ -783,8 +782,7 @@ SELF SINGLE - - + @@ -806,8 +804,7 @@ SELF SINGLE - - + @@ -852,8 +849,7 @@ SELF SINGLE - - + VP_UP 8 @@ -4614,8 +4610,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09100-09199.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09100-09199.xml index 5afd3ab488..9a66d8b28c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09100-09199.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09100-09199.xml @@ -720,8 +720,7 @@ SELF SINGLE - - + @@ -2347,8 +2346,6 @@ SELF SINGLE - - VP_UP 8 @@ -3359,8 +3356,7 @@ SELF SINGLE - - + VP_UP 8 @@ -3388,8 +3384,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09300-09399.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09300-09399.xml index 9e9c65ea21..3d6ad88bf7 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09300-09399.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09300-09399.xml @@ -1653,8 +1653,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09400-09499.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09400-09499.xml index 5afef37f02..5beb70d62e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09400-09499.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09400-09499.xml @@ -92,8 +92,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09500-09599.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09500-09599.xml index afc9163a5d..8559676c72 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09500-09599.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09500-09599.xml @@ -1882,8 +1882,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09700-09799.xml index e85d8580c2..6584b59450 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09700-09799.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/09700-09799.xml @@ -1723,8 +1723,7 @@ SELF SINGLE - - + @@ -1744,8 +1743,7 @@ SELF SINGLE - - + @@ -1768,8 +1766,7 @@ SELF SINGLE - - + @@ -1791,8 +1788,7 @@ SELF SINGLE - - + @@ -1814,8 +1810,7 @@ SELF SINGLE - - + @@ -1837,8 +1832,7 @@ SELF SINGLE - - + @@ -1860,8 +1854,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/15400-15499.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/15400-15499.xml index 877d2a3cc1..4925dd0d81 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/15400-15499.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/15400-15499.xml @@ -1284,7 +1284,7 @@ TARGET SINGLE - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/17100-17199.xml index cad7cfa7bf..a620182f6f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/17100-17199.xml @@ -129,7 +129,7 @@ SELF SINGLE - + @@ -149,7 +149,7 @@ SELF SINGLE - + @@ -169,7 +169,7 @@ SELF SINGLE - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/21200-21299.xml index ad9873827f..4ec4424940 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/21200-21299.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/21200-21299.xml @@ -884,8 +884,7 @@ SELF SINGLE - - + VP_UP 1 diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/21300-21399.xml index a48001b60e..ef7a329bad 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/21300-21399.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/21300-21399.xml @@ -952,8 +952,7 @@ SELF SINGLE - - + VP_UP 26 @@ -986,8 +985,7 @@ SELF SINGLE - - + VP_UP 26 @@ -1019,8 +1017,7 @@ SELF SINGLE - - + VP_UP 26 diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22000-22099.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22000-22099.xml index 05177c3dba..405c13fb57 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22000-22099.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22000-22099.xml @@ -938,8 +938,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22100-22199.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22100-22199.xml index 6190c05064..c15e61c188 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22100-22199.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22100-22199.xml @@ -947,8 +947,7 @@ SELF SINGLE - - + @@ -1143,8 +1142,7 @@ SELF SINGLE - - + @@ -1167,8 +1165,7 @@ SELF SINGLE - - + @@ -2541,8 +2538,7 @@ SELF SINGLE - - + @@ -2647,8 +2643,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22200-22299.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22200-22299.xml index fb6002768f..3b7fe45c1e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22200-22299.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22200-22299.xml @@ -533,8 +533,7 @@ SELF SINGLE - - + @@ -557,8 +556,7 @@ SELF SINGLE - - + @@ -1505,8 +1503,7 @@ SELF SINGLE - - + @@ -2691,8 +2688,7 @@ SELF SINGLE - - + 1 75 @@ -2721,8 +2717,7 @@ SELF SINGLE - - + 1 75 @@ -2751,8 +2746,7 @@ SELF SINGLE - - + 1 75 @@ -2781,8 +2775,7 @@ SELF SINGLE - - + 1 75 diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22300-22399.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22300-22399.xml index 07c24a7b78..6b126d639c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22300-22399.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22300-22399.xml @@ -66,8 +66,7 @@ SELF SINGLE - - + VP_UP 8 @@ -295,8 +294,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1684,8 +1682,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1745,8 +1742,7 @@ SELF SINGLE - - + VP_UP 8 @@ -2590,8 +2586,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22400-22499.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22400-22499.xml index 62fa0a4d7e..86e7fce75d 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22400-22499.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22400-22499.xml @@ -443,8 +443,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22500-22599.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22500-22599.xml index 700518d867..df74169b29 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22500-22599.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22500-22599.xml @@ -1437,8 +1437,7 @@ SELF SINGLE - - + @@ -1453,8 +1452,7 @@ SELF SINGLE - - + @@ -1469,8 +1467,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22600-22699.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22600-22699.xml index 08f240832b..4783e5ba0e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22600-22699.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22600-22699.xml @@ -285,8 +285,7 @@ SELF SINGLE - - + @@ -321,8 +320,7 @@ SELF SINGLE - - + @@ -1581,8 +1579,7 @@ SELF SINGLE - - + @@ -1605,8 +1602,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22700-22799.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22700-22799.xml index d709767271..2af42fdde9 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22700-22799.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22700-22799.xml @@ -208,8 +208,7 @@ SELF SINGLE - - + @@ -295,10 +294,6 @@ 3600000 SELF SINGLE - - - - @@ -319,10 +314,6 @@ 4 SELF SINGLE - - - - @@ -2015,8 +2006,7 @@ SELF SINGLE - - + @@ -2039,8 +2029,7 @@ SELF SINGLE - - + @@ -2063,8 +2052,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22800-22899.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22800-22899.xml index 94035e0d51..7bf92206de 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22800-22899.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/22800-22899.xml @@ -654,7 +654,7 @@ SELF SINGLE - + @@ -714,8 +714,7 @@ SELF SINGLE - - + @@ -738,8 +737,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/23100-23199.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/23100-23199.xml index d02fc51f9f..a8f3bdb69d 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/23100-23199.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/23100-23199.xml @@ -948,8 +948,7 @@ TARGET SINGLE - - + @@ -1219,8 +1218,7 @@ SELF SINGLE - - + @@ -1241,8 +1239,7 @@ SELF SINGLE - - + @@ -1361,8 +1358,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/23300-23399.xml index a2918a8b6a..065b141406 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/23300-23399.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/23300-23399.xml @@ -770,8 +770,7 @@ SELF SINGLE - - + @@ -810,8 +809,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 4b24edc1fa..95af1dea6b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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,7 @@ 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("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("ConsumeBody", ConsumeBodySkillCondition::new); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java similarity index 70% rename from L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java rename to L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java index 62cd6cf2dd..521770f12b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -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); } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02500-02599.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02500-02599.xml index f3e52cf37d..3b2c694936 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02500-02599.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02500-02599.xml @@ -2292,8 +2292,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02600-02699.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02600-02699.xml index c1d51b21b6..417382b421 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02600-02699.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02600-02699.xml @@ -1198,8 +1198,7 @@ SELF SINGLE - - + @@ -1221,8 +1220,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02800-02899.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02800-02899.xml index 5aa38c192f..4ca2b20786 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02800-02899.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/02800-02899.xml @@ -3013,8 +3013,7 @@ SELF SINGLE - - + @@ -3039,8 +3038,7 @@ SELF SINGLE - - + @@ -3240,8 +3238,7 @@ SELF SINGLE - - + @@ -3258,8 +3255,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/05700-05799.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/05700-05799.xml index d01cd8f221..5c93a65404 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/05700-05799.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/05700-05799.xml @@ -2532,8 +2532,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/06100-06199.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/06100-06199.xml index cf2c22696b..90a29d519d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/06100-06199.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/06100-06199.xml @@ -419,8 +419,7 @@ SELF SINGLE - - + @@ -1726,8 +1725,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09000-09099.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09000-09099.xml index f2dc0684d6..aaeeea0371 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09000-09099.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09000-09099.xml @@ -687,8 +687,7 @@ SELF SINGLE - - + @@ -783,8 +782,7 @@ SELF SINGLE - - + @@ -806,8 +804,7 @@ SELF SINGLE - - + @@ -852,8 +849,7 @@ SELF SINGLE - - + VP_UP 8 @@ -4611,8 +4607,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09100-09199.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09100-09199.xml index a824af169c..2aed5408df 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09100-09199.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09100-09199.xml @@ -720,8 +720,7 @@ SELF SINGLE - - + @@ -2345,8 +2344,7 @@ SELF SINGLE - - + VP_UP 8 @@ -3357,8 +3355,7 @@ SELF SINGLE - - + VP_UP 8 @@ -3386,8 +3383,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09300-09399.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09300-09399.xml index 0bb4787576..e567adb565 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09300-09399.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09300-09399.xml @@ -1653,8 +1653,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09400-09499.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09400-09499.xml index 78e7e12ec9..d83e280476 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09400-09499.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09400-09499.xml @@ -92,8 +92,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09500-09599.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09500-09599.xml index d4cebd0133..8e5783e0aa 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09500-09599.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09500-09599.xml @@ -1883,8 +1883,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09700-09799.xml index 7392642bc5..661978005e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09700-09799.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/09700-09799.xml @@ -1721,8 +1721,7 @@ SELF SINGLE - - + @@ -1742,8 +1741,7 @@ SELF SINGLE - - + @@ -1766,8 +1764,7 @@ SELF SINGLE - - + @@ -1789,8 +1786,7 @@ SELF SINGLE - - + @@ -1812,8 +1808,7 @@ SELF SINGLE - - + @@ -1835,8 +1830,7 @@ SELF SINGLE - - + @@ -1858,8 +1852,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/15400-15499.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/15400-15499.xml index 877d2a3cc1..4925dd0d81 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/15400-15499.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/15400-15499.xml @@ -1284,7 +1284,7 @@ TARGET SINGLE - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/17100-17199.xml index a9ebe808e1..e6093d1e56 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/17100-17199.xml @@ -129,7 +129,7 @@ SELF SINGLE - + @@ -149,7 +149,7 @@ SELF SINGLE - + @@ -169,7 +169,7 @@ SELF SINGLE - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/21200-21299.xml index d90c472b5f..c98d54ed9d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/21200-21299.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/21200-21299.xml @@ -884,8 +884,7 @@ SELF SINGLE - - + VP_UP 1 diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/21300-21399.xml index 9dd97ef50c..8fd9a7c5c4 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/21300-21399.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/21300-21399.xml @@ -950,8 +950,7 @@ SELF SINGLE - - + VP_UP 26 @@ -984,8 +983,7 @@ SELF SINGLE - - + VP_UP 26 @@ -1017,8 +1015,7 @@ SELF SINGLE - - + VP_UP 26 diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22000-22099.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22000-22099.xml index 0a0040aebc..7cf53ef6e2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22000-22099.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22000-22099.xml @@ -938,8 +938,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22100-22199.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22100-22199.xml index e4a5deeb5d..4a45afce58 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22100-22199.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22100-22199.xml @@ -945,8 +945,7 @@ SELF SINGLE - - + @@ -1141,8 +1140,7 @@ SELF SINGLE - - + @@ -1165,8 +1163,7 @@ SELF SINGLE - - + @@ -2539,8 +2536,7 @@ SELF SINGLE - - + @@ -2645,8 +2641,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22200-22299.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22200-22299.xml index d47890a111..ff8c2104fd 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22200-22299.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22200-22299.xml @@ -532,8 +532,7 @@ SELF SINGLE - - + @@ -556,8 +555,7 @@ SELF SINGLE - - + @@ -1504,8 +1502,7 @@ SELF SINGLE - - + @@ -2690,8 +2687,7 @@ SELF SINGLE - - + 1 75 @@ -2720,8 +2716,7 @@ SELF SINGLE - - + 1 75 @@ -2750,8 +2745,7 @@ SELF SINGLE - - + 1 75 @@ -2780,8 +2774,7 @@ SELF SINGLE - - + 1 75 diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22300-22399.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22300-22399.xml index 5e038dab11..36e9f5e4c9 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22300-22399.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22300-22399.xml @@ -66,8 +66,7 @@ SELF SINGLE - - + VP_UP 8 @@ -297,8 +296,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1686,8 +1684,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1747,8 +1744,7 @@ SELF SINGLE - - + VP_UP 8 @@ -2592,8 +2588,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22400-22499.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22400-22499.xml index 62fa0a4d7e..86e7fce75d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22400-22499.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22400-22499.xml @@ -443,8 +443,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22500-22599.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22500-22599.xml index aeb62d10f7..48c4c9bc7e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22500-22599.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22500-22599.xml @@ -1449,8 +1449,7 @@ SELF SINGLE - - + @@ -1465,8 +1464,7 @@ SELF SINGLE - - + @@ -1481,8 +1479,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22600-22699.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22600-22699.xml index 8bccacfaaa..0474435125 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22600-22699.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22600-22699.xml @@ -285,8 +285,7 @@ SELF SINGLE - - + @@ -321,8 +320,7 @@ SELF SINGLE - - + @@ -1581,8 +1579,7 @@ SELF SINGLE - - + @@ -1605,8 +1602,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22700-22799.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22700-22799.xml index 7edc0c7c1b..576fa8b4b4 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22700-22799.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22700-22799.xml @@ -210,8 +210,7 @@ SELF SINGLE - - + @@ -298,8 +297,7 @@ SELF SINGLE - - + @@ -322,8 +320,7 @@ SELF SINGLE - - + @@ -2017,8 +2014,7 @@ SELF SINGLE - - + @@ -2041,8 +2037,7 @@ SELF SINGLE - - + @@ -2065,8 +2060,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22800-22899.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22800-22899.xml index 48c2e03f16..f9c79122b9 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22800-22899.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/22800-22899.xml @@ -654,7 +654,7 @@ SELF SINGLE - + @@ -714,8 +714,7 @@ SELF SINGLE - - + @@ -738,8 +737,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/23100-23199.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/23100-23199.xml index cf85552f93..4e6af06c94 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/23100-23199.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/23100-23199.xml @@ -948,8 +948,7 @@ TARGET SINGLE - - + @@ -1219,8 +1218,7 @@ SELF SINGLE - - + @@ -1241,8 +1239,7 @@ SELF SINGLE - - + @@ -1361,8 +1358,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/23300-23399.xml index 6853f7e7f7..4681170936 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/23300-23399.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/23300-23399.xml @@ -766,8 +766,7 @@ SELF SINGLE - - + @@ -806,8 +805,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 4b24edc1fa..95af1dea6b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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,7 @@ 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("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("ConsumeBody", ConsumeBodySkillCondition::new); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java deleted file mode 100644 index ac8f3bb569..0000000000 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanRestoreVitalPointSkillCondition implements ISkillCondition -{ - public CanRestoreVitalPointSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java deleted file mode 100644 index 62cd6cf2dd..0000000000 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition -{ - public CanUseVitalityConsumeItemSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java new file mode 100644 index 0000000000..521770f12b --- /dev/null +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -0,0 +1,43 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +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; + +/** + * @author Mode + */ +public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition +{ + private final int _amount; + + public CanUseVitalityIncreaseItemSkillCondition(StatSet params) + { + _amount = params.getInt("amount", 0); + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS); + } +} diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02500-02599.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02500-02599.xml index f3e52cf37d..3b2c694936 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02500-02599.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02500-02599.xml @@ -2292,8 +2292,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02600-02699.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02600-02699.xml index c1d51b21b6..417382b421 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02600-02699.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02600-02699.xml @@ -1198,8 +1198,7 @@ SELF SINGLE - - + @@ -1221,8 +1220,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02800-02899.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02800-02899.xml index 5aa38c192f..f1247be6b5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02800-02899.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/02800-02899.xml @@ -3012,10 +3012,6 @@ true SELF SINGLE - - - - @@ -3038,10 +3034,6 @@ true SELF SINGLE - - - - @@ -3240,8 +3232,7 @@ SELF SINGLE - - + @@ -3258,8 +3249,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/05700-05799.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/05700-05799.xml index d01cd8f221..5c93a65404 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/05700-05799.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/05700-05799.xml @@ -2532,8 +2532,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/06100-06199.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/06100-06199.xml index cf2c22696b..90a29d519d 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/06100-06199.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/06100-06199.xml @@ -419,8 +419,7 @@ SELF SINGLE - - + @@ -1726,8 +1725,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09000-09099.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09000-09099.xml index f2dc0684d6..aaeeea0371 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09000-09099.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09000-09099.xml @@ -687,8 +687,7 @@ SELF SINGLE - - + @@ -783,8 +782,7 @@ SELF SINGLE - - + @@ -806,8 +804,7 @@ SELF SINGLE - - + @@ -852,8 +849,7 @@ SELF SINGLE - - + VP_UP 8 @@ -4611,8 +4607,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09100-09199.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09100-09199.xml index a824af169c..b2095f8834 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09100-09199.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09100-09199.xml @@ -720,8 +720,7 @@ SELF SINGLE - - + @@ -2345,8 +2344,6 @@ SELF SINGLE - - VP_UP 8 @@ -3357,8 +3354,7 @@ SELF SINGLE - - + VP_UP 8 @@ -3386,8 +3382,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09300-09399.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09300-09399.xml index 345e78a799..2b6a0f1d67 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09300-09399.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09300-09399.xml @@ -1653,8 +1653,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09400-09499.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09400-09499.xml index 20597ed94d..7573da6deb 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09400-09499.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09400-09499.xml @@ -92,8 +92,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09500-09599.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09500-09599.xml index 393c648c1c..eef8c6aff5 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09500-09599.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09500-09599.xml @@ -1889,8 +1889,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09700-09799.xml index 9df221c7d1..dfbd5273c8 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09700-09799.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/09700-09799.xml @@ -1721,8 +1721,7 @@ SELF SINGLE - - + @@ -1742,8 +1741,7 @@ SELF SINGLE - - + @@ -1766,8 +1764,7 @@ SELF SINGLE - - + @@ -1789,8 +1786,7 @@ SELF SINGLE - - + @@ -1812,8 +1808,7 @@ SELF SINGLE - - + @@ -1835,8 +1830,7 @@ SELF SINGLE - - + @@ -1858,8 +1852,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/15400-15499.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/15400-15499.xml index e7f2b780b0..5a437f7703 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/15400-15499.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/15400-15499.xml @@ -1284,7 +1284,7 @@ TARGET SINGLE - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/17100-17199.xml index d4d0e40a8d..ce9d462d00 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/17100-17199.xml @@ -129,7 +129,7 @@ SELF SINGLE - + @@ -149,7 +149,7 @@ SELF SINGLE - + @@ -169,7 +169,7 @@ SELF SINGLE - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/21200-21299.xml index efdb908b07..9b5279a1d2 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/21200-21299.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/21200-21299.xml @@ -884,8 +884,7 @@ SELF SINGLE - - + VP_UP 1 diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/21300-21399.xml index 241d799549..354c7d9cfb 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/21300-21399.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/21300-21399.xml @@ -950,8 +950,7 @@ SELF SINGLE - - + VP_UP 26 @@ -984,8 +983,7 @@ SELF SINGLE - - + VP_UP 26 @@ -1017,8 +1015,7 @@ SELF SINGLE - - + VP_UP 26 diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22000-22099.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22000-22099.xml index 0ea3173b67..ef719d165e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22000-22099.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22000-22099.xml @@ -938,8 +938,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22100-22199.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22100-22199.xml index e4a5deeb5d..4a45afce58 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22100-22199.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22100-22199.xml @@ -945,8 +945,7 @@ SELF SINGLE - - + @@ -1141,8 +1140,7 @@ SELF SINGLE - - + @@ -1165,8 +1163,7 @@ SELF SINGLE - - + @@ -2539,8 +2536,7 @@ SELF SINGLE - - + @@ -2645,8 +2641,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22200-22299.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22200-22299.xml index d47890a111..ff8c2104fd 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22200-22299.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22200-22299.xml @@ -532,8 +532,7 @@ SELF SINGLE - - + @@ -556,8 +555,7 @@ SELF SINGLE - - + @@ -1504,8 +1502,7 @@ SELF SINGLE - - + @@ -2690,8 +2687,7 @@ SELF SINGLE - - + 1 75 @@ -2720,8 +2716,7 @@ SELF SINGLE - - + 1 75 @@ -2750,8 +2745,7 @@ SELF SINGLE - - + 1 75 @@ -2780,8 +2774,7 @@ SELF SINGLE - - + 1 75 diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22300-22399.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22300-22399.xml index 472aa3953a..a55d603542 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22300-22399.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22300-22399.xml @@ -66,8 +66,7 @@ SELF SINGLE - - + VP_UP 8 @@ -297,8 +296,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1686,8 +1684,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1747,8 +1744,7 @@ SELF SINGLE - - + VP_UP 8 @@ -2592,8 +2588,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22400-22499.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22400-22499.xml index 90735f7439..c9ec023d43 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22400-22499.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22400-22499.xml @@ -443,8 +443,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22500-22599.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22500-22599.xml index aeb62d10f7..48c4c9bc7e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22500-22599.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22500-22599.xml @@ -1449,8 +1449,7 @@ SELF SINGLE - - + @@ -1465,8 +1464,7 @@ SELF SINGLE - - + @@ -1481,8 +1479,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22600-22699.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22600-22699.xml index 8bccacfaaa..0474435125 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22600-22699.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22600-22699.xml @@ -285,8 +285,7 @@ SELF SINGLE - - + @@ -321,8 +320,7 @@ SELF SINGLE - - + @@ -1581,8 +1579,7 @@ SELF SINGLE - - + @@ -1605,8 +1602,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22700-22799.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22700-22799.xml index b106b975d0..0b5eb3cb53 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22700-22799.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22700-22799.xml @@ -210,8 +210,7 @@ SELF SINGLE - - + @@ -297,10 +296,6 @@ 3600000 SELF SINGLE - - - - @@ -321,10 +316,6 @@ 4 SELF SINGLE - - - - @@ -2017,8 +2008,7 @@ SELF SINGLE - - + @@ -2041,8 +2031,7 @@ SELF SINGLE - - + @@ -2065,8 +2054,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22800-22899.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22800-22899.xml index 48c2e03f16..f9c79122b9 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22800-22899.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/22800-22899.xml @@ -654,7 +654,7 @@ SELF SINGLE - + @@ -714,8 +714,7 @@ SELF SINGLE - - + @@ -738,8 +737,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/23100-23199.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/23100-23199.xml index cf85552f93..4e6af06c94 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/23100-23199.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/23100-23199.xml @@ -948,8 +948,7 @@ TARGET SINGLE - - + @@ -1219,8 +1218,7 @@ SELF SINGLE - - + @@ -1241,8 +1239,7 @@ SELF SINGLE - - + @@ -1361,8 +1358,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/23300-23399.xml index 6853f7e7f7..4681170936 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/23300-23399.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/23300-23399.xml @@ -766,8 +766,7 @@ SELF SINGLE - - + @@ -806,8 +805,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 4b24edc1fa..95af1dea6b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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,7 @@ 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("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("ConsumeBody", ConsumeBodySkillCondition::new); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java deleted file mode 100644 index ac8f3bb569..0000000000 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanRestoreVitalPointSkillCondition implements ISkillCondition -{ - public CanRestoreVitalPointSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java deleted file mode 100644 index 62cd6cf2dd..0000000000 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition -{ - public CanUseVitalityConsumeItemSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java new file mode 100644 index 0000000000..521770f12b --- /dev/null +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -0,0 +1,43 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +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; + +/** + * @author Mode + */ +public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition +{ + private final int _amount; + + public CanUseVitalityIncreaseItemSkillCondition(StatSet params) + { + _amount = params.getInt("amount", 0); + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS); + } +} diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02500-02599.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02500-02599.xml index f3e52cf37d..3b2c694936 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02500-02599.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02500-02599.xml @@ -2292,8 +2292,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02600-02699.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02600-02699.xml index c1d51b21b6..417382b421 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02600-02699.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02600-02699.xml @@ -1198,8 +1198,7 @@ SELF SINGLE - - + @@ -1221,8 +1220,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02800-02899.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02800-02899.xml index 5aa38c192f..4ca2b20786 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02800-02899.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/02800-02899.xml @@ -3013,8 +3013,7 @@ SELF SINGLE - - + @@ -3039,8 +3038,7 @@ SELF SINGLE - - + @@ -3240,8 +3238,7 @@ SELF SINGLE - - + @@ -3258,8 +3255,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/05700-05799.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/05700-05799.xml index c1ef8b876a..5ef33b473d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/05700-05799.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/05700-05799.xml @@ -2532,8 +2532,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/06100-06199.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/06100-06199.xml index 7e4da1ce60..02404734c0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/06100-06199.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/06100-06199.xml @@ -419,8 +419,7 @@ SELF SINGLE - - + @@ -1726,8 +1725,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09000-09099.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09000-09099.xml index 29670bb5d8..ca1aeedbdb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09000-09099.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09000-09099.xml @@ -687,8 +687,7 @@ SELF SINGLE - - + @@ -783,8 +782,7 @@ SELF SINGLE - - + @@ -806,8 +804,7 @@ SELF SINGLE - - + @@ -852,8 +849,7 @@ SELF SINGLE - - + VP_UP 8 @@ -4611,8 +4607,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09100-09199.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09100-09199.xml index 0feb11a7f4..d6228c3777 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09100-09199.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09100-09199.xml @@ -720,8 +720,7 @@ SELF SINGLE - - + @@ -2345,8 +2344,7 @@ SELF SINGLE - - + VP_UP 8 @@ -3357,8 +3355,7 @@ SELF SINGLE - - + VP_UP 8 @@ -3386,8 +3383,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09300-09399.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09300-09399.xml index 345e78a799..2b6a0f1d67 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09300-09399.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09300-09399.xml @@ -1653,8 +1653,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09400-09499.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09400-09499.xml index 798725b056..fc1608b004 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09400-09499.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09400-09499.xml @@ -92,8 +92,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09500-09599.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09500-09599.xml index 393c648c1c..eef8c6aff5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09500-09599.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09500-09599.xml @@ -1889,8 +1889,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09700-09799.xml index 55f7992689..6a19fe9c1d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09700-09799.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/09700-09799.xml @@ -1721,8 +1721,7 @@ SELF SINGLE - - + @@ -1742,8 +1741,7 @@ SELF SINGLE - - + @@ -1766,8 +1764,7 @@ SELF SINGLE - - + @@ -1789,8 +1786,7 @@ SELF SINGLE - - + @@ -1812,8 +1808,7 @@ SELF SINGLE - - + @@ -1835,8 +1830,7 @@ SELF SINGLE - - + @@ -1858,8 +1852,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/15400-15499.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/15400-15499.xml index 552469b7e1..c94943cc46 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/15400-15499.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/15400-15499.xml @@ -1312,7 +1312,7 @@ TARGET SINGLE - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/17100-17199.xml index c7caa2e594..aee3f28653 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/17100-17199.xml @@ -129,7 +129,7 @@ SELF SINGLE - + @@ -149,7 +149,7 @@ SELF SINGLE - + @@ -169,7 +169,7 @@ SELF SINGLE - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/21200-21299.xml index f1defbf157..ea3d6e7f1b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/21200-21299.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/21200-21299.xml @@ -884,8 +884,7 @@ SELF SINGLE - - + VP_UP 1 diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/21300-21399.xml index baaba2fb28..4cc750e988 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/21300-21399.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/21300-21399.xml @@ -950,8 +950,7 @@ SELF SINGLE - - + VP_UP 26 @@ -984,8 +983,7 @@ SELF SINGLE - - + VP_UP 26 @@ -1017,8 +1015,7 @@ SELF SINGLE - - + VP_UP 26 diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22000-22099.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22000-22099.xml index b1f762821a..42a4fe231e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22000-22099.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22000-22099.xml @@ -938,8 +938,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22100-22199.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22100-22199.xml index e4a5deeb5d..4a45afce58 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22100-22199.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22100-22199.xml @@ -945,8 +945,7 @@ SELF SINGLE - - + @@ -1141,8 +1140,7 @@ SELF SINGLE - - + @@ -1165,8 +1163,7 @@ SELF SINGLE - - + @@ -2539,8 +2536,7 @@ SELF SINGLE - - + @@ -2645,8 +2641,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22200-22299.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22200-22299.xml index d47890a111..ff8c2104fd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22200-22299.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22200-22299.xml @@ -532,8 +532,7 @@ SELF SINGLE - - + @@ -556,8 +555,7 @@ SELF SINGLE - - + @@ -1504,8 +1502,7 @@ SELF SINGLE - - + @@ -2690,8 +2687,7 @@ SELF SINGLE - - + 1 75 @@ -2720,8 +2716,7 @@ SELF SINGLE - - + 1 75 @@ -2750,8 +2745,7 @@ SELF SINGLE - - + 1 75 @@ -2780,8 +2774,7 @@ SELF SINGLE - - + 1 75 diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22300-22399.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22300-22399.xml index 472aa3953a..a55d603542 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22300-22399.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22300-22399.xml @@ -66,8 +66,7 @@ SELF SINGLE - - + VP_UP 8 @@ -297,8 +296,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1686,8 +1684,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1747,8 +1744,7 @@ SELF SINGLE - - + VP_UP 8 @@ -2592,8 +2588,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22400-22499.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22400-22499.xml index 90735f7439..c9ec023d43 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22400-22499.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22400-22499.xml @@ -443,8 +443,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22500-22599.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22500-22599.xml index ca11f75385..07d7cf1578 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22500-22599.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22500-22599.xml @@ -1449,8 +1449,7 @@ SELF SINGLE - - + @@ -1465,8 +1464,7 @@ SELF SINGLE - - + @@ -1481,8 +1479,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22600-22699.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22600-22699.xml index 8bccacfaaa..0474435125 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22600-22699.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22600-22699.xml @@ -285,8 +285,7 @@ SELF SINGLE - - + @@ -321,8 +320,7 @@ SELF SINGLE - - + @@ -1581,8 +1579,7 @@ SELF SINGLE - - + @@ -1605,8 +1602,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22700-22799.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22700-22799.xml index 7edc0c7c1b..576fa8b4b4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22700-22799.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22700-22799.xml @@ -210,8 +210,7 @@ SELF SINGLE - - + @@ -298,8 +297,7 @@ SELF SINGLE - - + @@ -322,8 +320,7 @@ SELF SINGLE - - + @@ -2017,8 +2014,7 @@ SELF SINGLE - - + @@ -2041,8 +2037,7 @@ SELF SINGLE - - + @@ -2065,8 +2060,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22800-22899.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22800-22899.xml index 48c2e03f16..f9c79122b9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22800-22899.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/22800-22899.xml @@ -654,7 +654,7 @@ SELF SINGLE - + @@ -714,8 +714,7 @@ SELF SINGLE - - + @@ -738,8 +737,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/23100-23199.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/23100-23199.xml index cf85552f93..4e6af06c94 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/23100-23199.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/23100-23199.xml @@ -948,8 +948,7 @@ TARGET SINGLE - - + @@ -1219,8 +1218,7 @@ SELF SINGLE - - + @@ -1241,8 +1239,7 @@ SELF SINGLE - - + @@ -1361,8 +1358,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/23300-23399.xml index da31aac93c..f283c06c8f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/23300-23399.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/23300-23399.xml @@ -766,8 +766,7 @@ SELF SINGLE - - + @@ -806,8 +805,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 4b24edc1fa..95af1dea6b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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,7 @@ 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("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("ConsumeBody", ConsumeBodySkillCondition::new); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java deleted file mode 100644 index ac8f3bb569..0000000000 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanRestoreVitalPointSkillCondition implements ISkillCondition -{ - public CanRestoreVitalPointSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java deleted file mode 100644 index 62cd6cf2dd..0000000000 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition -{ - public CanUseVitalityConsumeItemSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java new file mode 100644 index 0000000000..521770f12b --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -0,0 +1,43 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +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; + +/** + * @author Mode + */ +public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition +{ + private final int _amount; + + public CanUseVitalityIncreaseItemSkillCondition(StatSet params) + { + _amount = params.getInt("amount", 0); + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS); + } +} diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02500-02599.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02500-02599.xml index cce0e08aab..29e28db4d1 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02500-02599.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02500-02599.xml @@ -2292,8 +2292,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02600-02699.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02600-02699.xml index c1d51b21b6..417382b421 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02600-02699.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02600-02699.xml @@ -1198,8 +1198,7 @@ SELF SINGLE - - + @@ -1221,8 +1220,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02800-02899.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02800-02899.xml index e35eef3a28..8dfa67b1f4 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02800-02899.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/02800-02899.xml @@ -3012,10 +3012,6 @@ true SELF SINGLE - - - - @@ -3038,10 +3034,6 @@ true SELF SINGLE - - - - @@ -3240,8 +3232,7 @@ SELF SINGLE - - + @@ -3258,8 +3249,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/05700-05799.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/05700-05799.xml index c1ef8b876a..5ef33b473d 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/05700-05799.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/05700-05799.xml @@ -2532,8 +2532,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/06100-06199.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/06100-06199.xml index a765b10255..3de3236e5d 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/06100-06199.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/06100-06199.xml @@ -419,8 +419,7 @@ SELF SINGLE - - + @@ -1720,8 +1719,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09000-09099.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09000-09099.xml index efa1ad6f39..ae5f4cb614 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09000-09099.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09000-09099.xml @@ -687,8 +687,7 @@ SELF SINGLE - - + @@ -783,8 +782,7 @@ SELF SINGLE - - + @@ -806,8 +804,7 @@ SELF SINGLE - - + @@ -852,8 +849,7 @@ SELF SINGLE - - + VP_UP 8 @@ -4611,8 +4607,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09100-09199.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09100-09199.xml index b896b4e90e..dcb67b3421 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09100-09199.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09100-09199.xml @@ -720,8 +720,7 @@ SELF SINGLE - - + @@ -2345,8 +2344,6 @@ SELF SINGLE - - VP_UP 8 @@ -3357,8 +3354,7 @@ SELF SINGLE - - + VP_UP 8 @@ -3386,8 +3382,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09300-09399.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09300-09399.xml index f4fd614f16..bff5babc4d 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09300-09399.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09300-09399.xml @@ -1653,8 +1653,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09400-09499.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09400-09499.xml index 2ec712cfb3..6f99bd8637 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09400-09499.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09400-09499.xml @@ -92,8 +92,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09500-09599.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09500-09599.xml index ff2563c5d0..33c41eec2a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09500-09599.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09500-09599.xml @@ -1893,8 +1893,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09700-09799.xml index 0537a86c10..79dee45729 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09700-09799.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/09700-09799.xml @@ -1721,8 +1721,7 @@ SELF SINGLE - - + @@ -1742,8 +1741,7 @@ SELF SINGLE - - + @@ -1766,8 +1764,7 @@ SELF SINGLE - - + @@ -1789,8 +1786,7 @@ SELF SINGLE - - + @@ -1812,8 +1808,7 @@ SELF SINGLE - - + @@ -1835,8 +1830,7 @@ SELF SINGLE - - + @@ -1858,8 +1852,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/15400-15499.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/15400-15499.xml index 154d50d794..d41bb8f82b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/15400-15499.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/15400-15499.xml @@ -1312,7 +1312,7 @@ TARGET SINGLE - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/17100-17199.xml index 46de5cb353..5f5ef88332 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/17100-17199.xml @@ -129,7 +129,7 @@ SELF SINGLE - + @@ -149,7 +149,7 @@ SELF SINGLE - + @@ -169,7 +169,7 @@ SELF SINGLE - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/21200-21299.xml index 413653c017..75f82d5d87 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/21200-21299.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/21200-21299.xml @@ -884,8 +884,7 @@ SELF SINGLE - - + VP_UP 1 diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/21300-21399.xml index 9f3717f68d..69ab05c65f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/21300-21399.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/21300-21399.xml @@ -942,8 +942,7 @@ SELF SINGLE - - + VP_UP 26 @@ -976,8 +975,7 @@ SELF SINGLE - - + VP_UP 26 @@ -1009,8 +1007,7 @@ SELF SINGLE - - + VP_UP 26 diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22000-22099.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22000-22099.xml index dd4da3d048..b122d8fccc 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22000-22099.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22000-22099.xml @@ -938,8 +938,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22100-22199.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22100-22199.xml index eefbee9653..c108b91720 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22100-22199.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22100-22199.xml @@ -945,8 +945,7 @@ SELF SINGLE - - + @@ -1141,8 +1140,7 @@ SELF SINGLE - - + @@ -1165,8 +1163,7 @@ SELF SINGLE - - + @@ -2539,8 +2536,7 @@ SELF SINGLE - - + @@ -2645,8 +2641,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22200-22299.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22200-22299.xml index d008f70f97..761a354115 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22200-22299.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22200-22299.xml @@ -532,8 +532,7 @@ SELF SINGLE - - + @@ -556,8 +555,7 @@ SELF SINGLE - - + @@ -1504,8 +1502,7 @@ SELF SINGLE - - + @@ -2690,8 +2687,7 @@ SELF SINGLE - - + 1 75 @@ -2720,8 +2716,7 @@ SELF SINGLE - - + 1 75 @@ -2750,8 +2745,7 @@ SELF SINGLE - - + 1 75 @@ -2780,8 +2774,7 @@ SELF SINGLE - - + 1 75 diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22300-22399.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22300-22399.xml index 1cbda8425a..5d9f80df08 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22300-22399.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22300-22399.xml @@ -66,8 +66,7 @@ SELF SINGLE - - + VP_UP 8 @@ -297,8 +296,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1686,8 +1684,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1747,8 +1744,7 @@ SELF SINGLE - - + VP_UP 8 @@ -2592,8 +2588,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22400-22499.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22400-22499.xml index d68bc63151..459713b371 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22400-22499.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22400-22499.xml @@ -443,8 +443,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22500-22599.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22500-22599.xml index 50488b568a..2b4555de66 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22500-22599.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22500-22599.xml @@ -1449,8 +1449,7 @@ SELF SINGLE - - + @@ -1465,8 +1464,7 @@ SELF SINGLE - - + @@ -1481,8 +1479,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22600-22699.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22600-22699.xml index f41faa20e5..a26977500c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22600-22699.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22600-22699.xml @@ -285,8 +285,7 @@ SELF SINGLE - - + @@ -321,8 +320,7 @@ SELF SINGLE - - + @@ -1581,8 +1579,7 @@ SELF SINGLE - - + @@ -1605,8 +1602,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22700-22799.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22700-22799.xml index ee6c6c1dc9..0a341cb655 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22700-22799.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22700-22799.xml @@ -210,8 +210,7 @@ SELF SINGLE - - + @@ -297,10 +296,6 @@ 3600000 SELF SINGLE - - - - @@ -321,10 +316,6 @@ 4 SELF SINGLE - - - - @@ -2017,8 +2008,7 @@ SELF SINGLE - - + @@ -2041,8 +2031,7 @@ SELF SINGLE - - + @@ -2065,8 +2054,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22800-22899.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22800-22899.xml index 4e19560a8a..650bdf2c23 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22800-22899.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/22800-22899.xml @@ -654,7 +654,7 @@ SELF SINGLE - + @@ -714,8 +714,7 @@ SELF SINGLE - - + @@ -738,8 +737,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/23100-23199.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/23100-23199.xml index ee66912cb6..8abdff573e 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/23100-23199.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/23100-23199.xml @@ -915,8 +915,7 @@ TARGET SINGLE - - + @@ -1186,8 +1185,7 @@ SELF SINGLE - - + @@ -1208,8 +1206,7 @@ SELF SINGLE - - + @@ -1327,8 +1324,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/23300-23399.xml index 3148403e39..842479d9e9 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/23300-23399.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/23300-23399.xml @@ -765,8 +765,7 @@ SELF SINGLE - - + @@ -805,8 +804,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 4b24edc1fa..95af1dea6b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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,7 @@ 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("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("ConsumeBody", ConsumeBodySkillCondition::new); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java deleted file mode 100644 index ac8f3bb569..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanRestoreVitalPointSkillCondition implements ISkillCondition -{ - public CanRestoreVitalPointSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java deleted file mode 100644 index 62cd6cf2dd..0000000000 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition -{ - public CanUseVitalityConsumeItemSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java new file mode 100644 index 0000000000..521770f12b --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -0,0 +1,43 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +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; + +/** + * @author Mode + */ +public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition +{ + private final int _amount; + + public CanUseVitalityIncreaseItemSkillCondition(StatSet params) + { + _amount = params.getInt("amount", 0); + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS); + } +} diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02500-02599.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02500-02599.xml index 529269e4d3..295cae50bd 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02500-02599.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02500-02599.xml @@ -2292,8 +2292,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02600-02699.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02600-02699.xml index e4bb51abc4..aabcba65f7 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02600-02699.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02600-02699.xml @@ -1198,8 +1198,7 @@ SELF SINGLE - - + @@ -1221,8 +1220,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02800-02899.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02800-02899.xml index e671531721..e4b8a7eb58 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02800-02899.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/02800-02899.xml @@ -3013,8 +3013,7 @@ SELF SINGLE - - + @@ -3039,8 +3038,7 @@ SELF SINGLE - - + @@ -3240,8 +3238,7 @@ SELF SINGLE - - + @@ -3258,8 +3255,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/05700-05799.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/05700-05799.xml index c4933b0623..767dba5f15 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/05700-05799.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/05700-05799.xml @@ -2532,8 +2532,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/06100-06199.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/06100-06199.xml index 6f0214a7ba..3558f4a5e1 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/06100-06199.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/06100-06199.xml @@ -419,8 +419,7 @@ SELF SINGLE - - + @@ -1720,8 +1719,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09000-09099.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09000-09099.xml index ddcf89f23e..14059ded77 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09000-09099.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09000-09099.xml @@ -687,8 +687,7 @@ SELF SINGLE - - + @@ -783,8 +782,7 @@ SELF SINGLE - - + @@ -806,8 +804,7 @@ SELF SINGLE - - + @@ -852,8 +849,7 @@ SELF SINGLE - - + VP_UP 8 @@ -4611,8 +4607,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09100-09199.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09100-09199.xml index ecb8fbbc9e..e767dd0c2f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09100-09199.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09100-09199.xml @@ -720,8 +720,7 @@ SELF SINGLE - - + @@ -2345,8 +2344,7 @@ SELF SINGLE - - + VP_UP 8 @@ -3357,8 +3355,7 @@ SELF SINGLE - - + VP_UP 8 @@ -3386,8 +3383,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09300-09399.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09300-09399.xml index c3e855282c..f7a6f949cf 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09300-09399.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09300-09399.xml @@ -1654,8 +1654,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09400-09499.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09400-09499.xml index 188bf023d0..bb008bb896 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09400-09499.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09400-09499.xml @@ -92,8 +92,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09500-09599.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09500-09599.xml index 937c70e036..d1b6b41eb9 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09500-09599.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09500-09599.xml @@ -1893,8 +1893,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09700-09799.xml index 53d0d19e27..fc24dea7f3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09700-09799.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/09700-09799.xml @@ -1721,8 +1721,7 @@ SELF SINGLE - - + @@ -1742,8 +1741,7 @@ SELF SINGLE - - + @@ -1766,8 +1764,7 @@ SELF SINGLE - - + @@ -1789,8 +1786,7 @@ SELF SINGLE - - + @@ -1812,8 +1808,7 @@ SELF SINGLE - - + @@ -1835,8 +1830,7 @@ SELF SINGLE - - + @@ -1858,8 +1852,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/15400-15499.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/15400-15499.xml index 154d50d794..d41bb8f82b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/15400-15499.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/15400-15499.xml @@ -1312,7 +1312,7 @@ TARGET SINGLE - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/17100-17199.xml index fe14d5c568..c13c79f64d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/17100-17199.xml @@ -129,7 +129,7 @@ SELF SINGLE - + @@ -149,7 +149,7 @@ SELF SINGLE - + @@ -169,7 +169,7 @@ SELF SINGLE - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/21200-21299.xml index d37d4a7f10..290ecf31fa 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/21200-21299.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/21200-21299.xml @@ -884,8 +884,7 @@ SELF SINGLE - - + VP_UP 1 diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/21300-21399.xml index bc1c7e66e5..76a09cdc96 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/21300-21399.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/21300-21399.xml @@ -942,8 +942,7 @@ SELF SINGLE - - + VP_UP 26 @@ -976,8 +975,7 @@ SELF SINGLE - - + VP_UP 26 @@ -1009,8 +1007,7 @@ SELF SINGLE - - + VP_UP 26 diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22000-22099.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22000-22099.xml index 7a05c136a8..75cbf13d32 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22000-22099.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22000-22099.xml @@ -938,8 +938,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22100-22199.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22100-22199.xml index 37358d030e..23c1d248e2 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22100-22199.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22100-22199.xml @@ -945,8 +945,7 @@ SELF SINGLE - - + @@ -1141,8 +1140,7 @@ SELF SINGLE - - + @@ -1165,8 +1163,7 @@ SELF SINGLE - - + @@ -2539,8 +2536,7 @@ SELF SINGLE - - + @@ -2645,8 +2641,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22200-22299.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22200-22299.xml index 0aada29f2e..366d2ef0de 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22200-22299.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22200-22299.xml @@ -532,8 +532,7 @@ SELF SINGLE - - + @@ -556,8 +555,7 @@ SELF SINGLE - - + @@ -1504,8 +1502,7 @@ SELF SINGLE - - + @@ -2690,8 +2687,7 @@ SELF SINGLE - - + 1 75 @@ -2720,8 +2716,7 @@ SELF SINGLE - - + 1 75 @@ -2750,8 +2745,7 @@ SELF SINGLE - - + 1 75 @@ -2780,8 +2774,7 @@ SELF SINGLE - - + 1 75 diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22300-22399.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22300-22399.xml index 2cb08e7358..a5829c55b2 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22300-22399.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22300-22399.xml @@ -66,8 +66,7 @@ SELF SINGLE - - + VP_UP 8 @@ -297,8 +296,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1686,8 +1684,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1747,8 +1744,7 @@ SELF SINGLE - - + VP_UP 8 @@ -2592,8 +2588,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22400-22499.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22400-22499.xml index 867eddb50f..8083ca775b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22400-22499.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22400-22499.xml @@ -443,8 +443,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22500-22599.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22500-22599.xml index e5af1bfc18..fc97ba432a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22500-22599.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22500-22599.xml @@ -1449,8 +1449,7 @@ SELF SINGLE - - + @@ -1465,8 +1464,7 @@ SELF SINGLE - - + @@ -1481,8 +1479,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22600-22699.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22600-22699.xml index 5a97f576d2..7818d8c9eb 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22600-22699.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22600-22699.xml @@ -285,8 +285,7 @@ SELF SINGLE - - + @@ -321,8 +320,7 @@ SELF SINGLE - - + @@ -1581,8 +1579,7 @@ SELF SINGLE - - + @@ -1605,8 +1602,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22700-22799.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22700-22799.xml index a0bb0f8c7f..4c0a7add70 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22700-22799.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22700-22799.xml @@ -210,8 +210,7 @@ SELF SINGLE - - + @@ -298,8 +297,7 @@ SELF SINGLE - - + @@ -322,8 +320,7 @@ SELF SINGLE - - + @@ -2017,8 +2014,7 @@ SELF SINGLE - - + @@ -2041,8 +2037,7 @@ SELF SINGLE - - + @@ -2065,8 +2060,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22800-22899.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22800-22899.xml index 1cf3e93f5d..799c9b2062 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22800-22899.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/22800-22899.xml @@ -654,7 +654,7 @@ SELF SINGLE - + @@ -714,8 +714,7 @@ SELF SINGLE - - + @@ -738,8 +737,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/23100-23199.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/23100-23199.xml index c8ca83112c..6c9e1f68b3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/23100-23199.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/23100-23199.xml @@ -915,8 +915,7 @@ TARGET SINGLE - - + @@ -1186,8 +1185,7 @@ SELF SINGLE - - + @@ -1208,8 +1206,7 @@ SELF SINGLE - - + @@ -1327,8 +1324,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/23300-23399.xml index 1a1ebcf757..76bd79e6d3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/23300-23399.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/23300-23399.xml @@ -765,8 +765,7 @@ SELF SINGLE - - + @@ -805,8 +804,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 4b24edc1fa..95af1dea6b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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,7 @@ 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("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("ConsumeBody", ConsumeBodySkillCondition::new); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java deleted file mode 100644 index ac8f3bb569..0000000000 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanRestoreVitalPointSkillCondition implements ISkillCondition -{ - public CanRestoreVitalPointSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java deleted file mode 100644 index 62cd6cf2dd..0000000000 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition -{ - public CanUseVitalityConsumeItemSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java new file mode 100644 index 0000000000..521770f12b --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -0,0 +1,43 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +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; + +/** + * @author Mode + */ +public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition +{ + private final int _amount; + + public CanUseVitalityIncreaseItemSkillCondition(StatSet params) + { + _amount = params.getInt("amount", 0); + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS); + } +} diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02500-02599.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02500-02599.xml index bf635a0ebd..e3d691b950 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02500-02599.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02500-02599.xml @@ -2292,8 +2292,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02600-02699.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02600-02699.xml index 913a2c4809..663b3beb82 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02600-02699.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02600-02699.xml @@ -1198,8 +1198,7 @@ SELF SINGLE - - + @@ -1221,8 +1220,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02800-02899.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02800-02899.xml index dea165a143..5055b9fb5f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02800-02899.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/02800-02899.xml @@ -3013,8 +3013,7 @@ SELF SINGLE - - + @@ -3039,8 +3038,7 @@ SELF SINGLE - - + @@ -3240,8 +3238,7 @@ SELF SINGLE - - + @@ -3258,8 +3255,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/05700-05799.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/05700-05799.xml index c4933b0623..767dba5f15 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/05700-05799.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/05700-05799.xml @@ -2532,8 +2532,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/06100-06199.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/06100-06199.xml index 7d51a759e1..31a2664659 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/06100-06199.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/06100-06199.xml @@ -419,8 +419,7 @@ SELF SINGLE - - + @@ -1720,8 +1719,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09000-09099.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09000-09099.xml index d79e7deca1..4525c02766 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09000-09099.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09000-09099.xml @@ -687,8 +687,7 @@ SELF SINGLE - - + @@ -783,8 +782,7 @@ SELF SINGLE - - + @@ -806,8 +804,7 @@ SELF SINGLE - - + @@ -852,8 +849,7 @@ SELF SINGLE - - + VP_UP 8 @@ -4611,8 +4607,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09100-09199.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09100-09199.xml index ce5a217b88..d7cbc5483a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09100-09199.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09100-09199.xml @@ -720,8 +720,7 @@ SELF SINGLE - - + @@ -2345,8 +2344,7 @@ SELF SINGLE - - + VP_UP 8 @@ -3357,8 +3355,7 @@ SELF SINGLE - - + VP_UP 8 @@ -3386,8 +3383,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09300-09399.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09300-09399.xml index 6fedd6c427..2311e1b9b0 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09300-09399.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09300-09399.xml @@ -1654,8 +1654,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09400-09499.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09400-09499.xml index 4c742e3621..a0976e09b7 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09400-09499.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09400-09499.xml @@ -92,8 +92,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09500-09599.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09500-09599.xml index a21f656cd3..1e4d023025 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09500-09599.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09500-09599.xml @@ -1893,8 +1893,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09700-09799.xml index 4d5d1562e7..fdeed676c8 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09700-09799.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/09700-09799.xml @@ -1721,8 +1721,7 @@ SELF SINGLE - - + @@ -1742,8 +1741,7 @@ SELF SINGLE - - + @@ -1766,8 +1764,7 @@ SELF SINGLE - - + @@ -1789,8 +1786,7 @@ SELF SINGLE - - + @@ -1812,8 +1808,7 @@ SELF SINGLE - - + @@ -1835,8 +1830,7 @@ SELF SINGLE - - + @@ -1858,8 +1852,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/15400-15499.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/15400-15499.xml index 7bac69dcc2..0e61b11ec6 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/15400-15499.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/15400-15499.xml @@ -1312,7 +1312,7 @@ TARGET SINGLE - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/17100-17199.xml index 15330349c2..0c4f2e9eae 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/17100-17199.xml @@ -129,7 +129,7 @@ SELF SINGLE - + @@ -149,7 +149,7 @@ SELF SINGLE - + @@ -169,7 +169,7 @@ SELF SINGLE - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/21200-21299.xml index 3dcd4028fb..334424d31f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/21200-21299.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/21200-21299.xml @@ -884,8 +884,7 @@ SELF SINGLE - - + VP_UP 1 diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/21300-21399.xml index 82b7f9277b..e3d82c1ef0 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/21300-21399.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/21300-21399.xml @@ -942,8 +942,7 @@ SELF SINGLE - - + VP_UP 26 @@ -976,8 +975,7 @@ SELF SINGLE - - + VP_UP 26 @@ -1009,8 +1007,7 @@ SELF SINGLE - - + VP_UP 26 diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22000-22099.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22000-22099.xml index 9ac4c7f8c3..68a94dd637 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22000-22099.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22000-22099.xml @@ -938,8 +938,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22100-22199.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22100-22199.xml index 882dc8e26b..1566ad45b5 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22100-22199.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22100-22199.xml @@ -945,8 +945,7 @@ SELF SINGLE - - + @@ -1141,8 +1140,7 @@ SELF SINGLE - - + @@ -1165,8 +1163,7 @@ SELF SINGLE - - + @@ -2539,8 +2536,7 @@ SELF SINGLE - - + @@ -2645,8 +2641,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22200-22299.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22200-22299.xml index 4c7163243d..608e870bb7 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22200-22299.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22200-22299.xml @@ -532,8 +532,7 @@ SELF SINGLE - - + @@ -556,8 +555,7 @@ SELF SINGLE - - + @@ -1504,8 +1502,7 @@ SELF SINGLE - - + @@ -2690,8 +2687,7 @@ SELF SINGLE - - + 1 75 @@ -2720,8 +2716,7 @@ SELF SINGLE - - + 1 75 @@ -2750,8 +2745,7 @@ SELF SINGLE - - + 1 75 @@ -2780,8 +2774,7 @@ SELF SINGLE - - + 1 75 diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22300-22399.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22300-22399.xml index 419bd3ce9e..ee077393a3 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22300-22399.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22300-22399.xml @@ -66,8 +66,7 @@ SELF SINGLE - - + VP_UP 8 @@ -297,8 +296,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1686,8 +1684,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1747,8 +1744,7 @@ SELF SINGLE - - + VP_UP 8 @@ -2592,8 +2588,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22400-22499.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22400-22499.xml index b637e2bccd..69535c67d1 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22400-22499.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22400-22499.xml @@ -443,8 +443,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22500-22599.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22500-22599.xml index d80f8bd14a..8418d4db33 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22500-22599.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22500-22599.xml @@ -1452,8 +1452,7 @@ SELF SINGLE - - + @@ -1468,8 +1467,7 @@ SELF SINGLE - - + @@ -1484,8 +1482,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22600-22699.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22600-22699.xml index 7bea2d4051..2123af2047 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22600-22699.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22600-22699.xml @@ -285,8 +285,7 @@ SELF SINGLE - - + @@ -321,8 +320,7 @@ SELF SINGLE - - + @@ -1581,8 +1579,7 @@ SELF SINGLE - - + @@ -1605,8 +1602,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22700-22799.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22700-22799.xml index e12f70057a..0dd063fc4c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22700-22799.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22700-22799.xml @@ -210,8 +210,7 @@ SELF SINGLE - - + @@ -298,8 +297,7 @@ SELF SINGLE - - + @@ -322,8 +320,7 @@ SELF SINGLE - - + @@ -2017,8 +2014,7 @@ SELF SINGLE - - + @@ -2041,8 +2037,7 @@ SELF SINGLE - - + @@ -2065,8 +2060,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22800-22899.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22800-22899.xml index 7fcf2f23dc..de2d1a10a2 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22800-22899.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/22800-22899.xml @@ -654,7 +654,7 @@ SELF SINGLE - + @@ -714,8 +714,7 @@ SELF SINGLE - - + @@ -738,8 +737,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/23100-23199.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/23100-23199.xml index 6d8469197a..6d723f1d4a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/23100-23199.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/23100-23199.xml @@ -915,8 +915,7 @@ TARGET SINGLE - - + @@ -1186,8 +1185,7 @@ SELF SINGLE - - + @@ -1208,8 +1206,7 @@ SELF SINGLE - - + @@ -1327,8 +1324,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/23300-23399.xml index 824973eab7..2f6a53cded 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/23300-23399.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/23300-23399.xml @@ -765,8 +765,7 @@ SELF SINGLE - - + @@ -805,8 +804,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 4b24edc1fa..95af1dea6b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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,7 @@ 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("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("ConsumeBody", ConsumeBodySkillCondition::new); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java deleted file mode 100644 index ac8f3bb569..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanRestoreVitalPointSkillCondition implements ISkillCondition -{ - public CanRestoreVitalPointSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java deleted file mode 100644 index 62cd6cf2dd..0000000000 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition -{ - public CanUseVitalityConsumeItemSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java new file mode 100644 index 0000000000..521770f12b --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -0,0 +1,43 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +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; + +/** + * @author Mode + */ +public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition +{ + private final int _amount; + + public CanUseVitalityIncreaseItemSkillCondition(StatSet params) + { + _amount = params.getInt("amount", 0); + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS); + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02500-02599.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02500-02599.xml index bf635a0ebd..e3d691b950 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02500-02599.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02500-02599.xml @@ -2292,8 +2292,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02600-02699.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02600-02699.xml index 43ef5d78e3..a3f4a59d50 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02600-02699.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02600-02699.xml @@ -1198,8 +1198,7 @@ SELF SINGLE - - + @@ -1221,8 +1220,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02800-02899.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02800-02899.xml index 684b7ddda4..90ce42f779 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02800-02899.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/02800-02899.xml @@ -3012,10 +3012,6 @@ true SELF SINGLE - - - - @@ -3038,10 +3034,6 @@ true SELF SINGLE - - - - @@ -3240,8 +3232,7 @@ SELF SINGLE - - + @@ -3258,8 +3249,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/05700-05799.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/05700-05799.xml index c159c17d52..73328459b2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/05700-05799.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/05700-05799.xml @@ -2532,8 +2532,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/06100-06199.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/06100-06199.xml index 1dc7ae02ed..a4f546b606 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/06100-06199.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/06100-06199.xml @@ -419,8 +419,7 @@ SELF SINGLE - - + @@ -1720,8 +1719,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09000-09099.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09000-09099.xml index b7fb462c8d..2a6f5cb08a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09000-09099.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09000-09099.xml @@ -687,8 +687,7 @@ SELF SINGLE - - + @@ -783,8 +782,7 @@ SELF SINGLE - - + @@ -806,8 +804,7 @@ SELF SINGLE - - + @@ -852,8 +849,7 @@ SELF SINGLE - - + VP_UP 8 @@ -4611,8 +4607,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09100-09199.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09100-09199.xml index 99cd1275d9..9a2464f545 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09100-09199.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09100-09199.xml @@ -720,8 +720,7 @@ SELF SINGLE - - + @@ -2345,8 +2344,6 @@ SELF SINGLE - - VP_UP 8 @@ -3357,8 +3354,7 @@ SELF SINGLE - - + VP_UP 8 @@ -3386,8 +3382,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09300-09399.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09300-09399.xml index c1e8782edc..0834a68b69 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09300-09399.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09300-09399.xml @@ -1654,8 +1654,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09400-09499.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09400-09499.xml index 3024ab77e2..cdbc4b3e41 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09400-09499.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09400-09499.xml @@ -92,8 +92,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09500-09599.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09500-09599.xml index 23decd26cf..c305fce263 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09500-09599.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09500-09599.xml @@ -1893,8 +1893,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09700-09799.xml index ec072d1f0c..238dc657b1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09700-09799.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/09700-09799.xml @@ -1721,8 +1721,7 @@ SELF SINGLE - - + @@ -1742,8 +1741,7 @@ SELF SINGLE - - + @@ -1766,8 +1764,7 @@ SELF SINGLE - - + @@ -1789,8 +1786,7 @@ SELF SINGLE - - + @@ -1812,8 +1808,7 @@ SELF SINGLE - - + @@ -1835,8 +1830,7 @@ SELF SINGLE - - + @@ -1858,8 +1852,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/15400-15499.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/15400-15499.xml index ea10e37bc5..9d0156b794 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/15400-15499.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/15400-15499.xml @@ -1312,7 +1312,7 @@ TARGET SINGLE - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/17100-17199.xml index 36c5e6f16e..60a4a60106 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/17100-17199.xml @@ -129,7 +129,7 @@ SELF SINGLE - + @@ -149,7 +149,7 @@ SELF SINGLE - + @@ -169,7 +169,7 @@ SELF SINGLE - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/21200-21299.xml index 37e92b9c01..0936cbdb61 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/21200-21299.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/21200-21299.xml @@ -884,8 +884,7 @@ SELF SINGLE - - + VP_UP 1 diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/21300-21399.xml index 288a7f57ce..84d6f02eac 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/21300-21399.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/21300-21399.xml @@ -942,8 +942,7 @@ SELF SINGLE - - + VP_UP 26 @@ -976,8 +975,7 @@ SELF SINGLE - - + VP_UP 26 @@ -1009,8 +1007,7 @@ SELF SINGLE - - + VP_UP 26 diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22000-22099.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22000-22099.xml index 3d228bf4fe..53c9c87c16 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22000-22099.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22000-22099.xml @@ -938,8 +938,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22100-22199.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22100-22199.xml index 2c3b0497bd..521ccd51f3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22100-22199.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22100-22199.xml @@ -945,8 +945,7 @@ SELF SINGLE - - + @@ -1141,8 +1140,7 @@ SELF SINGLE - - + @@ -1165,8 +1163,7 @@ SELF SINGLE - - + @@ -2539,8 +2536,7 @@ SELF SINGLE - - + @@ -2645,8 +2641,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22200-22299.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22200-22299.xml index b3b9baaa28..0a59700528 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22200-22299.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22200-22299.xml @@ -532,8 +532,7 @@ SELF SINGLE - - + @@ -556,8 +555,7 @@ SELF SINGLE - - + @@ -1504,8 +1502,7 @@ SELF SINGLE - - + @@ -2825,8 +2822,7 @@ SELF SINGLE - - + 1 75 @@ -2855,8 +2851,7 @@ SELF SINGLE - - + 1 75 @@ -2885,8 +2880,7 @@ SELF SINGLE - - + 1 75 @@ -2915,8 +2909,7 @@ SELF SINGLE - - + 1 75 diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22300-22399.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22300-22399.xml index f333f4ae0b..876b07b371 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22300-22399.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22300-22399.xml @@ -66,8 +66,7 @@ SELF SINGLE - - + VP_UP 8 @@ -297,8 +296,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1686,8 +1684,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1747,8 +1744,7 @@ SELF SINGLE - - + VP_UP 8 @@ -2592,8 +2588,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22400-22499.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22400-22499.xml index 478f3017db..9053d8a7e9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22400-22499.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22400-22499.xml @@ -443,8 +443,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22500-22599.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22500-22599.xml index 1c10519613..601d0f9c51 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22500-22599.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22500-22599.xml @@ -1453,8 +1453,7 @@ SELF SINGLE - - + @@ -1469,8 +1468,7 @@ SELF SINGLE - - + @@ -1485,8 +1483,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22600-22699.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22600-22699.xml index 7bea2d4051..2123af2047 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22600-22699.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22600-22699.xml @@ -285,8 +285,7 @@ SELF SINGLE - - + @@ -321,8 +320,7 @@ SELF SINGLE - - + @@ -1581,8 +1579,7 @@ SELF SINGLE - - + @@ -1605,8 +1602,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22700-22799.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22700-22799.xml index d0c756344d..23ab86ffea 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22700-22799.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22700-22799.xml @@ -210,8 +210,7 @@ SELF SINGLE - - + @@ -297,10 +296,6 @@ 3600000 SELF SINGLE - - - - @@ -321,10 +316,6 @@ 4 SELF SINGLE - - - - @@ -2017,8 +2008,7 @@ SELF SINGLE - - + @@ -2041,8 +2031,7 @@ SELF SINGLE - - + @@ -2065,8 +2054,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22800-22899.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22800-22899.xml index 7fcf2f23dc..de2d1a10a2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22800-22899.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/22800-22899.xml @@ -654,7 +654,7 @@ SELF SINGLE - + @@ -714,8 +714,7 @@ SELF SINGLE - - + @@ -738,8 +737,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/23100-23199.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/23100-23199.xml index c031d509a4..3291aa8897 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/23100-23199.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/23100-23199.xml @@ -915,8 +915,7 @@ TARGET SINGLE - - + @@ -1186,8 +1185,7 @@ SELF SINGLE - - + @@ -1208,8 +1206,7 @@ SELF SINGLE - - + @@ -1327,8 +1324,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/23300-23399.xml index 74cc50cb64..a2528413a1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/23300-23399.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/23300-23399.xml @@ -765,8 +765,7 @@ SELF SINGLE - - + @@ -805,8 +804,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 4b24edc1fa..cc4fff45e9 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java deleted file mode 100644 index ac8f3bb569..0000000000 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanRestoreVitalPointSkillCondition implements ISkillCondition -{ - public CanRestoreVitalPointSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java deleted file mode 100644 index 62cd6cf2dd..0000000000 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition -{ - public CanUseVitalityConsumeItemSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java new file mode 100644 index 0000000000..521770f12b --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -0,0 +1,43 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +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; + +/** + * @author Mode + */ +public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition +{ + private final int _amount; + + public CanUseVitalityIncreaseItemSkillCondition(StatSet params) + { + _amount = params.getInt("amount", 0); + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS); + } +} diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/HasVitalityPointsSkillCondition.java similarity index 75% rename from L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java rename to L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/HasVitalityPointsSkillCondition.java index ac8f3bb569..cc474b9c6d 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/HasVitalityPointsSkillCondition.java @@ -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); } -} +} \ No newline at end of file diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02500-02599.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02500-02599.xml index a83f5cc916..676498b237 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02500-02599.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02500-02599.xml @@ -2305,8 +2305,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02600-02699.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02600-02699.xml index c0d6264670..e6e25ef021 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02600-02699.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02600-02699.xml @@ -1198,8 +1198,7 @@ SELF SINGLE - - + @@ -1221,8 +1220,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02800-02899.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02800-02899.xml index ea9ee0ae23..220ac54f6e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02800-02899.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/02800-02899.xml @@ -3012,10 +3012,6 @@ true SELF SINGLE - - - - @@ -3038,10 +3034,6 @@ true SELF SINGLE - - - - @@ -3240,8 +3232,7 @@ SELF SINGLE - - + @@ -3258,8 +3249,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/05700-05799.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/05700-05799.xml index 9d1fa9a136..bcc62e3349 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/05700-05799.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/05700-05799.xml @@ -2558,8 +2558,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/06100-06199.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/06100-06199.xml index 7c9eed8df6..1a519591a4 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/06100-06199.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/06100-06199.xml @@ -419,8 +419,7 @@ SELF SINGLE - - + @@ -1722,8 +1721,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09000-09099.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09000-09099.xml index 817f72d296..ae1c81cc38 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09000-09099.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09000-09099.xml @@ -687,8 +687,7 @@ SELF SINGLE - - + @@ -783,8 +782,7 @@ SELF SINGLE - - + @@ -806,8 +804,7 @@ SELF SINGLE - - + @@ -852,8 +849,7 @@ SELF SINGLE - - + VP_UP 8 @@ -4611,8 +4607,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09100-09199.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09100-09199.xml index 1fa65121ab..71d8878730 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09100-09199.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09100-09199.xml @@ -720,8 +720,7 @@ SELF SINGLE - - + @@ -2345,8 +2344,6 @@ SELF SINGLE - - VP_UP 8 @@ -3357,8 +3354,7 @@ SELF SINGLE - - + VP_UP 8 @@ -3386,8 +3382,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09300-09399.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09300-09399.xml index 5d0e298462..25e4ceafba 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09300-09399.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09300-09399.xml @@ -1656,8 +1656,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09400-09499.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09400-09499.xml index 3f8cce55ca..5e16361af3 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09400-09499.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09400-09499.xml @@ -92,8 +92,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09500-09599.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09500-09599.xml index 78b15ad278..34175fd786 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09500-09599.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09500-09599.xml @@ -1900,8 +1900,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09700-09799.xml index 3af8aaa79c..22a612f821 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09700-09799.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/09700-09799.xml @@ -1725,8 +1725,7 @@ SELF SINGLE - - + @@ -1746,8 +1745,7 @@ SELF SINGLE - - + @@ -1770,8 +1768,7 @@ SELF SINGLE - - + @@ -1793,8 +1790,7 @@ SELF SINGLE - - + @@ -1816,8 +1812,7 @@ SELF SINGLE - - + @@ -1839,8 +1834,7 @@ SELF SINGLE - - + @@ -1862,8 +1856,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/15400-15499.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/15400-15499.xml index 2488339728..1dd5d1d263 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/15400-15499.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/15400-15499.xml @@ -1316,7 +1316,7 @@ TARGET SINGLE - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/17100-17199.xml index 0f3d0cd3db..74f50357d2 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/17100-17199.xml @@ -129,7 +129,7 @@ SELF SINGLE - + @@ -149,7 +149,7 @@ SELF SINGLE - + @@ -169,7 +169,7 @@ SELF SINGLE - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/21200-21299.xml index c1738b5453..dad1e18044 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/21200-21299.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/21200-21299.xml @@ -897,8 +897,7 @@ SELF SINGLE - - + VP_UP 1 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/21300-21399.xml index a7904ce0c8..c021a3eabb 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/21300-21399.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/21300-21399.xml @@ -942,8 +942,7 @@ SELF SINGLE - - + VP_UP 26 @@ -975,8 +974,7 @@ SELF SINGLE - - + VP_UP 26 @@ -1008,8 +1006,7 @@ SELF SINGLE - - + VP_UP 26 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22000-22099.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22000-22099.xml index 04f7c2e0aa..304a13373f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22000-22099.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22000-22099.xml @@ -938,8 +938,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22100-22199.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22100-22199.xml index 643250bdc3..4ef92bd8b1 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22100-22199.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22100-22199.xml @@ -945,8 +945,7 @@ SELF SINGLE - - + @@ -1141,8 +1140,7 @@ SELF SINGLE - - + @@ -1165,8 +1163,7 @@ SELF SINGLE - - + @@ -2539,8 +2536,7 @@ SELF SINGLE - - + @@ -2645,8 +2641,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22200-22299.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22200-22299.xml index cbfe967b16..4f81001e5c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22200-22299.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22200-22299.xml @@ -543,8 +543,7 @@ SELF SINGLE - - + @@ -567,8 +566,7 @@ SELF SINGLE - - + @@ -1515,8 +1513,7 @@ SELF SINGLE - - + @@ -2821,8 +2818,7 @@ SELF SINGLE - - + 1 75 @@ -2851,8 +2847,7 @@ SELF SINGLE - - + 1 75 @@ -2881,8 +2876,7 @@ SELF SINGLE - - + 1 75 @@ -2911,8 +2905,7 @@ SELF SINGLE - - + 1 75 diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22300-22399.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22300-22399.xml index 68a385fec7..d0c163e671 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22300-22399.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22300-22399.xml @@ -66,8 +66,7 @@ SELF SINGLE - - + VP_UP 8 @@ -297,8 +296,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1686,8 +1684,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1747,8 +1744,7 @@ SELF SINGLE - - + VP_UP 8 @@ -2592,8 +2588,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22400-22499.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22400-22499.xml index f4e81d1ae4..53ce496906 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22400-22499.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22400-22499.xml @@ -443,8 +443,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22500-22599.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22500-22599.xml index 15e0105d37..006db5f2ff 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22500-22599.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22500-22599.xml @@ -1459,8 +1459,7 @@ SELF SINGLE - - + @@ -1475,8 +1474,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22600-22699.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22600-22699.xml index a51fbca25b..f68ded7851 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22600-22699.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22600-22699.xml @@ -409,8 +409,7 @@ SELF SINGLE - - + @@ -452,8 +451,7 @@ SELF SINGLE - - + @@ -1717,8 +1715,7 @@ SELF SINGLE - - + @@ -1746,8 +1743,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22700-22799.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22700-22799.xml index e80660d244..d167148d2e 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22700-22799.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22700-22799.xml @@ -210,8 +210,7 @@ SELF SINGLE - - + @@ -297,10 +296,6 @@ 3600000 SELF SINGLE - - - - @@ -321,10 +316,6 @@ 4 SELF SINGLE - - - - @@ -2021,8 +2012,7 @@ SELF SINGLE - - + @@ -2045,8 +2035,7 @@ SELF SINGLE - - + @@ -2069,8 +2058,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22800-22899.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22800-22899.xml index f905338fba..8c02a7c25d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22800-22899.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/22800-22899.xml @@ -654,7 +654,7 @@ SELF SINGLE - + @@ -714,8 +714,7 @@ SELF SINGLE - - + @@ -738,8 +737,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/23100-23199.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/23100-23199.xml index 2d2caaafa2..0b1fb46bcb 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/23100-23199.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/23100-23199.xml @@ -915,8 +915,7 @@ TARGET SINGLE - - + @@ -1186,8 +1185,7 @@ SELF SINGLE - - + @@ -1208,8 +1206,7 @@ SELF SINGLE - - + @@ -1327,8 +1324,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/23300-23399.xml index 5d3a5ff5c9..6d9d486aac 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/23300-23399.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/23300-23399.xml @@ -771,8 +771,7 @@ SELF SINGLE - - + @@ -811,8 +810,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/33000-33099.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/33000-33099.xml index 05518052aa..95ac622eb0 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/33000-33099.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/33000-33099.xml @@ -602,6 +602,9 @@ icon.skill0000 P + + + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 4b24edc1fa..cc4fff45e9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java deleted file mode 100644 index ac8f3bb569..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanRestoreVitalPointSkillCondition implements ISkillCondition -{ - public CanRestoreVitalPointSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java deleted file mode 100644 index 62cd6cf2dd..0000000000 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition -{ - public CanUseVitalityConsumeItemSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java new file mode 100644 index 0000000000..521770f12b --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -0,0 +1,43 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +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; + +/** + * @author Mode + */ +public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition +{ + private final int _amount; + + public CanUseVitalityIncreaseItemSkillCondition(StatSet params) + { + _amount = params.getInt("amount", 0); + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS); + } +} diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/HasVitalityPointsSkillCondition.java similarity index 75% rename from L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java rename to L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/HasVitalityPointsSkillCondition.java index 62cd6cf2dd..cc474b9c6d 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/HasVitalityPointsSkillCondition.java @@ -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 CanUseVitalityConsumeItemSkillCondition implements ISkillCondition +/** + * @author Mode + */ +public class HasVitalityPointsSkillCondition implements ISkillCondition { - public CanUseVitalityConsumeItemSkillCondition(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); } -} +} \ No newline at end of file diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02500-02599.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02500-02599.xml index 3848e5580a..4cc6ce90ad 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02500-02599.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02500-02599.xml @@ -2305,8 +2305,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02600-02699.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02600-02699.xml index 2191d86204..99e454b4e9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02600-02699.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02600-02699.xml @@ -1198,8 +1198,7 @@ SELF SINGLE - - + @@ -1221,8 +1220,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02800-02899.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02800-02899.xml index 2fea75cd04..37d23f5617 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02800-02899.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/02800-02899.xml @@ -3012,10 +3012,6 @@ true SELF SINGLE - - - - @@ -3038,10 +3034,6 @@ true SELF SINGLE - - - - @@ -3240,8 +3232,7 @@ SELF SINGLE - - + @@ -3258,8 +3249,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/05700-05799.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/05700-05799.xml index c2abedebb1..14fa22333f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/05700-05799.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/05700-05799.xml @@ -2558,8 +2558,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/06100-06199.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/06100-06199.xml index 697bd62647..3e658c66ec 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/06100-06199.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/06100-06199.xml @@ -419,8 +419,7 @@ SELF SINGLE - - + @@ -1722,8 +1721,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09000-09099.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09000-09099.xml index b614ddba6d..8347c7f014 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09000-09099.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09000-09099.xml @@ -687,8 +687,7 @@ SELF SINGLE - - + @@ -783,8 +782,7 @@ SELF SINGLE - - + @@ -806,8 +804,7 @@ SELF SINGLE - - + @@ -852,8 +849,7 @@ SELF SINGLE - - + VP_UP 8 @@ -4611,8 +4607,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09100-09199.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09100-09199.xml index efca7abfb9..fcee28a1bd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09100-09199.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09100-09199.xml @@ -720,8 +720,7 @@ SELF SINGLE - - + @@ -2345,8 +2344,6 @@ SELF SINGLE - - VP_UP 8 @@ -3357,8 +3354,7 @@ SELF SINGLE - - + VP_UP 8 @@ -3386,8 +3382,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09300-09399.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09300-09399.xml index 3a30650c2d..fb98483f78 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09300-09399.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09300-09399.xml @@ -1656,8 +1656,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09400-09499.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09400-09499.xml index 4a795f82d6..425f6dcbcf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09400-09499.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09400-09499.xml @@ -92,8 +92,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09500-09599.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09500-09599.xml index a9fd09fb74..c034e6a989 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09500-09599.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09500-09599.xml @@ -1900,8 +1900,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09700-09799.xml index 4eb46aaf74..93372a6792 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09700-09799.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/09700-09799.xml @@ -1725,8 +1725,7 @@ SELF SINGLE - - + @@ -1746,8 +1745,7 @@ SELF SINGLE - - + @@ -1770,8 +1768,7 @@ SELF SINGLE - - + @@ -1793,8 +1790,7 @@ SELF SINGLE - - + @@ -1816,8 +1812,7 @@ SELF SINGLE - - + @@ -1839,8 +1834,7 @@ SELF SINGLE - - + @@ -1862,8 +1856,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/15400-15499.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/15400-15499.xml index e773604521..c32afdd617 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/15400-15499.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/15400-15499.xml @@ -1316,7 +1316,7 @@ TARGET SINGLE - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/17100-17199.xml index e72a12f0b7..eea29e95b9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/17100-17199.xml @@ -129,7 +129,7 @@ SELF SINGLE - + @@ -149,7 +149,7 @@ SELF SINGLE - + @@ -169,7 +169,7 @@ SELF SINGLE - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/21200-21299.xml index 3958191113..d9de99c6f2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/21200-21299.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/21200-21299.xml @@ -897,8 +897,7 @@ SELF SINGLE - - + VP_UP 1 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/21300-21399.xml index 96a2519f9a..0615901152 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/21300-21399.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/21300-21399.xml @@ -942,8 +942,7 @@ SELF SINGLE - - + VP_UP 26 @@ -975,8 +974,7 @@ SELF SINGLE - - + VP_UP 26 @@ -1008,8 +1006,7 @@ SELF SINGLE - - + VP_UP 26 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22000-22099.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22000-22099.xml index 04f7c2e0aa..304a13373f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22000-22099.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22000-22099.xml @@ -938,8 +938,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22100-22199.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22100-22199.xml index 81b4a7550a..214e7c90cb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22100-22199.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22100-22199.xml @@ -945,8 +945,7 @@ SELF SINGLE - - + @@ -1141,8 +1140,7 @@ SELF SINGLE - - + @@ -1165,8 +1163,7 @@ SELF SINGLE - - + @@ -2539,8 +2536,7 @@ SELF SINGLE - - + @@ -2645,8 +2641,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22200-22299.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22200-22299.xml index 66391157ce..472909f435 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22200-22299.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22200-22299.xml @@ -543,8 +543,7 @@ SELF SINGLE - - + @@ -567,8 +566,7 @@ SELF SINGLE - - + @@ -1515,8 +1513,7 @@ SELF SINGLE - - + @@ -2821,8 +2818,7 @@ SELF SINGLE - - + 1 75 @@ -2851,8 +2847,7 @@ SELF SINGLE - - + 1 75 @@ -2881,8 +2876,7 @@ SELF SINGLE - - + 1 75 @@ -2911,8 +2905,7 @@ SELF SINGLE - - + 1 75 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22300-22399.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22300-22399.xml index c17e734d68..e4ad9c99af 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22300-22399.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22300-22399.xml @@ -66,8 +66,7 @@ SELF SINGLE - - + VP_UP 8 @@ -297,8 +296,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1686,8 +1684,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1747,8 +1744,7 @@ SELF SINGLE - - + VP_UP 8 @@ -2592,8 +2588,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22400-22499.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22400-22499.xml index 0790cc7558..c580a78bce 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22400-22499.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22400-22499.xml @@ -443,8 +443,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22500-22599.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22500-22599.xml index 5fe288e2e0..af171fcbf1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22500-22599.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22500-22599.xml @@ -1459,8 +1459,7 @@ SELF SINGLE - - + @@ -1475,8 +1474,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22600-22699.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22600-22699.xml index b4dbae73e9..c679ca74ee 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22600-22699.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22600-22699.xml @@ -409,8 +409,7 @@ SELF SINGLE - - + @@ -452,8 +451,7 @@ SELF SINGLE - - + @@ -1717,8 +1715,7 @@ SELF SINGLE - - + @@ -1746,8 +1743,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22700-22799.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22700-22799.xml index cf6ca16698..f58d6c6e33 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22700-22799.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22700-22799.xml @@ -210,8 +210,7 @@ SELF SINGLE - - + @@ -297,10 +296,6 @@ 3600000 SELF SINGLE - - - - @@ -321,10 +316,6 @@ 4 SELF SINGLE - - - - @@ -2021,8 +2012,7 @@ SELF SINGLE - - + @@ -2045,8 +2035,7 @@ SELF SINGLE - - + @@ -2069,8 +2058,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22800-22899.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22800-22899.xml index d346d4c719..ab0c37c1f1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22800-22899.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/22800-22899.xml @@ -654,7 +654,7 @@ SELF SINGLE - + @@ -714,8 +714,7 @@ SELF SINGLE - - + @@ -738,8 +737,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/23100-23199.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/23100-23199.xml index 2d2caaafa2..0b1fb46bcb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/23100-23199.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/23100-23199.xml @@ -915,8 +915,7 @@ TARGET SINGLE - - + @@ -1186,8 +1185,7 @@ SELF SINGLE - - + @@ -1208,8 +1206,7 @@ SELF SINGLE - - + @@ -1327,8 +1324,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/23300-23399.xml index f11c2d0c71..eebc3370c7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/23300-23399.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/23300-23399.xml @@ -771,8 +771,7 @@ SELF SINGLE - - + @@ -811,8 +810,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33000-33099.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33000-33099.xml index 00fb63f483..dbfb83367c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33000-33099.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33000-33099.xml @@ -602,6 +602,9 @@ icon.skill0000 P + + + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33900-33999.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33900-33999.xml index 4572380404..8554dd83e7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33900-33999.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/33900-33999.xml @@ -77,351 +77,2029 @@ icon.skill0000 - A1 + P + + + Playable + 100 + 100 + 34010 + + 1 + 2 + 3 + + + icon.skill0000 - A1 + P + + + 100 + 34011 + + 1 + 2 + 3 + + + icon.skill0000 - A1 + P + + + 100 + true + 34012 + + 1 + 2 + 3 + + + icon.skill0000 - A1 + P + + + Creature + 100 + 100 + 34013 + + 1 + 2 + 3 + + + icon.skill0000 - A1 + P + + + 19226 + 34014 + + 1 + 2 + 3 + + 100 + SELF + + icon.skill0000 - A1 + P + + + + 1 + 1 + 1 + + CON + + + + 1 + 1 + 1 + + MEN + + + + 0 + 1 + 1 + + LUC + + + + 0 + 0 + 1 + + CHA + + icon.skill0000 - A1 + P + + + + 1 + 1 + 1 + + CON + + + + 1 + 1 + 1 + + MEN + + + + 0 + 1 + 1 + + LUC + + + + 0 + 0 + 1 + + CHA + + icon.skill0000 - A1 + P + + + + 1 + 1 + 1 + + CON + + + + 1 + 1 + 1 + + MEN + + + + 0 + 1 + 1 + + LUC + + + + 0 + 0 + 1 + + CHA + + icon.skill0000 - A1 + P + + + + 1 + 1 + 1 + + CON + + + + 1 + 1 + 1 + + MEN + + + + 0 + 1 + 1 + + LUC + + + + 0 + 0 + 1 + + CHA + + icon.skill0000 - A1 + P + + + + 1 + 1 + 1 + + CON + + + + 1 + 1 + 1 + + MEN + + + + 0 + 1 + 1 + + LUC + + + + 0 + 0 + 1 + + CHA + + icon.skill0000 - A1 + P + + + + 1 + 2 + 3 + + PER + + + + 1 + 2 + 3 + + PER + + icon.skill0000 - A1 + P + + + + 1 + 2 + 3 + + PER + + + + 1 + 2 + 3 + + PER + + icon.skill0000 - A1 + P + + + + 1 + 2 + 3 + + PER + + + + 1 + 2 + 3 + + PER + + icon.skill0000 - A1 + P + + + + 1 + 2 + 3 + + PER + + + + 1 + 2 + 3 + + PER + + icon.skill0000 - A1 + P + + + + 1 + 2 + 3 + + PER + + + + 1 + 2 + 3 + + PER + + icon.skill0000 - A1 + P + + + + 15 + 20 + 25 + + + + + 15 + 20 + 25 + + FIRE + + + + 15 + 20 + 25 + + WATER + + + + 15 + 20 + 25 + + WIND + + + + 15 + 20 + 25 + + EARTH + + + + 15 + 20 + 25 + + HOLY + + + + 15 + 20 + 25 + + DARK + + icon.skill0000 - A1 + P + + + + 1 + 2 + 3 + + + icon.skill0000 - A1 + P + + + + 15 + 20 + 25 + + + + + 15 + 20 + 25 + + FIRE + + + + 15 + 20 + 25 + + WATER + + + + 15 + 20 + 25 + + WIND + + + + 15 + 20 + 25 + + EARTH + + + + 15 + 20 + 25 + + HOLY + + + + 15 + 20 + 25 + + DARK + + icon.skill0000 - A1 + P + + + + 15 + 20 + 25 + + + + + 15 + 20 + 25 + + FIRE + + + + 15 + 20 + 25 + + WATER + + + + 15 + 20 + 25 + + WIND + + + + 15 + 20 + 25 + + EARTH + + + + 15 + 20 + 25 + + HOLY + + + + 15 + 20 + 25 + + DARK + + icon.skill0000 - A1 + P + + + + 1 + 2 + 3 + + LUC + + icon.skill0000 - A1 + P + + + + 3 + 4 + 5 + + PER + + + + 3 + 4 + 5 + + PER + + + + 3 + 4 + 5 + + PER + + icon.skill0000 - A1 + P + + + + + + + 1 + 2 + 3 + + PER + + icon.skill0000 - A1 + P + + + + 3 + 4 + 5 + + PER + + + + 3 + 4 + 5 + + PER + + icon.skill0000 - A1 + P + + + + 3 + 4 + 5 + + PER + + + + 3 + 4 + 5 + + PER + + icon.skill0000 - A1 + P + + + + 1 + 2 + 3 + + + icon.skill0000 - A1 + P + + + + 6 + 7 + 8 + + PER + + + + 6 + 7 + 8 + + PER + + + + 6 + 7 + 8 + + PER + + icon.skill0000 - A1 + P + + + + 1 + 2 + 3 + + PER + + icon.skill0000 - A1 + P + + + + 3 + 4 + 5 + + PER + + + + 3 + 4 + 5 + + PER + + + + 3 + 4 + 5 + + PER + + + + 3 + 4 + 5 + + PER + + icon.skill0000 - A1 + P + + + + 10 + 20 + 30 + + DIFF + + icon.skill0000 - A1 + P + + + + 1 + 2 + 3 + + + icon.skill0000 - A1 + P + + + 2 + CON + + + 2 + MEN + + + + 0 + 2 + 2 + + LUC + + + + 0 + 0 + 2 + + CHA + + icon.skill0000 - A1 + P + + + 2 + CON + + + 2 + MEN + + + + 0 + 2 + 2 + + LUC + + + + 0 + 0 + 2 + + CHA + + icon.skill0000 - A1 + P + + + 2 + CON + + + 2 + MEN + + + + 0 + 2 + 2 + + LUC + + + + 0 + 0 + 2 + + CHA + + icon.skill0000 - A1 + P + + + 2 + CON + + + 2 + MEN + + + + 0 + 2 + 2 + + LUC + + + + 0 + 0 + 2 + + CHA + + icon.skill0000 - A1 + P + + + 2 + CON + + + 2 + MEN + + + + 0 + 2 + 2 + + LUC + + + + 0 + 0 + 2 + + CHA + + icon.skill0000 - A1 + P + + + + 2 + 3 + 4 + + PER + + + + 2 + 3 + 4 + + PER + + icon.skill0000 - A1 + P + + + + 2 + 3 + 4 + + PER + + + + 2 + 3 + 4 + + PER + + icon.skill0000 - A1 + P + + + + 2 + 3 + 4 + + PER + + + + 2 + 3 + 4 + + PER + + icon.skill0000 - A1 + P + + + + 2 + 3 + 4 + + PER + + + + 2 + 3 + 4 + + PER + + icon.skill0000 - A1 + P + + + + 2 + 3 + 4 + + PER + + + + 2 + 3 + 4 + + PER + + icon.skill0000 - A1 + P + + + + 20 + 25 + 30 + + + + + 20 + 25 + 30 + + FIRE + + + + 20 + 25 + 30 + + WATER + + + + 20 + 25 + 30 + + WIND + + + + 20 + 25 + 30 + + EARTH + + + + 20 + 25 + 30 + + HOLY + + + + 20 + 25 + 30 + + DARK + + icon.skill0000 - A1 + P + + + + 2 + 3 + 4 + + + icon.skill0000 - A1 + P + + + + 20 + 25 + 30 + + + + + 20 + 25 + 30 + + FIRE + + + + 20 + 25 + 30 + + WATER + + + + 20 + 25 + 30 + + WIND + + + + 20 + 25 + 30 + + EARTH + + + + 20 + 25 + 30 + + HOLY + + + + 20 + 25 + 30 + + DARK + + icon.skill0000 - A1 + P + + + + 20 + 25 + 30 + + + + + 20 + 25 + 30 + + FIRE + + + + 20 + 25 + 30 + + WATER + + + + 20 + 25 + 30 + + WIND + + + + 20 + 25 + 30 + + EARTH + + + + 20 + 25 + 30 + + HOLY + + + + 20 + 25 + 30 + + DARK + + icon.skill0000 - A1 + P + + + + 2 + 3 + 4 + + LUC + + icon.skill0000 - A1 + P + + + + 4 + 5 + 6 + + PER + + + + 4 + 5 + 6 + + PER + + + + 4 + 5 + 6 + + PER + + icon.skill0000 - A1 + P + + + + + + + 2 + 3 + 4 + + PER + + icon.skill0000 - A1 + P + + + + 4 + 5 + 6 + + PER + + + + 4 + 5 + 6 + + PER + + icon.skill0000 - A1 + P + + + + 4 + 5 + 6 + + PER + + + + 4 + 5 + 6 + + PER + + icon.skill0000 - A1 + P + + + + 2 + 3 + 4 + + + icon.skill0000 - A1 + P + + + + 7 + 8 + 9 + + PER + + + + 7 + 8 + 9 + + PER + + + + 7 + 8 + 9 + + PER + + icon.skill0000 - A1 + P + + + + 2 + 3 + 4 + + PER + + icon.skill0000 - A1 + P + + + + 4 + 5 + 6 + + PER + + + + 4 + 5 + 6 + + PER + + + + 4 + 5 + 6 + + PER + + + + 4 + 5 + 6 + + PER + + icon.skill0000 - A1 + P + + + + 20 + 30 + 40 + + DIFF + + icon.skill0000 - A1 + P + + + + 2 + 3 + 4 + + + icon.skill0000 - A1 + P + + + 3 + CON + + + 3 + MEN + + + + 0 + 3 + 3 + + LUC + + + + 0 + 0 + 3 + + CHA + + icon.skill0000 - A1 + P + + + 3 + CON + + + 3 + MEN + + + + 0 + 3 + 3 + + LUC + + + + 0 + 0 + 3 + + CHA + + icon.skill0000 - A1 + P + + + 3 + CON + + + 3 + MEN + + + + 0 + 3 + 3 + + LUC + + + + 0 + 0 + 3 + + CHA + + icon.skill0000 - A1 + P + + + 3 + CON + + + 3 + MEN + + + + 0 + 3 + 3 + + LUC + + + + 0 + 0 + 3 + + CHA + + icon.skill0000 - A1 + P + + + 3 + CON + + + 3 + MEN + + + + 0 + 3 + 3 + + LUC + + + + 0 + 0 + 3 + + CHA + + icon.skill0000 - A1 + P + + + + 3 + 4 + 5 + + PER + + + + 3 + 4 + 5 + + PER + + icon.skill0000 - A1 + P + + + + 3 + 4 + 5 + + PER + + + + 3 + 4 + 5 + + PER + + icon.skill0000 - A1 + P + + + + 3 + 4 + 5 + + PER + + + + 3 + 4 + 5 + + PER + + icon.skill0000 - A1 + P + + + + 3 + 4 + 5 + + PER + + + + 3 + 4 + 5 + + PER + + icon.skill0000 - A1 + P + + + + 3 + 4 + 5 + + PER + + + + 3 + 4 + 5 + + PER + + icon.skill0000 - A1 + P + + + + 25 + 30 + 35 + + + + + 25 + 30 + 35 + + FIRE + + + + 25 + 30 + 35 + + WATER + + + + 25 + 30 + 35 + + WIND + + + + 25 + 30 + 35 + + EARTH + + + + 25 + 30 + 35 + + HOLY + + + + 25 + 30 + 35 + + DARK + + icon.skill0000 - A1 + P + + + + 3 + 4 + 5 + + + icon.skill0000 - A1 + P + + + + 25 + 30 + 35 + + + + + 25 + 30 + 35 + + FIRE + + + + 25 + 30 + 35 + + WATER + + + + 25 + 30 + 35 + + WIND + + + + 25 + 30 + 35 + + EARTH + + + + 25 + 30 + 35 + + HOLY + + + + 25 + 30 + 35 + + DARK + + icon.skill0000 - A1 + P + + + + 25 + 30 + 35 + + + + + 25 + 30 + 35 + + FIRE + + + + 25 + 30 + 35 + + WATER + + + + 25 + 30 + 35 + + WIND + + + + 25 + 30 + 35 + + EARTH + + + + 25 + 30 + 35 + + HOLY + + + + 25 + 30 + 35 + + DARK + + icon.skill0000 - A1 + P + + + + 3 + 4 + 5 + + LUC + + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/34000-34099.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/34000-34099.xml index 81c8f7072c..d6d95b6807 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/34000-34099.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/34000-34099.xml @@ -3,77 +3,400 @@ icon.skill0000 - A1 + P + + + + 5 + 6 + 7 + + PER + + + + 5 + 6 + 7 + + PER + + + + 5 + 6 + 7 + + PER + + icon.skill0000 - A1 + P + + + + + + + 3 + 4 + 5 + + PER + + icon.skill0000 - A1 + P + + + + 5 + 6 + 7 + + PER + + + + 5 + 6 + 7 + + PER + + icon.skill0000 - A1 + P + + + + 5 + 6 + 7 + + PER + + + + 5 + 6 + 7 + + PER + + icon.skill0000 - A1 + P + + + + 3 + 4 + 5 + + + icon.skill0000 - A1 + P + + + + 8 + 9 + 10 + + PER + + + + 8 + 9 + 10 + + PER + + + + 8 + 9 + 10 + + PER + + icon.skill0000 - A1 + P + + + + 3 + 4 + 5 + + PER + + icon.skill0000 - A1 + P + + + + 5 + 6 + 7 + + PER + + + + 5 + 6 + 7 + + PER + + + + 5 + 6 + 7 + + PER + + + + 5 + 6 + 7 + + PER + + icon.skill0000 - A1 + P + + + + 30 + 40 + 50 + + DIFF + + icon.skill0000 - A1 + P + + + + 3 + 4 + 5 + + + - icon.skill0000 - A1 + icon.homun_skill_icon + 1 + 15 + A2 + 4 + 120000 + true + 0 + true + SELF + SINGLE + + + + 1 + 2 + 3 + + PER + + + + 1 + 2 + 3 + + PER + + - icon.skill0000 - A1 + icon.homun_skill_icon + 1 + 15 + A2 + 4 + 120000 + true + 0 + true + SELF + SINGLE + + + + + + + 1 + 2 + 3 + + PER + + - icon.skill0000 - A1 + icon.homun_skill_icon + 1 + 15 + A2 + 4 + 120000 + true + 0 + true + SELF + SINGLE + + + + 1 + 3 + 5 + + ENEMY_ALL + PER + + + + 1 + 3 + 5 + + ENEMY_ALL + PER + + + + 1 + 3 + 5 + + ENEMY_ALL + PER + + + + 1 + 3 + 5 + + PER + + + + 1 + 3 + 5 + + PER + + + + 1 + 3 + 5 + + PER + + - icon.skill0000 - A1 + icon.homun_skill_icon + 1 + 15 + A2 + 4 + 120000 + true + 0 + true + SELF + SINGLE + + + + 15 + 30 + 50 + + DIFF + + - icon.skill0000 - A1 + icon.homun_skill_icon + 1 + 15 + A2 + 4 + 120000 + true + 0 + true + SELF + SINGLE + + + + 1 + 2 + 3 + + DIFF + LUC + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 2d48a6300c..8e0733c5c1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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,7 @@ 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("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("ConsumeBody", ConsumeBodySkillCondition::new); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java deleted file mode 100644 index ac8f3bb569..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanRestoreVitalPointSkillCondition implements ISkillCondition -{ - public CanRestoreVitalPointSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java deleted file mode 100644 index 62cd6cf2dd..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition -{ - public CanUseVitalityConsumeItemSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java new file mode 100644 index 0000000000..521770f12b --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -0,0 +1,43 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +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; + +/** + * @author Mode + */ +public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition +{ + private final int _amount; + + public CanUseVitalityIncreaseItemSkillCondition(StatSet params) + { + _amount = params.getInt("amount", 0); + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS); + } +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 2d48a6300c..8e0733c5c1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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,7 @@ 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("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("ConsumeBody", ConsumeBodySkillCondition::new); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java deleted file mode 100644 index ac8f3bb569..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanRestoreVitalPointSkillCondition implements ISkillCondition -{ - public CanRestoreVitalPointSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java deleted file mode 100644 index 62cd6cf2dd..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition -{ - public CanUseVitalityConsumeItemSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java new file mode 100644 index 0000000000..521770f12b --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -0,0 +1,43 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +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; + +/** + * @author Mode + */ +public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition +{ + private final int _amount; + + public CanUseVitalityIncreaseItemSkillCondition(StatSet params) + { + _amount = params.getInt("amount", 0); + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS); + } +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 2d48a6300c..8e0733c5c1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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,7 @@ 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("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("ConsumeBody", ConsumeBodySkillCondition::new); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java deleted file mode 100644 index ac8f3bb569..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanRestoreVitalPointSkillCondition implements ISkillCondition -{ - public CanRestoreVitalPointSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java deleted file mode 100644 index 62cd6cf2dd..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition -{ - public CanUseVitalityConsumeItemSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java new file mode 100644 index 0000000000..521770f12b --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -0,0 +1,43 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +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; + +/** + * @author Mode + */ +public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition +{ + private final int _amount; + + public CanUseVitalityIncreaseItemSkillCondition(StatSet params) + { + _amount = params.getInt("amount", 0); + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS); + } +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 2d48a6300c..8e0733c5c1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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,7 @@ 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("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("ConsumeBody", ConsumeBodySkillCondition::new); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java deleted file mode 100644 index ac8f3bb569..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanRestoreVitalPointSkillCondition implements ISkillCondition -{ - public CanRestoreVitalPointSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java deleted file mode 100644 index 62cd6cf2dd..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition -{ - public CanUseVitalityConsumeItemSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java new file mode 100644 index 0000000000..521770f12b --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -0,0 +1,43 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +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; + +/** + * @author Mode + */ +public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition +{ + private final int _amount; + + public CanUseVitalityIncreaseItemSkillCondition(StatSet params) + { + _amount = params.getInt("amount", 0); + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS); + } +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 2d48a6300c..8e0733c5c1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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,7 @@ 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("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("ConsumeBody", ConsumeBodySkillCondition::new); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java deleted file mode 100644 index ac8f3bb569..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanRestoreVitalPointSkillCondition implements ISkillCondition -{ - public CanRestoreVitalPointSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java deleted file mode 100644 index 62cd6cf2dd..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition -{ - public CanUseVitalityConsumeItemSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java new file mode 100644 index 0000000000..521770f12b --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -0,0 +1,43 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +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; + +/** + * @author Mode + */ +public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition +{ + private final int _amount; + + public CanUseVitalityIncreaseItemSkillCondition(StatSet params) + { + _amount = params.getInt("amount", 0); + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS); + } +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 2d48a6300c..8e0733c5c1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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,7 @@ 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("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("ConsumeBody", ConsumeBodySkillCondition::new); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java deleted file mode 100644 index ac8f3bb569..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanRestoreVitalPointSkillCondition implements ISkillCondition -{ - public CanRestoreVitalPointSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java deleted file mode 100644 index 62cd6cf2dd..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition -{ - public CanUseVitalityConsumeItemSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java new file mode 100644 index 0000000000..521770f12b --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -0,0 +1,43 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +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; + +/** + * @author Mode + */ +public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition +{ + private final int _amount; + + public CanUseVitalityIncreaseItemSkillCondition(StatSet params) + { + _amount = params.getInt("amount", 0); + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS); + } +} diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 2d48a6300c..8e0733c5c1 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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,7 @@ 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("CanUseVitalityIncreaseItem", CanUseVitalityIncreaseItemSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckLevel", CheckLevelSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("CheckSex", CheckSexSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("ConsumeBody", ConsumeBodySkillCondition::new); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java deleted file mode 100644 index ac8f3bb569..0000000000 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanRestoreVitalPointSkillCondition implements ISkillCondition -{ - public CanRestoreVitalPointSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java deleted file mode 100644 index 62cd6cf2dd..0000000000 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityConsumeItemSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanUseVitalityConsumeItemSkillCondition implements ISkillCondition -{ - public CanUseVitalityConsumeItemSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java new file mode 100644 index 0000000000..521770f12b --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -0,0 +1,43 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +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; + +/** + * @author Mode + */ +public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition +{ + private final int _amount; + + public CanUseVitalityIncreaseItemSkillCondition(StatSet params) + { + _amount = params.getInt("amount", 0); + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS); + } +} diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/02500-02599.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/02500-02599.xml index 606ee17918..a8d227a876 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/02500-02599.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/02500-02599.xml @@ -2292,8 +2292,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/02600-02699.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/02600-02699.xml index c1d51b21b6..417382b421 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/02600-02699.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/02600-02699.xml @@ -1198,8 +1198,7 @@ SELF SINGLE - - + @@ -1221,8 +1220,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/02800-02899.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/02800-02899.xml index 5aa38c192f..f1247be6b5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/02800-02899.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/02800-02899.xml @@ -3012,10 +3012,6 @@ true SELF SINGLE - - - - @@ -3038,10 +3034,6 @@ true SELF SINGLE - - - - @@ -3240,8 +3232,7 @@ SELF SINGLE - - + @@ -3258,8 +3249,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/05700-05799.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/05700-05799.xml index c1ef8b876a..5ef33b473d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/05700-05799.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/05700-05799.xml @@ -2532,8 +2532,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/06100-06199.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/06100-06199.xml index 7e4da1ce60..02404734c0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/06100-06199.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/06100-06199.xml @@ -419,8 +419,7 @@ SELF SINGLE - - + @@ -1726,8 +1725,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09000-09099.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09000-09099.xml index 29670bb5d8..ca1aeedbdb 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09000-09099.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09000-09099.xml @@ -687,8 +687,7 @@ SELF SINGLE - - + @@ -783,8 +782,7 @@ SELF SINGLE - - + @@ -806,8 +804,7 @@ SELF SINGLE - - + @@ -852,8 +849,7 @@ SELF SINGLE - - + VP_UP 8 @@ -4611,8 +4607,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09100-09199.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09100-09199.xml index 0feb11a7f4..64ac2d6993 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09100-09199.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09100-09199.xml @@ -720,8 +720,7 @@ SELF SINGLE - - + @@ -2345,8 +2344,6 @@ SELF SINGLE - - VP_UP 8 @@ -3357,8 +3354,7 @@ SELF SINGLE - - + VP_UP 8 @@ -3386,8 +3382,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09300-09399.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09300-09399.xml index c6ba5deac8..cfe20e78b9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09300-09399.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09300-09399.xml @@ -1645,8 +1645,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09400-09499.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09400-09499.xml index 798725b056..fc1608b004 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09400-09499.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09400-09499.xml @@ -92,8 +92,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09500-09599.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09500-09599.xml index 393c648c1c..eef8c6aff5 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09500-09599.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09500-09599.xml @@ -1889,8 +1889,7 @@ SELF SINGLE - - + VP_UP 8 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09700-09799.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09700-09799.xml index 55f7992689..6a19fe9c1d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09700-09799.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/09700-09799.xml @@ -1721,8 +1721,7 @@ SELF SINGLE - - + @@ -1742,8 +1741,7 @@ SELF SINGLE - - + @@ -1766,8 +1764,7 @@ SELF SINGLE - - + @@ -1789,8 +1786,7 @@ SELF SINGLE - - + @@ -1812,8 +1808,7 @@ SELF SINGLE - - + @@ -1835,8 +1830,7 @@ SELF SINGLE - - + @@ -1858,8 +1852,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/15400-15499.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/15400-15499.xml index 552469b7e1..c94943cc46 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/15400-15499.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/15400-15499.xml @@ -1312,7 +1312,7 @@ TARGET SINGLE - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/17100-17199.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/17100-17199.xml index c7caa2e594..aee3f28653 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/17100-17199.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/17100-17199.xml @@ -129,7 +129,7 @@ SELF SINGLE - + @@ -149,7 +149,7 @@ SELF SINGLE - + @@ -169,7 +169,7 @@ SELF SINGLE - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/21200-21299.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/21200-21299.xml index f1defbf157..ea3d6e7f1b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/21200-21299.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/21200-21299.xml @@ -884,8 +884,7 @@ SELF SINGLE - - + VP_UP 1 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/21300-21399.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/21300-21399.xml index baaba2fb28..4cc750e988 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/21300-21399.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/21300-21399.xml @@ -950,8 +950,7 @@ SELF SINGLE - - + VP_UP 26 @@ -984,8 +983,7 @@ SELF SINGLE - - + VP_UP 26 @@ -1017,8 +1015,7 @@ SELF SINGLE - - + VP_UP 26 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22000-22099.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22000-22099.xml index b1f762821a..42a4fe231e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22000-22099.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22000-22099.xml @@ -938,8 +938,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22100-22199.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22100-22199.xml index e4a5deeb5d..4a45afce58 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22100-22199.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22100-22199.xml @@ -945,8 +945,7 @@ SELF SINGLE - - + @@ -1141,8 +1140,7 @@ SELF SINGLE - - + @@ -1165,8 +1163,7 @@ SELF SINGLE - - + @@ -2539,8 +2536,7 @@ SELF SINGLE - - + @@ -2645,8 +2641,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22200-22299.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22200-22299.xml index d47890a111..ff8c2104fd 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22200-22299.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22200-22299.xml @@ -532,8 +532,7 @@ SELF SINGLE - - + @@ -556,8 +555,7 @@ SELF SINGLE - - + @@ -1504,8 +1502,7 @@ SELF SINGLE - - + @@ -2690,8 +2687,7 @@ SELF SINGLE - - + 1 75 @@ -2720,8 +2716,7 @@ SELF SINGLE - - + 1 75 @@ -2750,8 +2745,7 @@ SELF SINGLE - - + 1 75 @@ -2780,8 +2774,7 @@ SELF SINGLE - - + 1 75 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22300-22399.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22300-22399.xml index 472aa3953a..a55d603542 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22300-22399.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22300-22399.xml @@ -66,8 +66,7 @@ SELF SINGLE - - + VP_UP 8 @@ -297,8 +296,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1686,8 +1684,7 @@ SELF SINGLE - - + VP_UP 8 @@ -1747,8 +1744,7 @@ SELF SINGLE - - + VP_UP 8 @@ -2592,8 +2588,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22400-22499.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22400-22499.xml index 90735f7439..c9ec023d43 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22400-22499.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22400-22499.xml @@ -443,8 +443,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22500-22599.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22500-22599.xml index ca11f75385..07d7cf1578 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22500-22599.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22500-22599.xml @@ -1449,8 +1449,7 @@ SELF SINGLE - - + @@ -1465,8 +1464,7 @@ SELF SINGLE - - + @@ -1481,8 +1479,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22600-22699.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22600-22699.xml index 8bccacfaaa..0474435125 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22600-22699.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22600-22699.xml @@ -285,8 +285,7 @@ SELF SINGLE - - + @@ -321,8 +320,7 @@ SELF SINGLE - - + @@ -1581,8 +1579,7 @@ SELF SINGLE - - + @@ -1605,8 +1602,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22700-22799.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22700-22799.xml index 7edc0c7c1b..095fc9ca6b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22700-22799.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22700-22799.xml @@ -210,8 +210,7 @@ SELF SINGLE - - + @@ -297,10 +296,6 @@ 3600000 SELF SINGLE - - - - @@ -321,10 +316,6 @@ 4 SELF SINGLE - - - - @@ -2017,8 +2008,7 @@ SELF SINGLE - - + @@ -2041,8 +2031,7 @@ SELF SINGLE - - + @@ -2065,8 +2054,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22800-22899.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22800-22899.xml index 48c2e03f16..f9c79122b9 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22800-22899.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/22800-22899.xml @@ -654,7 +654,7 @@ SELF SINGLE - + @@ -714,8 +714,7 @@ SELF SINGLE - - + @@ -738,8 +737,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/23100-23199.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/23100-23199.xml index cf85552f93..4e6af06c94 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/23100-23199.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/23100-23199.xml @@ -948,8 +948,7 @@ TARGET SINGLE - - + @@ -1219,8 +1218,7 @@ SELF SINGLE - - + @@ -1241,8 +1239,7 @@ SELF SINGLE - - + @@ -1361,8 +1358,7 @@ TARGET SINGLE - - + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/23300-23399.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/23300-23399.xml index da31aac93c..f283c06c8f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/23300-23399.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/23300-23399.xml @@ -766,8 +766,7 @@ SELF SINGLE - - + @@ -806,8 +805,7 @@ SELF SINGLE - - + diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 4936b51fcf..1c31eb585f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java deleted file mode 100644 index ac8f3bb569..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanRestoreVitalPointSkillCondition implements ISkillCondition -{ - public CanRestoreVitalPointSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java index 53532fc6ce..aa9f511f35 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -19,7 +19,6 @@ 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.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -33,20 +32,12 @@ public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition public CanUseVitalityIncreaseItemSkillCondition(StatSet params) { - _amount = params.getInt("amount"); + _amount = params.getInt("amount", 0); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - if (caster.isPlayer()) - { - PlayerInstance player = caster.getActingPlayer(); - if ((player.getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS) - { - return true; - } - } - return false; + return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS); } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/HasVitalityPointsSkillCondition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/HasVitalityPointsSkillCondition.java index 5123d0be71..fe3b9bb6e3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/HasVitalityPointsSkillCondition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/HasVitalityPointsSkillCondition.java @@ -31,19 +31,12 @@ public class HasVitalityPointsSkillCondition implements ISkillCondition public HasVitalityPointsSkillCondition(StatSet params) { - _amount = params.getInt("amount"); + _amount = params.getInt("amount", 1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - if (caster.isPlayer()) - { - if (caster.getActingPlayer().getVitalityPoints() >= _amount) - { - return true; - } - } - return false; + return caster.isPlayer() && (caster.getActingPlayer().getVitalityPoints() >= _amount); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 4936b51fcf..1c31eb585f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -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); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java deleted file mode 100644 index ac8f3bb569..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/CanRestoreVitalPointSkillCondition.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -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.skills.ISkillCondition; -import org.l2jmobius.gameserver.model.skills.Skill; - -public class CanRestoreVitalPointSkillCondition implements ISkillCondition -{ - public CanRestoreVitalPointSkillCondition(StatSet params) - { - } - - @Override - public boolean canUse(Creature caster, Skill skill, WorldObject target) - { - return true; - } -} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java index 53532fc6ce..aa9f511f35 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/CanUseVitalityIncreaseItemSkillCondition.java @@ -19,7 +19,6 @@ 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.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.stat.PlayerStat; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -33,20 +32,12 @@ public class CanUseVitalityIncreaseItemSkillCondition implements ISkillCondition public CanUseVitalityIncreaseItemSkillCondition(StatSet params) { - _amount = params.getInt("amount"); + _amount = params.getInt("amount", 0); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - if (caster.isPlayer()) - { - PlayerInstance player = caster.getActingPlayer(); - if ((player.getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS) - { - return true; - } - } - return false; + return caster.isPlayer() && ((caster.getActingPlayer().getVitalityPoints() + _amount) <= PlayerStat.MAX_VITALITY_POINTS); } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/HasVitalityPointsSkillCondition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/HasVitalityPointsSkillCondition.java index 5123d0be71..fe3b9bb6e3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/HasVitalityPointsSkillCondition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/HasVitalityPointsSkillCondition.java @@ -31,19 +31,12 @@ public class HasVitalityPointsSkillCondition implements ISkillCondition public HasVitalityPointsSkillCondition(StatSet params) { - _amount = params.getInt("amount"); + _amount = params.getInt("amount", 1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - if (caster.isPlayer()) - { - if (caster.getActingPlayer().getVitalityPoints() >= _amount) - { - return true; - } - } - return false; + return caster.isPlayer() && (caster.getActingPlayer().getVitalityPoints() >= _amount); } }