Addition of EnchantRate effect handler.

Contributed by facab.

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -134,6 +134,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("DragonWeaponDefence", DragonWeaponDefence::new);
 		EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
 		EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
+		EffectHandler.getInstance().registerHandler("EnchantRate", EnchantRate::new);
 		EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
 		EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);
 		EffectHandler.getInstance().registerHandler("EnlargeSlot", EnlargeSlot::new);

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnchantRate.java

@@ -0,0 +1,31 @@
+/*
+ * 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.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author zarco
+ */
+public class EnchantRate extends AbstractStatAddEffect
+{
+	public EnchantRate(StatSet params)
+	{
+		super(params, Stat.ENCHANT_RATE);
+	}
+}

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java

@@ -40,7 +40,7 @@ public class CharmOfCourage implements IItemHandler
 		
 		final PlayerInstance player = playable.getActingPlayer();
 		int level = player.getLevel();
-		final int itemLevel = item.getItem().getCrystalType().getId();
+		final int itemLevel = item.getItem().getCrystalType().getLevel();
 		if (level < 20)
 		{
 			level = 0;

L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/09300-09399.xml

@@ -1542,6 +1542,14 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLevel>85</magicLevel>
+		<effects>
+			<effect name="EnchantRate">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">15</value>
+				</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9371" toLevel="1" name="Sayha's Portal">
 		<!-- Summons a portal that stays for 5 min. Cannot be used in special places like the GM Consultation Services. -->

L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/documentation.txt

@@ -104,6 +104,7 @@ DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to
 DragonWeaponDefence: Dragon weapon defence stat. (l2jmobius)
 DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
 EnableCloak: See/unsee cloaks.
+EnchantRate: Enchant rate modifier, does not work for non grade items. (l2jmobius)
 EnemyCharge: Charges towards the enemy. Rush Impact.
 EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.
 EnlargeAbnormalSlot: Increase the amount of buff slots.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -2151,7 +2151,7 @@ public class PlayerInstance extends Playable
 		{
 			if ((item != null) && item.isEquipped() && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT)))
 			{
-				crystaltype = item.getItem().getCrystalType().getId();
+				crystaltype = item.getItem().getCrystalType().getLevel();
 				if (crystaltype > expertiseLevel)
 				{
 					if (item.isWeapon() && (crystaltype > weaponPenalty))
@@ -8825,7 +8825,7 @@ public class PlayerInstance extends Playable
 	{
 		for (int itemId : _activeSoulShots)
 		{
-			if (ItemTable.getInstance().getTemplate(itemId).getCrystalType().getId() == crystalType)
+			if (ItemTable.getInstance().getTemplate(itemId).getCrystalType().getLevel() == crystalType)
 			{
 				disableAutoShot(itemId);
 			}

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -451,7 +451,7 @@ public abstract class Inventory extends ItemContainer
 			final PlayerInstance player = (PlayerInstance) inventory.getOwner();
 			
 			// Any items equipped that result in expertise penalty do not give any skills at all.
-			if (item.getItem().getCrystalType().getId() > player.getExpertiseLevel())
+			if (item.getItem().getCrystalType().getLevel() > player.getExpertiseLevel())
 			{
 				return;
 			}

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -25,8 +25,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
+import org.l2jmobius.gameserver.model.items.type.CrystalType;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
 import org.l2jmobius.gameserver.model.items.type.ItemType;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author UnAfraid
@@ -215,9 +217,11 @@ public class EnchantScroll extends AbstractEnchantItem
 			return EnchantResultType.ERROR;
 		}
 		
+		final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel();
+		final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0;
 		final double bonusRate = getBonusRate();
 		final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0;
-		final double finalChance = Math.min(chance + bonusRate + supportBonusRate, 100);
+		final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100);
 		final double random = 100 * Rnd.nextDouble();
 		final boolean success = (random < finalChance) || player.tryLuck();
 		return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE;

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java

@@ -35,14 +35,14 @@ public enum CrystalType
 	R99(10, 17371, 30, 500),
 	EVENT(11, 0, 0, 0);
 	
-	private final int _id;
+	private final int _level;
 	private final int _crystalId;
 	private final int _crystalEnchantBonusArmor;
 	private final int _crystalEnchantBonusWeapon;
 	
-	CrystalType(int id, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon)
+	CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon)
 	{
-		_id = id;
+		_level = level;
 		_crystalId = crystalId;
 		_crystalEnchantBonusArmor = crystalEnchantBonusArmor;
 		_crystalEnchantBonusWeapon = crystalEnchantBonusWeapon;
@@ -52,9 +52,9 @@ public enum CrystalType
 	 * Gets the crystal type ID.
 	 * @return the crystal type ID
 	 */
-	public int getId()
+	public int getLevel()
 	{
-		return _id;
+		return _level;
 	}
 	
 	/**
@@ -78,11 +78,11 @@ public enum CrystalType
 	
 	public boolean isGreater(CrystalType crystalType)
 	{
-		return getId() > crystalType.getId();
+		return getLevel() > crystalType.getLevel();
 	}
 	
 	public boolean isLesser(CrystalType crystalType)
 	{
-		return getId() < crystalType.getId();
+		return getLevel() < crystalType.getLevel();
 	}
 }

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -186,6 +186,7 @@ public enum Stat
 	BREATH("breath"),
 	FALL("fall"),
 	FISHING_EXP_SP_BONUS("fishingExpSpBonus"),
+	ENCHANT_RATE("enchantRate"),
 	
 	// VULNERABILITIES
 	DAMAGE_ZONE_VULN("damageZoneVuln"),

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java

@@ -59,7 +59,7 @@ public class ShopPreviewList implements IClientOutgoingPacket
 		int newlength = 0;
 		for (Product product : _list)
 		{
-			if ((product.getItem().getCrystalType().getId() <= _expertise) && product.getItem().isEquipable())
+			if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable())
 			{
 				newlength++;
 			}
@@ -68,7 +68,7 @@ public class ShopPreviewList implements IClientOutgoingPacket
 		
 		for (Product product : _list)
 		{
-			if ((product.getItem().getCrystalType().getId() <= _expertise) && product.getItem().isEquipable())
+			if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable())
 			{
 				packet.writeD(product.getItemId());
 				packet.writeH(product.getItem().getType2()); // item type2

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -134,6 +134,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("DragonWeaponDefence", DragonWeaponDefence::new);
 		EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
 		EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
+		EffectHandler.getInstance().registerHandler("EnchantRate", EnchantRate::new);
 		EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
 		EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);
 		EffectHandler.getInstance().registerHandler("EnlargeSlot", EnlargeSlot::new);

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnchantRate.java

@@ -0,0 +1,31 @@
+/*
+ * 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.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author zarco
+ */
+public class EnchantRate extends AbstractStatAddEffect
+{
+	public EnchantRate(StatSet params)
+	{
+		super(params, Stat.ENCHANT_RATE);
+	}
+}

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java

@@ -40,7 +40,7 @@ public class CharmOfCourage implements IItemHandler
 		
 		final PlayerInstance player = playable.getActingPlayer();
 		int level = player.getLevel();
-		final int itemLevel = item.getItem().getCrystalType().getId();
+		final int itemLevel = item.getItem().getCrystalType().getLevel();
 		if (level < 20)
 		{
 			level = 0;

L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/09300-09399.xml

@@ -1542,6 +1542,14 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLevel>85</magicLevel>
+		<effects>
+			<effect name="EnchantRate">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">15</value>
+				</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9371" toLevel="1" name="Sayha's Portal">
 		<!-- Summons a portal that stays for 5 min. Cannot be used in special places like the GM Consultation Services. -->

L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/documentation.txt

@@ -104,6 +104,7 @@ DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to
 DragonWeaponDefence: Dragon weapon defence stat. (l2jmobius)
 DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
 EnableCloak: See/unsee cloaks.
+EnchantRate: Enchant rate modifier, does not work for non grade items. (l2jmobius)
 EnemyCharge: Charges towards the enemy. Rush Impact.
 EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.
 EnlargeAbnormalSlot: Increase the amount of buff slots.

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -2157,7 +2157,7 @@ public class PlayerInstance extends Playable
 		{
 			if ((item != null) && item.isEquipped() && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT)))
 			{
-				crystaltype = item.getItem().getCrystalType().getId();
+				crystaltype = item.getItem().getCrystalType().getLevel();
 				if (crystaltype > expertiseLevel)
 				{
 					if (item.isWeapon() && (crystaltype > weaponPenalty))
@@ -8832,7 +8832,7 @@ public class PlayerInstance extends Playable
 	{
 		for (int itemId : _activeSoulShots)
 		{
-			if (ItemTable.getInstance().getTemplate(itemId).getCrystalType().getId() == crystalType)
+			if (ItemTable.getInstance().getTemplate(itemId).getCrystalType().getLevel() == crystalType)
 			{
 				disableAutoShot(itemId);
 			}

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -454,7 +454,7 @@ public abstract class Inventory extends ItemContainer
 			final PlayerInstance player = (PlayerInstance) inventory.getOwner();
 			
 			// Any items equipped that result in expertise penalty do not give any skills at all.
-			if (item.getItem().getCrystalType().getId() > player.getExpertiseLevel())
+			if (item.getItem().getCrystalType().getLevel() > player.getExpertiseLevel())
 			{
 				return;
 			}

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -25,8 +25,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
+import org.l2jmobius.gameserver.model.items.type.CrystalType;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
 import org.l2jmobius.gameserver.model.items.type.ItemType;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author UnAfraid
@@ -215,9 +217,11 @@ public class EnchantScroll extends AbstractEnchantItem
 			return EnchantResultType.ERROR;
 		}
 		
+		final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel();
+		final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0;
 		final double bonusRate = getBonusRate();
 		final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0;
-		final double finalChance = Math.min(chance + bonusRate + supportBonusRate, 100);
+		final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100);
 		final double random = 100 * Rnd.nextDouble();
 		final boolean success = (random < finalChance) || player.tryLuck();
 		return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE;

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java

@@ -35,14 +35,14 @@ public enum CrystalType
 	R99(10, 17371, 30, 500),
 	EVENT(11, 0, 0, 0);
 	
-	private final int _id;
+	private final int _level;
 	private final int _crystalId;
 	private final int _crystalEnchantBonusArmor;
 	private final int _crystalEnchantBonusWeapon;
 	
-	CrystalType(int id, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon)
+	CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon)
 	{
-		_id = id;
+		_level = level;
 		_crystalId = crystalId;
 		_crystalEnchantBonusArmor = crystalEnchantBonusArmor;
 		_crystalEnchantBonusWeapon = crystalEnchantBonusWeapon;
@@ -52,9 +52,9 @@ public enum CrystalType
 	 * Gets the crystal type ID.
 	 * @return the crystal type ID
 	 */
-	public int getId()
+	public int getLevel()
 	{
-		return _id;
+		return _level;
 	}
 	
 	/**
@@ -78,11 +78,11 @@ public enum CrystalType
 	
 	public boolean isGreater(CrystalType crystalType)
 	{
-		return getId() > crystalType.getId();
+		return getLevel() > crystalType.getLevel();
 	}
 	
 	public boolean isLesser(CrystalType crystalType)
 	{
-		return getId() < crystalType.getId();
+		return getLevel() < crystalType.getLevel();
 	}
 }

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -186,6 +186,7 @@ public enum Stat
 	BREATH("breath"),
 	FALL("fall"),
 	FISHING_EXP_SP_BONUS("fishingExpSpBonus"),
+	ENCHANT_RATE("enchantRate"),
 	
 	// VULNERABILITIES
 	DAMAGE_ZONE_VULN("damageZoneVuln"),

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java

@@ -59,7 +59,7 @@ public class ShopPreviewList implements IClientOutgoingPacket
 		int newlength = 0;
 		for (Product product : _list)
 		{
-			if ((product.getItem().getCrystalType().getId() <= _expertise) && product.getItem().isEquipable())
+			if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable())
 			{
 				newlength++;
 			}
@@ -68,7 +68,7 @@ public class ShopPreviewList implements IClientOutgoingPacket
 		
 		for (Product product : _list)
 		{
-			if ((product.getItem().getCrystalType().getId() <= _expertise) && product.getItem().isEquipable())
+			if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable())
 			{
 				packet.writeD(product.getItemId());
 				packet.writeH(product.getItem().getType2()); // item type2

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -134,6 +134,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("DragonWeaponDefence", DragonWeaponDefence::new);
 		EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
 		EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
+		EffectHandler.getInstance().registerHandler("EnchantRate", EnchantRate::new);
 		EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
 		EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);
 		EffectHandler.getInstance().registerHandler("EnlargeSlot", EnlargeSlot::new);

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnchantRate.java

@@ -0,0 +1,31 @@
+/*
+ * 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.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author zarco
+ */
+public class EnchantRate extends AbstractStatAddEffect
+{
+	public EnchantRate(StatSet params)
+	{
+		super(params, Stat.ENCHANT_RATE);
+	}
+}

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java

@@ -40,7 +40,7 @@ public class CharmOfCourage implements IItemHandler
 		
 		final PlayerInstance player = playable.getActingPlayer();
 		int level = player.getLevel();
-		final int itemLevel = item.getItem().getCrystalType().getId();
+		final int itemLevel = item.getItem().getCrystalType().getLevel();
 		if (level < 20)
 		{
 			level = 0;

L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/09300-09399.xml

@@ -1542,6 +1542,14 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLevel>85</magicLevel>
+		<effects>
+			<effect name="EnchantRate">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">15</value>
+				</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9371" toLevel="1" name="Sayha's Portal">
 		<!-- Summons a portal that stays for 5 min. Cannot be used in special places like the GM Consultation Services. -->

L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/documentation.txt

@@ -104,6 +104,7 @@ DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to
 DragonWeaponDefence: Dragon weapon defence stat. (l2jmobius)
 DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
 EnableCloak: See/unsee cloaks.
+EnchantRate: Enchant rate modifier, does not work for non grade items. (l2jmobius)
 EnemyCharge: Charges towards the enemy. Rush Impact.
 EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.
 EnlargeAbnormalSlot: Increase the amount of buff slots.

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -2159,7 +2159,7 @@ public class PlayerInstance extends Playable
 		{
 			if ((item != null) && item.isEquipped() && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT)))
 			{
-				crystaltype = item.getItem().getCrystalType().getId();
+				crystaltype = item.getItem().getCrystalType().getLevel();
 				if (crystaltype > expertiseLevel)
 				{
 					if (item.isWeapon() && (crystaltype > weaponPenalty))
@@ -8834,7 +8834,7 @@ public class PlayerInstance extends Playable
 	{
 		for (int itemId : _activeSoulShots)
 		{
-			if (ItemTable.getInstance().getTemplate(itemId).getCrystalType().getId() == crystalType)
+			if (ItemTable.getInstance().getTemplate(itemId).getCrystalType().getLevel() == crystalType)
 			{
 				disableAutoShot(itemId);
 			}

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -454,7 +454,7 @@ public abstract class Inventory extends ItemContainer
 			final PlayerInstance player = (PlayerInstance) inventory.getOwner();
 			
 			// Any items equipped that result in expertise penalty do not give any skills at all.
-			if (item.getItem().getCrystalType().getId() > player.getExpertiseLevel())
+			if (item.getItem().getCrystalType().getLevel() > player.getExpertiseLevel())
 			{
 				return;
 			}

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -25,8 +25,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
+import org.l2jmobius.gameserver.model.items.type.CrystalType;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
 import org.l2jmobius.gameserver.model.items.type.ItemType;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author UnAfraid
@@ -215,9 +217,11 @@ public class EnchantScroll extends AbstractEnchantItem
 			return EnchantResultType.ERROR;
 		}
 		
+		final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel();
+		final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0;
 		final double bonusRate = getBonusRate();
 		final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0;
-		final double finalChance = Math.min(chance + bonusRate + supportBonusRate, 100);
+		final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100);
 		final double random = 100 * Rnd.nextDouble();
 		final boolean success = (random < finalChance) || player.tryLuck();
 		return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE;

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java

@@ -35,14 +35,14 @@ public enum CrystalType
 	R99(10, 17371, 30, 500),
 	EVENT(11, 0, 0, 0);
 	
-	private final int _id;
+	private final int _level;
 	private final int _crystalId;
 	private final int _crystalEnchantBonusArmor;
 	private final int _crystalEnchantBonusWeapon;
 	
-	CrystalType(int id, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon)
+	CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon)
 	{
-		_id = id;
+		_level = level;
 		_crystalId = crystalId;
 		_crystalEnchantBonusArmor = crystalEnchantBonusArmor;
 		_crystalEnchantBonusWeapon = crystalEnchantBonusWeapon;
@@ -52,9 +52,9 @@ public enum CrystalType
 	 * Gets the crystal type ID.
 	 * @return the crystal type ID
 	 */
-	public int getId()
+	public int getLevel()
 	{
-		return _id;
+		return _level;
 	}
 	
 	/**
@@ -78,11 +78,11 @@ public enum CrystalType
 	
 	public boolean isGreater(CrystalType crystalType)
 	{
-		return getId() > crystalType.getId();
+		return getLevel() > crystalType.getLevel();
 	}
 	
 	public boolean isLesser(CrystalType crystalType)
 	{
-		return getId() < crystalType.getId();
+		return getLevel() < crystalType.getLevel();
 	}
 }

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -186,6 +186,7 @@ public enum Stat
 	BREATH("breath"),
 	FALL("fall"),
 	FISHING_EXP_SP_BONUS("fishingExpSpBonus"),
+	ENCHANT_RATE("enchantRate"),
 	
 	// VULNERABILITIES
 	DAMAGE_ZONE_VULN("damageZoneVuln"),

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java

@@ -59,7 +59,7 @@ public class ShopPreviewList implements IClientOutgoingPacket
 		int newlength = 0;
 		for (Product product : _list)
 		{
-			if ((product.getItem().getCrystalType().getId() <= _expertise) && product.getItem().isEquipable())
+			if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable())
 			{
 				newlength++;
 			}
@@ -68,7 +68,7 @@ public class ShopPreviewList implements IClientOutgoingPacket
 		
 		for (Product product : _list)
 		{
-			if ((product.getItem().getCrystalType().getId() <= _expertise) && product.getItem().isEquipable())
+			if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable())
 			{
 				packet.writeD(product.getItemId());
 				packet.writeH(product.getItem().getType2()); // item type2

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -138,6 +138,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("DragonWeaponDefence", DragonWeaponDefence::new);
 		EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
 		EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
+		EffectHandler.getInstance().registerHandler("EnchantRate", EnchantRate::new);
 		EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
 		EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);
 		EffectHandler.getInstance().registerHandler("EnlargeSlot", EnlargeSlot::new);

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnchantRate.java

@@ -0,0 +1,31 @@
+/*
+ * 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.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author zarco
+ */
+public class EnchantRate extends AbstractStatAddEffect
+{
+	public EnchantRate(StatSet params)
+	{
+		super(params, Stat.ENCHANT_RATE);
+	}
+}

L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/09300-09399.xml

@@ -1542,6 +1542,14 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLevel>85</magicLevel>
+		<effects>
+			<effect name="EnchantRate">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">15</value>
+				</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9371" toLevel="1" name="Sayha's Portal">
 		<!-- Summons a portal that stays for 5 min. Cannot be used in special places like the GM Consultation Services. -->

L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt

@@ -108,6 +108,7 @@ DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to
 DragonWeaponDefence: Dragon weapon defence stat. (l2jmobius)
 DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
 EnableCloak: See/unsee cloaks.
+EnchantRate: Enchant rate modifier, does not work for non grade items. (l2jmobius)
 EnemyCharge: Charges towards the enemy. Rush Impact.
 EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.
 EnlargeAbnormalSlot: Increase the amount of buff slots.

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -25,8 +25,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
+import org.l2jmobius.gameserver.model.items.type.CrystalType;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
 import org.l2jmobius.gameserver.model.items.type.ItemType;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author UnAfraid
@@ -215,9 +217,11 @@ public class EnchantScroll extends AbstractEnchantItem
 			return EnchantResultType.ERROR;
 		}
 		
+		final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel();
+		final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0;
 		final double bonusRate = getBonusRate();
 		final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0;
-		final double finalChance = Math.min(chance + bonusRate + supportBonusRate, 100);
+		final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100);
 		final double random = 100 * Rnd.nextDouble();
 		final boolean success = (random < finalChance) || player.tryLuck();
 		return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE;

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -186,6 +186,7 @@ public enum Stat
 	BREATH("breath"),
 	FALL("fall"),
 	FISHING_EXP_SP_BONUS("fishingExpSpBonus"),
+	ENCHANT_RATE("enchantRate"),
 	
 	// VULNERABILITIES
 	DAMAGE_ZONE_VULN("damageZoneVuln"),

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -140,6 +140,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("DragonWeaponDefence", DragonWeaponDefence::new);
 		EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
 		EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
+		EffectHandler.getInstance().registerHandler("EnchantRate", EnchantRate::new);
 		EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
 		EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);
 		EffectHandler.getInstance().registerHandler("EnlargeSlot", EnlargeSlot::new);

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnchantRate.java

@@ -0,0 +1,31 @@
+/*
+ * 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.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author zarco
+ */
+public class EnchantRate extends AbstractStatAddEffect
+{
+	public EnchantRate(StatSet params)
+	{
+		super(params, Stat.ENCHANT_RATE);
+	}
+}

L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/09300-09399.xml

@@ -1542,6 +1542,14 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLevel>85</magicLevel>
+		<effects>
+			<effect name="EnchantRate">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">15</value>
+				</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9371" toLevel="1" name="Sayha's Portal">
 		<!-- Summons a portal that stays for 5 min. Cannot be used in special places like the GM Consultation Services. -->

L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/documentation.txt

@@ -110,6 +110,7 @@ DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to
 DragonWeaponDefence: Dragon weapon defence stat. (l2jmobius)
 DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
 EnableCloak: See/unsee cloaks.
+EnchantRate: Enchant rate modifier, does not work for non grade items. (l2jmobius)
 EnemyCharge: Charges towards the enemy. Rush Impact.
 EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.
 EnlargeAbnormalSlot: Increase the amount of buff slots.

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -25,8 +25,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
+import org.l2jmobius.gameserver.model.items.type.CrystalType;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
 import org.l2jmobius.gameserver.model.items.type.ItemType;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author UnAfraid
@@ -215,9 +217,11 @@ public class EnchantScroll extends AbstractEnchantItem
 			return EnchantResultType.ERROR;
 		}
 		
+		final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel();
+		final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0;
 		final double bonusRate = getBonusRate();
 		final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0;
-		final double finalChance = Math.min(chance + bonusRate + supportBonusRate, 100);
+		final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100);
 		final double random = 100 * Rnd.nextDouble();
 		final boolean success = (random < finalChance) || player.tryLuck();
 		return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE;

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -188,6 +188,7 @@ public enum Stat
 	BREATH("breath"),
 	FALL("fall"),
 	FISHING_EXP_SP_BONUS("fishingExpSpBonus"),
+	ENCHANT_RATE("enchantRate"),
 	
 	// VULNERABILITIES
 	DAMAGE_ZONE_VULN("damageZoneVuln"),

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -141,6 +141,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("DragonWeaponDefence", DragonWeaponDefence::new);
 		EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
 		EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
+		EffectHandler.getInstance().registerHandler("EnchantRate", EnchantRate::new);
 		EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
 		EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);
 		EffectHandler.getInstance().registerHandler("EnlargeSlot", EnlargeSlot::new);

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnchantRate.java

