From 722bbb52c93dff2f5d7dbe3ad34db2b2cf8719d7 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 15 Jun 2017 19:05:00 +0000
Subject: [PATCH] Addition of level 1 and 2 brooch jewels.

---
 .../gameserver/enums/BroochJewel.java          |  4 ++++
 .../model/actor/instance/L2PcInstance.java     | 18 +++++++++++++++++-
 .../gameserver/enums/BroochJewel.java          |  4 ++++
 .../model/actor/instance/L2PcInstance.java     | 18 +++++++++++++++++-
 .../gameserver/enums/BroochJewel.java          |  4 ++++
 .../model/actor/instance/L2PcInstance.java     | 18 +++++++++++++++++-
 6 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/enums/BroochJewel.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/enums/BroochJewel.java
index d0b3dbb303..d782dd8f5c 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/enums/BroochJewel.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/enums/BroochJewel.java
@@ -21,9 +21,13 @@ package com.l2jmobius.gameserver.enums;
  */
 public enum BroochJewel
 {
+	RUBY_LV1(38855, 17814, 0.01),
+	RUBY_LV2(38856, 17814, 0.035),
 	RUBY_LV3(38857, 17815, 0.075),
 	RUBY_LV4(38858, 17816, 0.125),
 	RUBY_LV5(38859, 17817, 0.2),
+	SHAPPHIRE_LV1(38927, 17818, 0.01),
+	SHAPPHIRE_LV2(38928, 17818, 0.035),
 	SHAPPHIRE_LV3(38929, 17819, 0.075),
 	SHAPPHIRE_LV4(38930, 17820, 0.125),
 	SHAPPHIRE_LV5(38931, 17821, 0.2);
diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index d5b10c9078..88dff10363 100644
--- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -8697,10 +8697,18 @@ public final class L2PcInstance extends L2Playable
 		{
 			setActiveRubyJewel(BroochJewel.RUBY_LV4);
 		}
-		else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped()))
+		else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()).isEquipped()))
 		{
 			setActiveRubyJewel(BroochJewel.RUBY_LV3);
 		}
+		else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()).isEquipped()))
+		{
+			setActiveRubyJewel(BroochJewel.RUBY_LV2);
+		}
+		else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()).isEquipped()))
+		{
+			setActiveRubyJewel(BroochJewel.RUBY_LV1);
+		}
 		else
 		{
 			setActiveRubyJewel(null);
@@ -8718,6 +8726,14 @@ public final class L2PcInstance extends L2Playable
 		{
 			setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV3);
 		}
+		else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()).isEquipped()))
+		{
+			setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV2);
+		}
+		else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()).isEquipped()))
+		{
+			setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV1);
+		}
 		else
 		{
 			setActiveShappireJewel(null);
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/enums/BroochJewel.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/enums/BroochJewel.java
index d0b3dbb303..d782dd8f5c 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/enums/BroochJewel.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/enums/BroochJewel.java
@@ -21,9 +21,13 @@ package com.l2jmobius.gameserver.enums;
  */
 public enum BroochJewel
 {
+	RUBY_LV1(38855, 17814, 0.01),
+	RUBY_LV2(38856, 17814, 0.035),
 	RUBY_LV3(38857, 17815, 0.075),
 	RUBY_LV4(38858, 17816, 0.125),
 	RUBY_LV5(38859, 17817, 0.2),
+	SHAPPHIRE_LV1(38927, 17818, 0.01),
+	SHAPPHIRE_LV2(38928, 17818, 0.035),
 	SHAPPHIRE_LV3(38929, 17819, 0.075),
 	SHAPPHIRE_LV4(38930, 17820, 0.125),
 	SHAPPHIRE_LV5(38931, 17821, 0.2);
diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index d5b10c9078..88dff10363 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -8697,10 +8697,18 @@ public final class L2PcInstance extends L2Playable
 		{
 			setActiveRubyJewel(BroochJewel.RUBY_LV4);
 		}
-		else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped()))
+		else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()).isEquipped()))
 		{
 			setActiveRubyJewel(BroochJewel.RUBY_LV3);
 		}
+		else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()).isEquipped()))
+		{
+			setActiveRubyJewel(BroochJewel.RUBY_LV2);
+		}
+		else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()).isEquipped()))
+		{
+			setActiveRubyJewel(BroochJewel.RUBY_LV1);
+		}
 		else
 		{
 			setActiveRubyJewel(null);
@@ -8718,6 +8726,14 @@ public final class L2PcInstance extends L2Playable
 		{
 			setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV3);
 		}
+		else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()).isEquipped()))
+		{
+			setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV2);
+		}
+		else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()).isEquipped()))
+		{
+			setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV1);
+		}
 		else
 		{
 			setActiveShappireJewel(null);
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/enums/BroochJewel.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/enums/BroochJewel.java
index d0b3dbb303..d782dd8f5c 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/enums/BroochJewel.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/enums/BroochJewel.java
@@ -21,9 +21,13 @@ package com.l2jmobius.gameserver.enums;
  */
 public enum BroochJewel
 {
+	RUBY_LV1(38855, 17814, 0.01),
+	RUBY_LV2(38856, 17814, 0.035),
 	RUBY_LV3(38857, 17815, 0.075),
 	RUBY_LV4(38858, 17816, 0.125),
 	RUBY_LV5(38859, 17817, 0.2),
+	SHAPPHIRE_LV1(38927, 17818, 0.01),
+	SHAPPHIRE_LV2(38928, 17818, 0.035),
 	SHAPPHIRE_LV3(38929, 17819, 0.075),
 	SHAPPHIRE_LV4(38930, 17820, 0.125),
 	SHAPPHIRE_LV5(38931, 17821, 0.2);
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index f931dc6cdd..e6b8acf241 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -8696,10 +8696,18 @@ public final class L2PcInstance extends L2Playable
 		{
 			setActiveRubyJewel(BroochJewel.RUBY_LV4);
 		}
-		else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped()))
+		else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV3.getItemId()).isEquipped()))
 		{
 			setActiveRubyJewel(BroochJewel.RUBY_LV3);
 		}
+		else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV2.getItemId()).isEquipped()))
+		{
+			setActiveRubyJewel(BroochJewel.RUBY_LV2);
+		}
+		else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV1.getItemId()).isEquipped()))
+		{
+			setActiveRubyJewel(BroochJewel.RUBY_LV1);
+		}
 		else
 		{
 			setActiveRubyJewel(null);
@@ -8717,6 +8725,14 @@ public final class L2PcInstance extends L2Playable
 		{
 			setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV3);
 		}
+		else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV2.getItemId()).isEquipped()))
+		{
+			setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV2);
+		}
+		else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV1.getItemId()).isEquipped()))
+		{
+			setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV1);
+		}
 		else
 		{
 			setActiveShappireJewel(null);