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

Brooch enum support for Sapphire and skill level.

Browse Source 
Thanks to nasseka.
This commit is contained in:
MobiusDevelopment
2021-12-11 01:59:47 +00:00
parent a8be08b4e3
commit f47a1a6264
168 changed files with 1259 additions and 927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/BroochJewel.java
View File

@@ -21,38 +21,45 @@ package org.l2jmobius.gameserver.enums;
*/
public enum BroochJewel
{
RUBY_LV1(38855, 17814, 0.01, true),
RUBY_LV2(38856, 17814, 0.035, true),
RUBY_LV3(38857, 17815, 0.075, true),
RUBY_LV4(38858, 17816, 0.125, true),
RUBY_LV5(38859, 17817, 0.2, true),
GREATER_RUBY_LV1(47688, 18715, 0.2, true),
GREATER_RUBY_LV2(48771, 18715, 0.235, true),
GREATER_RUBY_LV3(48772, 18715, 0.275, true),
GREATER_RUBY_LV4(48773, 18715, 0.325, true),
GREATER_RUBY_LV5(48774, 18715, 0.4, true),
SHAPPHIRE_LV1(38927, 17818, 0.01, false),
SHAPPHIRE_LV2(38928, 17818, 0.035, false),
SHAPPHIRE_LV3(38929, 17819, 0.075, false),
SHAPPHIRE_LV4(38930, 17820, 0.125, false),
SHAPPHIRE_LV5(38931, 17821, 0.2, false),
GREATER_SHAPPHIRE_LV1(47689, 18718, 0.2, false),
GREATER_SHAPPHIRE_LV2(48775, 18718, 0.235, false),
GREATER_SHAPPHIRE_LV3(48776, 18718, 0.275, false),
GREATER_SHAPPHIRE_LV4(48777, 18718, 0.325, false),
GREATER_SHAPPHIRE_LV5(48778, 18718, 0.4, false);
RUBY_LV1(38855, 17814, 1, 0.01, true, false),
RUBY_LV2(38856, 17814, 1, 0.035, true, false),
RUBY_LV3(38857, 17815, 1, 0.075, true, false),
RUBY_LV4(38858, 17816, 1, 0.125, true, false),
RUBY_LV5(38859, 17817, 1, 0.2, true, false),
GREATER_RUBY_LV1(47688, 18715, 1, 0.2, true, false),
GREATER_RUBY_LV2(48771, 18715, 1, 0.235, true, false),
GREATER_RUBY_LV3(48772, 18715, 1, 0.275, true, false),
GREATER_RUBY_LV4(48773, 18715, 1, 0.325, true, false),
GREATER_RUBY_LV5(48774, 18715, 1, 0.4, true, false),
SAPPHIRE_LV1(38927, 17818, 1, 0.01, false, true),
SAPPHIRE_LV2(38928, 17818, 1, 0.035, false, true),
SAPPHIRE_LV3(38929, 17819, 1, 0.075, false, true),
SAPPHIRE_LV4(38930, 17820, 1, 0.125, false, true),
SAPPHIRE_LV5(38931, 17821, 1, 0.2, false, true),
GREATER_SAPPHIRE_LV1(47689, 18718, 1, 0.2, false, true),
GREATER_SAPPHIRE_LV2(48775, 18718, 1, 0.235, false, true),
GREATER_SAPPHIRE_LV3(48776, 18718, 1, 0.275, false, true),
GREATER_SAPPHIRE_LV4(48777, 18718, 1, 0.325, false, true),
GREATER_SAPPHIRE_LV5(48778, 18718, 1, 0.4, false, true);
private int _itemId;
private int _effectId;
private int _skillId;
private int _skillLevel;
private double _bonus;
private boolean _isRuby; // If not, it is sapphire.
private boolean _isRuby;
private boolean _isSapphire;
private BroochJewel(int itemId, int effectId, double bonus, boolean isRuby)
private BroochJewel(int itemId, int skillId, int skillLevel, double bonus, boolean isRuby, boolean isSapphire)
{
_itemId = itemId;
_effectId = effectId;
_skillId = skillId;
_skillLevel = skillLevel;
_bonus = bonus;
_isRuby = isRuby;
_isSapphire = isSapphire;
}
public int getItemId()
@@ -60,9 +67,14 @@ public enum BroochJewel
return _itemId;
}
public int getEffectId()
public int getSkillId()
{
return _effectId;
return _skillId;
}
public int getSkillLevel()
{
return _skillLevel;
}
public double getBonus()
@@ -74,4 +86,9 @@ public enum BroochJewel
{
return _isRuby;
}
public boolean isSapphire()
{
return _isSapphire;
}
}

2
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -8903,7 +8903,7 @@ public class Player extends Playable
for (int i = broochJewels.length - 1; i > 0; i--)
{
final BroochJewel jewel = broochJewels[i];
if (!jewel.isRuby() && _inventory.isItemEquipped(jewel.getItemId()))
if (jewel.isSapphire() && _inventory.isItemEquipped(jewel.getItemId()))
{
setActiveShappireJewel(jewel);
break;