Shield and Sigil skill condition adjustments.

Contributed by nasseka.
This commit is contained in:
MobiusDevelopment
2021-11-12 00:07:27 +00:00
parent d4be2f5d26
commit fbaafb63f5
94 changed files with 1143 additions and 372 deletions

View File

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

View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
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);
}
}

View File

@@ -265,6 +265,9 @@
<value level="10">110</value>
</magicLevel>
<magicCriticalRate>5</magicCriticalRate>
<conditions>
<condition name="EquipShield" />
</conditions>
<effects>
<effect name="PhysicalShieldAngleAll" />
<effect name="ShieldDefenceRate">

View File

@@ -210,20 +210,17 @@
<magicLevel>85</magicLevel>
<magicCriticalRate>5</magicCriticalRate>
<operateType>P</operateType>
<conditions>
<condition name="EquipSigil" />
</conditions>
<effects>
<effect name="MAtk">
<amount>5</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="MpRegen">
<amount>20</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="MagicCriticalDamage">
<amount>
@@ -232,9 +229,6 @@
<value level="3">3</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="MagicalSkillPower">
<amount>
@@ -243,9 +237,6 @@
<value level="3">1</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
</effects>
</skill>

View File

@@ -1157,6 +1157,9 @@
<value level="10">110</value>
</magicLevel>
<magicCriticalRate>5</magicCriticalRate>
<conditions>
<condition name="EquipShield" />
</conditions>
<effects>
<effect name="PhysicalShieldAngleAll" />
<effect name="ShieldDefenceRate">

View File

@@ -3071,6 +3071,10 @@
<magicLevel>85</magicLevel>
<magicCriticalRate>5</magicCriticalRate>
<effects>
<effect name="StatUp">
<amount>2</amount>
<stat>INT</stat>
</effect>
<effect name="MpRegen">
<amount>20</amount>
<mode>PER</mode>
@@ -3078,10 +3082,6 @@
<item>SIGIL</item>
</armorType>
</effect>
<effect name="StatUp">
<amount>2</amount>
<stat>INT</stat>
</effect>
<effect name="HealEffect">
<amount>40</amount>
<mode>DIFF</mode>

View File

@@ -1059,6 +1059,9 @@
<value level="1">40</value>
<value level="2">76</value>
</magicLevel>
<conditions>
<condition name="EquipSigil" />
</conditions>
<effects>
<effect name="MAtk">
<amount>
@@ -1066,9 +1069,6 @@
<value level="2">3</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="MpRegen">
<amount>
@@ -1076,9 +1076,6 @@
<value level="2">12</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
</effects>
</skill>
@@ -1359,6 +1356,9 @@
<icon>icon.skill0925</icon>
<operateType>P</operateType>
<magicCriticalRate>5</magicCriticalRate>
<conditions>
<condition name="EquipSigil" />
</conditions>
<effects>
<effect name="MAtk">
<amount>
@@ -1366,9 +1366,6 @@
<value level="2">3</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="MpRegen">
<amount>
@@ -1376,9 +1373,6 @@
<value level="2">12</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
</effects>
</skill>

View File

