Refactored NPC display state functions.

This commit is contained in:
MobiusDev
2015-10-13 12:46:58 +00:00
parent aa2a04b466
commit c39ac887e3
13 changed files with 56 additions and 61 deletions

View File

@@ -121,7 +121,7 @@ public final class Maguen extends AbstractNpcAI
{
npc.getAI().stopFollow();
final int randomEffect = getRandom(1, 3);
npc.setState(randomEffect);
npc.setDisplayEffect(randomEffect);
npc.getVariables().set("NPC_EFFECT", randomEffect);
startQuestTimer("SECOND_TIMER", 5000 + getRandom(300), npc, player);
npc.broadcastSocialAction(getRandom(1, 3));
@@ -130,7 +130,7 @@ public final class Maguen extends AbstractNpcAI
case "SECOND_TIMER":
{
final int randomEffect = getRandom(1, 3);
npc.setState(randomEffect);
npc.setDisplayEffect(randomEffect);
npc.getVariables().set("NPC_EFFECT", randomEffect);
startQuestTimer("THIRD_TIMER", 4600 + getRandom(600), npc, player);
npc.broadcastSocialAction(getRandom(1, 3));
@@ -139,7 +139,7 @@ public final class Maguen extends AbstractNpcAI
case "THIRD_TIMER":
{
final int randomEffect = getRandom(1, 3);
npc.setState(randomEffect);
npc.setDisplayEffect(randomEffect);
npc.getVariables().set("NPC_EFFECT", randomEffect);
startQuestTimer("FORTH_TIMER", 4200 + getRandom(900), npc, player);
npc.broadcastSocialAction(getRandom(1, 3));
@@ -148,7 +148,7 @@ public final class Maguen extends AbstractNpcAI
case "FORTH_TIMER":
{
npc.getVariables().set("NPC_EFFECT", 0);
npc.setState(4);
npc.setDisplayEffect(4);
startQuestTimer("END_TIMER", 500, npc, player);
npc.broadcastSocialAction(getRandom(1, 3));
break;
@@ -249,7 +249,7 @@ public final class Maguen extends AbstractNpcAI
{
startQuestTimer("END_TIMER", 1000, npc, player);
}
npc.setState(4);
npc.setDisplayEffect(4);
return super.onSpellFinished(npc, player, skill);
}

View File

@@ -268,7 +268,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
for (int j = 0; j < _regionsData[i].af_spawns.length; j++)
{
_regionsData[i].af_npcs[j] = addSpawn(ANNIHILATION_FURNACE, _regionsData[i].af_spawns[j][0], _regionsData[i].af_spawns[j][1], _regionsData[i].af_spawns[j][2], _regionsData[i].af_spawns[j][3], false, 0);
_regionsData[i].af_npcs[j].setState(_regionsData[i].activeBuff);
_regionsData[i].af_npcs[j].setDisplayEffect(_regionsData[i].activeBuff);
}
ZoneManager.getInstance().getZoneById(_regionsData[i].buff_zone, L2EffectZone.class).addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1);
}
@@ -311,7 +311,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
for (L2Npc af : _regionsData[i].af_npcs)
{
af.setState(_regionsData[i].activeBuff);
af.setDisplayEffect(_regionsData[i].activeBuff);
}
L2EffectZone zone = ZoneManager.getInstance().getZoneById(_regionsData[i].buff_zone, L2EffectZone.class);