From b19c2ec3d94ef70f642a3b0d9404dae623c304d5 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 13 May 2019 23:32:05 +0000
Subject: [PATCH] Fixed Elementals array index out of bounds exception.

---
 .../gameserver/model/Elementals.java          | 57 ++++--------------
 .../gameserver/model/Elementals.java          | 57 ++++--------------
 .../gameserver/model/Elementals.java          | 57 ++++--------------
 .../gameserver/model/Elementals.java          | 57 ++++--------------
 .../gameserver/model/Elementals.java          | 57 ++++--------------
 .../gameserver/model/Elementals.java          | 57 ++++--------------
 .../gameserver/model/Elementals.java          | 59 ++++---------------
 .../gameserver/model/Elementals.java          | 57 ++++--------------
 .../gameserver/model/Elementals.java          | 57 ++++--------------
 .../gameserver/model/Elementals.java          | 57 ++++--------------
 .../gameserver/model/Elementals.java          | 57 ++++--------------
 .../gameserver/model/Elementals.java          | 57 ++++--------------
 12 files changed, 133 insertions(+), 553 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Elementals.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Elementals.java
index e103f04f3f..15c70baa21 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Elementals.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Elementals.java
@@ -88,12 +88,12 @@ public final class Elementals
 	/* @formatter:off */
 	private static final int[][] CHANCE_TABLE =
 	{
-		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
-		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
-		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
-		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
-		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
-		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
+		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_CRYSTAL_SUPER,		Config.S_ARMOR_CRYSTAL_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
+		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_CRYSTAL_SUPER,	Config.S80_ARMOR_CRYSTAL_SUPER,		Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
+		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_CRYSTAL_SUPER,	Config.S84_ARMOR_CRYSTAL_SUPER,		Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
+		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_CRYSTAL_SUPER,		Config.R_ARMOR_CRYSTAL_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
+		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_CRYSTAL_SUPER,	Config.R95_ARMOR_CRYSTAL_SUPER,		Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
+		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_CRYSTAL_SUPER,	Config.R99_ARMOR_CRYSTAL_SUPER,		Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
 	};	
 	/* @formatter:on */
 	
@@ -344,62 +344,27 @@ public final class Elementals
 		{
 			case Stone:
 			{
-				if (item.isWeapon())
-				{
-					column = 0;
-				}
-				else // isArmor = true
-				{
-					column = 1;
-				}
+				column = item.isWeapon() ? 0 : 1;
 				break;
 			}
 			case Crystal:
 			{
-				if (item.isWeapon())
-				{
-					column = 2;
-				}
-				else // isArmor = true
-				{
-					column = 3;
-				}
+				column = item.isWeapon() ? 2 : 3;
 				break;
 			}
 			case StoneSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 4;
-				}
-				else // isArmor = true
-				{
-					column = 5;
-				}
+				column = item.isWeapon() ? 4 : 5;
 				break;
 			}
 			case CrystalSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 6;
-				}
-				else // isArmor = true
-				{
-					column = 7;
-				}
+				column = item.isWeapon() ? 6 : 7;
 				break;
 			}
 			case Jewel:
 			{
-				if (item.isWeapon())
-				{
-					column = 8;
-				}
-				else // isArmor = true
-				{
-					column = 9;
-				}
+				column = item.isWeapon() ? 8 : 9;
 				break;
 			}
 		}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Elementals.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Elementals.java
index e103f04f3f..15c70baa21 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Elementals.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Elementals.java
@@ -88,12 +88,12 @@ public final class Elementals
 	/* @formatter:off */
 	private static final int[][] CHANCE_TABLE =
 	{
-		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
-		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
-		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
-		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
-		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
-		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
+		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_CRYSTAL_SUPER,		Config.S_ARMOR_CRYSTAL_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
+		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_CRYSTAL_SUPER,	Config.S80_ARMOR_CRYSTAL_SUPER,		Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
+		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_CRYSTAL_SUPER,	Config.S84_ARMOR_CRYSTAL_SUPER,		Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
+		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_CRYSTAL_SUPER,		Config.R_ARMOR_CRYSTAL_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
+		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_CRYSTAL_SUPER,	Config.R95_ARMOR_CRYSTAL_SUPER,		Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
+		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_CRYSTAL_SUPER,	Config.R99_ARMOR_CRYSTAL_SUPER,		Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
 	};	
 	/* @formatter:on */
 	