@@ -0,0 +1,31 @@
+/*
+ * 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.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author zarco
+ */
+public class EnchantRate extends AbstractStatAddEffect
+{
+	public EnchantRate(StatSet params)
+	{
+		super(params, Stat.ENCHANT_RATE);
+	}
+}

L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/09300-09399.xml

@@ -1543,6 +1543,14 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLevel>85</magicLevel>
+		<effects>
+			<effect name="EnchantRate">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">15</value>
+				</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9371" toLevel="1" name="Sayha's Portal">
 		<!-- Summons a portal that stays for 5 min. Cannot be used in special places like the GM Consultation Services. -->

L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/documentation.txt

@@ -111,6 +111,7 @@ DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to
 DragonWeaponDefence: Dragon weapon defence stat. (l2jmobius)
 DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
 EnableCloak: See/unsee cloaks.
+EnchantRate: Enchant rate modifier, does not work for non grade items. (l2jmobius)
 EnemyCharge: Charges towards the enemy. Rush Impact.
 EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.
 EnlargeAbnormalSlot: Increase the amount of buff slots.

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -25,8 +25,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
+import org.l2jmobius.gameserver.model.items.type.CrystalType;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
 import org.l2jmobius.gameserver.model.items.type.ItemType;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author UnAfraid
@@ -215,9 +217,11 @@ public class EnchantScroll extends AbstractEnchantItem
 			return EnchantResultType.ERROR;
 		}
 		
