From 35ba6e27186f7c70beaddac933838d8e0b296406 Mon Sep 17 00:00:00 2001
From: Zealar <Zealar@users.noreply.github.com>
Date: Thu, 11 Jun 2015 01:37:52 +0300
Subject: [PATCH] Fix SkillChannelizer for Naia Falan
Reported by: @maneco2
Also
- Improve and add missing data in skill
- Proper mobs location spawn
- Remove random walk
---
.../data/scripts/hellbound/AI/HellboundCore.java | 14 +++++++++++---
.../data/scripts/hellbound/hellboundSpawns.xml | 12 ++++++------
.../dist/game/data/stats/skills/05400-05499.xml | 5 ++++-
3 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/L2J_DataPack/dist/game/data/scripts/hellbound/AI/HellboundCore.java b/L2J_DataPack/dist/game/data/scripts/hellbound/AI/HellboundCore.java
index 9e9b12c259..30c5702d55 100644
--- a/L2J_DataPack/dist/game/data/scripts/hellbound/AI/HellboundCore.java
+++ b/L2J_DataPack/dist/game/data/scripts/hellbound/AI/HellboundCore.java
@@ -41,7 +41,7 @@ public final class HellboundCore extends AbstractNpcAI
public HellboundCore()
{
super(HellboundCore.class.getSimpleName(), "hellbound/AI");
- addSpawnId(HELLBOUND_CORE);
+ addSpawnId(HELLBOUND_CORE, NAIA);
}
@Override
@@ -51,7 +51,7 @@ public final class HellboundCore extends AbstractNpcAI
{
for (L2Character naia : npc.getKnownList().getKnownCharactersInRadius(900))
{
- if ((naia != null) && naia.isMonster() && (naia.getId() == NAIA) && !naia.isDead())
+ if ((naia != null) && naia.isMonster() && (naia.getId() == NAIA) && !naia.isDead() && !naia.isChanneling())
{
naia.setTarget(npc);
naia.doSimultaneousCast(BEAM.getSkill());
@@ -65,7 +65,15 @@ public final class HellboundCore extends AbstractNpcAI
@Override
public final String onSpawn(L2Npc npc)
{
- startQuestTimer("cast", 10000, npc, null);
+ if (npc.getId() == NAIA)
+ {
+ npc.setIsNoRndWalk(true);
+ }
+ else
+ {
+ startQuestTimer("cast", 10000, npc, null);
+ }
+
return super.onSpawn(npc);
}
}
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/hellbound/hellboundSpawns.xml b/L2J_DataPack/dist/game/data/scripts/hellbound/hellboundSpawns.xml
index e8add30082..9cfb9d038c 100644
--- a/L2J_DataPack/dist/game/data/scripts/hellbound/hellboundSpawns.xml
+++ b/L2J_DataPack/dist/game/data/scripts/hellbound/hellboundSpawns.xml
@@ -2072,32 +2072,32 @@
<hellboundLevel min="5" />
</npc>
<npc id="18484">
- <location x="-23428" y="245322" z="-3142" />
+ <location x="-23428" y="245408" z="-3072" />
<respawn delay="300" randomInterval="150" />
<hellboundLevel min="6" max="6" />
</npc>
<npc id="18484">
- <location x="-23627" y="244925" z="-3138" />
+ <location x="-23845" y="244452" z="-3138" />
<respawn delay="300" randomInterval="150" />
<hellboundLevel min="6" max="6" />
</npc>
<npc id="18484">
- <location x="-23199" y="245080" z="-3138" />
+ <location x="-23619" y="245844" z="-3140" />
<respawn delay="300" randomInterval="150" />
<hellboundLevel min="6" max="6" />
</npc>
<npc id="18484">
- <location x="-24270" y="245074" z="-3132" />
+ <location x="-24391" y="244782" z="-3138" />
<respawn delay="300" randomInterval="150" />
<hellboundLevel min="6" max="6" />
</npc>
<npc id="18484">
- <location x="-23798" y="245110" z="-3109" />
+ <location x="-24354" y="245380" z="-3138" />
<respawn delay="300" randomInterval="150" />
<hellboundLevel min="6" max="6" />
</npc>
<npc id="18484">
- <location x="-24409" y="244729" z="-3138" />
+ <location x="-23319" y="244695" z="-3138" />
<respawn delay="300" randomInterval="150" />
<hellboundLevel min="6" max="6" />
</npc>
diff --git a/L2J_DataPack/dist/game/data/stats/skills/05400-05499.xml b/L2J_DataPack/dist/game/data/stats/skills/05400-05499.xml
index f7253e539a..4d55c996aa 100644
--- a/L2J_DataPack/dist/game/data/stats/skills/05400-05499.xml
+++ b/L2J_DataPack/dist/game/data/stats/skills/05400-05499.xml
@@ -1263,7 +1263,7 @@
<set name="abnormalVisualEffect" val="NONE" />
<set name="castRange" val="800" />
<set name="channelingSkillId" val="5106" />
- <set name="channelingSkillId" val="5106" />
+ <set name="channelingTickInterval" val="2" />
<set name="effectPoint" val="1" />
<set name="effectRange" val="1000" />
<set name="hitTime" val="25000" />
@@ -1276,6 +1276,9 @@
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
+ <cond msgId="109">
+ <target npcId="32331" />
+ </cond>
</skill>
<skill id="5494" levels="1" name="Gust">
<!-- Confirmed CT2.5 -->
--
GitLab