@@ -344,62 +344,27 @@ public final class Elementals
 		{
 			case Stone:
 			{
-				if (item.isWeapon())
-				{
-					column = 0;
-				}
-				else // isArmor = true
-				{
-					column = 1;
-				}
+				column = item.isWeapon() ? 0 : 1;
 				break;
 			}
 			case Crystal:
 			{
-				if (item.isWeapon())
-				{
-					column = 2;
-				}
-				else // isArmor = true
-				{
-					column = 3;
-				}
+				column = item.isWeapon() ? 2 : 3;
 				break;
 			}
 			case StoneSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 4;
-				}
-				else // isArmor = true
-				{
-					column = 5;
-				}
+				column = item.isWeapon() ? 4 : 5;
 				break;
 			}
 			case CrystalSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 6;
-				}
-				else // isArmor = true
-				{
-					column = 7;
-				}
+				column = item.isWeapon() ? 6 : 7;
 				break;
 			}
 			case Jewel:
 			{
-				if (item.isWeapon())
-				{
-					column = 8;
-				}
-				else // isArmor = true
-				{
-					column = 9;
-				}
+				column = item.isWeapon() ? 8 : 9;
 				break;
 			}
 		}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Elementals.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Elementals.java
index e103f04f3f..15c70baa21 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Elementals.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Elementals.java
@@ -88,12 +88,12 @@ public final class Elementals
 	/* @formatter:off */
 	private static final int[][] CHANCE_TABLE =
 	{
-		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
-		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
-		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
-		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
-		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
-		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
+		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_CRYSTAL_SUPER,		Config.S_ARMOR_CRYSTAL_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
+		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_CRYSTAL_SUPER,	Config.S80_ARMOR_CRYSTAL_SUPER,		Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
+		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_CRYSTAL_SUPER,	Config.S84_ARMOR_CRYSTAL_SUPER,		Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
+		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_CRYSTAL_SUPER,		Config.R_ARMOR_CRYSTAL_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
+		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_CRYSTAL_SUPER,	Config.R95_ARMOR_CRYSTAL_SUPER,		Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
+		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_CRYSTAL_SUPER,	Config.R99_ARMOR_CRYSTAL_SUPER,		Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
 	};	
 	/* @formatter:on */
 	
@@ -344,62 +344,27 @@ public final class Elementals
 		{
 			case Stone:
 			{
-				if (item.isWeapon())
-				{
-					column = 0;
-				}
-				else // isArmor = true
-				{
-					column = 1;
-				}
+				column = item.isWeapon() ? 0 : 1;
 				break;
 			}
 			case Crystal:
 			{
-				if (item.isWeapon())
-				{
-					column = 2;
-				}
-				else // isArmor = true
-				{
-					column = 3;
-				}
+				column = item.isWeapon() ? 2 : 3;
 				break;
 			}
 			case StoneSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 4;
-				}
-				else // isArmor = true
-				{
-					column = 5;
-				}
+				column = item.isWeapon() ? 4 : 5;
 				break;
 			}
 			case CrystalSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 6;
-				}
-				else // isArmor = true
-				{
-					column = 7;
-				}
+				column = item.isWeapon() ? 6 : 7;
 				break;
 			}
 			case Jewel:
 			{
-				if (item.isWeapon())
-				{
-					column = 8;
-				}
-				else // isArmor = true
-				{
-					column = 9;
-				}
+				column = item.isWeapon() ? 8 : 9;
 				break;
 			}
 		}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Elementals.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Elementals.java
