From 526e3d63febf8528dff592bfe4fc1ea0f438b706 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 17 Sep 2017 12:32:02 +0000 Subject: [PATCH] Improvements for Labyrinth of Belis. --- .../LabyrinthOfBelis/LabyrinthOfBelis.java | 16 +++++++++++----- .../LabyrinthOfBelis/LabyrinthOfBelis.java | 16 +++++++++++----- .../LabyrinthOfBelis/LabyrinthOfBelis.java | 16 +++++++++++----- 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java index d20d5aed5e..ca5fe1d144 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java @@ -273,6 +273,7 @@ public final class LabyrinthOfBelis extends AbstractInstance } case 7: { + npc.abortAttack(); npc.setScriptValue(0); npc.broadcastInfo(); npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SOMETHING_OMINOUS_IN_THERE_I_HOPE_YOU_RE_REALLY_READY_FOR_THIS_LET_ME_KNOW); @@ -539,18 +540,23 @@ public final class LabyrinthOfBelis extends AbstractInstance { world.setStatus(7); world.openCloseDoor(DOOR_ID_ROOM_4_1, true); - showOnScreenMsg(player, NpcStringId.ELECTRONIC_DEVICE_HAS_BEEN_DESTROYED, ExShowScreenMessage.TOP_CENTER, 4500); final L2Npc generator = world.getNpc(ELECTRICITY_GENERATOR); - generator.deleteMe(); - final L2Npc officer = world.getNpc(INFILTRATION_OFFICER); - officer.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, INFILTRATION_OFFICER_ROOM_4); - officer.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DEVICE_DESTROYED_LET_S_GO_ONTO_THE_NEXT); + generator.doDie(officer); + generator.deleteMe(); + getTimers().addTimer("MOVE_TO_ROOM_4", 3000, officer, null); } break; } + case "MOVE_TO_ROOM_4": + { + npc.setRunning(); + npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, INFILTRATION_OFFICER_ROOM_4); + npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DEVICE_DESTROYED_LET_S_GO_ONTO_THE_NEXT); + break; + } case "ROOM_4_DONE": { if (world.isStatus(8)) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java index d20d5aed5e..ca5fe1d144 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java @@ -273,6 +273,7 @@ public final class LabyrinthOfBelis extends AbstractInstance } case 7: { + npc.abortAttack(); npc.setScriptValue(0); npc.broadcastInfo(); npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SOMETHING_OMINOUS_IN_THERE_I_HOPE_YOU_RE_REALLY_READY_FOR_THIS_LET_ME_KNOW); @@ -539,18 +540,23 @@ public final class LabyrinthOfBelis extends AbstractInstance { world.setStatus(7); world.openCloseDoor(DOOR_ID_ROOM_4_1, true); - showOnScreenMsg(player, NpcStringId.ELECTRONIC_DEVICE_HAS_BEEN_DESTROYED, ExShowScreenMessage.TOP_CENTER, 4500); final L2Npc generator = world.getNpc(ELECTRICITY_GENERATOR); - generator.deleteMe(); - final L2Npc officer = world.getNpc(INFILTRATION_OFFICER); - officer.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, INFILTRATION_OFFICER_ROOM_4); - officer.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DEVICE_DESTROYED_LET_S_GO_ONTO_THE_NEXT); + generator.doDie(officer); + generator.deleteMe(); + getTimers().addTimer("MOVE_TO_ROOM_4", 3000, officer, null); } break; } + case "MOVE_TO_ROOM_4": + { + npc.setRunning(); + npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, INFILTRATION_OFFICER_ROOM_4); + npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DEVICE_DESTROYED_LET_S_GO_ONTO_THE_NEXT); + break; + } case "ROOM_4_DONE": { if (world.isStatus(8)) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java index 396733f8bf..eb38111778 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java @@ -273,6 +273,7 @@ public final class LabyrinthOfBelis extends AbstractInstance } case 7: { + npc.abortAttack(); npc.setScriptValue(0); npc.broadcastInfo(); npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SOMETHING_OMINOUS_IN_THERE_I_HOPE_YOU_RE_REALLY_READY_FOR_THIS_LET_ME_KNOW); @@ -538,18 +539,23 @@ public final class LabyrinthOfBelis extends AbstractInstance { world.setStatus(7); world.openCloseDoor(DOOR_ID_ROOM_4_1, true); - showOnScreenMsg(player, NpcStringId.ELECTRONIC_DEVICE_HAS_BEEN_DESTROYED, ExShowScreenMessage.TOP_CENTER, 4500); final L2Npc generator = world.getNpc(ELECTRICITY_GENERATOR); - generator.deleteMe(); - final L2Npc officer = world.getNpc(INFILTRATION_OFFICER); - officer.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, INFILTRATION_OFFICER_ROOM_4); - officer.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DEVICE_DESTROYED_LET_S_GO_ONTO_THE_NEXT); + generator.doDie(officer); + generator.deleteMe(); + getTimers().addTimer("MOVE_TO_ROOM_4", 3000, officer, null); } break; } + case "MOVE_TO_ROOM_4": + { + npc.setRunning(); + npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, INFILTRATION_OFFICER_ROOM_4); + npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DEVICE_DESTROYED_LET_S_GO_ONTO_THE_NEXT); + break; + } case "ROOM_4_DONE": { if (world.isStatus(8))