Shield and Sigil skill condition adjustments.

Contributed by nasseka.

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

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 <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);
+	}
+}

L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/10000-10099.xml

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

L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/11000-11099.xml

@@ -182,20 +182,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>
 		</effects>
 	</skill>

L2J_Mobius_01.0_Ertheia/dist/game/data/stats/skills/11600-11699.xml

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

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

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 <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);
+	}
+}

L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/10000-10099.xml

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

L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/11000-11099.xml

@@ -182,20 +182,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>
 		</effects>
 	</skill>

L2J_Mobius_02.5_Underground/dist/game/data/stats/skills/11600-11699.xml

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

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

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 <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);
+	}
+}

L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/10000-10099.xml

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

L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/11000-11099.xml

@@ -182,20 +182,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>
 		</effects>
 	</skill>

L2J_Mobius_03.0_Helios/dist/game/data/stats/skills/11600-11699.xml

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

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

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 <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);
+	}
+}

L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/10000-10099.xml

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

L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/11000-11099.xml

@@ -182,20 +182,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>
 		</effects>
 	</skill>

L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/11600-11699.xml

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

L2J_Mobius_04.0_GrandCrusade/dist/game/data/stats/skills/11700-11799.xml

@@ -2784,6 +2784,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>
@@ -2791,10 +2795,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>

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

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 <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);
+	}
+}

L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/10000-10099.xml

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

L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/11000-11099.xml

@@ -182,20 +182,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>
 		</effects>
 	</skill>

L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/11600-11699.xml

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

L2J_Mobius_05.0_Salvation/dist/game/data/stats/skills/11700-11799.xml

@@ -2786,6 +2786,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>
@@ -2793,10 +2797,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>

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

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 <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);
+	}
+}

L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml

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

L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/11000-11099.xml

@@ -182,20 +182,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>
 		</effects>
 	</skill>

L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/11600-11699.xml

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

L2J_Mobius_05.5_EtinasFate/dist/game/data/stats/skills/11700-11799.xml

@@ -2786,6 +2786,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>
@@ -2793,10 +2797,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>

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

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 <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);
+	}
+}

L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/10000-10099.xml

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

L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/11000-11099.xml

@@ -182,20 +182,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>
 		</effects>
 	</skill>

L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/11600-11699.xml

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

L2J_Mobius_06.0_Fafurion/dist/game/data/stats/skills/11700-11799.xml

@@ -2940,6 +2940,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>
@@ -2947,10 +2951,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>

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

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 <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);
+	}
+}

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/10000-10099.xml

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

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/11000-11099.xml

@@ -182,20 +182,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>
 		</effects>
 	</skill>

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/11600-11699.xml

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

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/11700-11799.xml

@@ -2935,6 +2935,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>
@@ -2942,10 +2946,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>

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/skills/30700-30799.xml

@@ -1102,6 +1102,9 @@
 			<value level="1">40</value>
 			<value level="2">76</value>
 		</magicLevel>
+		<conditions>
+			<condition name="EquipSigil" />
+		</conditions>
 		<effects>
 			<effect name="MAtk">
 				<amount>
@@ -1109,9 +1112,6 @@
 					<value level="2">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="MpRegen">
 				<amount>
@@ -1119,9 +1119,6 @@
 					<value level="2">12</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>
@@ -1412,6 +1409,9 @@
 		<icon>icon.skill0925</icon>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
+		<conditions>
+			<condition name="EquipSigil" />
+		</conditions>
 		<effects>
 			<effect name="MAtk">
 				<amount>
@@ -1419,9 +1419,6 @@
 					<value level="2">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="MpRegen">
 				<amount>
@@ -1429,9 +1426,6 @@
 					<value level="2">12</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>

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

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 <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);
+	}
+}

L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/10000-10099.xml

@@ -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">

L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11000-11099.xml

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

L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11600-11699.xml

@@ -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">

L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/11700-11799.xml

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

L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30700-30799.xml

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

L2J_Mobius_08.2_Homunculus/dist/game/data/stats/skills/30800-30899.xml

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

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

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 <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);
+	}
+}

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/10000-10099.xml

@@ -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">

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11000-11099.xml

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

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11600-11699.xml

@@ -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">

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/11700-11799.xml

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

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30700-30799.xml

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

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/30800-30899.xml

@@ -3270,6 +3270,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>
@@ -3278,9 +3281,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="CriticalDamage">
 				<amount>
@@ -3289,9 +3289,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="SkillCriticalDamage">
 				<amount>
@@ -3300,9 +3297,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>
@@ -3310,6 +3304,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>
@@ -3318,9 +3315,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="CriticalDamage">
 				<amount>