index e103f04f3f..15c70baa21 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Elementals.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Elementals.java
@@ -88,12 +88,12 @@ public final class Elementals
 	/* @formatter:off */
 	private static final int[][] CHANCE_TABLE =
 	{
-		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
-		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
-		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
-		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
-		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
-		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
+		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_CRYSTAL_SUPER,		Config.S_ARMOR_CRYSTAL_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
+		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_CRYSTAL_SUPER,	Config.S80_ARMOR_CRYSTAL_SUPER,		Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
+		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_CRYSTAL_SUPER,	Config.S84_ARMOR_CRYSTAL_SUPER,		Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
+		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_CRYSTAL_SUPER,		Config.R_ARMOR_CRYSTAL_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
+		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_CRYSTAL_SUPER,	Config.R95_ARMOR_CRYSTAL_SUPER,		Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
+		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_CRYSTAL_SUPER,	Config.R99_ARMOR_CRYSTAL_SUPER,		Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
 	};	
 	/* @formatter:on */
 	
@@ -344,62 +344,27 @@ public final class Elementals
 		{
 			case Stone:
 			{
-				if (item.isWeapon())
-				{
-					column = 0;
-				}
-				else // isArmor = true
-				{
-					column = 1;
-				}
+				column = item.isWeapon() ? 0 : 1;
 				break;
 			}
 			case Crystal:
 			{
-				if (item.isWeapon())
-				{
-					column = 2;
-				}
-				else // isArmor = true
-				{
-					column = 3;
-				}
+				column = item.isWeapon() ? 2 : 3;
 				break;
 			}
 			case StoneSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 4;
-				}
-				else // isArmor = true
-				{
-					column = 5;
-				}
+				column = item.isWeapon() ? 4 : 5;
 				break;
 			}
 			case CrystalSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 6;
-				}
-				else // isArmor = true
-				{
-					column = 7;
-				}
+				column = item.isWeapon() ? 6 : 7;
 				break;
 			}
 			case Jewel:
 			{
-				if (item.isWeapon())
-				{
-					column = 8;
-				}
-				else // isArmor = true
-				{
-					column = 9;
-				}
+				column = item.isWeapon() ? 8 : 9;
 				break;
 			}
 		}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Elementals.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Elementals.java
index 6d23af18a8..07d7c647b3 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Elementals.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Elementals.java
@@ -88,12 +88,12 @@ public final class Elementals
 	/* @formatter:off */
 	private static final int[][] CHANCE_TABLE =
 	{
-		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
-		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
-		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
-		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
-		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
-		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
+		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_CRYSTAL_SUPER,		Config.S_ARMOR_CRYSTAL_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
+		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_CRYSTAL_SUPER,	Config.S80_ARMOR_CRYSTAL_SUPER,		Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
+		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_CRYSTAL_SUPER,	Config.S84_ARMOR_CRYSTAL_SUPER,		Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
+		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_CRYSTAL_SUPER,		Config.R_ARMOR_CRYSTAL_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
+		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_CRYSTAL_SUPER,	Config.R95_ARMOR_CRYSTAL_SUPER,		Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
+		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_CRYSTAL_SUPER,	Config.R99_ARMOR_CRYSTAL_SUPER,		Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
 	};	
 	/* @formatter:on */
 	
@@ -346,62 +346,27 @@ public final class Elementals
 		{
 			case Stone:
 			{
-				if (item.isWeapon())
-				{
-					column = 0;
-				}
-				else // isArmor = true
-				{
-					column = 1;
-				}
+				column = item.isWeapon() ? 0 : 1;
 				break;
 			}
 			case Crystal:
 			{
-				if (item.isWeapon())
-				{
-					column = 2;
-				}
-				else // isArmor = true
-				{
-					column = 3;
-				}
+				column = item.isWeapon() ? 2 : 3;
 				break;
 			}
 			case StoneSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 4;
-				}
-				else // isArmor = true
-				{
-					column = 5;
-				}
+				column = item.isWeapon() ? 4 : 5;
 				break;
 			}
 			case CrystalSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 6;
