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

Fixed skill reduce on skill success.

Browse Source 
Contributed by yksdtc.
This commit is contained in:
MobiusDev 2016-12-28 17:52:20 +00:00
parent 650669f741
commit 9ffa9d022f
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/CreateItemRandom.java vendored
View File

@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.holders.ItemChanceHolder; import com.l2jmobius.gameserver.model.holders.ItemChanceHolder;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.model.items.type.ActionType;
import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.SystemMessageId;
@ -83,6 +84,9 @@ public class CreateItemRandom extends AbstractEffect
return; return;
} }
player.addItem("CreateItems", selectedItem.getId(), selectedItem.getCount(), player, true); if ((item.getItem().getDefaultAction() != ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) || player.destroyItem("Consume", item.getObjectId(), 1, player, true))
{
player.addItem("CreateItems", selectedItem.getId(), selectedItem.getCount(), player, true);
}
} }
} }

6
L2J_Mobius_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java vendored
View File

@ -173,12 +173,16 @@ public class ItemSkillsTemplate implements IItemHandler
{ {
case CAPSULE: case CAPSULE:
case SKILL_REDUCE: case SKILL_REDUCE:
case SKILL_REDUCE_ON_SKILL_SUCCESS:
{ {
if (!hasConsumeSkill && item.getItem().hasImmediateEffect()) if (!hasConsumeSkill && item.getItem().hasImmediateEffect())
{ {
return true; return true;
} }
break;
}
case SKILL_REDUCE_ON_SKILL_SUCCESS:
{
return false;
} }
} }
return hasConsumeSkill; return hasConsumeSkill;

2
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -319,7 +319,7 @@ public class SkillCaster implements Runnable
} }
// Consume the required items. Should happen after use message is displayed and SetupGauge // Consume the required items. Should happen after use message is displayed and SetupGauge
if ((_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !((_item != null) && (_item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE))) if ((_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !((_item != null) && ((_item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE) || (_item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))))
{ {
if (!caster.destroyItemByItemId(_skill.toString(), _skill.getItemConsumeId(), _skill.getItemConsumeCount(), null, true)) if (!caster.destroyItemByItemId(_skill.toString(), _skill.getItemConsumeId(), _skill.getItemConsumeCount(), null, true))
{ {