Added Greater Ruby and Sapphire.

This commit is contained in:
MobiusDev 2017-09-19 04:54:01 +00:00
parent 7bd37b9730
commit 850a989b49
4 changed files with 37 additions and 9 deletions

View File

@ -505,6 +505,9 @@
<set name="immediate_effect" val="true" />
<set name="weight" val="5" />
<set name="is_sellable" val="false" />
<skills>
<skill id="18717" level="1" />
</skills>
</item>
<item id="47689" name="Greater Sapphire" type="Armor">
<!-- When equipped, increases Spiritshot and Blessed Spiritshot damage by 20% and M. Atk. By 13%. Effect does not stack with additional jewels of the same type. Equipping various Greater Jewels will grant additional effects. -->
@ -514,6 +517,9 @@
<set name="immediate_effect" val="true" />
<set name="weight" val="5" />
<set name="is_sellable" val="false" />
<skills>
<skill id="18719" level="1" />
</skills>
</item>
<item id="47690" name="Greater Obsidian" type="Armor">
<!-- When equipped, PvP incoming damage decreases by 15% and cancels the attacker's target. Effect does not stack with additional jewels of the same type. Equipping various Greater Jewels will grant additional effects. -->

View File

@ -21,9 +21,15 @@
<operateType>A1</operateType>
</skill>
<skill id="18717" toLevel="1" name="Greater Ruby">
<!-- AUTO GENERATED SKILL TODO: FIX IT -->
<icon>icon.skill0000</icon>
<operateType>A1</operateType>
<operateType>P</operateType>
<magicCriticalRate>5</magicCriticalRate>
<magicLvl>1</magicLvl>
<effects>
<effect name="PAtk">
<amount>9</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="18718" toLevel="2" name="Greater Sapphire">
<!-- AUTO GENERATED SKILL TODO: FIX IT -->
@ -31,9 +37,15 @@
<operateType>A1</operateType>
</skill>
<skill id="18719" toLevel="1" name="Greater Sapphire">
<!-- AUTO GENERATED SKILL TODO: FIX IT -->
<icon>icon.skill0000</icon>
<operateType>A1</operateType>
<operateType>P</operateType>
<magicCriticalRate>5</magicCriticalRate>
<magicLvl>1</magicLvl>
<effects>
<effect name="MAtk">
<amount>13</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="18720" toLevel="1" name="Greater Obsidian - Cancel Target">
<!-- AUTO GENERATED SKILL TODO: FIX IT -->

View File

@ -26,11 +26,13 @@ public enum BroochJewel
RUBY_LV3(38857, 17815, 0.075),
RUBY_LV4(38858, 17816, 0.125),
RUBY_LV5(38859, 17817, 0.2),
GREATER_RUBY(47688, 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);
SHAPPHIRE_LV5(38931, 17821, 0.2),
GREATER_SHAPPHIRE(47689, 17821, 0.2);
private int _itemId;
private int _effectId;

View File

@ -8749,7 +8749,11 @@ public final class L2PcInstance extends L2Playable
public void updateActiveBroochJewel()
{
// Update active Ruby jewel.
if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped()))
if ((getInventory().getItemByItemId(BroochJewel.GREATER_RUBY.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.GREATER_RUBY.getItemId()).isEquipped()))
{
setActiveRubyJewel(BroochJewel.GREATER_RUBY);
}
else if ((getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.RUBY_LV5.getItemId()).isEquipped()))
{
setActiveRubyJewel(BroochJewel.RUBY_LV5);
}
@ -8774,7 +8778,11 @@ public final class L2PcInstance extends L2Playable
setActiveRubyJewel(null);
}
// Update active Sapphire jewel.
if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped()))
if ((getInventory().getItemByItemId(BroochJewel.GREATER_SHAPPHIRE.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.GREATER_SHAPPHIRE.getItemId()).isEquipped()))
{
setActiveShappireJewel(BroochJewel.GREATER_SHAPPHIRE);
}
else if ((getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()) != null) && (getInventory().getItemByItemId(BroochJewel.SHAPPHIRE_LV5.getItemId()).isEquipped()))
{
setActiveShappireJewel(BroochJewel.SHAPPHIRE_LV5);
}