-				}
-				else // isArmor = true
-				{
-					column = 7;
-				}
+				column = item.isWeapon() ? 6 : 7;
 				break;
 			}
 			case Jewel:
 			{
-				if (item.isWeapon())
-				{
-					column = 8;
-				}
-				else // isArmor = true
-				{
-					column = 9;
-				}
+				column = item.isWeapon() ? 8 : 9;
 				break;
 			}
 		}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Elementals.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Elementals.java
index 6d23af18a8..07d7c647b3 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Elementals.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Elementals.java
@@ -88,12 +88,12 @@ public final class Elementals
 	/* @formatter:off */
 	private static final int[][] CHANCE_TABLE =
 	{
-		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
-		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
-		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
-		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
-		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
-		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
+		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_CRYSTAL_SUPER,		Config.S_ARMOR_CRYSTAL_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
+		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_CRYSTAL_SUPER,	Config.S80_ARMOR_CRYSTAL_SUPER,		Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
+		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_CRYSTAL_SUPER,	Config.S84_ARMOR_CRYSTAL_SUPER,		Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
+		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_CRYSTAL_SUPER,		Config.R_ARMOR_CRYSTAL_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
+		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_CRYSTAL_SUPER,	Config.R95_ARMOR_CRYSTAL_SUPER,		Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
+		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_CRYSTAL_SUPER,	Config.R99_ARMOR_CRYSTAL_SUPER,		Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
 	};	
 	/* @formatter:on */
 	
@@ -346,62 +346,27 @@ public final class Elementals
 		{
 			case Stone:
 			{
-				if (item.isWeapon())
-				{
-					column = 0;
-				}
-				else // isArmor = true
-				{
-					column = 1;
-				}
+				column = item.isWeapon() ? 0 : 1;
 				break;
 			}
 			case Crystal:
 			{
-				if (item.isWeapon())
-				{
-					column = 2;
-				}
-				else // isArmor = true
-				{
-					column = 3;
-				}
+				column = item.isWeapon() ? 2 : 3;
 				break;
 			}
 			case StoneSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 4;
-				}
-				else // isArmor = true
-				{
-					column = 5;
-				}
+				column = item.isWeapon() ? 4 : 5;
 				break;
 			}
 			case CrystalSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 6;
-				}
-				else // isArmor = true
-				{
-					column = 7;
-				}
+				column = item.isWeapon() ? 6 : 7;
 				break;
 			}
 			case Jewel:
 			{
-				if (item.isWeapon())
-				{
-					column = 8;
-				}
-				else // isArmor = true
-				{
-					column = 9;
-				}
+				column = item.isWeapon() ? 8 : 9;
 				break;
 			}
 		}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Elementals.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Elementals.java
index 7335b585d2..7dc70b4f96 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Elementals.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Elementals.java
@@ -89,13 +89,13 @@ public final class Elementals
 	/* @formatter:off */
 	private static final int[][] CHANCE_TABLE =
 	{
-		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
-		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
-		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
-		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
-		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
-		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
-		{Config.R110_WEAPON_STONE,	Config.R110_ARMOR_STONE,	Config.R110_WEAPON_CRYSTAL,	Config.R110_ARMOR_CRYSTAL,	Config.R110_WEAPON_STONE_SUPER,	Config.R110_ARMOR_STONE_SUPER,	Config.R110_WEAPON_JEWEL,	Config.R110_ARMOR_JEWEL},
+		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_CRYSTAL_SUPER,		Config.S_ARMOR_CRYSTAL_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
+		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_CRYSTAL_SUPER,	Config.S80_ARMOR_CRYSTAL_SUPER,		Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
+		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_CRYSTAL_SUPER,	Config.S84_ARMOR_CRYSTAL_SUPER,		Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
+		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_CRYSTAL_SUPER,		Config.R_ARMOR_CRYSTAL_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
+		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_CRYSTAL_SUPER,	Config.R95_ARMOR_CRYSTAL_SUPER,		Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
+		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_CRYSTAL_SUPER,	Config.R99_ARMOR_CRYSTAL_SUPER,		Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
+		{Config.R110_WEAPON_STONE,	Config.R110_ARMOR_STONE,	Config.R110_WEAPON_CRYSTAL,	Config.R110_ARMOR_CRYSTAL,	Config.R110_WEAPON_STONE_SUPER,	Config.R110_ARMOR_STONE_SUPER,	Config.R110_WEAPON_CRYSTAL_SUPER,	Config.R110_ARMOR_CRYSTAL_SUPER,	Config.R110_WEAPON_JEWEL,	Config.R110_ARMOR_JEWEL},
 	};	
 	/* @formatter:on */
 	
