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

Player instead of Npc parameters for Chamber of Prophecies timers.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

35
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java vendored
View File

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

35
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java vendored
View File

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

35
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java vendored
View File

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

35
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java vendored
View File

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

35
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/ChamberOfProphecies/ChamberOfProphecies.java vendored
View File

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