@@ -3329,9 +3323,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="SkillCriticalDamage">
 				<amount>
@@ -3340,9 +3331,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>
@@ -3350,6 +3338,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>
@@ -3358,9 +3349,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="SkillCriticalDamage">
 				<amount>
@@ -3369,9 +3357,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>
@@ -3379,6 +3364,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>
@@ -3387,9 +3375,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="SkillCriticalDamage">
 				<amount>
@@ -3398,9 +3383,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>
@@ -3408,6 +3390,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>
@@ -3416,9 +3401,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="CriticalDamage">
 				<amount>
@@ -3427,9 +3409,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="SkillCriticalDamage">
 				<amount>
@@ -3438,9 +3417,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>
@@ -3448,6 +3424,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>
@@ -3456,9 +3435,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="MAtk">
 				<amount>
@@ -3467,9 +3443,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="CriticalDamage">
 				<amount>
@@ -3478,9 +3451,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="MagicCriticalDamage">
 				<amount>
@@ -3489,9 +3459,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>
@@ -3499,6 +3466,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>
@@ -3507,9 +3477,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="CriticalDamage">
 				<amount>
@@ -3518,9 +3485,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="SkillCriticalDamage">
 				<amount>
@@ -3529,9 +3493,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>
@@ -3539,6 +3500,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>
@@ -3547,9 +3511,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="MagicalSkillPower">
 				<amount>
@@ -3558,9 +3519,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>

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

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 <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);
+	}
+}

L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/10000-10099.xml

@@ -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">

L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/11000-11099.xml

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

L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/11600-11699.xml

@@ -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">

L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/11700-11799.xml

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

L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30700-30799.xml

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

L2J_Mobius_10.0_MasterClass/dist/game/data/stats/skills/30800-30899.xml

@@ -3270,6 +3270,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>
@@ -3278,9 +3281,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="CriticalDamage">
 				<amount>
@@ -3289,9 +3289,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="SkillCriticalDamage">
 				<amount>
@@ -3300,9 +3297,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>
@@ -3310,6 +3304,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>
@@ -3318,9 +3315,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="CriticalDamage">
 				<amount>
@@ -3329,9 +3323,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="SkillCriticalDamage">
 				<amount>
@@ -3340,9 +3331,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>
@@ -3350,6 +3338,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>
@@ -3358,9 +3349,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="SkillCriticalDamage">
 				<amount>
@@ -3369,9 +3357,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>
@@ -3379,6 +3364,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>
@@ -3387,9 +3375,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="SkillCriticalDamage">
 				<amount>
@@ -3398,9 +3383,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>
@@ -3408,6 +3390,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>
@@ -3416,9 +3401,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="CriticalDamage">
 				<amount>
@@ -3427,9 +3409,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="SkillCriticalDamage">
 				<amount>
@@ -3438,9 +3417,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>
@@ -3448,6 +3424,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>
@@ -3456,9 +3435,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="MAtk">
 				<amount>
@@ -3467,9 +3443,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="CriticalDamage">
 				<amount>
@@ -3478,9 +3451,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="MagicCriticalDamage">
 				<amount>
@@ -3489,9 +3459,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>
@@ -3499,6 +3466,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>
@@ -3507,9 +3477,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="CriticalDamage">
 				<amount>
@@ -3518,9 +3485,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="SkillCriticalDamage">
 				<amount>
@@ -3529,9 +3493,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>
@@ -3539,6 +3500,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>
@@ -3547,9 +3511,6 @@
 					<value level="3">3</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 			<effect name="MagicalSkillPower">
 				<amount>
@@ -3558,9 +3519,6 @@
 					<value level="3">1</value>
 				</amount>
 				<mode>PER</mode>
-				<armorType>
-					<item>SIGIL</item>
-				</armorType>
 			</effect>
 		</effects>
 	</skill>

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

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 <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);
+	}
+}

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

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 <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);
+	}
+}

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

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 <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);
+	}
+}

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

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 <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);
+	}
+}

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

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 <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);
+	}
+}

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

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 <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);
+	}
+}

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

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 <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);
+	}
+}

L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/10000-10099.xml

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

L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11000-11099.xml

@@ -182,20 +182,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>
 		</effects>
 	</skill>

L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11600-11699.xml

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

L2J_Mobius_Classic_Interlude/dist/game/data/stats/skills/11700-11799.xml

@@ -2784,6 +2784,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>
@@ -2791,10 +2795,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>

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

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 <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);
+	}
+}

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

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 <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);
+	}
+}

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

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 <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);
+	}
+}