@@ -372,62 +372,27 @@ public final class Elementals
 		{
 			case Stone:
 			{
-				if (item.isWeapon())
-				{
-					column = 0;
-				}
-				else // isArmor = true
-				{
-					column = 1;
-				}
+				column = item.isWeapon() ? 0 : 1;
 				break;
 			}
 			case Crystal:
 			{
-				if (item.isWeapon())
-				{
-					column = 2;
-				}
-				else // isArmor = true
-				{
-					column = 3;
-				}
+				column = item.isWeapon() ? 2 : 3;
 				break;
 			}
 			case StoneSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 4;
-				}
-				else // isArmor = true
-				{
-					column = 5;
-				}
+				column = item.isWeapon() ? 4 : 5;
 				break;
 			}
 			case CrystalSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 6;
-				}
-				else // isArmor = true
-				{
-					column = 7;
-				}
+				column = item.isWeapon() ? 6 : 7;
 				break;
 			}
 			case Jewel:
 			{
-				if (item.isWeapon())
-				{
-					column = 8;
-				}
-				else // isArmor = true
-				{
-					column = 9;
-				}
+				column = item.isWeapon() ? 8 : 9;
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Elementals.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Elementals.java
index 75293413ae..e56dd5f430 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Elementals.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Elementals.java
@@ -88,12 +88,12 @@ public final class Elementals
 	/* @formatter:off */
 	private static final int[][] CHANCE_TABLE =
 	{
-		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
-		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
-		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
-		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
-		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
-		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
+		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_CRYSTAL_SUPER,		Config.S_ARMOR_CRYSTAL_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
+		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_CRYSTAL_SUPER,	Config.S80_ARMOR_CRYSTAL_SUPER,		Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
+		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_CRYSTAL_SUPER,	Config.S84_ARMOR_CRYSTAL_SUPER,		Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
+		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_CRYSTAL_SUPER,		Config.R_ARMOR_CRYSTAL_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
+		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_CRYSTAL_SUPER,	Config.R95_ARMOR_CRYSTAL_SUPER,		Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
+		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_CRYSTAL_SUPER,	Config.R99_ARMOR_CRYSTAL_SUPER,		Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
 	};	
 	/* @formatter:on */
 	
@@ -232,62 +232,27 @@ public final class Elementals
 		{
 			case Stone:
 			{
-				if (item.isWeapon())
-				{
-					column = 0;
-				}
-				else // isArmor = true
-				{
-					column = 1;
-				}
+				column = item.isWeapon() ? 0 : 1;
 				break;
 			}
 			case Crystal:
 			{
-				if (item.isWeapon())
-				{
-					column = 2;
-				}
-				else // isArmor = true
-				{
-					column = 3;
-				}
+				column = item.isWeapon() ? 2 : 3;
 				break;
 			}
 			case StoneSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 4;
-				}
-				else // isArmor = true
-				{
-					column = 5;
-				}
+				column = item.isWeapon() ? 4 : 5;
 				break;
 			}
 			case CrystalSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 6;
