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

-Small fix for Rage Aura debuff

Browse Source 
-Update TriggerForce effect to avoid visual bug when Sigel' class use any aura on party, and some bug fixes on this effect.
-Implemented soulshot\spiritshot\blessed spiritshot damage bonus from enchanted weapon
-Implemented soulshot\spiritshot\blessed spiritshot damage bonus from Jewels Ruby\Sapphire
-Implemented Ruby\Sapphire\Topaz\Opal\Obsidian\Diamond\Emerald\Aquamarine\Pearl Jewels and its stats\skills.
-Changed compound jewels rate (in official servers - chances are lower (and from 3-5 lvls - greatly lower)
-Added visual effect to SS\SPS\BSPS if you equip Ruby\Sapphire 3\4\5 lvls (blue\yellow\red glow effects)
-New parameter weaponElementPower - increase weapon attribute power (if fire added in weapon - this parameter increase fire.. also about others)
-Small update skills.xsd to remove some eclipse warnings.

Contributed by NviX.
This commit is contained in:
MobiusDev 2015-07-11 16:22:19 +00:00
parent 5df3726293
commit 2beeb5bfbc
16 changed files with 429 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerForce.java vendored
View File

@ -92,15 +92,18 @@ public final class TriggerForce extends AbstractEffect
for (L2PcInstance member : effector.getParty().getMembers())
{
_affectedMembers.add(member);
if (member.calculateDistance(effector, true, false) < 900)
if ((member.calculateDistance(effector, true, false) < 900) && (_skill.getSkillId() != RAGE_AURA))
{
member.makeTriggerCast(_skill.getSkill(), effector);
_skill.getSkill().applyEffects(effector, member);
}
}
}
else
{
effector.makeTriggerCast(_skill.getSkill(), effector);
if (_skill.getSkillId() != RAGE_AURA)
{
_skill.getSkill().applyEffects(effector, effector);
}
_affectedMembers.add(effector);
}
}
@ -149,6 +152,7 @@ public final class TriggerForce extends AbstractEffect
if (_affectedObjects.contains(_affectedObjToRemove.get(i)))
{
_affectedObjects.remove(i);
i--;
}
}
}
@ -163,15 +167,15 @@ public final class TriggerForce extends AbstractEffect
{
_affectedMembers.add(member);
}
if (!member.getEffectList().isAffectedBySkill(_skill.getSkillId()) && (member.calculateDistance(effector, true, false) < 900))
if (!member.getEffectList().isAffectedBySkill(_skill.getSkillId()) && (member.calculateDistance(effector, true, false) < 900) && (_skill.getSkillId() != RAGE_AURA))
{
if ((member != effector))
{
member.makeTriggerCast(_skill.getSkill(), effector);
_skill.getSkill().applyEffects(effector, member);
}
else if ((_skill.getSkillId() != CHALLENGE_AURA) && (_skill.getSkillId() != IRON_AURA) && (_skill.getSkillId() != RESISTANCE_AURA) && (_skill.getSkillId() != RECOVERY_AURA) && (_skill.getSkillId() != SPIRIT_AURA))
{
member.makeTriggerCast(_skill.getSkill(), effector);
_skill.getSkill().applyEffects(effector, effector);
}
}
else if (member.getEffectList().isAffectedBySkill(_skill.getSkillId()) && (member.calculateDistance(effector, true, false) > 900))
@ -253,6 +257,7 @@ public final class TriggerForce extends AbstractEffect
if (!member.getEffectList().isAffectedBySkill(PARTY_SOLIDARITY) || (skill.getSkill().getLevel() != Math.min((activeForces - 3), 3)))
{
member.makeTriggerCast(SkillData.getInstance().getSkill(PARTY_SOLIDARITY, Math.min((activeForces - 3), 3)), member);
}
}
}

5
trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java vendored
View File