+		final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel();
+		final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0;
 		final double bonusRate = getBonusRate();
 		final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0;
-		final double finalChance = Math.min(chance + bonusRate + supportBonusRate, 100);
+		final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100);
 		final double random = 100 * Rnd.nextDouble();
 		final boolean success = (random < finalChance) || player.tryLuck();
 		return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE;

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -188,6 +188,7 @@ public enum Stat
 	BREATH("breath"),
 	FALL("fall"),
 	FISHING_EXP_SP_BONUS("fishingExpSpBonus"),
+	ENCHANT_RATE("enchantRate"),
 	
 	// VULNERABILITIES
 	DAMAGE_ZONE_VULN("damageZoneVuln"),

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -141,6 +141,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("DragonWeaponDefence", DragonWeaponDefence::new);
 		EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
 		EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
+		EffectHandler.getInstance().registerHandler("EnchantRate", EnchantRate::new);
 		EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
 		EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);
 		EffectHandler.getInstance().registerHandler("EnlargeSlot", EnlargeSlot::new);

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnchantRate.java

@@ -0,0 +1,31 @@
+/*
+ * 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.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author zarco
+ */
+public class EnchantRate extends AbstractStatAddEffect
+{
+	public EnchantRate(StatSet params)
+	{
+		super(params, Stat.ENCHANT_RATE);
+	}
+}