-				}
-				else // isArmor = true
-				{
-					column = 7;
-				}
+				column = item.isWeapon() ? 6 : 7;
 				break;
 			}
 			case Jewel:
 			{
-				if (item.isWeapon())
-				{
-					column = 8;
-				}
-				else // isArmor = true
-				{
-					column = 9;
-				}
+				column = item.isWeapon() ? 8 : 9;
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Elementals.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Elementals.java
index 75293413ae..e56dd5f430 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Elementals.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Elementals.java
@@ -88,12 +88,12 @@ public final class Elementals
 	/* @formatter:off */
 	private static final int[][] CHANCE_TABLE =
 	{
-		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
-		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
-		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
-		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
-		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
-		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
+		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_CRYSTAL_SUPER,		Config.S_ARMOR_CRYSTAL_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
+		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_CRYSTAL_SUPER,	Config.S80_ARMOR_CRYSTAL_SUPER,		Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
+		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_CRYSTAL_SUPER,	Config.S84_ARMOR_CRYSTAL_SUPER,		Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
+		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_CRYSTAL_SUPER,		Config.R_ARMOR_CRYSTAL_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
+		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_CRYSTAL_SUPER,	Config.R95_ARMOR_CRYSTAL_SUPER,		Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
+		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_CRYSTAL_SUPER,	Config.R99_ARMOR_CRYSTAL_SUPER,		Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
 	};	
 	/* @formatter:on */
 	
@@ -232,62 +232,27 @@ public final class Elementals
 		{
 			case Stone:
 			{
-				if (item.isWeapon())
-				{
-					column = 0;
-				}
-				else // isArmor = true
-				{
-					column = 1;
-				}
+				column = item.isWeapon() ? 0 : 1;
 				break;
 			}
 			case Crystal:
 			{
-				if (item.isWeapon())
-				{
-					column = 2;
-				}
-				else // isArmor = true
-				{
-					column = 3;
-				}
+				column = item.isWeapon() ? 2 : 3;
 				break;
 			}
 			case StoneSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 4;
-				}
-				else // isArmor = true
-				{
-					column = 5;
-				}
+				column = item.isWeapon() ? 4 : 5;
 				break;
 			}
 			case CrystalSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 6;
-				}
-				else // isArmor = true
-				{
-					column = 7;
-				}
+				column = item.isWeapon() ? 6 : 7;
 				break;
 			}
 			case Jewel:
 			{
-				if (item.isWeapon())
-				{
-					column = 8;
-				}
-				else // isArmor = true
-				{
-					column = 9;
-				}
+				column = item.isWeapon() ? 8 : 9;
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Elementals.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Elementals.java
index 75293413ae..e56dd5f430 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Elementals.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Elementals.java
@@ -88,12 +88,12 @@ public final class Elementals
 	/* @formatter:off */
 	private static final int[][] CHANCE_TABLE =
 	{
-		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
-		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
-		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
-		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
-		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
-		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
+		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_CRYSTAL_SUPER,		Config.S_ARMOR_CRYSTAL_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
+		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_CRYSTAL_SUPER,	Config.S80_ARMOR_CRYSTAL_SUPER,		Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
+		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_CRYSTAL_SUPER,	Config.S84_ARMOR_CRYSTAL_SUPER,		Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
+		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_CRYSTAL_SUPER,		Config.R_ARMOR_CRYSTAL_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
+		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_CRYSTAL_SUPER,	Config.R95_ARMOR_CRYSTAL_SUPER,		Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
+		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_CRYSTAL_SUPER,	Config.R99_ARMOR_CRYSTAL_SUPER,		Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
 	};	
 	/* @formatter:on */
 	
@@ -232,62 +232,27 @@ public final class Elementals
 		{
 			case Stone:
 			{
-				if (item.isWeapon())
-				{
-					column = 0;
-				}
-				else // isArmor = true
-				{
-					column = 1;
-				}
+				column = item.isWeapon() ? 0 : 1;
 				break;
 			}
 			case Crystal:
 			{
-				if (item.isWeapon())
-				{
-					column = 2;
-				}
-				else // isArmor = true
-				{
-					column = 3;
-				}
+				column = item.isWeapon() ? 2 : 3;
 				break;
 			}
 			case StoneSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 4;
-				}
-				else // isArmor = true
-				{
-					column = 5;
-				}
+				column = item.isWeapon() ? 4 : 5;
 				break;
 			}
 			case CrystalSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 6;
