lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addition of level 1 and 2 brooch jewels.

Browse Source
This commit is contained in:
MobiusDev 2017-06-15 19:05:00 +00:00
parent 4a32851386
commit 722bbb52c9
6 changed files with 63 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_Classic/java/com/l2jmobius/gameserver/enums/BroochJewel.java
View File

@ -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);

18
L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -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);

4
L2J_Mobius_Helios/java/com/l2jmobius/gameserver/enums/BroochJewel.java
View File

@ -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);

18
L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -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);

4
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/enums/BroochJewel.java
View File

@ -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);

18
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -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);