L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/09300-09399.xml

@@ -1543,6 +1543,14 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLevel>85</magicLevel>
+		<effects>
+			<effect name="EnchantRate">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">15</value>
+				</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9371" toLevel="1" name="Sayha's Portal">
 		<!-- Summons a portal that stays for 5 min. Cannot be used in special places like the GM Consultation Services. -->

L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/documentation.txt

@@ -111,6 +111,7 @@ DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to
 DragonWeaponDefence: Dragon weapon defence stat. (l2jmobius)
 DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
 EnableCloak: See/unsee cloaks.
+EnchantRate: Enchant rate modifier, does not work for non grade items. (l2jmobius)
 EnemyCharge: Charges towards the enemy. Rush Impact.
 EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.
 EnlargeAbnormalSlot: Increase the amount of buff slots.

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -25,8 +25,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
+import org.l2jmobius.gameserver.model.items.type.CrystalType;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
 import org.l2jmobius.gameserver.model.items.type.ItemType;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author UnAfraid
@@ -215,9 +217,11 @@ public class EnchantScroll extends AbstractEnchantItem
 			return EnchantResultType.ERROR;
 		}
 		
+		final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel();
+		final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0;
 		final double bonusRate = getBonusRate();
 		final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0;
-		final double finalChance = Math.min(chance + bonusRate + supportBonusRate, 100);
+		final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100);
 		final double random = 100 * Rnd.nextDouble();
 		final boolean success = (random < finalChance) || player.tryLuck();
 		return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE;

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -188,6 +188,7 @@ public enum Stat
 	BREATH("breath"),
 	FALL("fall"),
 	FISHING_EXP_SP_BONUS("fishingExpSpBonus"),
