From e89e44883b9719348b499cd03b27996396fbb906 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 8 Nov 2017 12:38:06 +0000 Subject: [PATCH] Making AirBind work more properly. --- .../scripts/handlers/EffectMasterHandler.java | 2 +- .../{HellBind.java => AirBind.java} | 30 +++++++++---------- .../game/data/stats/skills/07100-07199.xml | 1 + .../game/data/stats/skills/10000-10099.xml | 2 +- .../game/data/stats/skills/10200-10299.xml | 2 +- .../game/data/stats/skills/10500-10599.xml | 2 +- .../game/data/stats/skills/10700-10799.xml | 2 +- .../game/data/stats/skills/11000-11099.xml | 6 +++- .../game/data/stats/skills/11100-11199.xml | 4 +++ .../game/data/stats/skills/11200-11299.xml | 3 +- .../game/data/stats/skills/11300-11399.xml | 1 + .../game/data/stats/skills/11500-11599.xml | 2 +- .../game/data/stats/skills/11800-11899.xml | 2 +- .../game/data/stats/skills/14200-14299.xml | 1 + .../game/data/stats/skills/14400-14499.xml | 1 + .../game/data/stats/skills/14500-14599.xml | 5 ++++ .../game/data/stats/skills/14600-14699.xml | 3 ++ .../game/data/stats/skills/14800-14899.xml | 1 + .../game/data/stats/skills/15000-15099.xml | 1 + .../game/data/stats/skills/15200-15299.xml | 3 ++ .../game/data/stats/skills/15300-15399.xml | 6 ++++ .../game/data/stats/skills/26100-26199.xml | 1 + .../game/data/stats/skills/27300-27399.xml | 1 + .../game/data/stats/skills/documentation.txt | 2 +- .../scripts/handlers/EffectMasterHandler.java | 2 +- .../{HellBind.java => AirBind.java} | 30 +++++++++---------- .../game/data/stats/skills/07100-07199.xml | 1 + .../game/data/stats/skills/10000-10099.xml | 2 +- .../game/data/stats/skills/10200-10299.xml | 2 +- .../game/data/stats/skills/10500-10599.xml | 2 +- .../game/data/stats/skills/10700-10799.xml | 2 +- .../game/data/stats/skills/11000-11099.xml | 6 +++- .../game/data/stats/skills/11100-11199.xml | 4 +++ .../game/data/stats/skills/11200-11299.xml | 3 +- .../game/data/stats/skills/11300-11399.xml | 1 + .../game/data/stats/skills/11500-11599.xml | 2 +- .../game/data/stats/skills/11800-11899.xml | 2 +- .../game/data/stats/skills/13700-13799.xml | 2 ++ .../game/data/stats/skills/14200-14299.xml | 1 + .../game/data/stats/skills/14400-14499.xml | 1 + .../game/data/stats/skills/14500-14599.xml | 5 ++++ .../game/data/stats/skills/14600-14699.xml | 3 ++ .../game/data/stats/skills/14800-14899.xml | 1 + .../game/data/stats/skills/15000-15099.xml | 1 + .../game/data/stats/skills/15200-15299.xml | 3 ++ .../game/data/stats/skills/15300-15399.xml | 6 ++++ .../game/data/stats/skills/26100-26199.xml | 1 + .../game/data/stats/skills/27300-27399.xml | 1 + .../game/data/stats/skills/documentation.txt | 2 +- .../scripts/handlers/EffectMasterHandler.java | 2 +- .../{HellBind.java => AirBind.java} | 30 +++++++++---------- .../game/data/stats/skills/07100-07199.xml | 1 + .../game/data/stats/skills/10000-10099.xml | 2 +- .../game/data/stats/skills/10200-10299.xml | 2 +- .../game/data/stats/skills/10500-10599.xml | 2 +- .../game/data/stats/skills/10700-10799.xml | 2 +- .../game/data/stats/skills/11000-11099.xml | 6 +++- .../game/data/stats/skills/11100-11199.xml | 4 +++ .../game/data/stats/skills/11200-11299.xml | 3 +- .../game/data/stats/skills/11300-11399.xml | 1 + .../game/data/stats/skills/11500-11599.xml | 2 +- .../game/data/stats/skills/11800-11899.xml | 2 +- .../game/data/stats/skills/13700-13799.xml | 2 ++ .../game/data/stats/skills/14200-14299.xml | 1 + .../game/data/stats/skills/14400-14499.xml | 1 + .../game/data/stats/skills/14500-14599.xml | 5 ++++ .../game/data/stats/skills/14600-14699.xml | 3 ++ .../game/data/stats/skills/14800-14899.xml | 1 + .../game/data/stats/skills/15000-15099.xml | 1 + .../game/data/stats/skills/15200-15299.xml | 3 ++ .../game/data/stats/skills/15300-15399.xml | 6 ++++ .../game/data/stats/skills/26100-26199.xml | 1 + .../game/data/stats/skills/27300-27399.xml | 1 + .../game/data/stats/skills/documentation.txt | 2 +- 74 files changed, 181 insertions(+), 75 deletions(-) rename L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/{HellBind.java => AirBind.java} (81%) rename L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/{HellBind.java => AirBind.java} (81%) rename L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/{HellBind.java => AirBind.java} (81%) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java index e0d9996551..17d6fd6772 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -38,6 +38,7 @@ public final class EffectMasterHandler EffectHandler.getInstance().registerHandler("Accuracy", Accuracy::new); EffectHandler.getInstance().registerHandler("AddHate", AddHate::new); EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new); + EffectHandler.getInstance().registerHandler("AirBind", AirBind::new); EffectHandler.getInstance().registerHandler("AreaDamage", AreaDamage::new); EffectHandler.getInstance().registerHandler("AttackAttribute", AttackAttribute::new); EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new); @@ -156,7 +157,6 @@ public final class EffectMasterHandler EffectHandler.getInstance().registerHandler("HealEffect", HealEffect::new); EffectHandler.getInstance().registerHandler("HealOverTime", HealOverTime::new); EffectHandler.getInstance().registerHandler("HealPercent", HealPercent::new); - EffectHandler.getInstance().registerHandler("HellBind", HellBind::new); EffectHandler.getInstance().registerHandler("Hide", Hide::new); EffectHandler.getInstance().registerHandler("HitNumber", HitNumber::new); EffectHandler.getInstance().registerHandler("Hp", Hp::new); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HellBind.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java similarity index 81% rename from L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HellBind.java rename to L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index 6fd155b947..e1adc4c75d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HellBind.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; /** * @author Mobius */ -public final class HellBind extends AbstractEffect +public final class AirBind extends AbstractEffect { // skill data private static final Map _chainedAirSkills = new HashMap<>(36); @@ -60,11 +60,11 @@ public final class HellBind extends AbstractEffect _chainedAirSkills.put(ClassId.YUL_MOONLIGHT_SENTINEL, 10999); // Heavy Hit _chainedAirSkills.put(ClassId.YUL_GHOST_SENTINEL, 10999); // Heavy Hit _chainedAirSkills.put(ClassId.YUL_TRICKSTER, 10999); // Heavy Hit - _chainedAirSkills.put(ClassId.FEOH_ARCHMAGE, 11247); // Heavy Hit - _chainedAirSkills.put(ClassId.FEOH_SOULTAKER, 11247); // Heavy Hit - _chainedAirSkills.put(ClassId.FEOH_MYSTIC_MUSE, 11247); // Heavy Hit - _chainedAirSkills.put(ClassId.FEOH_STORM_SCREAMER, 11247); // Heavy Hit - _chainedAirSkills.put(ClassId.FEOH_SOUL_HOUND, 11247); // Heavy Hit + _chainedAirSkills.put(ClassId.FEOH_ARCHMAGE, 11249); // Heavy Hit + _chainedAirSkills.put(ClassId.FEOH_SOULTAKER, 11249); // Heavy Hit + _chainedAirSkills.put(ClassId.FEOH_MYSTIC_MUSE, 11249); // Heavy Hit + _chainedAirSkills.put(ClassId.FEOH_STORM_SCREAMER, 11249); // Heavy Hit + _chainedAirSkills.put(ClassId.FEOH_SOUL_HOUND, 11249); // Heavy Hit _chainedAirSkills.put(ClassId.ISS_HIEROPHANT, 11749); // Heavy Hit _chainedAirSkills.put(ClassId.ISS_SWORD_MUSE, 11749); // Heavy Hit _chainedAirSkills.put(ClassId.ISS_SPECTRAL_DANCER, 11749); // Heavy Hit @@ -78,7 +78,7 @@ public final class HellBind extends AbstractEffect _chainedAirSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 11999); // Heavy Hit } - public HellBind(StatsSet params) + public AirBind(StatsSet params) { } @@ -97,7 +97,7 @@ public final class HellBind extends AbstractEffect @Override public void continuousInstant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { - hellBind(effector, effected); + airBind(effector, effected); } @Override @@ -109,18 +109,18 @@ public final class HellBind extends AbstractEffect } } - public void hellBind(L2Character effector, L2Character effected) + public void airBind(L2Character effector, L2Character effected) { for (L2PcInstance nearbyPlayer : L2World.getInstance().getVisibleObjects(effected, L2PcInstance.class, 1200)) { - if (nearbyPlayer.getRace() == Race.ERTHEIA) - { - continue; - } - if ((nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive()) + if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) // + && nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive()) { final int chainSkill = _chainedAirSkills.get(nearbyPlayer.getClassId()); - nearbyPlayer.sendPacket(new ExAlterSkillRequest(nearbyPlayer, chainSkill, chainSkill, 5)); + if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1) + { + nearbyPlayer.sendPacket(new ExAlterSkillRequest(nearbyPlayer, chainSkill, chainSkill, 5)); + } } } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/07100-07199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/07100-07199.xml index d3748472e2..a4c635d03d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/07100-07199.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/07100-07199.xml @@ -55,6 +55,7 @@ TARGET SINGLE + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml index 40ecbf8b93..0515f25ec3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml @@ -521,7 +521,7 @@ - + 13634 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml index b11ac4b744..81524bdcda 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10200-10299.xml @@ -725,7 +725,7 @@ - + 11159 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml index 260579ff25..50dbb19e48 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10500-10599.xml @@ -468,7 +468,7 @@ - + 15 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml index b9afd6d072..d67b807e80 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/10700-10799.xml @@ -1084,7 +1084,7 @@ - + 20814 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml index 7291d43090..f92975dc70 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml @@ -1021,7 +1021,7 @@ ENEMY SINGLE - + 158 @@ -4113,6 +4113,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -4197,6 +4198,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -4278,6 +4280,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -4406,6 +4409,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11100-11199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11100-11199.xml index 8e7bb57668..1b3bba665d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11100-11199.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11100-11199.xml @@ -2821,6 +2821,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -2866,6 +2867,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -2911,6 +2913,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -2957,6 +2960,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml index 38a6c5075a..6abbc0db97 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml @@ -1242,7 +1242,7 @@ RANGE NOT_FRIEND - + 147 @@ -2178,6 +2178,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11300-11399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11300-11399.xml index 9e4a7ae1a2..28e59a4f64 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11300-11399.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11300-11399.xml @@ -25,6 +25,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml index 32992486b8..32692ce8d8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11500-11599.xml @@ -545,7 +545,7 @@ - + 14608 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11800-11899.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11800-11899.xml index b7c0296130..d534f680cf 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11800-11899.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11800-11899.xml @@ -520,7 +520,7 @@ ENEMY SINGLE - + 124 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14200-14299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14200-14299.xml index ade2b10f2b..bcf8d93cda 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14200-14299.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14200-14299.xml @@ -495,6 +495,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14400-14499.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14400-14499.xml index 72a8f95912..0bfa7f18df 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14400-14499.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14400-14499.xml @@ -1753,6 +1753,7 @@ RANGE NOT_FRIEND + 10279;10517;10025;10776;11770;1904 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14500-14599.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14500-14599.xml index c0a9413c0d..5e69036b32 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14500-14599.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14500-14599.xml @@ -1509,6 +1509,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 @@ -1572,6 +1573,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 @@ -1742,6 +1744,7 @@ TARGET SINGLE + 50000 DIFF @@ -2109,6 +2112,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 @@ -3244,6 +3248,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14600-14699.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14600-14699.xml index 822467cbe2..e4ec11fd6c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14600-14699.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14600-14699.xml @@ -1017,6 +1017,7 @@ ENEMY SINGLE + true 500 @@ -2522,6 +2523,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 @@ -2856,6 +2858,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14800-14899.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14800-14899.xml index 1fb1d0bc00..2fc91b5182 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14800-14899.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/14800-14899.xml @@ -942,6 +942,7 @@ POINT_BLANK NOT_FRIEND + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15000-15099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15000-15099.xml index 9da40bf944..62b5965751 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15000-15099.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15000-15099.xml @@ -1859,6 +1859,7 @@ 420 50 + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15200-15299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15200-15299.xml index 6dd5763dd3..8568611450 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15200-15299.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15200-15299.xml @@ -1138,6 +1138,9 @@ SELF POINT_BLANK NOT_FRIEND + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15300-15399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15300-15399.xml index a775b4e266..54f0ce290c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15300-15399.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/15300-15399.xml @@ -1280,6 +1280,9 @@ true ENEMY SINGLE + + + @@ -1375,6 +1378,9 @@ true ENEMY SINGLE + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/26100-26199.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/26100-26199.xml index 7532e222f9..9b7b844f65 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/26100-26199.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/26100-26199.xml @@ -706,6 +706,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/27300-27399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/27300-27399.xml index 56bcc69a11..f89ecf91f6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/27300-27399.xml +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/27300-27399.xml @@ -1394,6 +1394,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/documentation.txt index 8dc9d51304..13fbef7dd2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/documentation.txt @@ -7,6 +7,7 @@ AbstractStatEffect: Abstract class for managing stats. Accuracy: P. Accuracy stat. AddHate: Instant effect that increases target's hate towards you. AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots. +AirBind: Used by airbind chain skills. (l2jmobius) AreaDamage: Topography (Danger Zone) resistance stat. AttackAttribute: Stat that increases specific attack attribute. AttackAttributeAdd: Stat that increases all attack attribute. @@ -126,7 +127,6 @@ HealEffect: Increases the amount of HP received. Heal: Increases current HP by a given amount. HealOverTime: Increases current HP by a given amount over time. HealPercent: Increases current HP by a given percentage amount. -HellBind: Used by hellbind chain skills. (l2jmobius) Hide: Hide effect. HitNumber: Polearm attack max hit creatures. HpByLevel: recovers certain amount of HP, but current implementation is wrong... final amount should be computed from skill power and character level difference diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java index e0d9996551..17d6fd6772 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -38,6 +38,7 @@ public final class EffectMasterHandler EffectHandler.getInstance().registerHandler("Accuracy", Accuracy::new); EffectHandler.getInstance().registerHandler("AddHate", AddHate::new); EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new); + EffectHandler.getInstance().registerHandler("AirBind", AirBind::new); EffectHandler.getInstance().registerHandler("AreaDamage", AreaDamage::new); EffectHandler.getInstance().registerHandler("AttackAttribute", AttackAttribute::new); EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new); @@ -156,7 +157,6 @@ public final class EffectMasterHandler EffectHandler.getInstance().registerHandler("HealEffect", HealEffect::new); EffectHandler.getInstance().registerHandler("HealOverTime", HealOverTime::new); EffectHandler.getInstance().registerHandler("HealPercent", HealPercent::new); - EffectHandler.getInstance().registerHandler("HellBind", HellBind::new); EffectHandler.getInstance().registerHandler("Hide", Hide::new); EffectHandler.getInstance().registerHandler("HitNumber", HitNumber::new); EffectHandler.getInstance().registerHandler("Hp", Hp::new); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HellBind.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java similarity index 81% rename from L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HellBind.java rename to L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index 6fd155b947..e1adc4c75d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HellBind.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; /** * @author Mobius */ -public final class HellBind extends AbstractEffect +public final class AirBind extends AbstractEffect { // skill data private static final Map _chainedAirSkills = new HashMap<>(36); @@ -60,11 +60,11 @@ public final class HellBind extends AbstractEffect _chainedAirSkills.put(ClassId.YUL_MOONLIGHT_SENTINEL, 10999); // Heavy Hit _chainedAirSkills.put(ClassId.YUL_GHOST_SENTINEL, 10999); // Heavy Hit _chainedAirSkills.put(ClassId.YUL_TRICKSTER, 10999); // Heavy Hit - _chainedAirSkills.put(ClassId.FEOH_ARCHMAGE, 11247); // Heavy Hit - _chainedAirSkills.put(ClassId.FEOH_SOULTAKER, 11247); // Heavy Hit - _chainedAirSkills.put(ClassId.FEOH_MYSTIC_MUSE, 11247); // Heavy Hit - _chainedAirSkills.put(ClassId.FEOH_STORM_SCREAMER, 11247); // Heavy Hit - _chainedAirSkills.put(ClassId.FEOH_SOUL_HOUND, 11247); // Heavy Hit + _chainedAirSkills.put(ClassId.FEOH_ARCHMAGE, 11249); // Heavy Hit + _chainedAirSkills.put(ClassId.FEOH_SOULTAKER, 11249); // Heavy Hit + _chainedAirSkills.put(ClassId.FEOH_MYSTIC_MUSE, 11249); // Heavy Hit + _chainedAirSkills.put(ClassId.FEOH_STORM_SCREAMER, 11249); // Heavy Hit + _chainedAirSkills.put(ClassId.FEOH_SOUL_HOUND, 11249); // Heavy Hit _chainedAirSkills.put(ClassId.ISS_HIEROPHANT, 11749); // Heavy Hit _chainedAirSkills.put(ClassId.ISS_SWORD_MUSE, 11749); // Heavy Hit _chainedAirSkills.put(ClassId.ISS_SPECTRAL_DANCER, 11749); // Heavy Hit @@ -78,7 +78,7 @@ public final class HellBind extends AbstractEffect _chainedAirSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 11999); // Heavy Hit } - public HellBind(StatsSet params) + public AirBind(StatsSet params) { } @@ -97,7 +97,7 @@ public final class HellBind extends AbstractEffect @Override public void continuousInstant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { - hellBind(effector, effected); + airBind(effector, effected); } @Override @@ -109,18 +109,18 @@ public final class HellBind extends AbstractEffect } } - public void hellBind(L2Character effector, L2Character effected) + public void airBind(L2Character effector, L2Character effected) { for (L2PcInstance nearbyPlayer : L2World.getInstance().getVisibleObjects(effected, L2PcInstance.class, 1200)) { - if (nearbyPlayer.getRace() == Race.ERTHEIA) - { - continue; - } - if ((nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive()) + if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) // + && nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive()) { final int chainSkill = _chainedAirSkills.get(nearbyPlayer.getClassId()); - nearbyPlayer.sendPacket(new ExAlterSkillRequest(nearbyPlayer, chainSkill, chainSkill, 5)); + if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1) + { + nearbyPlayer.sendPacket(new ExAlterSkillRequest(nearbyPlayer, chainSkill, chainSkill, 5)); + } } } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/07100-07199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/07100-07199.xml index dc4b0b57b5..73b4080c2e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/07100-07199.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/07100-07199.xml @@ -55,6 +55,7 @@ TARGET SINGLE + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml index 7e25ed4f69..b0add262b2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10000-10099.xml @@ -521,7 +521,7 @@ - + 13634 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml index 6f092e1c74..6a135533e8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10200-10299.xml @@ -725,7 +725,7 @@ - + 11159 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml index d222400f5e..c60512258b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10500-10599.xml @@ -468,7 +468,7 @@ - + 15 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml index 30d19840f1..3659a6b07d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/10700-10799.xml @@ -1133,7 +1133,7 @@ - + 20814 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11000-11099.xml index 9edb9c565d..de9da4722a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11000-11099.xml @@ -1021,7 +1021,7 @@ ENEMY SINGLE - + 158 @@ -4113,6 +4113,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -4197,6 +4198,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -4278,6 +4280,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -4406,6 +4409,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11100-11199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11100-11199.xml index ccc324e133..faaf84f3a1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11100-11199.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11100-11199.xml @@ -3123,6 +3123,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -3168,6 +3169,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -3213,6 +3215,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -3259,6 +3262,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml index 53d62a5208..81dbe79c09 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml @@ -1249,7 +1249,7 @@ RANGE NOT_FRIEND - + 147 @@ -2191,6 +2191,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11300-11399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11300-11399.xml index 4327c86c21..2e19d35f58 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11300-11399.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11300-11399.xml @@ -25,6 +25,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml index e89408feb6..d496d8db4b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11500-11599.xml @@ -547,7 +547,7 @@ - + 14608 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11800-11899.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11800-11899.xml index 2507d8515e..9e8f3ba105 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11800-11899.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11800-11899.xml @@ -520,7 +520,7 @@ ENEMY SINGLE - + 124 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13700-13799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13700-13799.xml index a123b1b203..819a6915b6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13700-13799.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13700-13799.xml @@ -598,6 +598,7 @@ 150 5-12 + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912;30516 @@ -1287,6 +1288,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912;30516 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14200-14299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14200-14299.xml index 0c0cd0df0a..937cdea94e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14200-14299.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14200-14299.xml @@ -495,6 +495,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14400-14499.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14400-14499.xml index 60a9726b37..b00414a240 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14400-14499.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14400-14499.xml @@ -1753,6 +1753,7 @@ RANGE NOT_FRIEND + 10279;10517;10025;10776;11770;1904 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14500-14599.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14500-14599.xml index 52c92f138c..23349cfcc2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14500-14599.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14500-14599.xml @@ -1509,6 +1509,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 @@ -1572,6 +1573,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 @@ -1742,6 +1744,7 @@ TARGET SINGLE + 50000 DIFF @@ -2109,6 +2112,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 @@ -3244,6 +3248,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14600-14699.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14600-14699.xml index c5198be9a8..306430fb7c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14600-14699.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14600-14699.xml @@ -1017,6 +1017,7 @@ ENEMY SINGLE + true 500 @@ -2522,6 +2523,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 @@ -2856,6 +2858,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14800-14899.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14800-14899.xml index 33cbbfdfed..0f2800d43a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14800-14899.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/14800-14899.xml @@ -942,6 +942,7 @@ POINT_BLANK NOT_FRIEND + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/15000-15099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/15000-15099.xml index 7b4616413d..36cdf3ba73 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/15000-15099.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/15000-15099.xml @@ -1859,6 +1859,7 @@ 420 50 + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/15200-15299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/15200-15299.xml index 23feddfaa2..b420d50ba2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/15200-15299.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/15200-15299.xml @@ -1138,6 +1138,9 @@ SELF POINT_BLANK NOT_FRIEND + + + diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/15300-15399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/15300-15399.xml index 92b52ba0bb..fde625ad50 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/15300-15399.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/15300-15399.xml @@ -1280,6 +1280,9 @@ true ENEMY SINGLE + + + @@ -1375,6 +1378,9 @@ true ENEMY SINGLE + + + diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/26100-26199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/26100-26199.xml index 3af2d20567..070ee46473 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/26100-26199.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/26100-26199.xml @@ -706,6 +706,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/27300-27399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/27300-27399.xml index 6e2fd06b3c..c775220c10 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/27300-27399.xml +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/27300-27399.xml @@ -1394,6 +1394,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/documentation.txt index 8dc9d51304..13fbef7dd2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/documentation.txt @@ -7,6 +7,7 @@ AbstractStatEffect: Abstract class for managing stats. Accuracy: P. Accuracy stat. AddHate: Instant effect that increases target's hate towards you. AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots. +AirBind: Used by airbind chain skills. (l2jmobius) AreaDamage: Topography (Danger Zone) resistance stat. AttackAttribute: Stat that increases specific attack attribute. AttackAttributeAdd: Stat that increases all attack attribute. @@ -126,7 +127,6 @@ HealEffect: Increases the amount of HP received. Heal: Increases current HP by a given amount. HealOverTime: Increases current HP by a given amount over time. HealPercent: Increases current HP by a given percentage amount. -HellBind: Used by hellbind chain skills. (l2jmobius) Hide: Hide effect. HitNumber: Polearm attack max hit creatures. HpByLevel: recovers certain amount of HP, but current implementation is wrong... final amount should be computed from skill power and character level difference diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java index e0d9996551..17d6fd6772 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -38,6 +38,7 @@ public final class EffectMasterHandler EffectHandler.getInstance().registerHandler("Accuracy", Accuracy::new); EffectHandler.getInstance().registerHandler("AddHate", AddHate::new); EffectHandler.getInstance().registerHandler("AddTeleportBookmarkSlot", AddTeleportBookmarkSlot::new); + EffectHandler.getInstance().registerHandler("AirBind", AirBind::new); EffectHandler.getInstance().registerHandler("AreaDamage", AreaDamage::new); EffectHandler.getInstance().registerHandler("AttackAttribute", AttackAttribute::new); EffectHandler.getInstance().registerHandler("AttackAttributeAdd", AttackAttributeAdd::new); @@ -156,7 +157,6 @@ public final class EffectMasterHandler EffectHandler.getInstance().registerHandler("HealEffect", HealEffect::new); EffectHandler.getInstance().registerHandler("HealOverTime", HealOverTime::new); EffectHandler.getInstance().registerHandler("HealPercent", HealPercent::new); - EffectHandler.getInstance().registerHandler("HellBind", HellBind::new); EffectHandler.getInstance().registerHandler("Hide", Hide::new); EffectHandler.getInstance().registerHandler("HitNumber", HitNumber::new); EffectHandler.getInstance().registerHandler("Hp", Hp::new); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HellBind.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java similarity index 81% rename from L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HellBind.java rename to L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java index 6fd155b947..e1adc4c75d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HellBind.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExAlterSkillRequest; /** * @author Mobius */ -public final class HellBind extends AbstractEffect +public final class AirBind extends AbstractEffect { // skill data private static final Map _chainedAirSkills = new HashMap<>(36); @@ -60,11 +60,11 @@ public final class HellBind extends AbstractEffect _chainedAirSkills.put(ClassId.YUL_MOONLIGHT_SENTINEL, 10999); // Heavy Hit _chainedAirSkills.put(ClassId.YUL_GHOST_SENTINEL, 10999); // Heavy Hit _chainedAirSkills.put(ClassId.YUL_TRICKSTER, 10999); // Heavy Hit - _chainedAirSkills.put(ClassId.FEOH_ARCHMAGE, 11247); // Heavy Hit - _chainedAirSkills.put(ClassId.FEOH_SOULTAKER, 11247); // Heavy Hit - _chainedAirSkills.put(ClassId.FEOH_MYSTIC_MUSE, 11247); // Heavy Hit - _chainedAirSkills.put(ClassId.FEOH_STORM_SCREAMER, 11247); // Heavy Hit - _chainedAirSkills.put(ClassId.FEOH_SOUL_HOUND, 11247); // Heavy Hit + _chainedAirSkills.put(ClassId.FEOH_ARCHMAGE, 11249); // Heavy Hit + _chainedAirSkills.put(ClassId.FEOH_SOULTAKER, 11249); // Heavy Hit + _chainedAirSkills.put(ClassId.FEOH_MYSTIC_MUSE, 11249); // Heavy Hit + _chainedAirSkills.put(ClassId.FEOH_STORM_SCREAMER, 11249); // Heavy Hit + _chainedAirSkills.put(ClassId.FEOH_SOUL_HOUND, 11249); // Heavy Hit _chainedAirSkills.put(ClassId.ISS_HIEROPHANT, 11749); // Heavy Hit _chainedAirSkills.put(ClassId.ISS_SWORD_MUSE, 11749); // Heavy Hit _chainedAirSkills.put(ClassId.ISS_SPECTRAL_DANCER, 11749); // Heavy Hit @@ -78,7 +78,7 @@ public final class HellBind extends AbstractEffect _chainedAirSkills.put(ClassId.AEORE_SHILLIEN_SAINT, 11999); // Heavy Hit } - public HellBind(StatsSet params) + public AirBind(StatsSet params) { } @@ -97,7 +97,7 @@ public final class HellBind extends AbstractEffect @Override public void continuousInstant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { - hellBind(effector, effected); + airBind(effector, effected); } @Override @@ -109,18 +109,18 @@ public final class HellBind extends AbstractEffect } } - public void hellBind(L2Character effector, L2Character effected) + public void airBind(L2Character effector, L2Character effected) { for (L2PcInstance nearbyPlayer : L2World.getInstance().getVisibleObjects(effected, L2PcInstance.class, 1200)) { - if (nearbyPlayer.getRace() == Race.ERTHEIA) - { - continue; - } - if ((nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive()) + if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) // + && nearbyPlayer.isInCategory(CategoryType.AWAKEN_GROUP) && !nearbyPlayer.isAlterSkillActive()) { final int chainSkill = _chainedAirSkills.get(nearbyPlayer.getClassId()); - nearbyPlayer.sendPacket(new ExAlterSkillRequest(nearbyPlayer, chainSkill, chainSkill, 5)); + if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1) + { + nearbyPlayer.sendPacket(new ExAlterSkillRequest(nearbyPlayer, chainSkill, chainSkill, 5)); + } } } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/07100-07199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/07100-07199.xml index dc94c11251..66366af1e3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/07100-07199.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/07100-07199.xml @@ -55,6 +55,7 @@ TARGET SINGLE + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml index cf630b2584..dac5bad084 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10000-10099.xml @@ -520,7 +520,7 @@ - + 13634 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml index 1c894845bd..fffea31767 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10200-10299.xml @@ -725,7 +725,7 @@ - + 11159 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml index b188cbbf6a..7362fbf40f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10500-10599.xml @@ -468,7 +468,7 @@ - + 15 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml index 0b4d8f5922..7609168fb7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/10700-10799.xml @@ -1133,7 +1133,7 @@ - + 20814 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11000-11099.xml index 18e9d7bc6a..5aaa251bc1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11000-11099.xml @@ -1021,7 +1021,7 @@ ENEMY SINGLE - + 158 @@ -4122,6 +4122,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -4206,6 +4207,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -4287,6 +4289,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -4411,6 +4414,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11100-11199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11100-11199.xml index ab6a425f1d..446ba6849e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11100-11199.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11100-11199.xml @@ -3204,6 +3204,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -3249,6 +3250,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -3294,6 +3296,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 @@ -3340,6 +3343,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml index c8f38705a6..4fd66ace5b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml @@ -1255,7 +1255,7 @@ RANGE NOT_FRIEND - + 147 @@ -2197,6 +2197,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11300-11399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11300-11399.xml index 62364790c9..17cec85a70 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11300-11399.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11300-11399.xml @@ -25,6 +25,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml index 75aa526638..f5fd14145b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11500-11599.xml @@ -547,7 +547,7 @@ - + 14608 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11800-11899.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11800-11899.xml index 3ad3eaf01f..b9057d7463 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11800-11899.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11800-11899.xml @@ -520,7 +520,7 @@ ENEMY SINGLE - + 124 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13700-13799.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13700-13799.xml index 5effbbcae0..812020b88e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13700-13799.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13700-13799.xml @@ -598,6 +598,7 @@ 150 5-12 + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912;30516 @@ -1287,6 +1288,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912;30516 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14200-14299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14200-14299.xml index 493c5ff287..5d7f3791c1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14200-14299.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14200-14299.xml @@ -495,6 +495,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14400-14499.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14400-14499.xml index 60a9726b37..b00414a240 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14400-14499.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14400-14499.xml @@ -1753,6 +1753,7 @@ RANGE NOT_FRIEND + 10279;10517;10025;10776;11770;1904 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14500-14599.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14500-14599.xml index 52c92f138c..23349cfcc2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14500-14599.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14500-14599.xml @@ -1509,6 +1509,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 @@ -1572,6 +1573,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 @@ -1742,6 +1744,7 @@ TARGET SINGLE + 50000 DIFF @@ -2109,6 +2112,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 @@ -3244,6 +3248,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14600-14699.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14600-14699.xml index 07e29b5260..4318b32011 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14600-14699.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14600-14699.xml @@ -1017,6 +1017,7 @@ ENEMY SINGLE + true 500 @@ -2522,6 +2523,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 @@ -2856,6 +2858,7 @@ ENEMY SINGLE + 10279;10517;10025;10776;11770;1904 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14800-14899.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14800-14899.xml index 33cbbfdfed..0f2800d43a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14800-14899.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/14800-14899.xml @@ -942,6 +942,7 @@ POINT_BLANK NOT_FRIEND + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/15000-15099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/15000-15099.xml index 7b4616413d..36cdf3ba73 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/15000-15099.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/15000-15099.xml @@ -1859,6 +1859,7 @@ 420 50 + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/15200-15299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/15200-15299.xml index b9119ee0ff..157a9f552f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/15200-15299.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/15200-15299.xml @@ -1138,6 +1138,9 @@ SELF POINT_BLANK NOT_FRIEND + + + diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/15300-15399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/15300-15399.xml index 92b52ba0bb..fde625ad50 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/15300-15399.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/15300-15399.xml @@ -1280,6 +1280,9 @@ true ENEMY SINGLE + + + @@ -1375,6 +1378,9 @@ true ENEMY SINGLE + + + diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/26100-26199.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/26100-26199.xml index 3af2d20567..070ee46473 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/26100-26199.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/26100-26199.xml @@ -706,6 +706,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/27300-27399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/27300-27399.xml index 6e2fd06b3c..c775220c10 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/27300-27399.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/27300-27399.xml @@ -1394,6 +1394,7 @@ + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/documentation.txt b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/documentation.txt index 8dc9d51304..13fbef7dd2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/documentation.txt +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/documentation.txt @@ -7,6 +7,7 @@ AbstractStatEffect: Abstract class for managing stats. Accuracy: P. Accuracy stat. AddHate: Instant effect that increases target's hate towards you. AddTeleportBookmarkSlot: Instant effect that increases the amount of My Teleport slots. +AirBind: Used by airbind chain skills. (l2jmobius) AreaDamage: Topography (Danger Zone) resistance stat. AttackAttribute: Stat that increases specific attack attribute. AttackAttributeAdd: Stat that increases all attack attribute. @@ -126,7 +127,6 @@ HealEffect: Increases the amount of HP received. Heal: Increases current HP by a given amount. HealOverTime: Increases current HP by a given amount over time. HealPercent: Increases current HP by a given percentage amount. -HellBind: Used by hellbind chain skills. (l2jmobius) Hide: Hide effect. HitNumber: Polearm attack max hit creatures. HpByLevel: recovers certain amount of HP, but current implementation is wrong... final amount should be computed from skill power and character level difference