@@ -3265,6 +3265,9 @@
<!-- P. Atk. +$s1, when a sigil is equipped. -->
<icon>icon.skill_guard_mastery_1</icon>
<operateType>P</operateType>
<conditions>
<condition name="EquipSigil" />
</conditions>
<effects>
<effect name="PAtk">
<amount>
@@ -3273,9 +3276,6 @@
<value level="3">3</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="CriticalDamage">
<amount>
@@ -3284,9 +3284,6 @@
<value level="3">1</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="SkillCriticalDamage">
<amount>
@@ -3295,9 +3292,6 @@
<value level="3">1</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
</effects>
</skill>
@@ -3305,6 +3299,9 @@
<!-- P. Atk. +$s1, when a sigil is equipped. -->
<icon>icon.skill_guard_mastery_1</icon>
<operateType>P</operateType>
<conditions>
<condition name="EquipSigil" />
</conditions>
<effects>
<effect name="PAtk">
<amount>
@@ -3313,9 +3310,6 @@
<value level="3">3</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="CriticalDamage">
<amount>
@@ -3324,9 +3318,6 @@
<value level="3">1</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="SkillCriticalDamage">
<amount>
@@ -3335,9 +3326,6 @@
<value level="3">1</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
</effects>
</skill>
@@ -3345,6 +3333,9 @@
<!-- P. Atk. +$s1, when a sigil is equipped. -->
<icon>icon.skill_guard_mastery_1</icon>
<operateType>P</operateType>
<conditions>
<condition name="EquipSigil" />
</conditions>
<effects>
<effect name="PAtk">
<amount>
@@ -3353,9 +3344,6 @@
<value level="3">3</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="SkillCriticalDamage">
<amount>
@@ -3364,9 +3352,6 @@
<value level="3">1</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
</effects>
</skill>
@@ -3374,6 +3359,9 @@
<!-- P. Atk. +$s1, when a sigil is equipped. -->
<icon>icon.skill_guard_mastery_1</icon>
<operateType>P</operateType>
<conditions>
<condition name="EquipSigil" />
</conditions>
<effects>
<effect name="PAtk">
<amount>
@@ -3382,9 +3370,6 @@
<value level="3">3</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="SkillCriticalDamage">
<amount>
@@ -3393,9 +3378,6 @@
<value level="3">1</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
</effects>
</skill>
@@ -3403,6 +3385,9 @@
<!-- P. Atk. +$s1, when a sigil is equipped. -->
<icon>icon.skill_guard_mastery_1</icon>
<operateType>P</operateType>
<conditions>
<condition name="EquipSigil" />
</conditions>
<effects>
<effect name="PAtk">
<amount>
@@ -3411,9 +3396,6 @@
<value level="3">3</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="CriticalDamage">
<amount>
@@ -3422,9 +3404,6 @@
<value level="3">1</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="SkillCriticalDamage">
<amount>
@@ -3433,9 +3412,6 @@
<value level="3">1</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
</effects>
</skill>
@@ -3443,6 +3419,9 @@
<!-- P. Atk. +$s1, M. Atk. +$s2, when a sigil is equipped. -->
<icon>icon.skill_guard_mastery_1</icon>
<operateType>P</operateType>
<conditions>
<condition name="EquipSigil" />
</conditions>
<effects>
<effect name="PAtk">
<amount>
@@ -3451,9 +3430,6 @@
<value level="3">3</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="MAtk">
<amount>
@@ -3462,9 +3438,6 @@
<value level="3">3</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="CriticalDamage">
<amount>
@@ -3473,9 +3446,6 @@
<value level="3">1</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="MagicCriticalDamage">
<amount>
@@ -3484,9 +3454,6 @@
<value level="3">1</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
</effects>
</skill>
@@ -3494,6 +3461,9 @@
<!-- P. Atk. +$s1, when a sigil is equipped. -->
<icon>icon.skill_guard_mastery_1</icon>
<operateType>P</operateType>
<conditions>
<condition name="EquipSigil" />
</conditions>
<effects>
<effect name="PAtk">
<amount>
@@ -3502,9 +3472,6 @@
<value level="3">3</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="CriticalDamage">
<amount>
@@ -3513,9 +3480,6 @@
<value level="3">1</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="SkillCriticalDamage">
<amount>
@@ -3524,9 +3488,6 @@
<value level="3">1</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
</effects>
</skill>
@@ -3534,6 +3495,9 @@
<!-- M. Skill Critical Damage +$s1 when a sigil is equipped. -->
<icon>icon.skill_guard_mastery_1</icon>
<operateType>P</operateType>
<conditions>
<condition name="EquipSigil" />
</conditions>
<effects>
<effect name="MagicCriticalDamage">
<amount>
@@ -3542,9 +3506,6 @@
<value level="3">3</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
<effect name="MagicalSkillPower">
<amount>
@@ -3553,9 +3514,6 @@
<value level="3">1</value>
</amount>
<mode>PER</mode>
<armorType>
<item>SIGIL</item>
</armorType>
</effect>
</effects>
</skill>