-				}
-				else // isArmor = true
-				{
-					column = 7;
-				}
+				column = item.isWeapon() ? 6 : 7;
 				break;
 			}
 			case Jewel:
 			{
-				if (item.isWeapon())
-				{
-					column = 8;
-				}
-				else // isArmor = true
-				{
-					column = 9;
-				}
+				column = item.isWeapon() ? 8 : 9;
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Elementals.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Elementals.java
index 75293413ae..e56dd5f430 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Elementals.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Elementals.java
@@ -88,12 +88,12 @@ public final class Elementals
 	/* @formatter:off */
 	private static final int[][] CHANCE_TABLE =
 	{
-		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
-		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
-		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
-		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
-		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
-		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
+		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_CRYSTAL_SUPER,		Config.S_ARMOR_CRYSTAL_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
+		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_CRYSTAL_SUPER,	Config.S80_ARMOR_CRYSTAL_SUPER,		Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
+		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_CRYSTAL_SUPER,	Config.S84_ARMOR_CRYSTAL_SUPER,		Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
+		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_CRYSTAL_SUPER,		Config.R_ARMOR_CRYSTAL_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
+		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_CRYSTAL_SUPER,	Config.R95_ARMOR_CRYSTAL_SUPER,		Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
+		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_CRYSTAL_SUPER,	Config.R99_ARMOR_CRYSTAL_SUPER,		Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
 	};	
 	/* @formatter:on */
 	
@@ -232,62 +232,27 @@ public final class Elementals
 		{
 			case Stone:
 			{
-				if (item.isWeapon())
-				{
-					column = 0;
-				}
-				else // isArmor = true
-				{
-					column = 1;
-				}
+				column = item.isWeapon() ? 0 : 1;
 				break;
 			}
 			case Crystal:
 			{
-				if (item.isWeapon())
-				{
-					column = 2;
-				}
-				else // isArmor = true
-				{
-					column = 3;
-				}
+				column = item.isWeapon() ? 2 : 3;
 				break;
 			}
 			case StoneSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 4;
-				}
-				else // isArmor = true
-				{
-					column = 5;
-				}
+				column = item.isWeapon() ? 4 : 5;
 				break;
 			}
 			case CrystalSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 6;
