From b23c1aeec59d1d98d0084369010258ea74c8da6f Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 20 Nov 2022 05:47:44 +0000
Subject: [PATCH] New artifact enchant system adjustments and related cleanups.
 Contributed by Fakee.

---
 .../RequestExTryEnchantArtifact.java          | 23 +++++++++----------
 .../pledgeV2/RequestExPledgeMissionInfo.java  |  3 +--
 .../ExTryEnchantArtifactResult.java           |  5 ++--
 .../pledgeV2/ExPledgeMissionRewardCount.java  |  5 ++--
 .../RequestExTryEnchantArtifact.java          | 21 ++++++++---------
 .../pledgeV2/RequestExPledgeMissionInfo.java  |  3 +--
 .../ExTryEnchantArtifactResult.java           |  5 ++--
 .../pledgeV2/ExPledgeMissionRewardCount.java  |  5 ++--
 .../RequestExTryEnchantArtifact.java          | 21 ++++++++---------
 .../pledgeV2/RequestExPledgeMissionInfo.java  |  3 +--
 .../ExTryEnchantArtifactResult.java           |  5 ++--
 .../pledgeV2/ExPledgeMissionRewardCount.java  |  5 ++--
 .../RequestExTryEnchantArtifact.java          | 21 ++++++++---------
 .../pledgeV2/RequestExPledgeMissionInfo.java  |  3 +--
 .../ExTryEnchantArtifactResult.java           |  5 ++--
 .../pledgeV2/ExPledgeMissionRewardCount.java  |  5 ++--
 .../RequestExTryEnchantArtifact.java          | 21 ++++++++---------
 .../pledgeV2/RequestExPledgeMissionInfo.java  |  3 +--
 .../ExTryEnchantArtifactResult.java           |  5 ++--
 .../pledgeV2/ExPledgeMissionRewardCount.java  |  5 ++--
 .../RequestExTryEnchantArtifact.java          | 21 ++++++++---------
 .../pledgeV2/RequestExPledgeMissionInfo.java  |  3 +--
 .../ExTryEnchantArtifactResult.java           |  5 ++--
 .../pledgeV2/ExPledgeMissionRewardCount.java  |  5 ++--
 .../RequestExTryEnchantArtifact.java          | 21 ++++++++---------
 .../pledgeV2/RequestExPledgeMissionInfo.java  |  3 +--
 .../ExTryEnchantArtifactResult.java           |  5 ++--
 .../pledgeV2/ExPledgeMissionRewardCount.java  |  5 ++--
 28 files changed, 106 insertions(+), 134 deletions(-)

diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
index 33aacc1b32..bae88b439b 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
@@ -31,9 +31,8 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 09.09.2019
- **/
+ * @author Bonux
+ */
 public class RequestExTryEnchantArtifact implements ClientPacket
 {
 	private static final int[] ENCHANT_CHANCES =
@@ -124,21 +123,21 @@ public class RequestExTryEnchantArtifact implements ClientPacket
 			return;
 		}
 		
-		int minIngridientEnchant = -1;
-		if (enchantLevel <= 2)
+		int ingredientEnchant = -1;
+		if (enchantLevel <= 3)
 		{
-			minIngridientEnchant = 0;
+			ingredientEnchant = 0;
 		}
 		else if (enchantLevel <= 6)
 		{
-			minIngridientEnchant = 2;
+			ingredientEnchant = 1;
 		}
 		else if (enchantLevel <= 9)
 		{
-			minIngridientEnchant = 3;
+			ingredientEnchant = 3;
 		}
 		
-		if (minIngridientEnchant == -1)
+		if (ingredientEnchant == -1)
 		{
 			player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
 			return;
@@ -146,13 +145,13 @@ public class RequestExTryEnchantArtifact implements ClientPacket
 		
 		for (int objectId : _ingredients)
 		{
-			final Item ingridient = player.getInventory().getItemByObjectId(objectId);
-			if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot))
+			final Item ingredient = player.getInventory().getItemByObjectId(objectId);
+			if ((ingredient == null) || (ingredient.getEnchantLevel() < ingredientEnchant) || (ingredient.getTemplate().getArtifactSlot() != artifactSlot))
 			{
 				player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
 				return;
 			}
-			player.destroyItem("Artifact", ingridient, 1, player, true);
+			player.destroyItem("Artifact", ingredient, 1, player, true);
 		}
 		
 		if (Rnd.get(100) < chance)
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
index 9feb0f3b23..ee12e0a937 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
@@ -23,8 +23,7 @@ import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionIn
 import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 29.09.2019
