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

Cleanup for previous commit.

Browse Source
This commit is contained in:
MobiusDev
2017-11-06 11:40:08 +00:00
parent 32ebf9c12a
commit bcf06c4f88
3 changed files with 42 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java vendored
View File

@@ -146,12 +146,12 @@ public final class ChamberOfProphecies extends AbstractInstance
} }
case "teleport": case "teleport":
{ {
world.getNpc(FERIN).deleteMe(); world.getNpc(FERIN).deleteMe(); // probably needs another npc id for initial room
world.spawnGroup("q10753_16_instance_halter_1_1"); world.spawnGroup("q10753_16_instance_halter_1_1");
world.spawnGroup("wof_room1"); world.spawnGroup("wof_room1");
player.teleToLocation(FIRST_ROOM_LOC); player.teleToLocation(FIRST_ROOM_LOC);
cancelQuestTimers("CHECK_STATUS"); cancelQuestTimers("CHECK_STATUS");
startQuestTimer("CHECK_STATUS", 7000, player.getInstanceWorld().getNpc(KAIN_VAN_HALTER), null); startQuestTimer("CHECK_STATUS", 7000, world.getNpc(KAIN_VAN_HALTER), null);
break; break;
} }
case "CHECK_STATUS": case "CHECK_STATUS":
@@ -162,11 +162,9 @@ public final class ChamberOfProphecies extends AbstractInstance
{ {
if (world.getAliveNpcs(L2MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(L2MonsterInstance.class).isEmpty())
{ {
final L2Npc ferin = world.getNpc(FERIN);
final L2Npc halter = world.getNpc(VAN_HALTER);
final L2PcInstance pl = world.getFirstPlayer(); final L2PcInstance pl = world.getFirstPlayer();
startQuestTimer("SEY2", 14000, ferin, pl); startQuestTimer("SEY2", 14000, world.getNpc(FERIN), pl);
startQuestTimer("SEY_KAIN", 24000, halter, pl); startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), pl);
startQuestTimer("OPEN_DOOR1", 5000, npc, pl); startQuestTimer("OPEN_DOOR1", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, null);
@@ -186,9 +184,8 @@ public final class ChamberOfProphecies extends AbstractInstance
{ {
if (world.getAliveNpcs(L2MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(L2MonsterInstance.class).isEmpty())
{ {
final L2Npc ferin = world.getNpc(FERIN);
final L2PcInstance pl = world.getFirstPlayer(); final L2PcInstance pl = world.getFirstPlayer();
startQuestTimer("SEY3", 8000, ferin, pl); startQuestTimer("SEY3", 8000, world.getNpc(FERIN), pl);
startQuestTimer("OPEN_DOOR2", 5000, npc, pl); startQuestTimer("OPEN_DOOR2", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, null);
@@ -201,8 +198,7 @@ public final class ChamberOfProphecies extends AbstractInstance
world.setStatus(4); world.setStatus(4);
world.spawnGroup("wof_room3_2"); world.spawnGroup("wof_room3_2");
world.openCloseDoor(DOOR_3, false); world.openCloseDoor(DOOR_3, false);
final L2Npc halter = world.getNpc(VAN_HALTER); startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), world.getFirstPlayer());
startQuestTimer("SEY_KAIN_1", 5000, halter, world.getFirstPlayer());
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, null);
break; break;
@@ -213,11 +209,9 @@ public final class ChamberOfProphecies extends AbstractInstance
{ {
world.setStatus(5); world.setStatus(5);
world.spawnGroup("wof_room4"); world.spawnGroup("wof_room4");
final L2Npc ferin = world.getNpc(FERIN);
final L2Npc halter = world.getNpc(VAN_HALTER);
final L2PcInstance pl = world.getFirstPlayer(); final L2PcInstance pl = world.getFirstPlayer();
startQuestTimer("SEY_KAIN_2", 3000, halter, pl); startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), pl);
startQuestTimer("SEY4", 7000, ferin, pl); startQuestTimer("SEY4", 7000, world.getNpc(FERIN), pl);
} }
else else
{ {
@@ -240,16 +234,13 @@ public final class ChamberOfProphecies extends AbstractInstance
npc.setTarget(player); npc.setTarget(player);
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
} }
else else if (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK)
{ {
if (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) L2World.getInstance().forEachVisibleObjectInRange(npc, L2MonsterInstance.class, 3000, monster ->
{ {
L2World.getInstance().forEachVisibleObjectInRange(npc, L2MonsterInstance.class, 3000, chars -> addAttackDesire(npc, monster);
{ return;
addAttackDesire(npc, chars); });
return;
});
}
} }
break; break;
} }
@@ -264,8 +255,7 @@ public final class ChamberOfProphecies extends AbstractInstance
case "OPEN_DOOR2": case "OPEN_DOOR2":
{ {
cancelQuestTimers("ATTACK1"); cancelQuestTimers("ATTACK1");
final L2Npc halter = world.getNpc(VAN_HALTER); startQuestTimer("ATTACK2", 200, world.getNpc(VAN_HALTER), player, true);
startQuestTimer("ATTACK2", 200, halter, player, true);
world.setStatus(3); world.setStatus(3);
world.spawnGroup("wof_room3"); world.spawnGroup("wof_room3");
world.openCloseDoor(DOOR_3, true); world.openCloseDoor(DOOR_3, true);

38
L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java vendored
View File

@@ -146,12 +146,12 @@ public final class ChamberOfProphecies extends AbstractInstance
} }
case "teleport": case "teleport":
{ {
world.getNpc(FERIN).deleteMe(); world.getNpc(FERIN).deleteMe(); // probably needs another npc id for initial room
world.spawnGroup("q10753_16_instance_halter_1_1"); world.spawnGroup("q10753_16_instance_halter_1_1");
world.spawnGroup("wof_room1"); world.spawnGroup("wof_room1");
player.teleToLocation(FIRST_ROOM_LOC); player.teleToLocation(FIRST_ROOM_LOC);
cancelQuestTimers("CHECK_STATUS"); cancelQuestTimers("CHECK_STATUS");
startQuestTimer("CHECK_STATUS", 7000, player.getInstanceWorld().getNpc(KAIN_VAN_HALTER), null); startQuestTimer("CHECK_STATUS", 7000, world.getNpc(KAIN_VAN_HALTER), null);
break; break;
} }
case "CHECK_STATUS": case "CHECK_STATUS":
@@ -162,11 +162,9 @@ public final class ChamberOfProphecies extends AbstractInstance
{ {
if (world.getAliveNpcs(L2MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(L2MonsterInstance.class).isEmpty())
{ {
final L2Npc ferin = world.getNpc(FERIN);
final L2Npc halter = world.getNpc(VAN_HALTER);
final L2PcInstance pl = world.getFirstPlayer(); final L2PcInstance pl = world.getFirstPlayer();
startQuestTimer("SEY2", 14000, ferin, pl); startQuestTimer("SEY2", 14000, world.getNpc(FERIN), pl);
startQuestTimer("SEY_KAIN", 24000, halter, pl); startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), pl);
startQuestTimer("OPEN_DOOR1", 5000, npc, pl); startQuestTimer("OPEN_DOOR1", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, null);
@@ -186,9 +184,8 @@ public final class ChamberOfProphecies extends AbstractInstance
{ {
if (world.getAliveNpcs(L2MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(L2MonsterInstance.class).isEmpty())
{ {
final L2Npc ferin = world.getNpc(FERIN);
final L2PcInstance pl = world.getFirstPlayer(); final L2PcInstance pl = world.getFirstPlayer();
startQuestTimer("SEY3", 8000, ferin, pl); startQuestTimer("SEY3", 8000, world.getNpc(FERIN), pl);
startQuestTimer("OPEN_DOOR2", 5000, npc, pl); startQuestTimer("OPEN_DOOR2", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, null);
@@ -201,8 +198,7 @@ public final class ChamberOfProphecies extends AbstractInstance
world.setStatus(4); world.setStatus(4);
world.spawnGroup("wof_room3_2"); world.spawnGroup("wof_room3_2");
world.openCloseDoor(DOOR_3, false); world.openCloseDoor(DOOR_3, false);
final L2Npc halter = world.getNpc(VAN_HALTER); startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), world.getFirstPlayer());
startQuestTimer("SEY_KAIN_1", 5000, halter, world.getFirstPlayer());
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, null);
break; break;
@@ -213,11 +209,9 @@ public final class ChamberOfProphecies extends AbstractInstance
{ {
world.setStatus(5); world.setStatus(5);
world.spawnGroup("wof_room4"); world.spawnGroup("wof_room4");
final L2Npc ferin = world.getNpc(FERIN);
final L2Npc halter = world.getNpc(VAN_HALTER);
final L2PcInstance pl = world.getFirstPlayer(); final L2PcInstance pl = world.getFirstPlayer();
startQuestTimer("SEY_KAIN_2", 3000, halter, pl); startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), pl);
startQuestTimer("SEY4", 7000, ferin, pl); startQuestTimer("SEY4", 7000, world.getNpc(FERIN), pl);
} }
else else
{ {
@@ -240,16 +234,13 @@ public final class ChamberOfProphecies extends AbstractInstance
npc.setTarget(player); npc.setTarget(player);
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
} }
else else if (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK)
{ {
if (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) L2World.getInstance().forEachVisibleObjectInRange(npc, L2MonsterInstance.class, 3000, monster ->
{ {
L2World.getInstance().forEachVisibleObjectInRange(npc, L2MonsterInstance.class, 3000, chars -> addAttackDesire(npc, monster);
{ return;
addAttackDesire(npc, chars); });
return;
});
}
} }
break; break;
} }
@@ -264,8 +255,7 @@ public final class ChamberOfProphecies extends AbstractInstance
case "OPEN_DOOR2": case "OPEN_DOOR2":
{ {
cancelQuestTimers("ATTACK1"); cancelQuestTimers("ATTACK1");
final L2Npc halter = world.getNpc(VAN_HALTER); startQuestTimer("ATTACK2", 200, world.getNpc(VAN_HALTER), player, true);
startQuestTimer("ATTACK2", 200, halter, player, true);
world.setStatus(3); world.setStatus(3);
world.spawnGroup("wof_room3"); world.spawnGroup("wof_room3");
world.openCloseDoor(DOOR_3, true); world.openCloseDoor(DOOR_3, true);

38
L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java vendored
View File

@@ -146,12 +146,12 @@ public final class ChamberOfProphecies extends AbstractInstance
} }
case "teleport": case "teleport":
{ {
world.getNpc(FERIN).deleteMe(); world.getNpc(FERIN).deleteMe(); // probably needs another npc id for initial room
world.spawnGroup("q10753_16_instance_halter_1_1"); world.spawnGroup("q10753_16_instance_halter_1_1");
world.spawnGroup("wof_room1"); world.spawnGroup("wof_room1");
player.teleToLocation(FIRST_ROOM_LOC); player.teleToLocation(FIRST_ROOM_LOC);
cancelQuestTimers("CHECK_STATUS"); cancelQuestTimers("CHECK_STATUS");
startQuestTimer("CHECK_STATUS", 7000, player.getInstanceWorld().getNpc(KAIN_VAN_HALTER), null); startQuestTimer("CHECK_STATUS", 7000, world.getNpc(KAIN_VAN_HALTER), null);
break; break;
} }
case "CHECK_STATUS": case "CHECK_STATUS":
@@ -162,11 +162,9 @@ public final class ChamberOfProphecies extends AbstractInstance
{ {
if (world.getAliveNpcs(L2MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(L2MonsterInstance.class).isEmpty())
{ {
final L2Npc ferin = world.getNpc(FERIN);
final L2Npc halter = world.getNpc(VAN_HALTER);
final L2PcInstance pl = world.getFirstPlayer(); final L2PcInstance pl = world.getFirstPlayer();
startQuestTimer("SEY2", 14000, ferin, pl); startQuestTimer("SEY2", 14000, world.getNpc(FERIN), pl);
startQuestTimer("SEY_KAIN", 24000, halter, pl); startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), pl);
startQuestTimer("OPEN_DOOR1", 5000, npc, pl); startQuestTimer("OPEN_DOOR1", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, null);
@@ -186,9 +184,8 @@ public final class ChamberOfProphecies extends AbstractInstance
{ {
if (world.getAliveNpcs(L2MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(L2MonsterInstance.class).isEmpty())
{ {
final L2Npc ferin = world.getNpc(FERIN);
final L2PcInstance pl = world.getFirstPlayer(); final L2PcInstance pl = world.getFirstPlayer();
startQuestTimer("SEY3", 8000, ferin, pl); startQuestTimer("SEY3", 8000, world.getNpc(FERIN), pl);
startQuestTimer("OPEN_DOOR2", 5000, npc, pl); startQuestTimer("OPEN_DOOR2", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, null);
@@ -201,8 +198,7 @@ public final class ChamberOfProphecies extends AbstractInstance
world.setStatus(4); world.setStatus(4);
world.spawnGroup("wof_room3_2"); world.spawnGroup("wof_room3_2");
world.openCloseDoor(DOOR_3, false); world.openCloseDoor(DOOR_3, false);
final L2Npc halter = world.getNpc(VAN_HALTER); startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), world.getFirstPlayer());
startQuestTimer("SEY_KAIN_1", 5000, halter, world.getFirstPlayer());
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, null);
break; break;
@@ -213,11 +209,9 @@ public final class ChamberOfProphecies extends AbstractInstance
{ {
world.setStatus(5); world.setStatus(5);
world.spawnGroup("wof_room4"); world.spawnGroup("wof_room4");
final L2Npc ferin = world.getNpc(FERIN);
final L2Npc halter = world.getNpc(VAN_HALTER);
final L2PcInstance pl = world.getFirstPlayer(); final L2PcInstance pl = world.getFirstPlayer();
startQuestTimer("SEY_KAIN_2", 3000, halter, pl); startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), pl);
startQuestTimer("SEY4", 7000, ferin, pl); startQuestTimer("SEY4", 7000, world.getNpc(FERIN), pl);
} }
else else
{ {
@@ -240,16 +234,13 @@ public final class ChamberOfProphecies extends AbstractInstance
npc.setTarget(player); npc.setTarget(player);
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
} }
else else if (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK)
{ {
if (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) L2World.getInstance().forEachVisibleObjectInRange(npc, L2MonsterInstance.class, 3000, monster ->
{ {
L2World.getInstance().forEachVisibleObjectInRange(npc, L2MonsterInstance.class, 3000, chars -> addAttackDesire(npc, monster);
{ return;
addAttackDesire(npc, chars); });
return;
});
}
} }
break; break;
} }
@@ -264,8 +255,7 @@ public final class ChamberOfProphecies extends AbstractInstance
case "OPEN_DOOR2": case "OPEN_DOOR2":
{ {
cancelQuestTimers("ATTACK1"); cancelQuestTimers("ATTACK1");
final L2Npc halter = world.getNpc(VAN_HALTER); startQuestTimer("ATTACK2", 200, world.getNpc(VAN_HALTER), player, true);
startQuestTimer("ATTACK2", 200, halter, player, true);
world.setStatus(3); world.setStatus(3);
world.spawnGroup("wof_room3"); world.spawnGroup("wof_room3");
world.openCloseDoor(DOOR_3, true); world.openCloseDoor(DOOR_3, true);