Skip to content

Instantly share code, notes, and snippets.

@Sdwz
Last active December 15, 2015 00:59
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Sdwz/9508644 to your computer and use it in GitHub Desktop.
Save Sdwz/9508644 to your computer and use it in GitHub Desktop.
Item consume
Index: dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java
===================================================================
--- dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java (révision 10247)
+++ dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java (copie de travail)
@@ -104,9 +104,11 @@
}
final boolean isCapsuleItem = item.getItem().getDefaultAction() == L2ActionType.capsule;
- if (isCapsuleItem || ((itemSkill.getItemConsumeId() == 0) && (itemSkill.getItemConsume() > 0) && (item.isPotion() || item.isElixir() || itemSkill.isSimultaneousCast())))
+ final boolean isSkillReduceItem = item.getItem().getDefaultAction() == L2ActionType.skill_reduce;
+
+ if ((isCapsuleItem || isSkillReduceItem))
{
- if (!playable.destroyItem("Consume", item.getObjectId(), isCapsuleItem && (itemSkill.getItemConsume() == 0) ? 1 : itemSkill.getItemConsume(), playable, false))
+ if (!playable.destroyItem("Consume", item.getObjectId(), (isSkillReduceItem || isCapsuleItem) && (itemSkill.getItemConsume() == 0) ? 1 : itemSkill.getItemConsume(), playable, false))
{
playable.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
return false;
@@ -137,16 +139,6 @@
{
return false;
}
-
- // Consume.
- if ((itemSkill.getItemConsumeId() == 0) && (itemSkill.getItemConsume() > 0))
- {
- if (!playable.destroyItem("Consume", item.getObjectId(), itemSkill.getItemConsume(), null, false))
- {
- playable.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
- return false;
- }
- }
}
if (itemSkill.getReuseDelay() > 0)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment