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

Fixed consuming skill reagents.

Browse Source
This commit is contained in:
MobiusDev
2018-08-31 22:33:55 +00:00
parent 46a314540b
commit d3023bcc94
7 changed files with 105 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -335,11 +335,22 @@ public class SkillCaster implements Runnable
caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime));
} }
// Consume reagent item.
if ((_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && (caster.getInventory() != null))
{
// Get the L2ItemInstance consumed by the spell.
final L2ItemInstance requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId());
if (requiredItem.getItem().getDefaultAction() == ActionType.NONE) // Non reagent items are removed at finishSkill or item handler.
{
caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false);
}
}
if (caster.isPlayer()) if (caster.isPlayer())
{ {
final L2PcInstance player = caster.getActingPlayer(); final L2PcInstance player = caster.getActingPlayer();
// Consume fame points // Consume fame points.
if (_skill.getFamePointConsume() > 0) if (_skill.getFamePointConsume() > 0)
{ {
if (player.getFame() < _skill.getFamePointConsume()) if (player.getFame() < _skill.getFamePointConsume())
@@ -354,7 +365,7 @@ public class SkillCaster implements Runnable
player.sendPacket(msg); player.sendPacket(msg);
} }
// Consume clan reputation points // Consume clan reputation points.
if (_skill.getClanRepConsume() > 0) if (_skill.getClanRepConsume() > 0)
{ {
final L2Clan clan = player.getClan(); final L2Clan clan = player.getClan();
@@ -997,8 +1008,8 @@ public class SkillCaster implements Runnable
if ((skill.getItemConsumeId() > 0) && (skill.getItemConsumeCount() > 0) && (caster.getInventory() != null)) if ((skill.getItemConsumeId() > 0) && (skill.getItemConsumeCount() > 0) && (caster.getInventory() != null))
{ {
// Get the L2ItemInstance consumed by the spell // Get the L2ItemInstance consumed by the spell
final L2ItemInstance requiredItems = caster.getInventory().getItemByItemId(skill.getItemConsumeId()); final L2ItemInstance requiredItem = caster.getInventory().getItemByItemId(skill.getItemConsumeId());
if ((requiredItems == null) || (requiredItems.getCount() < skill.getItemConsumeCount())) if ((requiredItem == null) || (requiredItem.getCount() < skill.getItemConsumeCount()))
{ {
if (skill.hasEffectType(L2EffectType.SUMMON)) if (skill.hasEffectType(L2EffectType.SUMMON))
{ {

19
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -335,11 +335,22 @@ public class SkillCaster implements Runnable
caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime));
} }
// Consume reagent item.
if ((_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && (caster.getInventory() != null))
{
// Get the L2ItemInstance consumed by the spell.
final L2ItemInstance requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId());
if (requiredItem.getItem().getDefaultAction() == ActionType.NONE) // Non reagent items are removed at finishSkill or item handler.
{
caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false);
}
}
if (caster.isPlayer()) if (caster.isPlayer())
{ {
final L2PcInstance player = caster.getActingPlayer(); final L2PcInstance player = caster.getActingPlayer();
// Consume fame points // Consume fame points.
if (_skill.getFamePointConsume() > 0) if (_skill.getFamePointConsume() > 0)
{ {
if (player.getFame() < _skill.getFamePointConsume()) if (player.getFame() < _skill.getFamePointConsume())
@@ -354,7 +365,7 @@ public class SkillCaster implements Runnable
player.sendPacket(msg); player.sendPacket(msg);
} }
// Consume clan reputation points // Consume clan reputation points.
if (_skill.getClanRepConsume() > 0) if (_skill.getClanRepConsume() > 0)
{ {
final L2Clan clan = player.getClan(); final L2Clan clan = player.getClan();
@@ -997,8 +1008,8 @@ public class SkillCaster implements Runnable
if ((skill.getItemConsumeId() > 0) && (skill.getItemConsumeCount() > 0) && (caster.getInventory() != null)) if ((skill.getItemConsumeId() > 0) && (skill.getItemConsumeCount() > 0) && (caster.getInventory() != null))
{ {
// Get the L2ItemInstance consumed by the spell // Get the L2ItemInstance consumed by the spell
final L2ItemInstance requiredItems = caster.getInventory().getItemByItemId(skill.getItemConsumeId()); final L2ItemInstance requiredItem = caster.getInventory().getItemByItemId(skill.getItemConsumeId());
if ((requiredItems == null) || (requiredItems.getCount() < skill.getItemConsumeCount())) if ((requiredItem == null) || (requiredItem.getCount() < skill.getItemConsumeCount()))
{ {
if (skill.hasEffectType(L2EffectType.SUMMON)) if (skill.hasEffectType(L2EffectType.SUMMON))
{ {

19
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -335,11 +335,22 @@ public class SkillCaster implements Runnable
caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime));
} }
// Consume reagent item.
if ((_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && (caster.getInventory() != null))
{
// Get the L2ItemInstance consumed by the spell.
final L2ItemInstance requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId());
if (requiredItem.getItem().getDefaultAction() == ActionType.NONE) // Non reagent items are removed at finishSkill or item handler.
{
caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false);
}
}
if (caster.isPlayer()) if (caster.isPlayer())
{ {
final L2PcInstance player = caster.getActingPlayer(); final L2PcInstance player = caster.getActingPlayer();
// Consume fame points // Consume fame points.
if (_skill.getFamePointConsume() > 0) if (_skill.getFamePointConsume() > 0)
{ {
if (player.getFame() < _skill.getFamePointConsume()) if (player.getFame() < _skill.getFamePointConsume())
@@ -354,7 +365,7 @@ public class SkillCaster implements Runnable
player.sendPacket(msg); player.sendPacket(msg);
} }
// Consume clan reputation points // Consume clan reputation points.
if (_skill.getClanRepConsume() > 0) if (_skill.getClanRepConsume() > 0)
{ {
final L2Clan clan = player.getClan(); final L2Clan clan = player.getClan();
@@ -997,8 +1008,8 @@ public class SkillCaster implements Runnable
if ((skill.getItemConsumeId() > 0) && (skill.getItemConsumeCount() > 0) && (caster.getInventory() != null)) if ((skill.getItemConsumeId() > 0) && (skill.getItemConsumeCount() > 0) && (caster.getInventory() != null))
{ {
// Get the L2ItemInstance consumed by the spell // Get the L2ItemInstance consumed by the spell
final L2ItemInstance requiredItems = caster.getInventory().getItemByItemId(skill.getItemConsumeId()); final L2ItemInstance requiredItem = caster.getInventory().getItemByItemId(skill.getItemConsumeId());
if ((requiredItems == null) || (requiredItems.getCount() < skill.getItemConsumeCount())) if ((requiredItem == null) || (requiredItem.getCount() < skill.getItemConsumeCount()))
{ {
if (skill.hasEffectType(L2EffectType.SUMMON)) if (skill.hasEffectType(L2EffectType.SUMMON))
{ {

19
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -335,11 +335,22 @@ public class SkillCaster implements Runnable
caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime));
} }
// Consume reagent item.
if ((_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && (caster.getInventory() != null))
{
// Get the L2ItemInstance consumed by the spell.
final L2ItemInstance requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId());
if (requiredItem.getItem().getDefaultAction() == ActionType.NONE) // Non reagent items are removed at finishSkill or item handler.
{
caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false);
}
}
if (caster.isPlayer()) if (caster.isPlayer())
{ {
final L2PcInstance player = caster.getActingPlayer(); final L2PcInstance player = caster.getActingPlayer();
// Consume fame points // Consume fame points.
if (_skill.getFamePointConsume() > 0) if (_skill.getFamePointConsume() > 0)
{ {
if (player.getFame() < _skill.getFamePointConsume()) if (player.getFame() < _skill.getFamePointConsume())
@@ -354,7 +365,7 @@ public class SkillCaster implements Runnable
player.sendPacket(msg); player.sendPacket(msg);
} }
// Consume clan reputation points // Consume clan reputation points.
if (_skill.getClanRepConsume() > 0) if (_skill.getClanRepConsume() > 0)
{ {
final L2Clan clan = player.getClan(); final L2Clan clan = player.getClan();
@@ -997,8 +1008,8 @@ public class SkillCaster implements Runnable
if ((skill.getItemConsumeId() > 0) && (skill.getItemConsumeCount() > 0) && (caster.getInventory() != null)) if ((skill.getItemConsumeId() > 0) && (skill.getItemConsumeCount() > 0) && (caster.getInventory() != null))
{ {
// Get the L2ItemInstance consumed by the spell // Get the L2ItemInstance consumed by the spell
final L2ItemInstance requiredItems = caster.getInventory().getItemByItemId(skill.getItemConsumeId()); final L2ItemInstance requiredItem = caster.getInventory().getItemByItemId(skill.getItemConsumeId());
if ((requiredItems == null) || (requiredItems.getCount() < skill.getItemConsumeCount())) if ((requiredItem == null) || (requiredItem.getCount() < skill.getItemConsumeCount()))
{ {
if (skill.hasEffectType(L2EffectType.SUMMON)) if (skill.hasEffectType(L2EffectType.SUMMON))
{ {

19
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -335,11 +335,22 @@ public class SkillCaster implements Runnable
caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime));
} }
// Consume reagent item.
if ((_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && (caster.getInventory() != null))
{
// Get the L2ItemInstance consumed by the spell.
final L2ItemInstance requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId());
if (requiredItem.getItem().getDefaultAction() == ActionType.NONE) // Non reagent items are removed at finishSkill or item handler.
{
caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false);
}
}
if (caster.isPlayer()) if (caster.isPlayer())
{ {
final L2PcInstance player = caster.getActingPlayer(); final L2PcInstance player = caster.getActingPlayer();
// Consume fame points // Consume fame points.
if (_skill.getFamePointConsume() > 0) if (_skill.getFamePointConsume() > 0)
{ {
if (player.getFame() < _skill.getFamePointConsume()) if (player.getFame() < _skill.getFamePointConsume())
@@ -354,7 +365,7 @@ public class SkillCaster implements Runnable
player.sendPacket(msg); player.sendPacket(msg);
} }
// Consume clan reputation points // Consume clan reputation points.
if (_skill.getClanRepConsume() > 0) if (_skill.getClanRepConsume() > 0)
{ {
final L2Clan clan = player.getClan(); final L2Clan clan = player.getClan();
@@ -997,8 +1008,8 @@ public class SkillCaster implements Runnable
if ((skill.getItemConsumeId() > 0) && (skill.getItemConsumeCount() > 0) && (caster.getInventory() != null)) if ((skill.getItemConsumeId() > 0) && (skill.getItemConsumeCount() > 0) && (caster.getInventory() != null))
{ {
// Get the L2ItemInstance consumed by the spell // Get the L2ItemInstance consumed by the spell
final L2ItemInstance requiredItems = caster.getInventory().getItemByItemId(skill.getItemConsumeId()); final L2ItemInstance requiredItem = caster.getInventory().getItemByItemId(skill.getItemConsumeId());
if ((requiredItems == null) || (requiredItems.getCount() < skill.getItemConsumeCount())) if ((requiredItem == null) || (requiredItem.getCount() < skill.getItemConsumeCount()))
{ {
if (skill.hasEffectType(L2EffectType.SUMMON)) if (skill.hasEffectType(L2EffectType.SUMMON))
{ {

19
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -335,11 +335,22 @@ public class SkillCaster implements Runnable
caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime));
} }
// Consume reagent item.
if ((_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && (caster.getInventory() != null))
{
// Get the L2ItemInstance consumed by the spell.
final L2ItemInstance requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId());
if (requiredItem.getItem().getDefaultAction() == ActionType.NONE) // Non reagent items are removed at finishSkill or item handler.
{
caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false);
}
}
if (caster.isPlayer()) if (caster.isPlayer())
{ {
final L2PcInstance player = caster.getActingPlayer(); final L2PcInstance player = caster.getActingPlayer();
// Consume fame points // Consume fame points.
if (_skill.getFamePointConsume() > 0) if (_skill.getFamePointConsume() > 0)
{ {
if (player.getFame() < _skill.getFamePointConsume()) if (player.getFame() < _skill.getFamePointConsume())
@@ -354,7 +365,7 @@ public class SkillCaster implements Runnable
player.sendPacket(msg); player.sendPacket(msg);
} }
// Consume clan reputation points // Consume clan reputation points.
if (_skill.getClanRepConsume() > 0) if (_skill.getClanRepConsume() > 0)
{ {
final L2Clan clan = player.getClan(); final L2Clan clan = player.getClan();
@@ -997,8 +1008,8 @@ public class SkillCaster implements Runnable
if ((skill.getItemConsumeId() > 0) && (skill.getItemConsumeCount() > 0) && (caster.getInventory() != null)) if ((skill.getItemConsumeId() > 0) && (skill.getItemConsumeCount() > 0) && (caster.getInventory() != null))
{ {
// Get the L2ItemInstance consumed by the spell // Get the L2ItemInstance consumed by the spell
final L2ItemInstance requiredItems = caster.getInventory().getItemByItemId(skill.getItemConsumeId()); final L2ItemInstance requiredItem = caster.getInventory().getItemByItemId(skill.getItemConsumeId());
if ((requiredItems == null) || (requiredItems.getCount() < skill.getItemConsumeCount())) if ((requiredItem == null) || (requiredItem.getCount() < skill.getItemConsumeCount()))
{ {
if (skill.hasEffectType(L2EffectType.SUMMON)) if (skill.hasEffectType(L2EffectType.SUMMON))
{ {

19
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -335,11 +335,22 @@ public class SkillCaster implements Runnable
caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime)); caster.sendPacket(new SetupGauge(caster.getObjectId(), SetupGauge.BLUE, displayedCastTime));
} }
// Consume reagent item.
if ((_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && (caster.getInventory() != null))
{
// Get the L2ItemInstance consumed by the spell.
final L2ItemInstance requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId());
if (requiredItem.getItem().getDefaultAction() == ActionType.NONE) // Non reagent items are removed at finishSkill or item handler.
{
caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false);
}
}
if (caster.isPlayer()) if (caster.isPlayer())
{ {
final L2PcInstance player = caster.getActingPlayer(); final L2PcInstance player = caster.getActingPlayer();
// Consume fame points // Consume fame points.
if (_skill.getFamePointConsume() > 0) if (_skill.getFamePointConsume() > 0)
{ {
if (player.getFame() < _skill.getFamePointConsume()) if (player.getFame() < _skill.getFamePointConsume())
@@ -354,7 +365,7 @@ public class SkillCaster implements Runnable
player.sendPacket(msg); player.sendPacket(msg);
} }
// Consume clan reputation points // Consume clan reputation points.
if (_skill.getClanRepConsume() > 0) if (_skill.getClanRepConsume() > 0)
{ {
final L2Clan clan = player.getClan(); final L2Clan clan = player.getClan();
@@ -997,8 +1008,8 @@ public class SkillCaster implements Runnable
if ((skill.getItemConsumeId() > 0) && (skill.getItemConsumeCount() > 0) && (caster.getInventory() != null)) if ((skill.getItemConsumeId() > 0) && (skill.getItemConsumeCount() > 0) && (caster.getInventory() != null))
{ {
// Get the L2ItemInstance consumed by the spell // Get the L2ItemInstance consumed by the spell
final L2ItemInstance requiredItems = caster.getInventory().getItemByItemId(skill.getItemConsumeId()); final L2ItemInstance requiredItem = caster.getInventory().getItemByItemId(skill.getItemConsumeId());
if ((requiredItems == null) || (requiredItems.getCount() < skill.getItemConsumeCount())) if ((requiredItem == null) || (requiredItem.getCount() < skill.getItemConsumeCount()))
{ {
if (skill.hasEffectType(L2EffectType.SUMMON)) if (skill.hasEffectType(L2EffectType.SUMMON))
{ {