Player instead of Npc parameters for Chamber of Prophecies timers.

This commit is contained in:
MobiusDevelopment
2020-02-25 19:20:34 +00:00
parent 53e9308b8a
commit 81d29e0644
8 changed files with 128 additions and 152 deletions

View File

@@ -86,9 +86,9 @@ public class ChamberOfProphecies extends AbstractInstance
qs.setCond(16, true); qs.setCond(16, true);
} }
} }
else if (npc != null) else if (player != null)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (!isInInstance(world)) if (!isInInstance(world))
{ {
return null; return null;
@@ -151,7 +151,7 @@ public class ChamberOfProphecies extends AbstractInstance
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, world.getNpc(KAIN_VAN_HALTER), null); startQuestTimer("CHECK_STATUS", 7000, world.getNpc(KAIN_VAN_HALTER), player);
break; break;
} }
case "CHECK_STATUS": case "CHECK_STATUS":
@@ -162,12 +162,11 @@ public class ChamberOfProphecies extends AbstractInstance
{ {
if (world.getAliveNpcs(MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(MonsterInstance.class).isEmpty())
{ {
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
startQuestTimer("SEY2", 14000, world.getNpc(FERIN), pl); startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), pl); startQuestTimer("OPEN_DOOR1", 5000, npc, player);
startQuestTimer("OPEN_DOOR1", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 1: case 1:
@@ -177,18 +176,17 @@ public class ChamberOfProphecies extends AbstractInstance
world.spawnGroup("wof_room2_1"); world.spawnGroup("wof_room2_1");
world.setStatus(2); world.setStatus(2);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 2: case 2:
{ {
if (world.getAliveNpcs(MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(MonsterInstance.class).isEmpty())
{ {
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
startQuestTimer("SEY3", 8000, world.getNpc(FERIN), pl); startQuestTimer("OPEN_DOOR2", 5000, npc, player);
startQuestTimer("OPEN_DOOR2", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 3: case 3:
@@ -198,9 +196,9 @@ public 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);
startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), world.getFirstPlayer()); startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 4: case 4:
@@ -209,13 +207,12 @@ public class ChamberOfProphecies extends AbstractInstance
{ {
world.setStatus(5); world.setStatus(5);
world.spawnGroup("wof_room4"); world.spawnGroup("wof_room4");
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), pl); startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
startQuestTimer("SEY4", 7000, world.getNpc(FERIN), pl);
} }
else else
{ {
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
} }
break; break;
} }

View File

@@ -86,9 +86,9 @@ public class ChamberOfProphecies extends AbstractInstance
qs.setCond(16, true); qs.setCond(16, true);
} }
} }
else if (npc != null) else if (player != null)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (!isInInstance(world)) if (!isInInstance(world))
{ {
return null; return null;
@@ -151,7 +151,7 @@ public class ChamberOfProphecies extends AbstractInstance
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, world.getNpc(KAIN_VAN_HALTER), null); startQuestTimer("CHECK_STATUS", 7000, world.getNpc(KAIN_VAN_HALTER), player);
break; break;
} }
case "CHECK_STATUS": case "CHECK_STATUS":
@@ -162,12 +162,11 @@ public class ChamberOfProphecies extends AbstractInstance
{ {
if (world.getAliveNpcs(MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(MonsterInstance.class).isEmpty())
{ {
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
startQuestTimer("SEY2", 14000, world.getNpc(FERIN), pl); startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), pl); startQuestTimer("OPEN_DOOR1", 5000, npc, player);
startQuestTimer("OPEN_DOOR1", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 1: case 1:
@@ -177,18 +176,17 @@ public class ChamberOfProphecies extends AbstractInstance
world.spawnGroup("wof_room2_1"); world.spawnGroup("wof_room2_1");
world.setStatus(2); world.setStatus(2);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 2: case 2:
{ {
if (world.getAliveNpcs(MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(MonsterInstance.class).isEmpty())
{ {
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
startQuestTimer("SEY3", 8000, world.getNpc(FERIN), pl); startQuestTimer("OPEN_DOOR2", 5000, npc, player);
startQuestTimer("OPEN_DOOR2", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 3: case 3:
@@ -198,9 +196,9 @@ public 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);
startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), world.getFirstPlayer()); startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 4: case 4:
@@ -209,13 +207,12 @@ public class ChamberOfProphecies extends AbstractInstance
{ {
world.setStatus(5); world.setStatus(5);
world.spawnGroup("wof_room4"); world.spawnGroup("wof_room4");
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), pl); startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
startQuestTimer("SEY4", 7000, world.getNpc(FERIN), pl);
} }
else else
{ {
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
} }
break; break;
} }

View File

@@ -86,9 +86,9 @@ public class ChamberOfProphecies extends AbstractInstance
qs.setCond(16, true); qs.setCond(16, true);
} }
} }
else if (npc != null) else if (player != null)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (!isInInstance(world)) if (!isInInstance(world))
{ {
return null; return null;
@@ -151,7 +151,7 @@ public class ChamberOfProphecies extends AbstractInstance
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, world.getNpc(KAIN_VAN_HALTER), null); startQuestTimer("CHECK_STATUS", 7000, world.getNpc(KAIN_VAN_HALTER), player);
break; break;
} }
case "CHECK_STATUS": case "CHECK_STATUS":
@@ -162,12 +162,11 @@ public class ChamberOfProphecies extends AbstractInstance
{ {
if (world.getAliveNpcs(MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(MonsterInstance.class).isEmpty())
{ {
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
startQuestTimer("SEY2", 14000, world.getNpc(FERIN), pl); startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), pl); startQuestTimer("OPEN_DOOR1", 5000, npc, player);
startQuestTimer("OPEN_DOOR1", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 1: case 1:
@@ -177,18 +176,17 @@ public class ChamberOfProphecies extends AbstractInstance
world.spawnGroup("wof_room2_1"); world.spawnGroup("wof_room2_1");
world.setStatus(2); world.setStatus(2);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 2: case 2:
{ {
if (world.getAliveNpcs(MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(MonsterInstance.class).isEmpty())
{ {
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
startQuestTimer("SEY3", 8000, world.getNpc(FERIN), pl); startQuestTimer("OPEN_DOOR2", 5000, npc, player);
startQuestTimer("OPEN_DOOR2", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 3: case 3:
@@ -198,9 +196,9 @@ public 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);
startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), world.getFirstPlayer()); startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 4: case 4:
@@ -209,13 +207,12 @@ public class ChamberOfProphecies extends AbstractInstance
{ {
world.setStatus(5); world.setStatus(5);
world.spawnGroup("wof_room4"); world.spawnGroup("wof_room4");
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), pl); startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
startQuestTimer("SEY4", 7000, world.getNpc(FERIN), pl);
} }
else else
{ {
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
} }
break; break;
} }

View File

@@ -86,9 +86,9 @@ public class ChamberOfProphecies extends AbstractInstance
qs.setCond(16, true); qs.setCond(16, true);
} }
} }
else if (npc != null) else if (player != null)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (!isInInstance(world)) if (!isInInstance(world))
{ {
return null; return null;
@@ -151,7 +151,7 @@ public class ChamberOfProphecies extends AbstractInstance
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, world.getNpc(KAIN_VAN_HALTER), null); startQuestTimer("CHECK_STATUS", 7000, world.getNpc(KAIN_VAN_HALTER), player);
break; break;
} }
case "CHECK_STATUS": case "CHECK_STATUS":
@@ -162,12 +162,11 @@ public class ChamberOfProphecies extends AbstractInstance
{ {
if (world.getAliveNpcs(MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(MonsterInstance.class).isEmpty())
{ {
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
startQuestTimer("SEY2", 14000, world.getNpc(FERIN), pl); startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), pl); startQuestTimer("OPEN_DOOR1", 5000, npc, player);
startQuestTimer("OPEN_DOOR1", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 1: case 1:
@@ -177,18 +176,17 @@ public class ChamberOfProphecies extends AbstractInstance
world.spawnGroup("wof_room2_1"); world.spawnGroup("wof_room2_1");
world.setStatus(2); world.setStatus(2);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 2: case 2:
{ {
if (world.getAliveNpcs(MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(MonsterInstance.class).isEmpty())
{ {
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
startQuestTimer("SEY3", 8000, world.getNpc(FERIN), pl); startQuestTimer("OPEN_DOOR2", 5000, npc, player);
startQuestTimer("OPEN_DOOR2", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 3: case 3:
@@ -198,9 +196,9 @@ public 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);
startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), world.getFirstPlayer()); startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 4: case 4:
@@ -209,13 +207,12 @@ public class ChamberOfProphecies extends AbstractInstance
{ {
world.setStatus(5); world.setStatus(5);
world.spawnGroup("wof_room4"); world.spawnGroup("wof_room4");
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), pl); startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
startQuestTimer("SEY4", 7000, world.getNpc(FERIN), pl);
} }
else else
{ {
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
} }
break; break;
} }

View File

@@ -86,9 +86,9 @@ public class ChamberOfProphecies extends AbstractInstance
qs.setCond(16, true); qs.setCond(16, true);
} }
} }
else if (npc != null) else if (player != null)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (!isInInstance(world)) if (!isInInstance(world))
{ {
return null; return null;
@@ -151,7 +151,7 @@ public class ChamberOfProphecies extends AbstractInstance
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, world.getNpc(KAIN_VAN_HALTER), null); startQuestTimer("CHECK_STATUS", 7000, world.getNpc(KAIN_VAN_HALTER), player);
break; break;
} }
case "CHECK_STATUS": case "CHECK_STATUS":
@@ -162,12 +162,11 @@ public class ChamberOfProphecies extends AbstractInstance
{ {
if (world.getAliveNpcs(MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(MonsterInstance.class).isEmpty())
{ {
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
startQuestTimer("SEY2", 14000, world.getNpc(FERIN), pl); startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), pl); startQuestTimer("OPEN_DOOR1", 5000, npc, player);
startQuestTimer("OPEN_DOOR1", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 1: case 1:
@@ -177,18 +176,17 @@ public class ChamberOfProphecies extends AbstractInstance
world.spawnGroup("wof_room2_1"); world.spawnGroup("wof_room2_1");
world.setStatus(2); world.setStatus(2);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 2: case 2:
{ {
if (world.getAliveNpcs(MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(MonsterInstance.class).isEmpty())
{ {
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
startQuestTimer("SEY3", 8000, world.getNpc(FERIN), pl); startQuestTimer("OPEN_DOOR2", 5000, npc, player);
startQuestTimer("OPEN_DOOR2", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 3: case 3:
@@ -198,9 +196,9 @@ public 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);
startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), world.getFirstPlayer()); startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 4: case 4:
@@ -209,13 +207,12 @@ public class ChamberOfProphecies extends AbstractInstance
{ {
world.setStatus(5); world.setStatus(5);
world.spawnGroup("wof_room4"); world.spawnGroup("wof_room4");
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), pl); startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
startQuestTimer("SEY4", 7000, world.getNpc(FERIN), pl);
} }
else else
{ {
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
} }
break; break;
} }

View File

@@ -86,9 +86,9 @@ public class ChamberOfProphecies extends AbstractInstance
qs.setCond(16, true); qs.setCond(16, true);
} }
} }
else if (npc != null) else if (player != null)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (!isInInstance(world)) if (!isInInstance(world))
{ {
return null; return null;
@@ -151,7 +151,7 @@ public class ChamberOfProphecies extends AbstractInstance
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, world.getNpc(KAIN_VAN_HALTER), null); startQuestTimer("CHECK_STATUS", 7000, world.getNpc(KAIN_VAN_HALTER), player);
break; break;
} }
case "CHECK_STATUS": case "CHECK_STATUS":
@@ -162,12 +162,11 @@ public class ChamberOfProphecies extends AbstractInstance
{ {
if (world.getAliveNpcs(MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(MonsterInstance.class).isEmpty())
{ {
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
startQuestTimer("SEY2", 14000, world.getNpc(FERIN), pl); startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), pl); startQuestTimer("OPEN_DOOR1", 5000, npc, player);
startQuestTimer("OPEN_DOOR1", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 1: case 1:
@@ -177,18 +176,17 @@ public class ChamberOfProphecies extends AbstractInstance
world.spawnGroup("wof_room2_1"); world.spawnGroup("wof_room2_1");
world.setStatus(2); world.setStatus(2);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 2: case 2:
{ {
if (world.getAliveNpcs(MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(MonsterInstance.class).isEmpty())
{ {
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
startQuestTimer("SEY3", 8000, world.getNpc(FERIN), pl); startQuestTimer("OPEN_DOOR2", 5000, npc, player);
startQuestTimer("OPEN_DOOR2", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 3: case 3:
@@ -198,9 +196,9 @@ public 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);
startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), world.getFirstPlayer()); startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 4: case 4:
@@ -209,13 +207,12 @@ public class ChamberOfProphecies extends AbstractInstance
{ {
world.setStatus(5); world.setStatus(5);
world.spawnGroup("wof_room4"); world.spawnGroup("wof_room4");
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), pl); startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
startQuestTimer("SEY4", 7000, world.getNpc(FERIN), pl);
} }
else else
{ {
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
} }
break; break;
} }

View File

@@ -86,9 +86,9 @@ public class ChamberOfProphecies extends AbstractInstance
qs.setCond(16, true); qs.setCond(16, true);
} }
} }
else if (npc != null) else if (player != null)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (!isInInstance(world)) if (!isInInstance(world))
{ {
return null; return null;
@@ -151,7 +151,7 @@ public class ChamberOfProphecies extends AbstractInstance
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, world.getNpc(KAIN_VAN_HALTER), null); startQuestTimer("CHECK_STATUS", 7000, world.getNpc(KAIN_VAN_HALTER), player);
break; break;
} }
case "CHECK_STATUS": case "CHECK_STATUS":
@@ -162,12 +162,11 @@ public class ChamberOfProphecies extends AbstractInstance
{ {
if (world.getAliveNpcs(MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(MonsterInstance.class).isEmpty())
{ {
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
startQuestTimer("SEY2", 14000, world.getNpc(FERIN), pl); startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), pl); startQuestTimer("OPEN_DOOR1", 5000, npc, player);
startQuestTimer("OPEN_DOOR1", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 1: case 1:
@@ -177,18 +176,17 @@ public class ChamberOfProphecies extends AbstractInstance
world.spawnGroup("wof_room2_1"); world.spawnGroup("wof_room2_1");
world.setStatus(2); world.setStatus(2);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 2: case 2:
{ {
if (world.getAliveNpcs(MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(MonsterInstance.class).isEmpty())
{ {
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
startQuestTimer("SEY3", 8000, world.getNpc(FERIN), pl); startQuestTimer("OPEN_DOOR2", 5000, npc, player);
startQuestTimer("OPEN_DOOR2", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 3: case 3:
@@ -198,9 +196,9 @@ public 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);
startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), world.getFirstPlayer()); startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 4: case 4:
@@ -209,13 +207,12 @@ public class ChamberOfProphecies extends AbstractInstance
{ {
world.setStatus(5); world.setStatus(5);
world.spawnGroup("wof_room4"); world.spawnGroup("wof_room4");
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), pl); startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
startQuestTimer("SEY4", 7000, world.getNpc(FERIN), pl);
} }
else else
{ {
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
} }
break; break;
} }

View File

@@ -86,9 +86,9 @@ public class ChamberOfProphecies extends AbstractInstance
qs.setCond(4, true); qs.setCond(4, true);
} }
} }
else if (npc != null) else if (player != null)
{ {
final Instance world = npc.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (!isInInstance(world)) if (!isInInstance(world))
{ {
return null; return null;
@@ -151,7 +151,7 @@ public class ChamberOfProphecies extends AbstractInstance
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, world.getNpc(KAIN_VAN_HALTER), null); startQuestTimer("CHECK_STATUS", 7000, world.getNpc(KAIN_VAN_HALTER), player);
break; break;
} }
case "CHECK_STATUS": case "CHECK_STATUS":
@@ -162,12 +162,11 @@ public class ChamberOfProphecies extends AbstractInstance
{ {
if (world.getAliveNpcs(MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(MonsterInstance.class).isEmpty())
{ {
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY2", 14000, world.getNpc(FERIN), player);
startQuestTimer("SEY2", 14000, world.getNpc(FERIN), pl); startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), player);
startQuestTimer("SEY_KAIN", 24000, world.getNpc(VAN_HALTER), pl); startQuestTimer("OPEN_DOOR1", 5000, npc, player);
startQuestTimer("OPEN_DOOR1", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 1: case 1:
@@ -177,18 +176,17 @@ public class ChamberOfProphecies extends AbstractInstance
world.spawnGroup("wof_room2_1"); world.spawnGroup("wof_room2_1");
world.setStatus(2); world.setStatus(2);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 2: case 2:
{ {
if (world.getAliveNpcs(MonsterInstance.class).isEmpty()) if (world.getAliveNpcs(MonsterInstance.class).isEmpty())
{ {
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY3", 8000, world.getNpc(FERIN), player);
startQuestTimer("SEY3", 8000, world.getNpc(FERIN), pl); startQuestTimer("OPEN_DOOR2", 5000, npc, player);
startQuestTimer("OPEN_DOOR2", 5000, npc, pl);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 3: case 3:
@@ -198,9 +196,9 @@ public 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);
startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), world.getFirstPlayer()); startQuestTimer("SEY_KAIN_1", 5000, world.getNpc(VAN_HALTER), player);
} }
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
break; break;
} }
case 4: case 4:
@@ -209,13 +207,12 @@ public class ChamberOfProphecies extends AbstractInstance
{ {
world.setStatus(5); world.setStatus(5);
world.spawnGroup("wof_room4"); world.spawnGroup("wof_room4");
final PlayerInstance pl = world.getFirstPlayer(); startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), player);
startQuestTimer("SEY_KAIN_2", 3000, world.getNpc(VAN_HALTER), pl); startQuestTimer("SEY4", 7000, world.getNpc(FERIN), player);
startQuestTimer("SEY4", 7000, world.getNpc(FERIN), pl);
} }
else else
{ {
startQuestTimer("CHECK_STATUS", 7000, npc, null); startQuestTimer("CHECK_STATUS", 7000, npc, player);
} }
break; break;
} }