Addition of Saving Santa event.

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

View File

@@ -39,6 +39,7 @@ public class OpTargetNpcSkillCondition implements ISkillCondition
@Override
public boolean canUse(Creature caster, Skill skill, WorldObject target)
{
return (target != null) && target.isNpc() && _npcId.contains(target.getId());
final WorldObject actualTarget = (caster == null) || !caster.isPlayer() ? target : caster.getTarget();
return (actualTarget != null) && (actualTarget.isNpc() || actualTarget.isDoor()) && _npcId.contains(actualTarget.getId());
}
}

View File

@@ -305,15 +305,21 @@
<magicCriticalRate>5</magicCriticalRate>
<hitCancelTime>1</hitCancelTime>
<staticReuse>true</staticReuse>
<targetType>ENEMY</targetType>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpTargetNpc">
<npcIds>
<item>100</item>
<item>13183</item>
</npcIds>
</condition>
</conditions>
<selfEffects>
<effect name="CallSkill">
<skillId>23019</skillId>
<skillLevel>1</skillLevel>
</effect>
</selfEffects>
</skill>
<skill id="21015" toLevel="1" name="Rock">
<!-- Challenge him with the rock. Usable only on the crooked turkey. -->
@@ -329,15 +335,21 @@
<hitCancelTime>1</hitCancelTime>
<effectRange>500</effectRange>
<staticReuse>true</staticReuse>
<targetType>ENEMY</targetType>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpTargetNpc">
<npcIds>
<item>100</item>
<item>13183</item>
</npcIds>
</condition>
</conditions>
<selfEffects>
<effect name="CallSkill">
<skillId>23019</skillId>
<skillLevel>2</skillLevel>
</effect>
</selfEffects>
</skill>
<skill id="21016" toLevel="1" name="Paper">
<!-- Challenge him with the paper. Usable only on the crooked turkey. -->
@@ -353,15 +365,21 @@
<hitCancelTime>1</hitCancelTime>
<effectRange>500</effectRange>
<staticReuse>true</staticReuse>
<targetType>ENEMY</targetType>
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<conditions>
<condition name="OpTargetNpc">
<npcIds>
<item>100</item>
<item>13183</item>
</npcIds>
</condition>
</conditions>
<selfEffects>
<effect name="CallSkill">
<skillId>23019</skillId>
<skillLevel>3</skillLevel>
</effect>
</selfEffects>
</skill>
<skill id="21017" toLevel="1" name="Holiday Dream Weapon">
<!-- Increases Max CP. Increases Critical Rate. Increases the ability to restore some damage inflicted on the enemy as HP with a certain probability. Excludes damage by skill or ranged attacks. -->