+	ENCHANT_RATE("enchantRate"),
 	
 	// VULNERABILITIES
 	DAMAGE_ZONE_VULN("damageZoneVuln"),

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -141,6 +141,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("DragonWeaponDefence", DragonWeaponDefence::new);
 		EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
 		EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
+		EffectHandler.getInstance().registerHandler("EnchantRate", EnchantRate::new);
 		EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
 		EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);
 		EffectHandler.getInstance().registerHandler("EnlargeSlot", EnlargeSlot::new);

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/EnchantRate.java

@@ -0,0 +1,31 @@
+/*
+ * 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.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author zarco
+ */
+public class EnchantRate extends AbstractStatAddEffect
+{
+	public EnchantRate(StatSet params)
+	{
+		super(params, Stat.ENCHANT_RATE);
+	}
+}

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/09300-09399.xml

@@ -1543,6 +1543,14 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLevel>85</magicLevel>
+		<effects>
+			<effect name="EnchantRate">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">15</value>
+				</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9371" toLevel="1" name="Sayha's Portal">
 		<!-- Summons a portal that stays for 5 min. Cannot be used in special places like the GM Consultation Services. -->

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/documentation.txt

@@ -111,6 +111,7 @@ DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to
 DragonWeaponDefence: Dragon weapon defence stat. (l2jmobius)
 DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
 EnableCloak: See/unsee cloaks.
+EnchantRate: Enchant rate modifier, does not work for non grade items. (l2jmobius)
 EnemyCharge: Charges towards the enemy. Rush Impact.
 EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.
 EnlargeAbnormalSlot: Increase the amount of buff slots.

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -25,8 +25,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
+import org.l2jmobius.gameserver.model.items.type.CrystalType;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
 import org.l2jmobius.gameserver.model.items.type.ItemType;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author UnAfraid
@@ -215,9 +217,11 @@ public class EnchantScroll extends AbstractEnchantItem
 			return EnchantResultType.ERROR;
 		}
 		
+		final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel();
+		final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0;
 		final double bonusRate = getBonusRate();
 		final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0;
-		final double finalChance = Math.min(chance + bonusRate + supportBonusRate, 100);
+		final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100);
 		final double random = 100 * Rnd.nextDouble();
 		final boolean success = (random < finalChance) || player.tryLuck();
 		return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE;

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -188,6 +188,7 @@ public enum Stat
 	BREATH("breath"),
 	FALL("fall"),
 	FISHING_EXP_SP_BONUS("fishingExpSpBonus"),
+	ENCHANT_RATE("enchantRate"),
 	
 	// VULNERABILITIES
 	DAMAGE_ZONE_VULN("damageZoneVuln"),

L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -141,6 +141,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("DragonWeaponDefence", DragonWeaponDefence::new);
 		EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
 		EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
+		EffectHandler.getInstance().registerHandler("EnchantRate", EnchantRate::new);
 		EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
 		EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);
 		EffectHandler.getInstance().registerHandler("EnlargeSlot", EnlargeSlot::new);

L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/EnchantRate.java

@@ -0,0 +1,31 @@
+/*
+ * 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.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author zarco
+ */
+public class EnchantRate extends AbstractStatAddEffect
+{
+	public EnchantRate(StatSet params)
+	{
+		super(params, Stat.ENCHANT_RATE);
+	}
+}

L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/09300-09399.xml

@@ -1553,6 +1553,14 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<magicLevel>85</magicLevel>
+		<effects>
+			<effect name="EnchantRate">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">15</value>
+				</amount>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="9371" toLevel="1" name="Sayha's Portal">
 		<!-- Summons a portal that stays for 5 min. Cannot be used in special places like the GM Consultation Services. -->

L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/documentation.txt

@@ -111,6 +111,7 @@ DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to
 DragonWeaponDefence: Dragon weapon defence stat. (l2jmobius)
 DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
 EnableCloak: See/unsee cloaks.
+EnchantRate: Enchant rate modifier, does not work for non grade items. (l2jmobius)
 EnemyCharge: Charges towards the enemy. Rush Impact.
 EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.
 EnlargeAbnormalSlot: Increase the amount of buff slots.

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -25,8 +25,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
+import org.l2jmobius.gameserver.model.items.type.CrystalType;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
 import org.l2jmobius.gameserver.model.items.type.ItemType;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author UnAfraid
@@ -215,9 +217,11 @@ public class EnchantScroll extends AbstractEnchantItem
 			return EnchantResultType.ERROR;
 		}
 		
