Changed calculations for max enchant values.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -62,9 +62,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -111,27 +111,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -179,6 +176,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -62,9 +62,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -111,27 +111,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -179,6 +176,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -62,9 +62,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -111,27 +111,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -179,6 +176,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)

L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/EnchantItemGroupsData.java

@@ -64,9 +64,9 @@ public class EnchantItemGroupsData implements IXmlReader
 		
 		if (Config.OVER_ENCHANT_PROTECTION)
 		{
-			LOGGER.info(getClass().getSimpleName() + ": Maximum weapon enchant is set to " + _maxWeaponEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max weapon enchant is set to " + _maxWeaponEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum armor enchant is set to " + _maxArmorEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max armor enchant is set to " + _maxArmorEnchant + ".");
-			LOGGER.info(getClass().getSimpleName() + ": Maximum accessory enchant is set to " + _maxAccessoryEnchant + ".");
+			LOGGER.info(getClass().getSimpleName() + ": Max accessory enchant is set to " + _maxAccessoryEnchant + ".");
 		}
 	}
 	
@@ -113,27 +113,24 @@ public class EnchantItemGroupsData implements IXmlReader
 								// Try to get a generic max value.
 								if (chance > 0)
 								{
-									if (name.endsWith("WEAPON_GROUP"))
+									if (name.contains("WEAPON"))
 									{
 										if (_maxWeaponEnchant < max)
 										{
 											_maxWeaponEnchant = max;
 										}
 									}
-									else if (name.endsWith("ARMOR_GROUP"))
+									else if (name.contains("ACCESSORIES") || name.contains("RING") || name.contains("EARRING") || name.contains("NECK"))
-									{
-										if (_maxArmorEnchant < max)
-										{
-											_maxArmorEnchant = max;
-										}
-									}
-									else if (name.contains("ACCESSORIES"))
 									{
 										if (_maxAccessoryEnchant < max)
 										{
 											_maxAccessoryEnchant = max;
 										}
 									}
+									else if (_maxArmorEnchant < max)
+									{
+										_maxArmorEnchant = max;
+									}
 								}
 							}
 						}
@@ -181,6 +178,11 @@ public class EnchantItemGroupsData implements IXmlReader
 		{
 			_maxAccessoryEnchant = _maxArmorEnchant;
 		}
+		
+		// Max enchant values are set to current max enchant + 1.
+		_maxWeaponEnchant += 1;
+		_maxArmorEnchant += 1;
+		_maxAccessoryEnchant += 1;
 	}
 	
 	public EnchantItemGroup getItemGroup(ItemTemplate item, int scrollGroup)