From 511aa1e7403d3eb7d8c0b7dbf749c006d6cd05b4 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 28 May 2021 11:58:16 +0000 Subject: [PATCH] Addition of parameter skillLevel to OpAffectedBySkill skill condition. --- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- .../OpAffectedBySkillSkillCondition.java | 10 +++++++++- 19 files changed, 171 insertions(+), 19 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } } diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java index 6223172dbc..d8956974c7 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/skillconditionhandlers/OpAffectedBySkillSkillCondition.java @@ -19,6 +19,7 @@ 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.BuffInfo; import org.l2jmobius.gameserver.model.skills.ISkillCondition; import org.l2jmobius.gameserver.model.skills.Skill; @@ -28,15 +29,22 @@ import org.l2jmobius.gameserver.model.skills.Skill; public class OpAffectedBySkillSkillCondition implements ISkillCondition { private final int _skillId; + private final int _skillLevel; public OpAffectedBySkillSkillCondition(StatSet params) { _skillId = params.getInt("skillId", -1); + _skillLevel = params.getInt("skillLevel", -1); } @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getEffectList().getBuffInfoBySkillId(_skillId) != null; + final BuffInfo buffInfo = caster.getEffectList().getBuffInfoBySkillId(_skillId); + if (_skillLevel > 0) + { + return (buffInfo != null) && (buffInfo.getSkill().getLevel() >= _skillLevel); + } + return buffInfo != null; } }