+		final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel();
+		final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0;
 		final double bonusRate = getBonusRate();
 		final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0;
-		final double finalChance = Math.min(chance + bonusRate + supportBonusRate, 100);
+		final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100);
 		final double random = 100 * Rnd.nextDouble();
 		final boolean success = (random < finalChance) || player.tryLuck();
 		return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE;

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -188,6 +188,7 @@ public enum Stat
 	BREATH("breath"),
 	FALL("fall"),
 	FISHING_EXP_SP_BONUS("fishingExpSpBonus"),
+	ENCHANT_RATE("enchantRate"),
 	
 	// VULNERABILITIES
 	DAMAGE_ZONE_VULN("damageZoneVuln"),

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -131,6 +131,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("DoubleCast", DoubleCast::new);
 		EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
 		EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
+		EffectHandler.getInstance().registerHandler("EnchantRate", EnchantRate::new);
 		EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
 		EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);
 		EffectHandler.getInstance().registerHandler("EnlargeSlot", EnlargeSlot::new);

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnchantRate.java

@@ -0,0 +1,31 @@
+/*
+ * 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.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author zarco
+ */
+public class EnchantRate extends AbstractStatAddEffect
+{
+	public EnchantRate(StatSet params)
+	{
+		super(params, Stat.ENCHANT_RATE);
+	}
+}

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java

@@ -40,7 +40,7 @@ public class CharmOfCourage implements IItemHandler
 		
 		final PlayerInstance player = playable.getActingPlayer();
 		int level = player.getLevel();