+ * @author Bonux
  */
 public class RequestExPledgeMissionInfo implements ClientPacket
 {
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
index 396ef5b379..5e8b1d5982 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
@@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 09.09.2019
- **/
+ * @author Bonux
+ */
 public class ExTryEnchantArtifactResult extends ServerPacket
 {
 	public static final int SUCCESS = 0;
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
index 1414be40bc..09a9234241 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
@@ -22,9 +22,8 @@ import org.l2jmobius.gameserver.network.ServerPackets;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 
 /**
- * @author Bonux (bonuxq@gmail.com), NasSeKa
- * @date 29.09.2019
- **/
+ * @author Bonux, NasSeKa
+ */
 public class ExPledgeMissionRewardCount extends ServerPacket
 {
 	private final int _doneMissionsCount;
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
index a255e91989..bae88b439b 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
@@ -31,9 +31,8 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 09.09.2019
- **/
+ * @author Bonux
+ */
 public class RequestExTryEnchantArtifact implements ClientPacket
 {
 	private static final int[] ENCHANT_CHANCES =
@@ -124,21 +123,21 @@ public class RequestExTryEnchantArtifact implements ClientPacket
 			return;
 		}
 		
-		int minIngridientEnchant = -1;
+		int ingredientEnchant = -1;
 		if (enchantLevel <= 3)
 		{
-			minIngridientEnchant = 0;
+			ingredientEnchant = 0;
 		}
 		else if (enchantLevel <= 6)
 		{
-			minIngridientEnchant = 1;
+			ingredientEnchant = 1;
 		}
 		else if (enchantLevel <= 9)
 		{
-			minIngridientEnchant = 3;
+			ingredientEnchant = 3;
 		}
 		
-		if (minIngridientEnchant == -1)
+		if (ingredientEnchant == -1)
 		{
 			player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
 			return;
@@ -146,13 +145,13 @@ public class RequestExTryEnchantArtifact implements ClientPacket
 		
 		for (int objectId : _ingredients)
 		{
-			final Item ingridient = player.getInventory().getItemByObjectId(objectId);
-			if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot))
+			final Item ingredient = player.getInventory().getItemByObjectId(objectId);
+			if ((ingredient == null) || (ingredient.getEnchantLevel() < ingredientEnchant) || (ingredient.getTemplate().getArtifactSlot() != artifactSlot))
 			{
 				player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
 				return;
 			}
-			player.destroyItem("Artifact", ingridient, 1, player, true);
+			player.destroyItem("Artifact", ingredient, 1, player, true);
 		}
 		
 		if (Rnd.get(100) < chance)
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
index 9feb0f3b23..ee12e0a937 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
@@ -23,8 +23,7 @@ import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionIn
 import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 29.09.2019
+ * @author Bonux
  */
 public class RequestExPledgeMissionInfo implements ClientPacket
 {
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
index 396ef5b379..5e8b1d5982 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
@@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 09.09.2019
- **/
+ * @author Bonux
+ */
 public class ExTryEnchantArtifactResult extends ServerPacket
 {
 	public static final int SUCCESS = 0;
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
index 1414be40bc..09a9234241 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
@@ -22,9 +22,8 @@ import org.l2jmobius.gameserver.network.ServerPackets;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 
 /**
- * @author Bonux (bonuxq@gmail.com), NasSeKa
- * @date 29.09.2019
- **/
+ * @author Bonux, NasSeKa
+ */
 public class ExPledgeMissionRewardCount extends ServerPacket
 {
 	private final int _doneMissionsCount;
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
index a255e91989..bae88b439b 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
@@ -31,9 +31,8 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 09.09.2019
- **/
+ * @author Bonux
+ */
 public class RequestExTryEnchantArtifact implements ClientPacket
 {
 	private static final int[] ENCHANT_CHANCES =
@@ -124,21 +123,21 @@ public class RequestExTryEnchantArtifact implements ClientPacket
 			return;
 		}
 		
-		int minIngridientEnchant = -1;
+		int ingredientEnchant = -1;
 		if (enchantLevel <= 3)
 		{
-			minIngridientEnchant = 0;
+			ingredientEnchant = 0;
 		}
 		else if (enchantLevel <= 6)
 		{
-			minIngridientEnchant = 1;
+			ingredientEnchant = 1;
 		}
 		else if (enchantLevel <= 9)
 		{
-			minIngridientEnchant = 3;
+			ingredientEnchant = 3;
 		}
 		
-		if (minIngridientEnchant == -1)
+		if (ingredientEnchant == -1)
 		{
 			player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
 			return;
@@ -146,13 +145,13 @@ public class RequestExTryEnchantArtifact implements ClientPacket
 		
 		for (int objectId : _ingredients)
 		{
-			final Item ingridient = player.getInventory().getItemByObjectId(objectId);
-			if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot))
+			final Item ingredient = player.getInventory().getItemByObjectId(objectId);
+			if ((ingredient == null) || (ingredient.getEnchantLevel() < ingredientEnchant) || (ingredient.getTemplate().getArtifactSlot() != artifactSlot))
 			{
 				player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
 				return;
 			}
-			player.destroyItem("Artifact", ingridient, 1, player, true);
+			player.destroyItem("Artifact", ingredient, 1, player, true);
 		}
 		
 		if (Rnd.get(100) < chance)
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
index 9feb0f3b23..ee12e0a937 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
@@ -23,8 +23,7 @@ import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionIn
 import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 29.09.2019
+ * @author Bonux
  */
 public class RequestExPledgeMissionInfo implements ClientPacket
 {
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
index 396ef5b379..5e8b1d5982 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
@@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 09.09.2019
- **/
+ * @author Bonux
+ */
 public class ExTryEnchantArtifactResult extends ServerPacket
 {
 	public static final int SUCCESS = 0;
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
index 1414be40bc..09a9234241 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
@@ -22,9 +22,8 @@ import org.l2jmobius.gameserver.network.ServerPackets;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 
 /**
- * @author Bonux (bonuxq@gmail.com), NasSeKa
- * @date 29.09.2019
- **/
+ * @author Bonux, NasSeKa
+ */
 public class ExPledgeMissionRewardCount extends ServerPacket
 {
 	private final int _doneMissionsCount;
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
index a255e91989..bae88b439b 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
@@ -31,9 +31,8 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 09.09.2019
- **/
+ * @author Bonux
+ */
 public class RequestExTryEnchantArtifact implements ClientPacket
 {
 	private static final int[] ENCHANT_CHANCES =
@@ -124,21 +123,21 @@ public class RequestExTryEnchantArtifact implements ClientPacket
 			return;
 		}
 		
-		int minIngridientEnchant = -1;
+		int ingredientEnchant = -1;
 		if (enchantLevel <= 3)
 		{
-			minIngridientEnchant = 0;
+			ingredientEnchant = 0;
 		}
 		else if (enchantLevel <= 6)
 		{
-			minIngridientEnchant = 1;
+			ingredientEnchant = 1;
 		}
 		else if (enchantLevel <= 9)
 		{
-			minIngridientEnchant = 3;
+			ingredientEnchant = 3;
 		}
 		
-		if (minIngridientEnchant == -1)
+		if (ingredientEnchant == -1)
 		{
 			player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
 			return;
@@ -146,13 +145,13 @@ public class RequestExTryEnchantArtifact implements ClientPacket
 		
 		for (int objectId : _ingredients)
 		{
-			final Item ingridient = player.getInventory().getItemByObjectId(objectId);
-			if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot))
+			final Item ingredient = player.getInventory().getItemByObjectId(objectId);
+			if ((ingredient == null) || (ingredient.getEnchantLevel() < ingredientEnchant) || (ingredient.getTemplate().getArtifactSlot() != artifactSlot))
 			{
 				player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
 				return;
 			}
-			player.destroyItem("Artifact", ingridient, 1, player, true);
+			player.destroyItem("Artifact", ingredient, 1, player, true);
 		}
 		
 		if (Rnd.get(100) < chance)
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
index 9feb0f3b23..ee12e0a937 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
@@ -23,8 +23,7 @@ import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionIn
 import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 29.09.2019
+ * @author Bonux
  */
 public class RequestExPledgeMissionInfo implements ClientPacket
 {
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
index 396ef5b379..5e8b1d5982 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
@@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 09.09.2019
- **/
+ * @author Bonux
+ */
 public class ExTryEnchantArtifactResult extends ServerPacket
 {
 	public static final int SUCCESS = 0;
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
index 1414be40bc..09a9234241 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
@@ -22,9 +22,8 @@ import org.l2jmobius.gameserver.network.ServerPackets;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 
 /**
- * @author Bonux (bonuxq@gmail.com), NasSeKa
- * @date 29.09.2019
- **/
+ * @author Bonux, NasSeKa
+ */
 public class ExPledgeMissionRewardCount extends ServerPacket
 {
 	private final int _doneMissionsCount;
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
index a255e91989..bae88b439b 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
@@ -31,9 +31,8 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 09.09.2019
- **/
+ * @author Bonux
+ */
 public class RequestExTryEnchantArtifact implements ClientPacket
 {
 	private static final int[] ENCHANT_CHANCES =
@@ -124,21 +123,21 @@ public class RequestExTryEnchantArtifact implements ClientPacket
 			return;
 		}
 		
-		int minIngridientEnchant = -1;
+		int ingredientEnchant = -1;
 		if (enchantLevel <= 3)
 		{
-			minIngridientEnchant = 0;
+			ingredientEnchant = 0;
 		}
 		else if (enchantLevel <= 6)
 		{
-			minIngridientEnchant = 1;
+			ingredientEnchant = 1;
 		}
 		else if (enchantLevel <= 9)
 		{
-			minIngridientEnchant = 3;
+			ingredientEnchant = 3;
 		}
 		
-		if (minIngridientEnchant == -1)
+		if (ingredientEnchant == -1)
 		{
 			player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
 			return;
@@ -146,13 +145,13 @@ public class RequestExTryEnchantArtifact implements ClientPacket
 		
 		for (int objectId : _ingredients)
 		{
-			final Item ingridient = player.getInventory().getItemByObjectId(objectId);
-			if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot))
+			final Item ingredient = player.getInventory().getItemByObjectId(objectId);
+			if ((ingredient == null) || (ingredient.getEnchantLevel() < ingredientEnchant) || (ingredient.getTemplate().getArtifactSlot() != artifactSlot))
 			{
 				player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
 				return;
 			}
-			player.destroyItem("Artifact", ingridient, 1, player, true);
+			player.destroyItem("Artifact", ingredient, 1, player, true);
 		}
 		
 		if (Rnd.get(100) < chance)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
index 9feb0f3b23..ee12e0a937 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
@@ -23,8 +23,7 @@ import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionIn
 import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 29.09.2019
+ * @author Bonux
  */
 public class RequestExPledgeMissionInfo implements ClientPacket
 {
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
index 396ef5b379..5e8b1d5982 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
@@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 09.09.2019
- **/
+ * @author Bonux
+ */
 public class ExTryEnchantArtifactResult extends ServerPacket
 {
 	public static final int SUCCESS = 0;
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
index 1414be40bc..09a9234241 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
@@ -22,9 +22,8 @@ import org.l2jmobius.gameserver.network.ServerPackets;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 
 /**
- * @author Bonux (bonuxq@gmail.com), NasSeKa
- * @date 29.09.2019
- **/
+ * @author Bonux, NasSeKa
+ */
 public class ExPledgeMissionRewardCount extends ServerPacket
 {
 	private final int _doneMissionsCount;
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
index a255e91989..bae88b439b 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
@@ -31,9 +31,8 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 09.09.2019
- **/
+ * @author Bonux
+ */
 public class RequestExTryEnchantArtifact implements ClientPacket
 {
 	private static final int[] ENCHANT_CHANCES =
@@ -124,21 +123,21 @@ public class RequestExTryEnchantArtifact implements ClientPacket
 			return;
 		}
 		
-		int minIngridientEnchant = -1;
+		int ingredientEnchant = -1;
 		if (enchantLevel <= 3)
 		{
-			minIngridientEnchant = 0;
+			ingredientEnchant = 0;
 		}
 		else if (enchantLevel <= 6)
 		{
-			minIngridientEnchant = 1;
+			ingredientEnchant = 1;
 		}
 		else if (enchantLevel <= 9)
 		{
-			minIngridientEnchant = 3;
+			ingredientEnchant = 3;
 		}
 		
-		if (minIngridientEnchant == -1)
+		if (ingredientEnchant == -1)
 		{
 			player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
 			return;
@@ -146,13 +145,13 @@ public class RequestExTryEnchantArtifact implements ClientPacket
 		
 		for (int objectId : _ingredients)
 		{
-			final Item ingridient = player.getInventory().getItemByObjectId(objectId);
-			if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot))
+			final Item ingredient = player.getInventory().getItemByObjectId(objectId);
+			if ((ingredient == null) || (ingredient.getEnchantLevel() < ingredientEnchant) || (ingredient.getTemplate().getArtifactSlot() != artifactSlot))
 			{
 				player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
 				return;
 			}
-			player.destroyItem("Artifact", ingridient, 1, player, true);
+			player.destroyItem("Artifact", ingredient, 1, player, true);
 		}
 		
 		if (Rnd.get(100) < chance)
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
index 9feb0f3b23..ee12e0a937 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
@@ -23,8 +23,7 @@ import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionIn
 import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 29.09.2019
+ * @author Bonux
  */
 public class RequestExPledgeMissionInfo implements ClientPacket
 {
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
index 396ef5b379..5e8b1d5982 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
@@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 09.09.2019
- **/
+ * @author Bonux
+ */
 public class ExTryEnchantArtifactResult extends ServerPacket
 {
 	public static final int SUCCESS = 0;
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
index 1414be40bc..09a9234241 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
@@ -22,9 +22,8 @@ import org.l2jmobius.gameserver.network.ServerPackets;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 
 /**
- * @author Bonux (bonuxq@gmail.com), NasSeKa
- * @date 29.09.2019
- **/
+ * @author Bonux, NasSeKa
+ */
 public class ExPledgeMissionRewardCount extends ServerPacket
 {
 	private final int _doneMissionsCount;
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
index a255e91989..86b3fee996 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java
@@ -31,9 +31,8 @@ import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 09.09.2019
- **/
+ * @author Bonux
+ */
 public class RequestExTryEnchantArtifact implements ClientPacket
 {
 	private static final int[] ENCHANT_CHANCES =
@@ -124,21 +123,21 @@ public class RequestExTryEnchantArtifact implements ClientPacket
 			return;
 		}
 		
-		int minIngridientEnchant = -1;
+		int ingredientEnchant = -1;
 		if (enchantLevel <= 3)
 		{
-			minIngridientEnchant = 0;
+			ingredientEnchant = 0;
 		}
 		else if (enchantLevel <= 6)
 		{
-			minIngridientEnchant = 1;
+			ingredientEnchant = 1;
 		}
 		else if (enchantLevel <= 9)
 		{
-			minIngridientEnchant = 3;
+			ingredientEnchant = 3;
 		}
 		
-		if (minIngridientEnchant == -1)
+		if (ingredientEnchant == -1)
 		{
 			player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
 			return;
@@ -146,13 +145,13 @@ public class RequestExTryEnchantArtifact implements ClientPacket
 		
 		for (int objectId : _ingredients)
 		{
-			final Item ingridient = player.getInventory().getItemByObjectId(objectId);
-			if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot))
+			final Item ingredient = player.getInventory().getItemByObjectId(objectId);
+			if ((ingredient == null) || (ingredient.getEnchantLevel() < ingredientEnchant) || (ingredient.getEnchantLevel() > ingredientEnchant) || (ingredient.getTemplate().getArtifactSlot() != artifactSlot))
 			{
 				player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET);
 				return;
 			}
-			player.destroyItem("Artifact", ingridient, 1, player, true);
+			player.destroyItem("Artifact", ingredient, 1, player, true);
 		}
 		
 		if (Rnd.get(100) < chance)
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
index 9feb0f3b23..ee12e0a937 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java
@@ -23,8 +23,7 @@ import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionIn
 import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 29.09.2019
+ * @author Bonux
  */
 public class RequestExPledgeMissionInfo implements ClientPacket
 {
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
index 396ef5b379..5e8b1d5982 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java
@@ -19,9 +19,8 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import org.l2jmobius.gameserver.network.ServerPackets;
 
 /**
- * @author Bonux (bonuxq@gmail.com)
- * @date 09.09.2019
- **/
+ * @author Bonux
+ */
 public class ExTryEnchantArtifactResult extends ServerPacket
 {
 	public static final int SUCCESS = 0;
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
index 1414be40bc..09a9234241 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java
@@ -22,9 +22,8 @@ import org.l2jmobius.gameserver.network.ServerPackets;
 import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
 
 /**
- * @author Bonux (bonuxq@gmail.com), NasSeKa
- * @date 29.09.2019
- **/
+ * @author Bonux, NasSeKa
+ */
 public class ExPledgeMissionRewardCount extends ServerPacket
 {
 	private final int _doneMissionsCount;