-				}
-				else // isArmor = true
-				{
-					column = 7;
-				}
+				column = item.isWeapon() ? 6 : 7;
 				break;
 			}
 			case Jewel:
 			{
-				if (item.isWeapon())
-				{
-					column = 8;
-				}
-				else // isArmor = true
-				{
-					column = 9;
-				}
+				column = item.isWeapon() ? 8 : 9;
 				break;
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Elementals.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Elementals.java
index 75293413ae..e56dd5f430 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Elementals.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Elementals.java
@@ -88,12 +88,12 @@ public final class Elementals
 	/* @formatter:off */
 	private static final int[][] CHANCE_TABLE =
 	{
-		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
-		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
-		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
-		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
-		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
-		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
+		{Config.S_WEAPON_STONE,		Config.S_ARMOR_STONE,		Config.S_WEAPON_CRYSTAL,	Config.S_ARMOR_CRYSTAL,		Config.S_WEAPON_STONE_SUPER,	Config.S_ARMOR_STONE_SUPER,		Config.S_WEAPON_CRYSTAL_SUPER,		Config.S_ARMOR_CRYSTAL_SUPER,		Config.S_WEAPON_JEWEL,		Config.S_ARMOR_JEWEL},
+		{Config.S80_WEAPON_STONE,	Config.S80_ARMOR_STONE,		Config.S80_WEAPON_CRYSTAL,	Config.S80_ARMOR_CRYSTAL,	Config.S80_WEAPON_STONE_SUPER,	Config.S80_ARMOR_STONE_SUPER,	Config.S80_WEAPON_CRYSTAL_SUPER,	Config.S80_ARMOR_CRYSTAL_SUPER,		Config.S80_WEAPON_JEWEL,	Config.S80_ARMOR_JEWEL},
+		{Config.S84_WEAPON_STONE,	Config.S84_ARMOR_STONE,		Config.S84_WEAPON_CRYSTAL,	Config.S84_ARMOR_CRYSTAL,	Config.S84_WEAPON_STONE_SUPER,	Config.S84_ARMOR_STONE_SUPER,	Config.S84_WEAPON_CRYSTAL_SUPER,	Config.S84_ARMOR_CRYSTAL_SUPER,		Config.S84_WEAPON_JEWEL,	Config.S84_ARMOR_JEWEL},
+		{Config.R_WEAPON_STONE,		Config.R_ARMOR_STONE,		Config.R_WEAPON_CRYSTAL,	Config.R_ARMOR_CRYSTAL,		Config.R_WEAPON_STONE_SUPER,	Config.R_ARMOR_STONE_SUPER,		Config.R_WEAPON_CRYSTAL_SUPER,		Config.R_ARMOR_CRYSTAL_SUPER,		Config.R_WEAPON_JEWEL,		Config.R_ARMOR_JEWEL},
+		{Config.R95_WEAPON_STONE,	Config.R95_ARMOR_STONE,		Config.R95_WEAPON_CRYSTAL,	Config.R95_ARMOR_CRYSTAL,	Config.R95_WEAPON_STONE_SUPER,	Config.R95_ARMOR_STONE_SUPER,	Config.R95_WEAPON_CRYSTAL_SUPER,	Config.R95_ARMOR_CRYSTAL_SUPER,		Config.R95_WEAPON_JEWEL,	Config.R95_ARMOR_JEWEL},
+		{Config.R99_WEAPON_STONE,	Config.R99_ARMOR_STONE,		Config.R99_WEAPON_CRYSTAL,	Config.R99_ARMOR_CRYSTAL,	Config.R99_WEAPON_STONE_SUPER,	Config.R99_ARMOR_STONE_SUPER,	Config.R99_WEAPON_CRYSTAL_SUPER,	Config.R99_ARMOR_CRYSTAL_SUPER,		Config.R99_WEAPON_JEWEL,	Config.R99_ARMOR_JEWEL},
 	};	
 	/* @formatter:on */
 	
@@ -232,62 +232,27 @@ public final class Elementals
 		{
 			case Stone:
 			{
-				if (item.isWeapon())
-				{
-					column = 0;
-				}
-				else // isArmor = true
-				{
-					column = 1;
-				}
+				column = item.isWeapon() ? 0 : 1;
 				break;
 			}
 			case Crystal:
 			{
-				if (item.isWeapon())
-				{
-					column = 2;
-				}
-				else // isArmor = true
-				{
-					column = 3;
-				}
+				column = item.isWeapon() ? 2 : 3;
 				break;
 			}
 			case StoneSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 4;
-				}
-				else // isArmor = true
-				{
-					column = 5;
-				}
+				column = item.isWeapon() ? 4 : 5;
 				break;
 			}
 			case CrystalSuper:
 			{
-				if (item.isWeapon())
-				{
-					column = 6;
-				}
-				else // isArmor = true
-				{
-					column = 7;
-				}
+				column = item.isWeapon() ? 6 : 7;
 				break;
 			}
 			case Jewel:
 			{
-				if (item.isWeapon())
-				{
-					column = 8;
-				}
-				else // isArmor = true
-				{
-					column = 9;
-				}
+				column = item.isWeapon() ? 8 : 9;
 				break;
 			}
 		}