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

Addition of Saving Santa event.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-11-11 16:38:50 +00:00
parent 2b84f853f7
commit c1762baef0
91 changed files with 8999 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/21000-21099.xml vendored
View File

@@ -224,49 +224,64 @@
</skill>
<skill id="21014" levels="1" name="Scissors">
<!-- Challenge opponent with "Scissors." Can only be used on Thomas D. Turkey. -->
<set name="icon" val="BranchSys.icon.br_xmas_gawi_i00" />
<set name="castRange" val="400" />
<set name="coolTime" val="500" />
<set name="effectPoint" val="-1" />
<set name="effectRange" val="500" />
<set name="hitTime" val="2000" />
<set name="icon" val="BranchSys.icon.br_xmas_gawi_i00" />
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="1" />
<set name="operateType" val="A1" />
<set name="targetType" val="ONE" />
<set name="targetType" val="SELF" />
<cond msgId="109">
<target npcId="13183" />
</cond>
<selfEffects>
<effect name="CallSkill">
<param skillId="23019" skillLevel="1" />
</effect>
</selfEffects>
</skill>
<skill id="21015" levels="1" name="Rock">
<!-- Challenge opponent with "Rock." Can only be used on Thomas D. Turkey. -->
<set name="icon" val="BranchSys.icon.br_xmas_bawi_i00" />
<set name="castRange" val="400" />
<set name="coolTime" val="500" />
<set name="effectPoint" val="-1" />
<set name="hitTime" val="2000" />
<set name="icon" val="BranchSys.icon.br_xmas_bawi_i00" />
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="1" />
<set name="operateType" val="A1" />
<set name="targetType" val="ONE" />
<set name="targetType" val="SELF" />
<cond msgId="109">
<target npcId="13183" />
</cond>
<selfEffects>
<effect name="CallSkill">
<param skillId="23019" skillLevel="2" />
</effect>
</selfEffects>
</skill>
<skill id="21016" levels="1" name="Paper">
<!-- Challenge opponent with "Paper." Can only be used on Thomas D. Turkey. -->
<set name="icon" val="BranchSys.icon.br_xmas_bo_i00" />
<set name="castRange" val="400" />
<set name="coolTime" val="500" />
<set name="effectPoint" val="-1" />
<set name="hitTime" val="2000" />
<set name="icon" val="BranchSys.icon.br_xmas_bo_i00" />
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="1" />
<set name="operateType" val="A1" />
<set name="targetType" val="ONE" />
<set name="targetType" val="SELF" />
<cond msgId="109">
<target npcId="13183" />
</cond>
<selfEffects>
<effect name="CallSkill">
<param skillId="23019" skillLevel="3" />
</effect>
</selfEffects>
</skill>
<skill id="21017" levels="1" name="Holiday Dream Weapon">
<!-- Max CP is increased. The rate of critical attacks is increased. Bestow the ability to regenerate HP by using some of the damage inflicted on the enemy. Excludes damage caused by skills and long-range attacks. -->

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/conditions/ConditionTargetNpcId.java
View File

@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.model.conditions;
import java.util.List;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.items.Item;
import org.l2jmobius.gameserver.model.skills.Skill;
@@ -41,6 +42,7 @@ public class ConditionTargetNpcId extends Condition
@Override
public boolean testImpl(Creature effector, Creature effected, Skill skill, Item item)
{
return (effected != null) && (effected.isNpc() || effected.isDoor()) && _npcIds.contains(effected.getId());
final WorldObject target = (effector == null) || !effector.isPlayer() ? effected : effector.getTarget();
return (target != null) && (target.isNpc() || target.isDoor()) && _npcIds.contains(target.getId());
}
}