-		final int itemLevel = item.getItem().getCrystalType().getId();
+		final int itemLevel = item.getItem().getCrystalType().getLevel();
 		if (level < 20)
 		{
 			level = 0;

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt

@@ -101,6 +101,7 @@ DispelBySlotProbability: Removes given amount of effects by specified AbnormalTy
 DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to cast two skills at once.
 DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
 EnableCloak: See/unsee cloaks.
+EnchantRate: Enchant rate modifier, does not work for non grade items. (l2jmobius)
 EnemyCharge: Charges towards the enemy. Rush Impact.
 EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.
 EnlargeAbnormalSlot: Increase the amount of buff slots.

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -2115,7 +2115,7 @@ public class PlayerInstance extends Playable
 		{
 			if ((item != null) && item.isEquipped() && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT)))
 			{
-				crystaltype = item.getItem().getCrystalType().getId();
+				crystaltype = item.getItem().getCrystalType().getLevel();
 				if (crystaltype > expertiseLevel)
 				{
 					if (item.isWeapon() && (crystaltype > weaponPenalty))
@@ -8712,7 +8712,7 @@ public class PlayerInstance extends Playable
 	{
 		for (int itemId : _activeSoulShots)
 		{
-			if (ItemTable.getInstance().getTemplate(itemId).getCrystalType().getId() == crystalType)
+			if (ItemTable.getInstance().getTemplate(itemId).getCrystalType().getLevel() == crystalType)
 			{
 				disableAutoShot(itemId);
 			}

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -454,7 +454,7 @@ public abstract class Inventory extends ItemContainer
 			final PlayerInstance player = (PlayerInstance) inventory.getOwner();
 			
 			// Any items equipped that result in expertise penalty do not give any skills at all.
-			if (item.getItem().getCrystalType().getId() > player.getExpertiseLevel())
+			if (item.getItem().getCrystalType().getLevel() > player.getExpertiseLevel())
 			{
 				return;
 			}

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -25,8 +25,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
+import org.l2jmobius.gameserver.model.items.type.CrystalType;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
 import org.l2jmobius.gameserver.model.items.type.ItemType;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author UnAfraid
@@ -215,9 +217,11 @@ public class EnchantScroll extends AbstractEnchantItem
 			return EnchantResultType.ERROR;
 		}
 		
+		final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel();
+		final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0;
 		final double bonusRate = getBonusRate();
 		final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0;
-		final double finalChance = Math.min(chance + bonusRate + supportBonusRate, 100);
+		final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100);
 		final double random = 100 * Rnd.nextDouble();
 		final boolean success = (random < finalChance);
 		return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE;

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java

@@ -35,14 +35,14 @@ public enum CrystalType
 	R99(10, 17371, 30, 500),
 	EVENT(11, 0, 0, 0);
 	
-	private final int _id;
+	private final int _level;
 	private final int _crystalId;
 	private final int _crystalEnchantBonusArmor;
 	private final int _crystalEnchantBonusWeapon;
 	
-	CrystalType(int id, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon)
+	CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon)
 	{
-		_id = id;
+		_level = level;
 		_crystalId = crystalId;
 		_crystalEnchantBonusArmor = crystalEnchantBonusArmor;
 		_crystalEnchantBonusWeapon = crystalEnchantBonusWeapon;
@@ -52,9 +52,9 @@ public enum CrystalType
 	 * Gets the crystal type ID.
 	 * @return the crystal type ID
 	 */
-	public int getId()
+	public int getLevel()
 	{
-		return _id;
+		return _level;
 	}
 	
 	/**
@@ -78,11 +78,11 @@ public enum CrystalType
 	
 	public boolean isGreater(CrystalType crystalType)
 	{
-		return getId() > crystalType.getId();
+		return getLevel() > crystalType.getLevel();
 	}
 	
 	public boolean isLesser(CrystalType crystalType)
 	{
-		return getId() < crystalType.getId();
+		return getLevel() < crystalType.getLevel();
 	}
 }

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -183,6 +183,7 @@ public enum Stat
 	BREATH("breath"),
 	FALL("fall"),
 	FISHING_EXP_SP_BONUS("fishingExpSpBonus"),
+	ENCHANT_RATE("enchantRate"),
 	
 	// VULNERABILITIES
 	DAMAGE_ZONE_VULN("damageZoneVuln"),

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java

@@ -59,7 +59,7 @@ public class ShopPreviewList implements IClientOutgoingPacket
 		int newlength = 0;
 		for (Product product : _list)
 		{
-			if ((product.getItem().getCrystalType().getId() <= _expertise) && product.getItem().isEquipable())
+			if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable())
 			{
 				newlength++;
 			}
@@ -68,7 +68,7 @@ public class ShopPreviewList implements IClientOutgoingPacket
 		
 		for (Product product : _list)
 		{
-			if ((product.getItem().getCrystalType().getId() <= _expertise) && product.getItem().isEquipable())
+			if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable())
 			{
 				packet.writeD(product.getItemId());
 				packet.writeH(product.getItem().getType2()); // item type2

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -131,6 +131,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("DoubleCast", DoubleCast::new);
 		EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
 		EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
+		EffectHandler.getInstance().registerHandler("EnchantRate", EnchantRate::new);
 		EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
 		EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);
 		EffectHandler.getInstance().registerHandler("EnlargeSlot", EnlargeSlot::new);

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnchantRate.java

@@ -0,0 +1,31 @@
+/*
+ * 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.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author zarco
+ */
+public class EnchantRate extends AbstractStatAddEffect
+{
+	public EnchantRate(StatSet params)
+	{
+		super(params, Stat.ENCHANT_RATE);
+	}
+}

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java

@@ -40,7 +40,7 @@ public class CharmOfCourage implements IItemHandler
 		
 		final PlayerInstance player = playable.getActingPlayer();
 		int level = player.getLevel();
-		final int itemLevel = item.getItem().getCrystalType().getId();
+		final int itemLevel = item.getItem().getCrystalType().getLevel();
 		if (level < 20)
 		{
 			level = 0;

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/documentation.txt

@@ -101,6 +101,7 @@ DispelBySlotProbability: Removes given amount of effects by specified AbnormalTy
 DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to cast two skills at once.
 DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
 EnableCloak: See/unsee cloaks.
+EnchantRate: Enchant rate modifier, does not work for non grade items. (l2jmobius)
 EnemyCharge: Charges towards the enemy. Rush Impact.
 EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.
 EnlargeAbnormalSlot: Increase the amount of buff slots.

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -2115,7 +2115,7 @@ public class PlayerInstance extends Playable
 		{
 			if ((item != null) && item.isEquipped() && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT)))
 			{
-				crystaltype = item.getItem().getCrystalType().getId();
+				crystaltype = item.getItem().getCrystalType().getLevel();
 				if (crystaltype > expertiseLevel)
 				{
 					if (item.isWeapon() && (crystaltype > weaponPenalty))
@@ -8712,7 +8712,7 @@ public class PlayerInstance extends Playable
 	{
 		for (int itemId : _activeSoulShots)
 		{
-			if (ItemTable.getInstance().getTemplate(itemId).getCrystalType().getId() == crystalType)
+			if (ItemTable.getInstance().getTemplate(itemId).getCrystalType().getLevel() == crystalType)
 			{
 				disableAutoShot(itemId);
 			}

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -454,7 +454,7 @@ public abstract class Inventory extends ItemContainer
 			final PlayerInstance player = (PlayerInstance) inventory.getOwner();
 			
 			// Any items equipped that result in expertise penalty do not give any skills at all.
-			if (item.getItem().getCrystalType().getId() > player.getExpertiseLevel())
+			if (item.getItem().getCrystalType().getLevel() > player.getExpertiseLevel())
 			{
 				return;
 			}

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -25,8 +25,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
+import org.l2jmobius.gameserver.model.items.type.CrystalType;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
 import org.l2jmobius.gameserver.model.items.type.ItemType;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author UnAfraid
@@ -215,9 +217,11 @@ public class EnchantScroll extends AbstractEnchantItem
 			return EnchantResultType.ERROR;
 		}
 		
+		final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel();
+		final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0;
 		final double bonusRate = getBonusRate();
 		final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0;
-		final double finalChance = Math.min(chance + bonusRate + supportBonusRate, 100);
+		final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100);
 		final double random = 100 * Rnd.nextDouble();
 		final boolean success = (random < finalChance);
 		return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE;

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java

@@ -35,14 +35,14 @@ public enum CrystalType
 	R99(10, 17371, 30, 500),
 	EVENT(11, 0, 0, 0);
 	
-	private final int _id;
+	private final int _level;
 	private final int _crystalId;
 	private final int _crystalEnchantBonusArmor;
 	private final int _crystalEnchantBonusWeapon;
 	
-	CrystalType(int id, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon)
+	CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon)
 	{
-		_id = id;
+		_level = level;
 		_crystalId = crystalId;
 		_crystalEnchantBonusArmor = crystalEnchantBonusArmor;
 		_crystalEnchantBonusWeapon = crystalEnchantBonusWeapon;
@@ -52,9 +52,9 @@ public enum CrystalType
 	 * Gets the crystal type ID.
 	 * @return the crystal type ID
 	 */
-	public int getId()
+	public int getLevel()
 	{
-		return _id;
+		return _level;
 	}
 	
 	/**
@@ -78,11 +78,11 @@ public enum CrystalType
 	
 	public boolean isGreater(CrystalType crystalType)
 	{
-		return getId() > crystalType.getId();
+		return getLevel() > crystalType.getLevel();
 	}
 	
 	public boolean isLesser(CrystalType crystalType)
 	{
-		return getId() < crystalType.getId();
+		return getLevel() < crystalType.getLevel();
 	}
 }

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -183,6 +183,7 @@ public enum Stat
 	BREATH("breath"),
 	FALL("fall"),
 	FISHING_EXP_SP_BONUS("fishingExpSpBonus"),
+	ENCHANT_RATE("enchantRate"),
 	
 	// VULNERABILITIES
 	DAMAGE_ZONE_VULN("damageZoneVuln"),

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java

@@ -59,7 +59,7 @@ public class ShopPreviewList implements IClientOutgoingPacket
 		int newlength = 0;
 		for (Product product : _list)
 		{
-			if ((product.getItem().getCrystalType().getId() <= _expertise) && product.getItem().isEquipable())
+			if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable())
 			{
 				newlength++;
 			}
@@ -68,7 +68,7 @@ public class ShopPreviewList implements IClientOutgoingPacket
 		
 		for (Product product : _list)
 		{
-			if ((product.getItem().getCrystalType().getId() <= _expertise) && product.getItem().isEquipable())
+			if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable())
 			{
 				packet.writeD(product.getItemId());
 				packet.writeH(product.getItem().getType2()); // item type2

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -132,6 +132,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("DoubleCast", DoubleCast::new);
 		EffectHandler.getInstance().registerHandler("DuelistFury", DuelistFury::new);
 		EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
+		EffectHandler.getInstance().registerHandler("EnchantRate", EnchantRate::new);
 		EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
 		EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);
 		EffectHandler.getInstance().registerHandler("EnlargeSlot", EnlargeSlot::new);

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnchantRate.java

@@ -0,0 +1,31 @@
+/*
+ * 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.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatSet;
+import org.l2jmobius.gameserver.model.stats.Stat;
+
+/**
+ * @author zarco
+ */
+public class EnchantRate extends AbstractStatAddEffect
+{
+	public EnchantRate(StatSet params)
+	{
+		super(params, Stat.ENCHANT_RATE);
+	}
+}

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java

@@ -40,7 +40,7 @@ public class CharmOfCourage implements IItemHandler
 		
 		final PlayerInstance player = playable.getActingPlayer();
 		int level = player.getLevel();
-		final int itemLevel = item.getItem().getCrystalType().getId();
+		final int itemLevel = item.getItem().getCrystalType().getLevel();
 		if (level < 20)
 		{
 			level = 0;

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/documentation.txt

@@ -102,6 +102,7 @@ DispelBySlotProbability: Removes given amount of effects by specified AbnormalTy
 DoubleCast: Triggers Fire, Water, Wind, Earth stance and enables the ability to cast two skills at once.
 DuelistFury: Synergy effect for Faceoff effect. (l2jmobius)
 EnableCloak: See/unsee cloaks.
+EnchantRate: Enchant rate modifier, does not work for non grade items. (l2jmobius)
 EnemyCharge: Charges towards the enemy. Rush Impact.
 EnergyAttack: Physical attack based on Momentum formula. Triple Sonic Slash, Double Sonic Slash etc.
 EnlargeAbnormalSlot: Increase the amount of buff slots.

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -2113,7 +2113,7 @@ public class PlayerInstance extends Playable
 		{
 			if ((item != null) && item.isEquipped() && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT)))
 			{
-				crystaltype = item.getItem().getCrystalType().getId();
+				crystaltype = item.getItem().getCrystalType().getLevel();
 				if (crystaltype > expertiseLevel)
 				{
 					if (item.isWeapon() && (crystaltype > weaponPenalty))
@@ -8698,7 +8698,7 @@ public class PlayerInstance extends Playable
 	{
 		for (int itemId : _activeSoulShots)
 		{
-			if (ItemTable.getInstance().getTemplate(itemId).getCrystalType().getId() == crystalType)
+			if (ItemTable.getInstance().getTemplate(itemId).getCrystalType().getLevel() == crystalType)
 			{
 				disableAutoShot(itemId);
 			}

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -466,7 +466,7 @@ public abstract class Inventory extends ItemContainer
 			final PlayerInstance player = (PlayerInstance) inventory.getOwner();
 			
 			// Any items equipped that result in expertise penalty do not give any skills at all.
-			if (item.getItem().getCrystalType().getId() > player.getExpertiseLevel())
+			if (item.getItem().getCrystalType().getLevel() > player.getExpertiseLevel())
 			{
 				return;
 			}

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java

@@ -25,8 +25,10 @@ import org.l2jmobius.gameserver.data.xml.EnchantItemGroupsData;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
+import org.l2jmobius.gameserver.model.items.type.CrystalType;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
 import org.l2jmobius.gameserver.model.items.type.ItemType;
+import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
  * @author UnAfraid
@@ -215,9 +217,11 @@ public class EnchantScroll extends AbstractEnchantItem
 			return EnchantResultType.ERROR;
 		}
 		
+		final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel();
+		final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0;
 		final double bonusRate = getBonusRate();
 		final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0;
-		final double finalChance = Math.min(chance + bonusRate + supportBonusRate, 100);
+		final double finalChance = Math.min(chance + bonusRate + supportBonusRate + enchantRateStat, 100);
 		final double random = 100 * Rnd.nextDouble();
 		final boolean success = (random < finalChance);
 		return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE;

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java

@@ -35,14 +35,14 @@ public enum CrystalType
 	R99(10, 17371, 30, 500),
 	EVENT(11, 0, 0, 0);
 	
-	private final int _id;
+	private final int _level;
 	private final int _crystalId;
 	private final int _crystalEnchantBonusArmor;
 	private final int _crystalEnchantBonusWeapon;
 	
-	CrystalType(int id, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon)
+	CrystalType(int level, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon)
 	{
-		_id = id;
+		_level = level;
 		_crystalId = crystalId;
 		_crystalEnchantBonusArmor = crystalEnchantBonusArmor;
 		_crystalEnchantBonusWeapon = crystalEnchantBonusWeapon;
@@ -52,9 +52,9 @@ public enum CrystalType
 	 * Gets the crystal type ID.
 	 * @return the crystal type ID
 	 */
-	public int getId()
+	public int getLevel()
 	{
-		return _id;
+		return _level;
 	}
 	
 	/**
@@ -78,11 +78,11 @@ public enum CrystalType
 	
 	public boolean isGreater(CrystalType crystalType)
 	{
-		return getId() > crystalType.getId();
+		return getLevel() > crystalType.getLevel();
 	}
 	
 	public boolean isLesser(CrystalType crystalType)
 	{
-		return getId() < crystalType.getId();
+		return getLevel() < crystalType.getLevel();
 	}
 }

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java

@@ -185,6 +185,7 @@ public enum Stat
 	BREATH("breath"),
 	FALL("fall"),
 	FISHING_EXP_SP_BONUS("fishingExpSpBonus"),
+	ENCHANT_RATE("enchantRate"),
 	
 	// VULNERABILITIES
 	DAMAGE_ZONE_VULN("damageZoneVuln"),

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java

@@ -59,7 +59,7 @@ public class ShopPreviewList implements IClientOutgoingPacket
 		int newlength = 0;
 		for (Product product : _list)
 		{
-			if ((product.getItem().getCrystalType().getId() <= _expertise) && product.getItem().isEquipable())
+			if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable())
 			{
 				newlength++;
 			}
@@ -68,7 +68,7 @@ public class ShopPreviewList implements IClientOutgoingPacket
 		
 		for (Product product : _list)
 		{
-			if ((product.getItem().getCrystalType().getId() <= _expertise) && product.getItem().isEquipable())
+			if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable())
 			{
 				packet.writeD(product.getItemId());
 				packet.writeH(product.getItem().getType2()); // item type2

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -135,6 +135,7 @@ public class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("ElementalSpiritAttack", ElementalSpiritAttack::new);
 		EffectHandler.getInstance().registerHandler("ElementalSpiritDefense", ElementalSpiritDefense::new);
 		EffectHandler.getInstance().registerHandler("EnableCloak", EnableCloak::new);
+		EffectHandler.getInstance().registerHandler("EnchantRate", EnchantRate::new);
 		EffectHandler.getInstance().registerHandler("EnergyAttack", EnergyAttack::new);
 		EffectHandler.getInstance().registerHandler("EnlargeAbnormalSlot", EnlargeAbnormalSlot::new);
 		EffectHandler.getInstance().registerHandler("EnlargeSlot", EnlargeSlot::new);