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

Sync with L2JServer Feb 3rd 2015.

Browse Source
This commit is contained in:
mobius
2015-02-03 21:11:57 +00:00
parent 9cf1a6d6e5
commit fe25f74122
169 changed files with 3379 additions and 5414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
trunk/dist/game/data/scripts/gracia/AI/Maguen.java vendored
View File

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

4
trunk/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java vendored
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].setDisplayEffect(_regionsData[i].activeBuff);
_regionsData[i].af_npcs[j].setState(_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.setDisplayEffect(_regionsData[i].activeBuff);
af.setState(_regionsData[i].activeBuff);
}
L2EffectZone zone = ZoneManager.getInstance().getZoneById(_regionsData[i].buff_zone, L2EffectZone.class);