@ -44,6 +44,7 @@ public final class TriggerSkillBySkill extends AbstractEffect
private final int _chance;
private final SkillHolder _skill;
private final L2TargetType _targetType;
private final int AQUAMARINE = 17822;
/**
* @param attachCond
@ -64,12 +65,12 @@ public final class TriggerSkillBySkill extends AbstractEffect
public void onSkillUseEvent(OnCreatureSkillUse event)
{
if ((_chance == 0) || ((_skill.getSkillId() == 0) || (_skill.getSkillLvl() == 0) || (_castSkillId == 0)))
if ((_chance == 0) || ((_skill.getSkillId() == 0) || (_skill.getSkillLvl() == 0) || ((_castSkillId == 0) && (_skill.getSkillId() != AQUAMARINE))))
{
return;
}
if (_castSkillId != event.getSkill().getId())
if ((_castSkillId != event.getSkill().getId()) && (_skill.getSkillId() != AQUAMARINE))
{
return;
}

38
trunk/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java vendored
View File

@ -123,7 +123,23 @@ public class BeastSoulShot implements IItemHandler
if (!pet.isChargedShot(ShotType.SOULSHOTS))
{
pet.setChargedShot(ShotType.SOULSHOTS, true);
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
// Visual effect change if player has equipped Ruby lvl 3 or higher
if ((activeOwner.getInventory().getItemByItemId(38859) != null) && (activeOwner.getInventory().getItemByItemId(38859).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, 17817, 1, 0, 0), 600);
}
else if ((activeOwner.getInventory().getItemByItemId(38858) != null) && (activeOwner.getInventory().getItemByItemId(38858).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, 17816, 1, 0, 0), 600);
}
else if ((activeOwner.getInventory().getItemByItemId(38857) != null) && (activeOwner.getInventory().getItemByItemId(38857).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, 17815, 1, 0, 0), 600);
}
else
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
}
}
}
@ -132,9 +148,25 @@ public class BeastSoulShot implements IItemHandler
if (!s.isChargedShot(ShotType.SOULSHOTS))
{
s.setChargedShot(ShotType.SOULSHOTS, true);
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(s, s, skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
// Visual effect change if player has equipped Ruby lvl 3 or higher
if ((activeOwner.getInventory().getItemByItemId(38859) != null) && (activeOwner.getInventory().getItemByItemId(38859).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(s, s, 17817, 1, 0, 0), 600);
}
else if ((activeOwner.getInventory().getItemByItemId(38858) != null) && (activeOwner.getInventory().getItemByItemId(38858).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(s, s, 17816, 1, 0, 0), 600);
}
else if ((activeOwner.getInventory().getItemByItemId(38857) != null) && (activeOwner.getInventory().getItemByItemId(38857).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(s, s, 17815, 1, 0, 0), 600);
}
else
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(s, s, skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
}
}
});
return true;
}
}
}

38
trunk/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java vendored
View File

@ -125,7 +125,23 @@ public class BeastSpiritShot implements IItemHandler
if (!pet.isChargedShot(shotType))
{
pet.setChargedShot(shotType, true);
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
// Visual effect change if player has equipped Sapphire lvl 3 or higher
if ((activeOwner.getInventory().getItemByItemId(38931) != null) && (activeOwner.getInventory().getItemByItemId(38931).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, 17821, 2, 0, 0), 600);
}
else if ((activeOwner.getInventory().getItemByItemId(38930) != null) && (activeOwner.getInventory().getItemByItemId(38930).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, 17820, 2, 0, 0), 600);
}
else if ((activeOwner.getInventory().getItemByItemId(38929) != null) && (activeOwner.getInventory().getItemByItemId(38929).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, 17819, 2, 0, 0), 600);
}
else
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
}
}
}
@ -134,9 +150,25 @@ public class BeastSpiritShot implements IItemHandler
if (!s.isChargedShot(shotType))
{
s.setChargedShot(shotType, true);
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(s, s, skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
// Visual effect change if player has equipped Sapphire lvl 3 or higher
if ((activeOwner.getInventory().getItemByItemId(38931) != null) && (activeOwner.getInventory().getItemByItemId(38931).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(s, s, 17821, 2, 0, 0), 600);
}
else if ((activeOwner.getInventory().getItemByItemId(38930) != null) && (activeOwner.getInventory().getItemByItemId(38930).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(s, s, 17820, 2, 0, 0), 600);
}
else if ((activeOwner.getInventory().getItemByItemId(38929) != null) && (activeOwner.getInventory().getItemByItemId(38929).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(s, s, 17819, 2, 0, 0), 600);
}
else
{
Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(s, s, skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
}
}
});
return true;
}
}
}

21
trunk/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java vendored
View File

@ -98,8 +98,23 @@ public class BlessedSpiritShot implements IItemHandler
// Send message to client
activeChar.sendPacket(SystemMessageId.YOUR_SPIRITSHOT_HAS_BEEN_ENABLED);
activeChar.setChargedShot(ShotType.BLESSED_SPIRITSHOTS, true);
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
// Visual effect change if player has equipped Sapphire lvl 3 or higher
if ((activeChar.getInventory().getItemByItemId(38931) != null) && (activeChar.getInventory().getItemByItemId(38931).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17821, 2, 0, 0), 600);
}
else if ((activeChar.getInventory().getItemByItemId(38930) != null) && (activeChar.getInventory().getItemByItemId(38930).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17820, 2, 0, 0), 600);
}
else if ((activeChar.getInventory().getItemByItemId(38929) != null) && (activeChar.getInventory().getItemByItemId(38929).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17819, 2, 0, 0), 600);
}
else
{
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
}
return true;
}
}
}

20
trunk/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java vendored
View File

@ -112,7 +112,23 @@ public class SoulShots implements IItemHandler
// Send message to client
activeChar.sendPacket(SystemMessageId.YOUR_SOULSHOTS_ARE_ENABLED);
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
// Visual effect change if player has equipped Ruby lvl 3 or higher
if ((activeChar.getInventory().getItemByItemId(38859) != null) && (activeChar.getInventory().getItemByItemId(38859).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17817, 1, 0, 0), 600);
}
else if ((activeChar.getInventory().getItemByItemId(38858) != null) && (activeChar.getInventory().getItemByItemId(38858).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17816, 1, 0, 0), 600);
}
else if ((activeChar.getInventory().getItemByItemId(38857) != null) && (activeChar.getInventory().getItemByItemId(38857).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17815, 1, 0, 0), 600);
}
else
{
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
}
return true;
}
}
}

20
trunk/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java vendored
View File

@ -99,7 +99,23 @@ public class SpiritShot implements IItemHandler
// Send message to client
activeChar.sendPacket(SystemMessageId.YOUR_SPIRITSHOT_HAS_BEEN_ENABLED);
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
// Visual effect change if player has equipped Sapphire lvl 3 or higher
if ((activeChar.getInventory().getItemByItemId(38931) != null) && (activeChar.getInventory().getItemByItemId(38931).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17821, 1, 0, 0), 600);
}
else if ((activeChar.getInventory().getItemByItemId(38930) != null) && (activeChar.getInventory().getItemByItemId(38930).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17820, 1, 0, 0), 600);
}
else if ((activeChar.getInventory().getItemByItemId(38929) != null) && (activeChar.getInventory().getItemByItemId(38929).isEquipped()))
{
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17819, 1, 0, 0), 600);
}
else
{
Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, skills[0].getSkillId(), skills[0].getSkillLvl(), 0, 0), 600);
}
return true;
}
}
}

181
trunk/dist/game/data/stats/items/38800-38899.xml vendored
View File

@ -607,12 +607,22 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38851" /> <!-- Lv. 2 -->
<set name="compoundChance" val="80" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17701-1" />
</item>
<item id="38851" name="Topaz" additionalName="Lv. 2" type="Armor">
<!-- Disrupts the target's casting when used. When used on a PC, inflicts damage with 3717 power. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_topaz_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38852" /> <!-- Lv. 3 -->
<set name="compoundChance" val="60" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17701-2" />
</item>
<item id="38852" name="Topaz" additionalName="Lv. 3" type="Armor">
<!-- Disrupts the target's casting when used. When used on a PC, inflicts damage with 6903 power. Effect does not stack with additional jewels of the same type. -->
@ -623,6 +633,9 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38853" /> <!-- Lv. 4 -->
<set name="compoundChance" val="40" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17701-3" />
</item>
<item id="38853" name="Topaz" additionalName="Lv. 4" type="Armor">
<!-- Disrupts the target's casting when used. When used on a PC, inflicts damage with 10089 power. Effect does not stack with additional jewels of the same type. -->
@ -633,6 +646,9 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38854" /> <!-- Lv. 2 -->
<set name="compoundChance" val="20" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17701-4" />
</item>
<item id="38854" name="Topaz" additionalName="Lv. 5" type="Armor">
<!-- Disrupts the target's casting when used. When used on a PC, inflicts damage with 13275 power. Effect does not stack with additional jewels of the same type. -->
@ -640,9 +656,8 @@
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="item_skill" val="17701-5" />
</item>
<item id="38855" name="Ruby" additionalName="Lv. 1" type="Armor">
<!-- When equipped, increases Soulshot and Beast Soulshot damage by 1%. Effect does not stack with additional jewels of the same type. -->
@ -653,6 +668,8 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38856" /> <!-- Lv. 2 -->
<set name="compoundChance" val="80" /> <!-- TODO: Find more retail values -->
</item>
<item id="38856" name="Ruby" additionalName="Lv. 2" type="Armor">
<!-- When equipped, increases Soulshot and Beast Soulshot damage by 3.5%. Effect does not stack with additional jewels of the same type. -->
@ -663,6 +680,8 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38857" /> <!-- Lv. 3 -->
<set name="compoundChance" val="60" /> <!-- TODO: Find more retail values -->
</item>
<item id="38857" name="Ruby" additionalName="Lv. 3" type="Armor">
<!-- When equipped, increases Soulshot and Beast Soulshot damage by 7.5%. Effect does not stack with additional jewels of the same type. -->
@ -673,6 +692,8 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38858" /> <!-- Lv. 4 -->
<set name="compoundChance" val="40" /> <!-- TODO: Find more retail values -->
</item>
<item id="38858" name="Ruby" additionalName="Lv. 4" type="Armor">
<!-- When equipped, increases Soulshot and Beast Soulshot damage by 12.5%. Effect does not stack with additional jewels of the same type. -->
@ -683,6 +704,8 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38859" /> <!-- Lv. 5 -->
<set name="compoundChance" val="20" /> <!-- TODO: Find more retail values -->
</item>
<item id="38859" name="Ruby" additionalName="Lv. 5" type="Armor">
<!-- When equipped, increases Soulshot and Beast Soulshot damage by 20%. Effect does not stack with additional jewels of the same type. -->
@ -690,8 +713,6 @@
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
</item>
<item id="38860" name="Emergency Recovery Jewel Lv. 1" additionalName="" type="Armor">
@ -791,7 +812,6 @@
<set name="is_sellable" val="false" />
</item>
<item id="38870" name="Obsidian" additionalName="Lv. 1" type="Armor">
<!-- When equipped, PvP incoming damage decreases by 1%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_obsidian_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -799,9 +819,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38871" />
<set name="compoundChance" val="80" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17704-1" />
</item>
<item id="38871" name="Obsidian" additionalName="Lv. 2" type="Armor">
<!-- When equipped, PvP incoming damage decreases by 3%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_obsidian_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -809,9 +831,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38872" />
<set name="compoundChance" val="60" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17704-2" />
</item>
<item id="38872" name="Obsidian" additionalName="Lv. 3" type="Armor">
<!-- When equipped, PvP incoming damage decreases by 7%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_obsidian_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -819,9 +843,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38873" />
<set name="compoundChance" val="40" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17704-3" />
</item>
<item id="38873" name="Obsidian" additionalName="Lv. 4" type="Armor">
<!-- When equipped, PvP incoming damage decreases by 11%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_obsidian_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -829,19 +855,19 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38874" />
<set name="compoundChance" val="20" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17704-4" />
</item>
<item id="38874" name="Obsidian" additionalName="Lv. 5" type="Armor">
<!-- When equipped, PvP incoming damage decreases by 15%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_obsidian_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="item_skill" val="17704-5" />
</item>
<item id="38875" name="Opal" additionalName="Lv. 1" type="Armor">
<!-- When equipped, the weapon attribute P. Atk. Increases by 10. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_opal_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -849,9 +875,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38876" />
<set name="compoundChance" val="80" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17705-1" />
</item>
<item id="38876" name="Opal" additionalName="Lv. 2" type="Armor">
<!-- When equipped, the weapon attribute P. Atk. Increases by 20. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_opal_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -859,9 +887,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38877" />
<set name="compoundChance" val="60" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17705-2" />
</item>
<item id="38877" name="Opal" additionalName="Lv. 3" type="Armor">
<!-- When equipped, the weapon attribute P. Atk. Increases by 40. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_opal_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -869,9 +899,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38878" />
<set name="compoundChance" val="40" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17705-3" />
</item>
<item id="38878" name="Opal" additionalName="Lv. 4" type="Armor">
<!-- When equipped, the weapon attribute P. Atk. Increases by 70. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_opal_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -879,19 +911,19 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38879" />
<set name="compoundChance" val="20" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17705-4" />
</item>
<item id="38879" name="Opal" additionalName="Lv. 5" type="Armor">
<!-- When equipped, the weapon attribute P. Atk. Increases by 120. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_opal_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="item_skill" val="17705-5" />
</item>
<item id="38880" name="Emerald" additionalName="Lv. 1" type="Armor">
<!-- When equipped, CON + 1 and MEN + 1. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_emerald_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -899,11 +931,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38881" /> <!-- Lv. 2 -->
<set name="compoundChance" val="100" />
<set name="compoundItem" val="38881" />
<set name="compoundChance" val="80" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17825-1" />
</item>
<item id="38881" name="Emerald" additionalName="Lv. 2" type="Armor">
<!-- When equipped, STR + 1, CON + 1, INT + 1, and MEN + 1. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_emerald_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -911,11 +943,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38882" /> <!-- Lv. 3 -->
<set name="compoundChance" val="80" /> <!-- TODO: Find more retail values -->
<set name="compoundItem" val="38882" />
<set name="compoundChance" val="60" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17825-2" />
</item>
<item id="38882" name="Emerald" additionalName="Lv. 3" type="Armor">
<!-- When equipped, STR + 1, DEX + 1, CON + 1, INT + 1, WIT + 1, and MEN + 1. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_emerald_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -923,11 +955,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38883" /> <!-- Lv. 4 -->
<set name="compoundChance" val="70" /> <!-- TODO: Find more retail values -->
<set name="compoundItem" val="38883" />
<set name="compoundChance" val="40" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17825-3" />
</item>
<item id="38883" name="Emerald" additionalName="Lv. 4" type="Armor">
<!-- When equipped, STR + 2, DEX + 2, CON + 2, INT + 2, WIT + 2, and MEN + 2. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_emerald_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -935,21 +967,19 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38884" /> <!-- Lv. 5 -->
<set name="compoundChance" val="50" /> <!-- TODO: Find more retail values -->
<set name="compoundItem" val="38884" />
<set name="compoundChance" val="20" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17825-4" />
</item>
<item id="38884" name="Emerald" additionalName="Lv. 5" type="Armor">
<!-- When equipped, STR + 3, DEX + 3, CON + 3, INT + 3, WIT + 3, and MEN + 3. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_emerald_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="item_skill" val="17825-5" />
</item>
<item id="38885" name="Aquamarine" additionalName="Lv. 1" type="Armor">
<!-- When using the skill after equipping, there is a chance of MP Recovery. Activation rate 1%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_aquamarine_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -957,11 +987,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38886" /> <!-- Lv. 2 -->
<set name="compoundChance" val="100" /> <!-- TODO: Find more retail values -->
<set name="compoundItem" val="38886" />
<set name="compoundChance" val="80" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17823-1" />
</item>
<item id="38886" name="Aquamarine" additionalName="Lv. 2" type="Armor">
<!-- When using the skill after equipping, there is a chance of MP Recovery. Activation rate 2%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_aquamarine_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -969,11 +999,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38887" /> <!-- Lv. 3 -->
<set name="compoundChance" val="80" /> <!-- TODO: Find more retail values -->
<set name="compoundItem" val="38887" />
<set name="compoundChance" val="60" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17823-2" />
</item>
<item id="38887" name="Aquamarine" additionalName="Lv. 3" type="Armor">
<!-- When using the skill after equipping, there is a chance of MP Recovery. Activation rate 4%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_aquamarine_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -981,11 +1011,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38888" /> <!-- Lv. 4 -->
<set name="compoundChance" val="70" /> <!-- TODO: Find more retail values -->
<set name="compoundItem" val="38888" />
<set name="compoundChance" val="40" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17823-3" />
</item>
<item id="38888" name="Aquamarine" additionalName="Lv. 4" type="Armor">
<!-- When using the skill after equipping, there is a chance of MP Recovery. Activation rate 9%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_aquamarine_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -993,21 +1023,19 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38889" /> <!-- Lv. 5 -->
<set name="compoundChance" val="50" /> <!-- TODO: Find more retail values -->
<set name="compoundItem" val="38889" />
<set name="compoundChance" val="20" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17823-4" />
</item>
<item id="38889" name="Aquamarine" additionalName="Lv. 5" type="Armor">
<!-- When using the skill after equipping, there is a chance of MP Recovery. Activation rate 15%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_aquamarine_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="item_skill" val="17823-5" />
</item>
<item id="38890" name="Diamond" additionalName="Lv. 1" type="Armor">
<!-- When equipped, P. Def. Increases by 283 and incoming P. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_diamond_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -1015,11 +1043,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38891" /> <!-- Lv. 2 -->
<set name="compoundChance" val="100" /> <!-- TODO: Find more retail values -->
<set name="compoundItem" val="38891" />
<set name="compoundChance" val="80" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17708-1" />
</item>
<item id="38891" name="Diamond" additionalName="Lv. 2" type="Armor">
<!-- When equipped, P. Def. Increases by 567 and incoming P. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_diamond_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -1027,11 +1055,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38892" /> <!-- Lv. 3 -->
<set name="compoundChance" val="80" /> <!-- TODO: Find more retail values -->
<set name="compoundItem" val="38892" />
<set name="compoundChance" val="60" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17708-2" />
</item>
<item id="38892" name="Diamond" additionalName="Lv. 3" type="Armor">
<!-- When equipped, P. Def. Increases by 945 and incoming P. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_diamond_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -1039,11 +1067,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38893" /> <!-- Lv. 4 -->
<set name="compoundChance" val="70" /> <!-- TODO: Find more retail values -->
<set name="compoundItem" val="38893" />
<set name="compoundChance" val="40" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17708-3" />
</item>
<item id="38893" name="Diamond" additionalName="Lv. 4" type="Armor">
<!-- When equipped, P. Def. Increases by 1418 and incoming P. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_diamond_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -1051,21 +1079,19 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38894" /> <!-- Lv. 5 -->
<set name="compoundChance" val="50" /> <!-- TODO: Find more retail values -->
<set name="compoundItem" val="38894" />
<set name="compoundChance" val="20" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17708-4" />
</item>
<item id="38894" name="Diamond" additionalName="Lv. 5" type="Armor">
<!-- When equipped, P. Def. Increases by 1986 and incoming P. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_diamond_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="item_skill" val="17708-5" />
</item>
<item id="38895" name="Pearl" additionalName="Lv. 1" type="Armor">
<!-- When equipped, M. Def. Increases by 163 and incoming M. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_pearl_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -1073,11 +1099,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38896" /> <!-- Lv. 2 -->
<set name="compoundChance" val="100" /> <!-- TODO: Find more retail values -->
<set name="compoundItem" val="38896" />
<set name="compoundChance" val="80" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17709-1" />
</item>
<item id="38896" name="Pearl" additionalName="Lv. 2" type="Armor">
<!-- When equipped, M. Def. Increases by 328 and incoming M. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_pearl_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -1085,11 +1111,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38897" /> <!-- Lv. 3 -->
<set name="compoundChance" val="80" /> <!-- TODO: Find more retail values -->
<set name="compoundItem" val="38897" />
<set name="compoundChance" val="60" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17709-2" />
</item>
<item id="38897" name="Pearl" additionalName="Lv. 3" type="Armor">
<!-- When equipped, M. Def. Increases by 548 and incoming M. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_pearl_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -1097,11 +1123,11 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38898" /> <!-- Lv. 4 -->
<set name="compoundChance" val="70" /> <!-- TODO: Find more retail values -->
<set name="compoundItem" val="38898" />
<set name="compoundChance" val="40" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17709-3" />
</item>
<item id="38898" name="Pearl" additionalName="Lv. 4" type="Armor">
<!-- When equipped, M. Def. Increases by 821 and incoming M. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_pearl_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -1109,17 +1135,16 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38899" /> <!-- Lv. 5 -->
<set name="compoundChance" val="50" /> <!-- TODO: Find more retail values -->
<set name="compoundItem" val="38899" />
<set name="compoundChance" val="20" /> <!-- TODO: Find more retail values -->
<set name="item_skill" val="17709-4" />
</item>
<item id="38899" name="Pearl" additionalName="Lv. 5" type="Armor">
<!-- When equipped, M. Def. Increases by 1150 and incoming M. Critical Damage decreases. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_pearl_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="item_skill" val="17709-5" />
</item>
</list>

41
trunk/dist/game/data/stats/items/38900-38999.xml vendored
View File

@ -144,7 +144,6 @@
<set name="is_stackable" val="true" />
</item>
<item id="38927" name="Sapphire" additionalName="Lv. 1" type="Armor">
<!-- When equipped, increases Spiritshot and Blessed Spiritshot damage by 1%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -152,23 +151,10 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38928" /> <!-- Lv. 2 -->
<set name="compoundChance" val="100" /> <!-- TODO: Find more retail values -->
</item>
<item id="38928" name="Sapphire" additionalName="Lv. 2" type="Armor">
<!-- When equipped, increases Spiritshot and Blessed Spiritshot damage by 3.5%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38929" /> <!-- Lv. 3 -->
<set name="compoundItem" val="38928" />
<set name="compoundChance" val="80" /> <!-- TODO: Find more retail values -->
</item>
<item id="38929" name="Sapphire" additionalName="Lv. 3" type="Armor">
<!-- When equipped, increases Spiritshot and Blessed Spiritshot damage by 7.5%. Effect does not stack with additional jewels of the same type. -->
<item id="38928" name="Sapphire" additionalName="Lv. 2" type="Armor">
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -176,11 +162,21 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38930" /> <!-- Lv. 4 -->
<set name="compoundChance" val="70" /> <!-- TODO: Find more retail values -->
<set name="compoundItem" val="38929" />
<set name="compoundChance" val="60" /> <!-- TODO: Find more retail values -->
</item>
<item id="38929" name="Sapphire" additionalName="Lv. 3" type="Armor">
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38930" />
<set name="compoundChance" val="40" /> <!-- TODO: Find more retail values -->
</item>
<item id="38930" name="Sapphire" additionalName="Lv. 4" type="Armor">
<!-- When equipped, increases Spiritshot and Blessed Spiritshot damage by 12.5%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
@ -188,17 +184,14 @@
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
<set name="compoundItem" val="38931" /> <!-- Lv. 5 -->
<set name="compoundChance" val="50" /> <!-- TODO: Find more retail values -->
<set name="compoundItem" val="38931" />
<set name="compoundChance" val="20" /> <!-- TODO: Find more retail values -->
</item>
<item id="38931" name="Sapphire" additionalName="Lv. 5" type="Armor">
<!-- When equipped, increases Spiritshot and Blessed Spiritshot damage by 20%. Effect does not stack with additional jewels of the same type. -->
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="default_action" val="EQUIP" />
<set name="bodypart" val="brooch_jewel" />
<set name="weight" val="5" />
<set name="is_dropable" val="false" />
<set name="is_tradable" val="false" />
<set name="is_sellable" val="false" />
</item>
<item id="38932" name="La Vie En Rose's Ruby Chest" additionalName="" type="EtcItem">

2
trunk/dist/game/data/stats/skills/10000-10099.xml vendored
View File

@ -1270,7 +1270,7 @@
<set name="targetType" val="AURA" />
<set name="isDebuff" val="true" />
<set name="isMagic" val="3" />
<set name="operateType" val="TOGGLE" />
<set name="operateType" val="ACTIVE_CONTINUOUS" />
<set name="isTriggeredSkill" val="true" />
<for>
<effect name="Debuff">

55
trunk/dist/game/data/stats/skills/17700-17799.xml vendored
View File

@ -1,15 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
<skill id="17701" levels="5" name="Topaz: Spiritshot">
<!-- AUTO GENERATED SKILL -->
<!-- Interrupts target's skill casting. In PvP, ignores CP and inflicts a fixed damage of 1062. -->
<table name="#power"> 1062 3717 6903 10089 13275 </table>
<set name="icon" val="icon.etc_bm_jewel_topaz_i00" />
<set name="operateType" val="ACTIVE_INSTANT" />
<set name="targetType" val="SELF" />
<set name="targetType" val="ONE" />
<set name="dmgDirectlyToHp" val="true" />
<set name="castRange" val="600" />
<set name="effectRange" val="1100" />
<set name="isMagic" val="2" />
<set name="magicLvl" val="106" />
<set name="hitTime" val="1000" />
<set name="coolTime" val="500" />
<set name="reuseDelay" val="30000" />
<for>
<effect name="SkillTurning">
<param chance="100" />
</effect>
<effect name="StaticDamage">
<param power="#power" />
</effect>
</for>
</skill>
<skill id="17702" levels="5" name="Jewel: Quick Recovery">
<!-- AUTO GENERATED SKILL -->
@ -27,18 +38,28 @@
<set name="targetType" val="SELF" />
</skill>
<skill id="17704" levels="5" name="Obsidian">
<!-- AUTO GENERATED SKILL -->
<!-- Received Damage in PvP - 1%. -->
<table name="#rate"> 1.01 1.03 1.07 1.11 1.15 </table>
<set name="icon" val="icon.etc_bm_jewel_obsidian_i00" />
<set name="operateType" val="PASSIVE" />
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
<mul stat="pvpMagicalDef" val="#rate" />
<mul stat="pvpPhysSkillsDef" val="#rate" />
<mul stat="pvpPhysDef" val="#rate" />
</effect>
</for>
</skill>
<skill id="17705" levels="5" name="Opal">
<!-- AUTO GENERATED SKILL -->
<!-- Attack Attribute + 10. -->
<table name="#rate"> 10 20 40 70 120 </table>
<set name="icon" val="icon.etc_bm_jewel_opal_i00" />
<set name="operateType" val="PASSIVE" />
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
<add stat="weaponElementPower" val="#rate" />
</effect>
</for>
</skill>
<skill id="17706" levels="5" name="Jewel: Atk. Spd. Increase">
<!-- AUTO GENERATED SKILL -->
@ -55,18 +76,30 @@
<set name="targetType" val="SELF" />
</skill>
<skill id="17708" levels="5" name="Diamond">
<!-- AUTO GENERATED SKILL -->
<!-- P. Def. + 283, and Received P. Critical Damage - 1%. -->
<table name="#pDef"> 283 567 945 1418 1986 </table>
<table name="#defCritDmg"> 0.99 0.98 0.07 0.96 0.95 </table>
<set name="icon" val="icon.etc_bm_jewel_diamond_i00" />
<set name="operateType" val="PASSIVE" />
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
<add stat="pDef" val="#pDef" />
<mul stat="defCritDamage" val="#defCritDmg" />
</effect>
</for>
</skill>
<skill id="17709" levels="5" name="Pearl">
<!-- AUTO GENERATED SKILL -->
<!-- M. Def. + 163, and Received P. Critical Damage - 1%. -->
<table name="#mDef"> 163 328 548 821 1150 </table>
<table name="#defCritDmg"> 0.99 0.98 0.97 0.96 0.95 </table>
<set name="icon" val="icon.etc_bm_jewel_pearl_i00" />
<set name="operateType" val="PASSIVE" />
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
<add stat="mDef" val="#mDef" />
<mul stat="defCritDamage" val="#defCritDmg" />
</effect>
</for>
</skill>
<skill id="17710" levels="1" name="10th Anniversary Blessing Effect (Free)">
<!-- AUTO GENERATED SKILL -->

55
trunk/dist/game/data/stats/skills/17800-17899.xml vendored
View File

@ -99,73 +99,75 @@
<set name="targetType" val="SELF" />
</skill>
<skill id="17814" levels="2" name="Ruby">
<!-- AUTO GENERATED SKILL -->
<!-- Soulshot damage + 1%. -->
<!-- DONE IN CORE -->
<set name="icon" val="icon.etc_bm_jewel_ruby_i00" />
<set name="operateType" val="ACTIVE_INSTANT" />
<set name="targetType" val="SELF" />
</skill>
<skill id="17815" levels="1" name="Ruby">
<!-- AUTO GENERATED SKILL -->
<!-- Soulshot damage + 7.5%. -->
<!-- DONE IN CORE -->
<set name="icon" val="icon.etc_bm_jewel_ruby_i00" />
<set name="operateType" val="ACTIVE_INSTANT" />
<set name="targetType" val="SELF" />
</skill>
<skill id="17816" levels="1" name="Ruby">
<!-- AUTO GENERATED SKILL -->
<!-- Soulshot damage + 12.5%. -->
<!-- DONE IN CORE -->
<set name="icon" val="icon.etc_bm_jewel_ruby_i00" />
<set name="operateType" val="ACTIVE_INSTANT" />
<set name="targetType" val="SELF" />
</skill>
<skill id="17817" levels="1" name="Ruby">
<!-- AUTO GENERATED SKILL -->
<!-- Soulshot damage + 20%. -->
<!-- DONE IN CORE -->
<set name="icon" val="icon.etc_bm_jewel_ruby_i00" />
<set name="operateType" val="ACTIVE_INSTANT" />
<set name="targetType" val="SELF" />
</skill>
<skill id="17818" levels="4" name="Sapphire">
<!-- AUTO GENERATED SKILL -->
<!-- Spiritshot damage + 1%. -->
<!-- DONE IN CORE -->
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="operateType" val="ACTIVE_INSTANT" />
<set name="targetType" val="SELF" />
</skill>
<skill id="17819" levels="2" name="Sapphire">
<!-- AUTO GENERATED SKILL -->
<!-- Spiritshot damage + 7.5%. -->
<!-- DONE IN CORE -->
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="operateType" val="ACTIVE_INSTANT" />
<set name="targetType" val="SELF" />
</skill>
<skill id="17820" levels="2" name="Sapphire">
<!-- AUTO GENERATED SKILL -->
<!-- Spiritshot damage + 12.5%. -->
<!-- DONE IN CORE -->
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="operateType" val="ACTIVE_INSTANT" />
<set name="targetType" val="SELF" />
</skill>
<skill id="17821" levels="2" name="Sapphire">
<!-- AUTO GENERATED SKILL -->
<!-- Spiritshot damage + 20%. -->
<!-- DONE IN CORE -->
<set name="icon" val="icon.etc_bm_jewel_sapphire_i00" />
<set name="operateType" val="ACTIVE_INSTANT" />
<set name="targetType" val="SELF" />
</skill>
<skill id="17822" levels="1" name="Aquamarine">
<!-- AUTO GENERATED SKILL -->
<set name="icon" val="icon.skill0000" />
<set name="operateType" val="ACTIVE_INSTANT" />
<set name="targetType" val="SELF" />
<for>
<effect name="ManaHeal">
<param power="136" />
</effect>
</for>
</skill>
<skill id="17823" levels="5" name="Aquamarine">
<!-- AUTO GENERATED SKILL -->
<!-- 1% chance of recovering 136 MP. -->
<table name="#rate"> 1 2 4 9 15 </table>
<set name="icon" val="icon.etc_bm_jewel_aquamarine_i00" />
<set name="operateType" val="PASSIVE" />
<set name="targetType" val="SELF" />
<for>
<effect name="TriggerSkillBySkill">
<param chance="#rate" />
<param skillId="17822" skillLevel="1" />
<param targetType="SELF" />
</effect>
</for>
</skill>
<skill id="17824" levels="1" name="La Vie En Rose's Jewelry Box">
<!-- AUTO GENERATED SKILL -->
@ -174,11 +176,22 @@
<set name="targetType" val="SELF" />
</skill>
<skill id="17825" levels="5" name="Emerald">
<!-- AUTO GENERATED SKILL -->
<!-- CON + 1, MEN + 1 -->
<table name="#rate1"> 1 1 1 2 3 </table>
<table name="#rate2"> 0 1 1 2 3 </table>
<table name="#rate3"> 0 0 1 2 3 </table>
<set name="icon" val="icon.etc_bm_jewel_emerald_i00" />
<set name="operateType" val="PASSIVE" />
<set name="targetType" val="SELF" />
<for>
<effect name="Buff">
<add stat="STR" val="#rate2" />
<add stat="DEX" val="#rate3" />
<add stat="CON" val="#rate1" />
<add stat="INT" val="#rate2" />
<add stat="WIT" val="#rate3" />
<add stat="MEN" val="#rate1" />
</effect>
</for>
</skill>
<skill id="17826" levels="1" name="10th Anniversary Time Capsule Box">
<!-- AUTO GENERATED SKILL -->

2
trunk/dist/game/data/xsd/skills.xsd vendored
View File

@ -389,6 +389,8 @@
<xs:enumeration value="magicSuccRes" />
<xs:enumeration value="reflectDamageRes" />
<xs:enumeration value="receivedDamageModifier" />
<xs:enumeration value="maxSkillDamage" />
<xs:enumeration value="weaponElementPower" />
</xs:restriction>
</xs:simpleType>
<xs:complexType name="addType" mixed="true">

13
trunk/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java
View File

@ -730,20 +730,21 @@ public class CharStat
public int getAttackElementValue(byte attackAttribute)
{
double additionalPower = _activeChar.getStat().calcStat(Stats.WEAPON_ELEMENT_POWER, 0, null, null);
switch (attackAttribute)
{
case Elementals.FIRE:
return (int) calcStat(Stats.FIRE_POWER, _activeChar.getTemplate().getBaseFire());
return (int) (calcStat(Stats.FIRE_POWER, _activeChar.getTemplate().getBaseFire()) + additionalPower);
case Elementals.WATER:
return (int) calcStat(Stats.WATER_POWER, _activeChar.getTemplate().getBaseWater());
return (int) (calcStat(Stats.WATER_POWER, _activeChar.getTemplate().getBaseWater()) + additionalPower);
case Elementals.WIND:
return (int) calcStat(Stats.WIND_POWER, _activeChar.getTemplate().getBaseWind());
return (int) (calcStat(Stats.WIND_POWER, _activeChar.getTemplate().getBaseWind()) + additionalPower);
case Elementals.EARTH:
return (int) calcStat(Stats.EARTH_POWER, _activeChar.getTemplate().getBaseEarth());
return (int) (calcStat(Stats.EARTH_POWER, _activeChar.getTemplate().getBaseEarth()) + additionalPower);
case Elementals.HOLY:
return (int) calcStat(Stats.HOLY_POWER, _activeChar.getTemplate().getBaseHoly());
return (int) (calcStat(Stats.HOLY_POWER, _activeChar.getTemplate().getBaseHoly()) + additionalPower);
case Elementals.DARK:
return (int) calcStat(Stats.DARK_POWER, _activeChar.getTemplate().getBaseDark());
return (int) (calcStat(Stats.DARK_POWER, _activeChar.getTemplate().getBaseDark()) + additionalPower);
default:
return 0;
}

89
trunk/java/com/l2jserver/gameserver/model/stats/Formulas.java
View File

@ -713,7 +713,33 @@ public final class Formulas
}
// Add soulshot boost.
int ssBoost = ss ? 2 : 1;
double ssBoost;
if (attacker.isPlayer())
{
double rubyBonus = 0;
if ((attacker.getInventory().getItemByItemId(38859) != null) && (attacker.getInventory().getItemByItemId(38859).isEquipped()))
{
rubyBonus = 0.2;
}
else if ((attacker.getInventory().getItemByItemId(38858) != null) && (attacker.getInventory().getItemByItemId(38858).isEquipped()))
{
rubyBonus = 0.125;
}
else if ((attacker.getInventory().getItemByItemId(38857) != null) && (attacker.getInventory().getItemByItemId(38857).isEquipped()))
{
rubyBonus = 0.075;
}
double ssEnchBonus = attacker.getActiveWeaponInstance().getEnchantLevel() * 0.007;
if (ssEnchBonus > 0.21)
{
ssEnchBonus = 0.21;
}
ssBoost = ss ? (2 + rubyBonus + ssEnchBonus) : 1;
}
else
{
ssBoost = ss ? 2 : 1;
}
damage = (skill != null) ? ((damage * ssBoost) + skill.getPower(attacker, target, isPvP, isPvE)) : (damage * ssBoost);
if (crit)
@ -853,7 +879,7 @@ public final class Formulas
}
}
int mAtk = attacker.getMAtk(target, skill);
double mAtk = attacker.getMAtk(target, skill);
final boolean isPvP = attacker.isPlayable() && target.isPlayable();
final boolean isPvE = attacker.isPlayable() && target.isAttackable();
@ -870,8 +896,33 @@ public final class Formulas
}
}
// Bonus Spirit shot
mAtk *= bss ? 4 : sps ? 2 : 1;
// Add spiritshot\blessed spiritshot boost.
if (attacker.isPlayer())
{
double sapphireBonus = 0;
if ((attacker.getInventory().getItemByItemId(38931) != null) && (attacker.getInventory().getItemByItemId(38931).isEquipped()))
{
sapphireBonus = 0.2;
}
else if ((attacker.getInventory().getItemByItemId(38930) != null) && (attacker.getInventory().getItemByItemId(38930).isEquipped()))
{
sapphireBonus = 0.125;
}
else if ((attacker.getInventory().getItemByItemId(38929) != null) && (attacker.getInventory().getItemByItemId(38929).isEquipped()))
{
sapphireBonus = 0.075;
}
double ssEnchBonus = attacker.getActiveWeaponInstance().getEnchantLevel() * 0.007;
if (ssEnchBonus > 0.21)
{
ssEnchBonus = 0.21;
}
mAtk *= bss ? (4 + sapphireBonus + ssEnchBonus) : sps ? (2 + sapphireBonus + ssEnchBonus) : 1;
}
else
{
mAtk *= bss ? 4 : sps ? 2 : 1;
}
// MDAM Formula.
double damage = ((91 * Math.sqrt(mAtk)) / mDef) * skill.getPower(attacker, target, isPvP, isPvE);
@ -1499,9 +1550,33 @@ public final class Formulas
return 1;
}
// Bonus Spiritshot
mAtk *= bss ? 4 : sps ? 2 : 1;
// Add spiritshot\blessed spiritshot boost.
if (attacker.isPlayer())
{
double sapphireBonus = 0;
if ((attacker.getInventory().getItemByItemId(38931) != null) && (attacker.getInventory().getItemByItemId(38931).isEquipped()))
{
sapphireBonus = 0.2;
}
else if ((attacker.getInventory().getItemByItemId(38930) != null) && (attacker.getInventory().getItemByItemId(38930).isEquipped()))
{
sapphireBonus = 0.125;
}
else if ((attacker.getInventory().getItemByItemId(38929) != null) && (attacker.getInventory().getItemByItemId(38929).isEquipped()))
{
sapphireBonus = 0.075;
}
double ssEnchBonus = attacker.getActiveWeaponInstance().getEnchantLevel() * 0.007;
if (ssEnchBonus > 0.21)
{
ssEnchBonus = 0.21;
}
mAtk *= bss ? (4 + sapphireBonus + ssEnchBonus) : sps ? (2 + sapphireBonus + ssEnchBonus) : 1;
}
else
{
mAtk *= bss ? 4 : sps ? 2 : 1;
}
double damage = (Math.sqrt(mAtk) * skill.getPower(attacker, target, isPvP, isPvE) * (mp / 97)) / mDef;
damage *= calcGeneralTraitBonus(attacker, target, skill.getTraitType(), false);

1
trunk/java/com/l2jserver/gameserver/model/stats/Stats.java
View File

@ -142,6 +142,7 @@ public enum Stats
EARTH_POWER("earthPower"),
HOLY_POWER("holyPower"),
DARK_POWER("darkPower"),
WEAPON_ELEMENT_POWER("weaponElementPower"),
// PROFICIENCY
CANCEL_PROF("cancelProf"),