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 f075754123..b4b30f7fe5 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 @@ -54,6 +54,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml index 4f939ccfa2..36ac7a9037 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml @@ -186,6 +186,9 @@ 110 5 + + + diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml index 6285630945..c38c1e2f9c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml @@ -182,20 +182,17 @@ 85 5 P + + + 5 PER - - SIGIL - 20 PER - - SIGIL - diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/11600-11699.xml b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/11600-11699.xml index c122e3b6fd..e70bfd5cab 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/11600-11699.xml +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/11600-11699.xml @@ -1148,6 +1148,9 @@ 110 5 + + + 50 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 f075754123..b4b30f7fe5 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 @@ -54,6 +54,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/10000-10099.xml index 8540ef7c20..5be954e94f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/10000-10099.xml @@ -186,6 +186,9 @@ 110 5 + + + diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/11000-11099.xml index 978f19c51d..492a342f66 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/11000-11099.xml @@ -182,20 +182,17 @@ 85 5 P + + + 5 PER - - SIGIL - 20 PER - - SIGIL - diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/11600-11699.xml b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/11600-11699.xml index 48d3a69010..59868ce53d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/11600-11699.xml +++ b/L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/11600-11699.xml @@ -1154,6 +1154,9 @@ 110 5 + + + 50 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 f075754123..b4b30f7fe5 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 @@ -54,6 +54,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/10000-10099.xml index f3987242bc..d69a7ba12b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/10000-10099.xml @@ -186,6 +186,9 @@ 110 5 + + + diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/11000-11099.xml index 8a3e47caf2..6488c20f5b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/11000-11099.xml @@ -182,20 +182,17 @@ 85 5 P + + + 5 PER - - SIGIL - 20 PER - - SIGIL - diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/11600-11699.xml b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/11600-11699.xml index 1ab4005b0d..d2a544abeb 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/11600-11699.xml +++ b/L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/11600-11699.xml @@ -1154,6 +1154,9 @@ 110 5 + + + 50 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 f075754123..b4b30f7fe5 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 @@ -54,6 +54,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/10000-10099.xml index 6cba306990..8d94039a8d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/10000-10099.xml @@ -186,6 +186,9 @@ 110 5 + + + diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/11000-11099.xml index 2efd676cbb..bd6e73e746 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/11000-11099.xml @@ -182,20 +182,17 @@ 85 5 P + + + 5 PER - - SIGIL - 20 PER - - SIGIL - diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/11600-11699.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/11600-11699.xml index b78506e576..10fd59bdd0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/11600-11699.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/11600-11699.xml @@ -1154,6 +1154,9 @@ 110 5 + + + 50 diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/11700-11799.xml index ecf0460afd..4255f80ce6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/11700-11799.xml @@ -2784,6 +2784,10 @@ 85 5 + + 2 + INT + 20 PER @@ -2791,10 +2795,6 @@ SIGIL - - 2 - INT - 40 DIFF 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 f075754123..b4b30f7fe5 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 @@ -54,6 +54,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/10000-10099.xml index faa3c90a97..aea4e51d64 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/10000-10099.xml @@ -210,6 +210,9 @@ 110 5 + + + diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/11000-11099.xml index ce2982caf5..659f4f5e05 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/11000-11099.xml @@ -182,20 +182,17 @@ 85 5 P + + + 5 PER - - SIGIL - 20 PER - - SIGIL - diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/11600-11699.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/11600-11699.xml index 274d4461e7..97830e3a49 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/11600-11699.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/11600-11699.xml @@ -1164,6 +1164,9 @@ 110 5 + + + 50 diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/11700-11799.xml index dfcf1667cd..3f65c6f571 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/11700-11799.xml @@ -2786,6 +2786,10 @@ 85 5 + + 2 + INT + 20 PER @@ -2793,10 +2797,6 @@ SIGIL - - 2 - INT - 40 DIFF 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 f075754123..b4b30f7fe5 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 @@ -54,6 +54,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml index b06701206b..87b9e4fcd7 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml @@ -210,6 +210,9 @@ 110 5 + + + diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/11000-11099.xml index 48613301bb..37db08db76 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/11000-11099.xml @@ -182,20 +182,17 @@ 85 5 P + + + 5 PER - - SIGIL - 20 PER - - SIGIL - diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/11600-11699.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/11600-11699.xml index f2961085cd..aea7e5760b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/11600-11699.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/11600-11699.xml @@ -1164,6 +1164,9 @@ 110 5 + + + 50 diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/11700-11799.xml index 4763b0d06f..ae45859b35 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/11700-11799.xml @@ -2786,6 +2786,10 @@ 85 5 + + 2 + INT + 20 PER @@ -2793,10 +2797,6 @@ SIGIL - - 2 - INT - 40 DIFF 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 f075754123..b4b30f7fe5 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 @@ -54,6 +54,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml index 59062f6822..14c29a3bb6 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml @@ -210,6 +210,9 @@ 110 5 + + + diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/11000-11099.xml index 0e0fe0551a..f18327c117 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/11000-11099.xml @@ -182,20 +182,17 @@ 85 5 P + + + 5 PER - - SIGIL - 20 PER - - SIGIL - diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/11600-11699.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/11600-11699.xml index bbb56f0434..b85b3377b6 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/11600-11699.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/11600-11699.xml @@ -1171,6 +1171,9 @@ 110 5 + + + 50 diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/11700-11799.xml index dcd6d69ef3..2b98e5e6ae 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/11700-11799.xml @@ -2940,6 +2940,10 @@ 85 5 + + 2 + INT + 20 PER @@ -2947,10 +2951,6 @@ SIGIL - - 2 - INT - 40 DIFF 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 f075754123..b4b30f7fe5 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 @@ -54,6 +54,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml index 87d50ab6c0..0df6c15237 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml @@ -210,6 +210,9 @@ 110 5 + + + diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/11000-11099.xml index 9ea954a372..fd11416b54 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/11000-11099.xml @@ -182,20 +182,17 @@ 85 5 P + + + 5 PER - - SIGIL - 20 PER - - SIGIL - diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/11600-11699.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/11600-11699.xml index ba7b7dc46c..9d444faecf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/11600-11699.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/11600-11699.xml @@ -1132,6 +1132,9 @@ 110 5 + + + 50 diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/11700-11799.xml index 086e41f2e3..0764e8addb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/11700-11799.xml @@ -2935,6 +2935,10 @@ 85 5 + + 2 + INT + 20 PER @@ -2942,10 +2946,6 @@ SIGIL - - 2 - INT - 40 DIFF diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/30700-30799.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/30700-30799.xml index bb5a828244..2221b4717d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/30700-30799.xml +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/30700-30799.xml @@ -1102,6 +1102,9 @@ 40 76 + + + @@ -1109,9 +1112,6 @@ 3 PER - - SIGIL - @@ -1119,9 +1119,6 @@ 12 PER - - SIGIL - @@ -1412,6 +1409,9 @@ icon.skill0925 P 5 + + + @@ -1419,9 +1419,6 @@ 3 PER - - SIGIL - @@ -1429,9 +1426,6 @@ 12 PER - - SIGIL - 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 6e42775edc..abe5b60590 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 @@ -55,6 +55,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/10000-10099.xml index cffa5c1a95..09469a528c 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/10000-10099.xml @@ -265,6 +265,9 @@ 110 5 + + + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11000-11099.xml index 60b2610988..59d4ff7c48 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11000-11099.xml @@ -210,20 +210,17 @@ 85 5 P + + + 5 PER - - SIGIL - 20 PER - - SIGIL - @@ -232,9 +229,6 @@ 3 PER - - SIGIL - @@ -243,9 +237,6 @@ 1 PER - - SIGIL - diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11600-11699.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11600-11699.xml index 2b9daaf9ef..e68c8f8001 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11600-11699.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11600-11699.xml @@ -1157,6 +1157,9 @@ 110 5 + + + diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11700-11799.xml index be98e92638..c8b6fb57c2 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11700-11799.xml @@ -3071,6 +3071,10 @@ 85 5 + + 2 + INT + 20 PER @@ -3078,10 +3082,6 @@ SIGIL - - 2 - INT - 40 DIFF diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30700-30799.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30700-30799.xml index 97852dc3ce..c0979e24ba 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30700-30799.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30700-30799.xml @@ -1059,6 +1059,9 @@ 40 76 + + + @@ -1066,9 +1069,6 @@ 3 PER - - SIGIL - @@ -1076,9 +1076,6 @@ 12 PER - - SIGIL - @@ -1359,6 +1356,9 @@ icon.skill0925 P 5 + + + @@ -1366,9 +1366,6 @@ 3 PER - - SIGIL - @@ -1376,9 +1373,6 @@ 12 PER - - SIGIL - diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30800-30899.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30800-30899.xml index 96f40ee3cc..1ded59c630 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30800-30899.xml +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30800-30899.xml @@ -3265,6 +3265,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3273,9 +3276,6 @@ 3 PER - - SIGIL - @@ -3284,9 +3284,6 @@ 1 PER - - SIGIL - @@ -3295,9 +3292,6 @@ 1 PER - - SIGIL - @@ -3305,6 +3299,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3313,9 +3310,6 @@ 3 PER - - SIGIL - @@ -3324,9 +3318,6 @@ 1 PER - - SIGIL - @@ -3335,9 +3326,6 @@ 1 PER - - SIGIL - @@ -3345,6 +3333,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3353,9 +3344,6 @@ 3 PER - - SIGIL - @@ -3364,9 +3352,6 @@ 1 PER - - SIGIL - @@ -3374,6 +3359,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3382,9 +3370,6 @@ 3 PER - - SIGIL - @@ -3393,9 +3378,6 @@ 1 PER - - SIGIL - @@ -3403,6 +3385,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3411,9 +3396,6 @@ 3 PER - - SIGIL - @@ -3422,9 +3404,6 @@ 1 PER - - SIGIL - @@ -3433,9 +3412,6 @@ 1 PER - - SIGIL - @@ -3443,6 +3419,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3451,9 +3430,6 @@ 3 PER - - SIGIL - @@ -3462,9 +3438,6 @@ 3 PER - - SIGIL - @@ -3473,9 +3446,6 @@ 1 PER - - SIGIL - @@ -3484,9 +3454,6 @@ 1 PER - - SIGIL - @@ -3494,6 +3461,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3502,9 +3472,6 @@ 3 PER - - SIGIL - @@ -3513,9 +3480,6 @@ 1 PER - - SIGIL - @@ -3524,9 +3488,6 @@ 1 PER - - SIGIL - @@ -3534,6 +3495,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3542,9 +3506,6 @@ 3 PER - - SIGIL - @@ -3553,9 +3514,6 @@ 1 PER - - SIGIL - 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 6e42775edc..abe5b60590 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 @@ -55,6 +55,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10000-10099.xml index 6e6468c8a6..2038dfe9d9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10000-10099.xml @@ -265,6 +265,9 @@ 110 5 + + + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11000-11099.xml index 63af225da6..41e9a9973f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11000-11099.xml @@ -210,20 +210,17 @@ 85 5 P + + + 5 PER - - SIGIL - 20 PER - - SIGIL - @@ -232,9 +229,6 @@ 3 PER - - SIGIL - @@ -243,9 +237,6 @@ 1 PER - - SIGIL - diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11600-11699.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11600-11699.xml index c2e0ad5bb4..0e48880bd9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11600-11699.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11600-11699.xml @@ -1157,6 +1157,9 @@ 110 5 + + + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11700-11799.xml index b2725f9c01..f1f956610b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11700-11799.xml @@ -3071,6 +3071,10 @@ 85 5 + + 2 + INT + 20 PER @@ -3078,10 +3082,6 @@ SIGIL - - 2 - INT - 40 DIFF diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30700-30799.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30700-30799.xml index c1379a95ce..fb36d0d261 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30700-30799.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30700-30799.xml @@ -1059,6 +1059,9 @@ 40 76 + + + @@ -1066,9 +1069,6 @@ 3 PER - - SIGIL - @@ -1076,9 +1076,6 @@ 12 PER - - SIGIL - @@ -1359,6 +1356,9 @@ icon.skill0925 P 5 + + + @@ -1366,9 +1366,6 @@ 3 PER - - SIGIL - @@ -1376,9 +1373,6 @@ 12 PER - - SIGIL - diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml index f94cc8a018..91b79fc185 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml @@ -3270,6 +3270,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3278,9 +3281,6 @@ 3 PER - - SIGIL - @@ -3289,9 +3289,6 @@ 1 PER - - SIGIL - @@ -3300,9 +3297,6 @@ 1 PER - - SIGIL - @@ -3310,6 +3304,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3318,9 +3315,6 @@ 3 PER - - SIGIL - @@ -3329,9 +3323,6 @@ 1 PER - - SIGIL - @@ -3340,9 +3331,6 @@ 1 PER - - SIGIL - @@ -3350,6 +3338,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3358,9 +3349,6 @@ 3 PER - - SIGIL - @@ -3369,9 +3357,6 @@ 1 PER - - SIGIL - @@ -3379,6 +3364,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3387,9 +3375,6 @@ 3 PER - - SIGIL - @@ -3398,9 +3383,6 @@ 1 PER - - SIGIL - @@ -3408,6 +3390,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3416,9 +3401,6 @@ 3 PER - - SIGIL - @@ -3427,9 +3409,6 @@ 1 PER - - SIGIL - @@ -3438,9 +3417,6 @@ 1 PER - - SIGIL - @@ -3448,6 +3424,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3456,9 +3435,6 @@ 3 PER - - SIGIL - @@ -3467,9 +3443,6 @@ 3 PER - - SIGIL - @@ -3478,9 +3451,6 @@ 1 PER - - SIGIL - @@ -3489,9 +3459,6 @@ 1 PER - - SIGIL - @@ -3499,6 +3466,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3507,9 +3477,6 @@ 3 PER - - SIGIL - @@ -3518,9 +3485,6 @@ 1 PER - - SIGIL - @@ -3529,9 +3493,6 @@ 1 PER - - SIGIL - @@ -3539,6 +3500,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3547,9 +3511,6 @@ 3 PER - - SIGIL - @@ -3558,9 +3519,6 @@ 1 PER - - SIGIL - diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 6e42775edc..abe5b60590 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -55,6 +55,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/10000-10099.xml index 6e6468c8a6..2038dfe9d9 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/10000-10099.xml @@ -265,6 +265,9 @@ 110 5 + + + diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/11000-11099.xml index 63af225da6..41e9a9973f 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/11000-11099.xml @@ -210,20 +210,17 @@ 85 5 P + + + 5 PER - - SIGIL - 20 PER - - SIGIL - @@ -232,9 +229,6 @@ 3 PER - - SIGIL - @@ -243,9 +237,6 @@ 1 PER - - SIGIL - diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/11600-11699.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/11600-11699.xml index c2e0ad5bb4..0e48880bd9 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/11600-11699.xml +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/11600-11699.xml @@ -1157,6 +1157,9 @@ 110 5 + + + diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/11700-11799.xml index b2725f9c01..f1f956610b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/11700-11799.xml @@ -3071,6 +3071,10 @@ 85 5 + + 2 + INT + 20 PER @@ -3078,10 +3082,6 @@ SIGIL - - 2 - INT - 40 DIFF diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30700-30799.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30700-30799.xml index c1379a95ce..fb36d0d261 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30700-30799.xml +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30700-30799.xml @@ -1059,6 +1059,9 @@ 40 76 + + + @@ -1066,9 +1069,6 @@ 3 PER - - SIGIL - @@ -1076,9 +1076,6 @@ 12 PER - - SIGIL - @@ -1359,6 +1356,9 @@ icon.skill0925 P 5 + + + @@ -1366,9 +1366,6 @@ 3 PER - - SIGIL - @@ -1376,9 +1373,6 @@ 12 PER - - SIGIL - diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30800-30899.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30800-30899.xml index f94cc8a018..91b79fc185 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30800-30899.xml +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30800-30899.xml @@ -3270,6 +3270,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3278,9 +3281,6 @@ 3 PER - - SIGIL - @@ -3289,9 +3289,6 @@ 1 PER - - SIGIL - @@ -3300,9 +3297,6 @@ 1 PER - - SIGIL - @@ -3310,6 +3304,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3318,9 +3315,6 @@ 3 PER - - SIGIL - @@ -3329,9 +3323,6 @@ 1 PER - - SIGIL - @@ -3340,9 +3331,6 @@ 1 PER - - SIGIL - @@ -3350,6 +3338,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3358,9 +3349,6 @@ 3 PER - - SIGIL - @@ -3369,9 +3357,6 @@ 1 PER - - SIGIL - @@ -3379,6 +3364,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3387,9 +3375,6 @@ 3 PER - - SIGIL - @@ -3398,9 +3383,6 @@ 1 PER - - SIGIL - @@ -3408,6 +3390,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3416,9 +3401,6 @@ 3 PER - - SIGIL - @@ -3427,9 +3409,6 @@ 1 PER - - SIGIL - @@ -3438,9 +3417,6 @@ 1 PER - - SIGIL - @@ -3448,6 +3424,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3456,9 +3435,6 @@ 3 PER - - SIGIL - @@ -3467,9 +3443,6 @@ 3 PER - - SIGIL - @@ -3478,9 +3451,6 @@ 1 PER - - SIGIL - @@ -3489,9 +3459,6 @@ 1 PER - - SIGIL - @@ -3499,6 +3466,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3507,9 +3477,6 @@ 3 PER - - SIGIL - @@ -3518,9 +3485,6 @@ 1 PER - - SIGIL - @@ -3529,9 +3493,6 @@ 1 PER - - SIGIL - @@ -3539,6 +3500,9 @@ icon.skill_guard_mastery_1 P + + + @@ -3547,9 +3511,6 @@ 3 PER - - SIGIL - @@ -3558,9 +3519,6 @@ 1 PER - - SIGIL - 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 8e0733c5c1..d22496bfec 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 @@ -54,6 +54,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} 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 8e0733c5c1..d22496bfec 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 @@ -54,6 +54,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} 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 8e0733c5c1..d22496bfec 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 @@ -54,6 +54,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} 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 8e0733c5c1..d22496bfec 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 @@ -54,6 +54,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} 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 8e0733c5c1..d22496bfec 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 @@ -54,6 +54,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} 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 8e0733c5c1..d22496bfec 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 @@ -54,6 +54,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} 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 8e0733c5c1..d22496bfec 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 @@ -54,6 +54,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10000-10099.xml index 6cba306990..8d94039a8d 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10000-10099.xml @@ -186,6 +186,9 @@ 110 5 + + + diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11000-11099.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11000-11099.xml index 94e14c6df0..bd8aaf85bf 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11000-11099.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11000-11099.xml @@ -182,20 +182,17 @@ 85 5 P + + + 5 PER - - SIGIL - 20 PER - - SIGIL - diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11600-11699.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11600-11699.xml index b73aad83dc..7c7d68f078 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11600-11699.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11600-11699.xml @@ -1153,6 +1153,9 @@ 110 5 + + + 50 diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11700-11799.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11700-11799.xml index ecf0460afd..4255f80ce6 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11700-11799.xml +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11700-11799.xml @@ -2784,6 +2784,10 @@ 85 5 + + 2 + INT + 20 PER @@ -2791,10 +2795,6 @@ SIGIL - - 2 - INT - 40 DIFF 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 1c31eb585f..5f700cff89 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 @@ -56,6 +56,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} 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 1c31eb585f..5f700cff89 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 @@ -56,6 +56,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java index 1c31eb585f..5f700cff89 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/SkillConditionMasterHandler.java @@ -56,6 +56,7 @@ public class SkillConditionMasterHandler SkillConditionHandler.getInstance().registerHandler("EnergySaved", EnergySavedSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipArmor", EquipArmorSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipShield", EquipShieldSkillCondition::new); + SkillConditionHandler.getInstance().registerHandler("EquipSigil", EquipSigilSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("EquipWeapon", EquipWeaponSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("MaxMpSkillCondition", MaxMpSkillCondition::new); SkillConditionHandler.getInstance().registerHandler("NotFeared", NotFearedSkillCondition::new); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java new file mode 100644 index 0000000000..19fa68da6a --- /dev/null +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/EquipSigilSkillCondition.java @@ -0,0 +1,42 @@ +/* + * 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.items.Item; +import org.l2jmobius.gameserver.model.items.type.ArmorType; +import org.l2jmobius.gameserver.model.skills.ISkillCondition; +import org.l2jmobius.gameserver.model.skills.Skill; + +/** + * @author nasseka + */ +public class EquipSigilSkillCondition implements ISkillCondition +{ + public EquipSigilSkillCondition(StatSet params) + { + } + + @Override + public boolean canUse(Creature caster, Skill skill, WorldObject target) + { + final Item sigil = caster.getSecondaryWeaponItem(); + return (sigil != null) && (sigil.getItemType() == ArmorType.SIGIL); + } +}