From bbafd95780052b073bdb142cfd8442a8adb887e2 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 23 Dec 2021 02:03:04 +0000
Subject: [PATCH] Made Command Post instance available.
---
.../dist/game/data/html/default/34089-1.htm | 2 +-
.../dist/game/data/html/default/34089.htm | 2 +-
.../dist/game/data/instances/CommandPost.xml | 22 +--
.../instances/CommandPost/CommandPost.java | 181 +++++++-----------
.../data/spawns/DarkElf/AteliaFortress.xml | 1 +
.../dist/game/data/zones/custom_script.xml | 14 +-
.../dist/game/data/html/default/34089-1.htm | 2 +-
.../dist/game/data/html/default/34089.htm | 2 +-
.../dist/game/data/instances/CommandPost.xml | 22 +--
.../instances/CommandPost/CommandPost.java | 181 +++++++-----------
.../data/spawns/DarkElf/AteliaFortress.xml | 1 +
.../dist/game/data/zones/custom_script.xml | 14 +-
.../dist/game/data/html/default/34089-1.htm | 2 +-
.../dist/game/data/html/default/34089.htm | 2 +-
.../dist/game/data/instances/CommandPost.xml | 22 +--
.../instances/CommandPost/CommandPost.java | 181 +++++++-----------
.../data/spawns/DarkElf/AteliaFortress.xml | 1 +
.../dist/game/data/zones/custom_script.xml | 14 +-
.../dist/game/data/html/default/34089-1.htm | 2 +-
.../dist/game/data/html/default/34089.htm | 2 +-
.../dist/game/data/instances/CommandPost.xml | 22 +--
.../instances/CommandPost/CommandPost.java | 181 +++++++-----------
.../data/spawns/DarkElf/AteliaFortress.xml | 1 +
.../dist/game/data/zones/custom_script.xml | 14 +-
.../dist/game/data/html/default/34089-1.htm | 2 +-
.../dist/game/data/html/default/34089.htm | 2 +-
.../dist/game/data/instances/CommandPost.xml | 22 +--
.../instances/CommandPost/CommandPost.java | 181 +++++++-----------
.../data/spawns/DarkElf/AteliaFortress.xml | 1 +
.../dist/game/data/zones/custom_script.xml | 14 +-
.../dist/game/data/html/default/34089-1.htm | 2 +-
.../dist/game/data/html/default/34089.htm | 2 +-
.../dist/game/data/instances/CommandPost.xml | 22 +--
.../instances/CommandPost/CommandPost.java | 181 +++++++-----------
.../data/spawns/DarkElf/AteliaFortress.xml | 1 +
.../dist/game/data/zones/custom_script.xml | 14 +-
.../dist/game/data/html/default/34089-1.htm | 2 +-
.../dist/game/data/html/default/34089.htm | 2 +-
.../dist/game/data/instances/CommandPost.xml | 22 +--
.../instances/CommandPost/CommandPost.java | 181 +++++++-----------
.../data/spawns/DarkElf/AteliaFortress.xml | 1 +
.../dist/game/data/zones/custom_script.xml | 14 +-
.../dist/game/data/html/default/34089-1.htm | 2 +-
.../dist/game/data/html/default/34089.htm | 2 +-
.../dist/game/data/instances/CommandPost.xml | 22 +--
.../instances/CommandPost/CommandPost.java | 181 +++++++-----------
.../data/spawns/DarkElf/AteliaFortress.xml | 1 +
.../dist/game/data/zones/custom_script.xml | 14 +-
.../dist/game/data/html/default/34089-1.htm | 2 +-
.../dist/game/data/html/default/34089.htm | 2 +-
.../dist/game/data/instances/CommandPost.xml | 22 +--
.../instances/CommandPost/CommandPost.java | 181 +++++++-----------
.../data/spawns/DarkElf/AteliaFortress.xml | 1 +
.../dist/game/data/zones/custom_script.xml | 14 +-
.../dist/game/data/html/default/34089-1.htm | 2 +-
.../dist/game/data/html/default/34089.htm | 2 +-
.../dist/game/data/instances/CommandPost.xml | 22 +--
.../instances/CommandPost/CommandPost.java | 181 +++++++-----------
.../data/spawns/DarkElf/AteliaFortress.xml | 1 +
.../dist/game/data/zones/custom_script.xml | 14 +-
60 files changed, 880 insertions(+), 1340 deletions(-)
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/html/default/34089-1.htm b/L2J_Mobius_02.5_Underground/dist/game/data/html/default/34089-1.htm
index cea757c854..e6de154ff1 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/html/default/34089-1.htm
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/html/default/34089-1.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
The command Post is where the Embryo are training new recruits.
The one in charge there is Commander Burnstein. I hear all kinds of inhumane things are going inside.
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/html/default/34089.htm b/L2J_Mobius_02.5_Underground/dist/game/data/html/default/34089.htm
index 98167c90c5..4407758e73 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/html/default/34089.htm
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/html/default/34089.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
Shh! Please be quiet. This is enemy territory.
You don't need to introduce yourself. I've heard of your accomplishments.
If only you could've come sooner... We are waiting for Burnstein to come out of the command post.
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/instances/CommandPost.xml b/L2J_Mobius_02.5_Underground/dist/game/data/instances/CommandPost.xml
index 439b5854a1..11ba81fe27 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/instances/CommandPost.xml
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/instances/CommandPost.xml
@@ -80,12 +80,12 @@
-
+
-
+
@@ -96,7 +96,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
@@ -119,7 +119,7 @@
-
+
@@ -129,22 +129,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index 757ea726e6..c482b27b4c 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -19,17 +19,13 @@ package instances.CommandPost;
import java.util.List;
import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.model.zone.ZoneType;
import org.l2jmobius.gameserver.model.zone.type.ScriptZone;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -39,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import instances.AbstractInstance;
/**
- * @author NasSeKa
+ * @author NasSeKa, Mobius
*/
public class CommandPost extends AbstractInstance
{
@@ -47,10 +43,6 @@ public class CommandPost extends AbstractInstance
private static final int DEVIANNE = 34089;
private static final int GEORK = 26135;
private static final int BURNSTEIN = 26136;
- private static final int ELITE_KNIGHT = 23605;
- private static final int ELITE_WARRIOR = 23606;
- private static final int ELITE_ARCHER = 23607;
- private static final int ELITE_WIZARD = 23608;
private static final int ADOLPH = 23590;
private static final int BARTON = 23591;
private static final int HAYUK = 23592;
@@ -111,7 +103,6 @@ public class CommandPost extends AbstractInstance
// Zones
private static final ScriptZone FLOOR_1_TP = ZoneManager.getInstance().getZoneById(25901, ScriptZone.class);
private static final ScriptZone FLOOR_2_TP = ZoneManager.getInstance().getZoneById(25902, ScriptZone.class);
- private static final ScriptZone FLOOR_2_START = ZoneManager.getInstance().getZoneById(25903, ScriptZone.class);
// Misc
private static final int TEMPLATE_ID = 259;
@@ -120,7 +111,6 @@ public class CommandPost extends AbstractInstance
super(TEMPLATE_ID);
addStartNpc(DEVIANNE);
addTalkId(DEVIANNE);
- addEnterZoneId(FLOOR_1_TP.getId(), FLOOR_2_TP.getId(), FLOOR_2_START.getId());
addMoveFinishedId(GROUP_1);
addMoveFinishedId(GROUP_2);
addMoveFinishedId(GROUP_3);
@@ -220,8 +210,8 @@ public class CommandPost extends AbstractInstance
if (world.getAliveNpcs(FIRST_FLOOR).isEmpty())
{
showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_2ND_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
- world.setStatus(2);
world.getNpc(GEORK).teleToLocation(GEORK_FLOOR_2_SPAWN);
+ world.setStatus(2);
for (Npc monster : world.spawnGroup("group_1"))
{
monster.setInvul(true);
@@ -257,23 +247,25 @@ public class CommandPost extends AbstractInstance
}
case 2:
{
- if (!player.isGM())
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
{
- final Party party = player.getParty();
- final List members = party.getMembers();
- for (Player member : members)
+ if (!member.isTeleporting() && FLOOR_1_TP.isInsideZone(member))
{
- if (FLOOR_1_TP.isInsideZone(member))
- {
- member.teleToLocation(FLOOR_2_SPAWN);
- }
+ member.teleToLocation(FLOOR_2_SPAWN);
+ teleported++;
}
}
- else if (FLOOR_1_TP.isInsideZone(player))
+ if (teleported == world.getPlayersCount())
{
- player.teleToLocation(FLOOR_2_SPAWN);
+ world.setStatus(3);
+ world.setParameter("TELEPORTED", 0);
+ world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
@@ -285,17 +277,13 @@ public class CommandPost extends AbstractInstance
monster.setWalking();
monster.getAI().moveTo(GROUP_1_MOVE);
}
-
+ world.setStatus(4);
startQuestTimer("check_status", 3000, null, player);
break;
}
case 4:
{
- if ((world.getStatus() == 4) && //
- (!world.getNpc(ELITE_KNIGHT).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WARRIOR).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_ARCHER).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WIZARD).isInsideZone(ZoneId.SCRIPT)))
+ if (world.getAliveNpcs().size() == 19)
{
for (Npc monster : world.getNpcsOfGroup("group_2"))
{
@@ -306,13 +294,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("secondGroupId"), true);
world.setStatus(5);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 5:
{
- if (world.getAliveNpcs(GROUP_2).isEmpty())
+ if (world.getAliveNpcs().size() == 14)
{
for (Npc monster : world.getNpcsOfGroup("group_3"))
{
@@ -323,13 +310,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("thirdGroupId"), true);
world.setStatus(6);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 6:
{
- if (world.getAliveNpcs(GROUP_3).isEmpty())
+ if (world.getAliveNpcs().size() == 8)
{
for (Npc monster : world.getNpcsOfGroup("group_4"))
{
@@ -340,23 +326,43 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("fourthGroupId"), true);
world.setStatus(7);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 7:
{
- // if (world.getAliveNpcs(GROUP_4).isEmpty())
- // {
- // System.out.println("Status is 7.");
- // }
-
+ if (world.getAliveNpcs().size() == 1)
+ {
+ showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_3RD_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
+ world.getNpc(GEORK).deleteMe();
+ world.setStatus(8);
+ }
startQuestTimer("check_status", 3000, null, player);
break;
}
- default:
+ case 8:
{
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
+ {
+ if (!member.isTeleporting() && FLOOR_2_TP.isInsideZone(member))
+ {
+ member.teleToLocation(FLOOR_3_SPAWN);
+ teleported++;
+ }
+ }
+ if (teleported == world.getPlayersCount())
+ {
+ world.setStatus(9);
+ world.spawnGroup("boss");
+ world.setParameter("TELEPORTED", 0);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
+ }
startQuestTimer("check_status", 3000, null, player);
+ break;
}
}
break;
@@ -369,56 +375,14 @@ public class CommandPost extends AbstractInstance
public void onMoveFinished(Npc npc)
{
final Instance world = npc.getInstanceWorld();
- if (world != null)
+ if (isInInstance(world))
{
npc.setInvul(false);
npc.setTargetable(true);
- if (CommonUtil.contains(GROUP_1, npc.getId()))
- {
- world.setStatus(4);
- }
}
super.onMoveFinished(npc);
}
- @Override
- public String onEnterZone(Creature creature, ZoneType zone)
- {
- final Instance world = creature.getInstanceWorld();
- if (world != null)
- {
- switch (zone.getId())
- {
- case 25901:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 2))
- {
- creature.teleToLocation(FLOOR_2_SPAWN);
- }
- break;
- }
- case 25902:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 3))
- {
- creature.teleToLocation(FLOOR_3_SPAWN);
- }
- break;
- }
- case 25903:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() == 2))
- {
- world.setStatus(3);
- world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
- }
- break;
- }
- }
- }
- return super.onEnterZone(creature, zone);
- }
-
@Override
public String onKill(Npc npc, Player player, boolean isPet)
{
@@ -430,51 +394,52 @@ public class CommandPost extends AbstractInstance
case BURNSTEIN:
{
world.finishInstance();
+ showOnScreenMsg(world, NpcStringId.YOU_VE_SUCCESSFULLY_ATTACKED_THE_COMMAND_POST_AND_DEFEATED_COMMANDER_BURNSTEIN, ExShowScreenMessage.TOP_CENTER, 10000, true);
break;
}
case ADOLPH:
{
- world.spawnGroup("adolph");
- world.getNpc(ADOLPH).setInvul(true);
- world.getNpc(ADOLPH).setRandomWalking(false);
- world.getNpc(ADOLPH).setTargetable(false);
- addMoveToDesire(world.getNpc(ADOLPH), ADOLPH_MOVE, 6);
+ final Npc adolph = world.spawnGroup("adolph").stream().findFirst().get();
+ adolph.setInvul(true);
+ adolph.setRandomWalking(false);
+ adolph.setTargetable(false);
+ addMoveToDesire(adolph, ADOLPH_MOVE, 6);
break;
}
case BARTON:
{
- world.spawnGroup("barton");
- world.getNpc(BARTON).setInvul(true);
- world.getNpc(BARTON).setRandomWalking(false);
- world.getNpc(BARTON).setTargetable(false);
- addMoveToDesire(world.getNpc(BARTON), BARTON_MOVE, 6);
+ final Npc barton = world.spawnGroup("barton").stream().findFirst().get();
+ barton.setInvul(true);
+ barton.setRandomWalking(false);
+ barton.setTargetable(false);
+ addMoveToDesire(barton, BARTON_MOVE, 6);
break;
}
case HAYUK:
{
- world.spawnGroup("hayuk");
- world.getNpc(HAYUK).setInvul(true);
- world.getNpc(HAYUK).setRandomWalking(false);
- world.getNpc(HAYUK).setTargetable(false);
- addMoveToDesire(world.getNpc(HAYUK), HAYUK_MOVE, 6);
+ final Npc hayuk = world.spawnGroup("hayuk").stream().findFirst().get();
+ hayuk.setInvul(true);
+ hayuk.setRandomWalking(false);
+ hayuk.setTargetable(false);
+ addMoveToDesire(hayuk, HAYUK_MOVE, 6);
break;
}
case ELISE:
{
- world.spawnGroup("elise");
- world.getNpc(ELISE).setInvul(true);
- world.getNpc(ELISE).setRandomWalking(false);
- world.getNpc(ELISE).setTargetable(false);
- addMoveToDesire(world.getNpc(ELISE), ELISE_MOVE, 6);
+ final Npc elise = world.spawnGroup("elise").stream().findFirst().get();
+ elise.setInvul(true);
+ elise.setRandomWalking(false);
+ elise.setTargetable(false);
+ addMoveToDesire(elise, ELISE_MOVE, 6);
break;
}
case ELRYAH:
{
- world.spawnGroup("elryah");
- world.getNpc(ELRYAH).setInvul(true);
- world.getNpc(ELRYAH).setRandomWalking(false);
- world.getNpc(ELRYAH).setTargetable(false);
- addMoveToDesire(world.getNpc(ELRYAH), ELRYAH_MOVE, 6);
+ final Npc elryah = world.spawnGroup("elryah").stream().findFirst().get();
+ elryah.setInvul(true);
+ elryah.setRandomWalking(false);
+ elryah.setTargetable(false);
+ addMoveToDesire(elryah, ELRYAH_MOVE, 6);
break;
}
}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/spawns/DarkElf/AteliaFortress.xml b/L2J_Mobius_02.5_Underground/dist/game/data/spawns/DarkElf/AteliaFortress.xml
index 64155c4013..7f6f78624e 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/spawns/DarkElf/AteliaFortress.xml
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/spawns/DarkElf/AteliaFortress.xml
@@ -2,6 +2,7 @@
+
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/zones/custom_script.xml b/L2J_Mobius_02.5_Underground/dist/game/data/zones/custom_script.xml
index 0cf8508677..da839c6ff9 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/zones/custom_script.xml
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/zones/custom_script.xml
@@ -1158,22 +1158,10 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/html/default/34089-1.htm b/L2J_Mobius_03.0_Helios/dist/game/data/html/default/34089-1.htm
index cea757c854..e6de154ff1 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/html/default/34089-1.htm
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/html/default/34089-1.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
The command Post is where the Embryo are training new recruits.
The one in charge there is Commander Burnstein. I hear all kinds of inhumane things are going inside.
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/html/default/34089.htm b/L2J_Mobius_03.0_Helios/dist/game/data/html/default/34089.htm
index 98167c90c5..4407758e73 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/html/default/34089.htm
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/html/default/34089.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
Shh! Please be quiet. This is enemy territory.
You don't need to introduce yourself. I've heard of your accomplishments.
If only you could've come sooner... We are waiting for Burnstein to come out of the command post.
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/instances/CommandPost.xml b/L2J_Mobius_03.0_Helios/dist/game/data/instances/CommandPost.xml
index 439b5854a1..11ba81fe27 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/instances/CommandPost.xml
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/instances/CommandPost.xml
@@ -80,12 +80,12 @@
-
+
-
+
@@ -96,7 +96,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
@@ -119,7 +119,7 @@
-
+
@@ -129,22 +129,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index 757ea726e6..c482b27b4c 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -19,17 +19,13 @@ package instances.CommandPost;
import java.util.List;
import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.model.zone.ZoneType;
import org.l2jmobius.gameserver.model.zone.type.ScriptZone;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -39,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import instances.AbstractInstance;
/**
- * @author NasSeKa
+ * @author NasSeKa, Mobius
*/
public class CommandPost extends AbstractInstance
{
@@ -47,10 +43,6 @@ public class CommandPost extends AbstractInstance
private static final int DEVIANNE = 34089;
private static final int GEORK = 26135;
private static final int BURNSTEIN = 26136;
- private static final int ELITE_KNIGHT = 23605;
- private static final int ELITE_WARRIOR = 23606;
- private static final int ELITE_ARCHER = 23607;
- private static final int ELITE_WIZARD = 23608;
private static final int ADOLPH = 23590;
private static final int BARTON = 23591;
private static final int HAYUK = 23592;
@@ -111,7 +103,6 @@ public class CommandPost extends AbstractInstance
// Zones
private static final ScriptZone FLOOR_1_TP = ZoneManager.getInstance().getZoneById(25901, ScriptZone.class);
private static final ScriptZone FLOOR_2_TP = ZoneManager.getInstance().getZoneById(25902, ScriptZone.class);
- private static final ScriptZone FLOOR_2_START = ZoneManager.getInstance().getZoneById(25903, ScriptZone.class);
// Misc
private static final int TEMPLATE_ID = 259;
@@ -120,7 +111,6 @@ public class CommandPost extends AbstractInstance
super(TEMPLATE_ID);
addStartNpc(DEVIANNE);
addTalkId(DEVIANNE);
- addEnterZoneId(FLOOR_1_TP.getId(), FLOOR_2_TP.getId(), FLOOR_2_START.getId());
addMoveFinishedId(GROUP_1);
addMoveFinishedId(GROUP_2);
addMoveFinishedId(GROUP_3);
@@ -220,8 +210,8 @@ public class CommandPost extends AbstractInstance
if (world.getAliveNpcs(FIRST_FLOOR).isEmpty())
{
showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_2ND_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
- world.setStatus(2);
world.getNpc(GEORK).teleToLocation(GEORK_FLOOR_2_SPAWN);
+ world.setStatus(2);
for (Npc monster : world.spawnGroup("group_1"))
{
monster.setInvul(true);
@@ -257,23 +247,25 @@ public class CommandPost extends AbstractInstance
}
case 2:
{
- if (!player.isGM())
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
{
- final Party party = player.getParty();
- final List members = party.getMembers();
- for (Player member : members)
+ if (!member.isTeleporting() && FLOOR_1_TP.isInsideZone(member))
{
- if (FLOOR_1_TP.isInsideZone(member))
- {
- member.teleToLocation(FLOOR_2_SPAWN);
- }
+ member.teleToLocation(FLOOR_2_SPAWN);
+ teleported++;
}
}
- else if (FLOOR_1_TP.isInsideZone(player))
+ if (teleported == world.getPlayersCount())
{
- player.teleToLocation(FLOOR_2_SPAWN);
+ world.setStatus(3);
+ world.setParameter("TELEPORTED", 0);
+ world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
@@ -285,17 +277,13 @@ public class CommandPost extends AbstractInstance
monster.setWalking();
monster.getAI().moveTo(GROUP_1_MOVE);
}
-
+ world.setStatus(4);
startQuestTimer("check_status", 3000, null, player);
break;
}
case 4:
{
- if ((world.getStatus() == 4) && //
- (!world.getNpc(ELITE_KNIGHT).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WARRIOR).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_ARCHER).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WIZARD).isInsideZone(ZoneId.SCRIPT)))
+ if (world.getAliveNpcs().size() == 19)
{
for (Npc monster : world.getNpcsOfGroup("group_2"))
{
@@ -306,13 +294,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("secondGroupId"), true);
world.setStatus(5);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 5:
{
- if (world.getAliveNpcs(GROUP_2).isEmpty())
+ if (world.getAliveNpcs().size() == 14)
{
for (Npc monster : world.getNpcsOfGroup("group_3"))
{
@@ -323,13 +310,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("thirdGroupId"), true);
world.setStatus(6);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 6:
{
- if (world.getAliveNpcs(GROUP_3).isEmpty())
+ if (world.getAliveNpcs().size() == 8)
{
for (Npc monster : world.getNpcsOfGroup("group_4"))
{
@@ -340,23 +326,43 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("fourthGroupId"), true);
world.setStatus(7);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 7:
{
- // if (world.getAliveNpcs(GROUP_4).isEmpty())
- // {
- // System.out.println("Status is 7.");
- // }
-
+ if (world.getAliveNpcs().size() == 1)
+ {
+ showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_3RD_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
+ world.getNpc(GEORK).deleteMe();
+ world.setStatus(8);
+ }
startQuestTimer("check_status", 3000, null, player);
break;
}
- default:
+ case 8:
{
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
+ {
+ if (!member.isTeleporting() && FLOOR_2_TP.isInsideZone(member))
+ {
+ member.teleToLocation(FLOOR_3_SPAWN);
+ teleported++;
+ }
+ }
+ if (teleported == world.getPlayersCount())
+ {
+ world.setStatus(9);
+ world.spawnGroup("boss");
+ world.setParameter("TELEPORTED", 0);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
+ }
startQuestTimer("check_status", 3000, null, player);
+ break;
}
}
break;
@@ -369,56 +375,14 @@ public class CommandPost extends AbstractInstance
public void onMoveFinished(Npc npc)
{
final Instance world = npc.getInstanceWorld();
- if (world != null)
+ if (isInInstance(world))
{
npc.setInvul(false);
npc.setTargetable(true);
- if (CommonUtil.contains(GROUP_1, npc.getId()))
- {
- world.setStatus(4);
- }
}
super.onMoveFinished(npc);
}
- @Override
- public String onEnterZone(Creature creature, ZoneType zone)
- {
- final Instance world = creature.getInstanceWorld();
- if (world != null)
- {
- switch (zone.getId())
- {
- case 25901:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 2))
- {
- creature.teleToLocation(FLOOR_2_SPAWN);
- }
- break;
- }
- case 25902:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 3))
- {
- creature.teleToLocation(FLOOR_3_SPAWN);
- }
- break;
- }
- case 25903:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() == 2))
- {
- world.setStatus(3);
- world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
- }
- break;
- }
- }
- }
- return super.onEnterZone(creature, zone);
- }
-
@Override
public String onKill(Npc npc, Player player, boolean isPet)
{
@@ -430,51 +394,52 @@ public class CommandPost extends AbstractInstance
case BURNSTEIN:
{
world.finishInstance();
+ showOnScreenMsg(world, NpcStringId.YOU_VE_SUCCESSFULLY_ATTACKED_THE_COMMAND_POST_AND_DEFEATED_COMMANDER_BURNSTEIN, ExShowScreenMessage.TOP_CENTER, 10000, true);
break;
}
case ADOLPH:
{
- world.spawnGroup("adolph");
- world.getNpc(ADOLPH).setInvul(true);
- world.getNpc(ADOLPH).setRandomWalking(false);
- world.getNpc(ADOLPH).setTargetable(false);
- addMoveToDesire(world.getNpc(ADOLPH), ADOLPH_MOVE, 6);
+ final Npc adolph = world.spawnGroup("adolph").stream().findFirst().get();
+ adolph.setInvul(true);
+ adolph.setRandomWalking(false);
+ adolph.setTargetable(false);
+ addMoveToDesire(adolph, ADOLPH_MOVE, 6);
break;
}
case BARTON:
{
- world.spawnGroup("barton");
- world.getNpc(BARTON).setInvul(true);
- world.getNpc(BARTON).setRandomWalking(false);
- world.getNpc(BARTON).setTargetable(false);
- addMoveToDesire(world.getNpc(BARTON), BARTON_MOVE, 6);
+ final Npc barton = world.spawnGroup("barton").stream().findFirst().get();
+ barton.setInvul(true);
+ barton.setRandomWalking(false);
+ barton.setTargetable(false);
+ addMoveToDesire(barton, BARTON_MOVE, 6);
break;
}
case HAYUK:
{
- world.spawnGroup("hayuk");
- world.getNpc(HAYUK).setInvul(true);
- world.getNpc(HAYUK).setRandomWalking(false);
- world.getNpc(HAYUK).setTargetable(false);
- addMoveToDesire(world.getNpc(HAYUK), HAYUK_MOVE, 6);
+ final Npc hayuk = world.spawnGroup("hayuk").stream().findFirst().get();
+ hayuk.setInvul(true);
+ hayuk.setRandomWalking(false);
+ hayuk.setTargetable(false);
+ addMoveToDesire(hayuk, HAYUK_MOVE, 6);
break;
}
case ELISE:
{
- world.spawnGroup("elise");
- world.getNpc(ELISE).setInvul(true);
- world.getNpc(ELISE).setRandomWalking(false);
- world.getNpc(ELISE).setTargetable(false);
- addMoveToDesire(world.getNpc(ELISE), ELISE_MOVE, 6);
+ final Npc elise = world.spawnGroup("elise").stream().findFirst().get();
+ elise.setInvul(true);
+ elise.setRandomWalking(false);
+ elise.setTargetable(false);
+ addMoveToDesire(elise, ELISE_MOVE, 6);
break;
}
case ELRYAH:
{
- world.spawnGroup("elryah");
- world.getNpc(ELRYAH).setInvul(true);
- world.getNpc(ELRYAH).setRandomWalking(false);
- world.getNpc(ELRYAH).setTargetable(false);
- addMoveToDesire(world.getNpc(ELRYAH), ELRYAH_MOVE, 6);
+ final Npc elryah = world.spawnGroup("elryah").stream().findFirst().get();
+ elryah.setInvul(true);
+ elryah.setRandomWalking(false);
+ elryah.setTargetable(false);
+ addMoveToDesire(elryah, ELRYAH_MOVE, 6);
break;
}
}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/spawns/DarkElf/AteliaFortress.xml b/L2J_Mobius_03.0_Helios/dist/game/data/spawns/DarkElf/AteliaFortress.xml
index 64155c4013..7f6f78624e 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/spawns/DarkElf/AteliaFortress.xml
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/spawns/DarkElf/AteliaFortress.xml
@@ -2,6 +2,7 @@
+
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/zones/custom_script.xml b/L2J_Mobius_03.0_Helios/dist/game/data/zones/custom_script.xml
index 0cf8508677..da839c6ff9 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/zones/custom_script.xml
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/zones/custom_script.xml
@@ -1158,22 +1158,10 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/html/default/34089-1.htm b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/html/default/34089-1.htm
index cea757c854..e6de154ff1 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/html/default/34089-1.htm
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/html/default/34089-1.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
The command Post is where the Embryo are training new recruits.
The one in charge there is Commander Burnstein. I hear all kinds of inhumane things are going inside.
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/html/default/34089.htm b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/html/default/34089.htm
index 98167c90c5..4407758e73 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/html/default/34089.htm
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/html/default/34089.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
Shh! Please be quiet. This is enemy territory.
You don't need to introduce yourself. I've heard of your accomplishments.
If only you could've come sooner... We are waiting for Burnstein to come out of the command post.
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/instances/CommandPost.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/instances/CommandPost.xml
index 439b5854a1..11ba81fe27 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/instances/CommandPost.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/instances/CommandPost.xml
@@ -80,12 +80,12 @@
-
+
-
+
@@ -96,7 +96,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
@@ -119,7 +119,7 @@
-
+
@@ -129,22 +129,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index 757ea726e6..c482b27b4c 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -19,17 +19,13 @@ package instances.CommandPost;
import java.util.List;
import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.model.zone.ZoneType;
import org.l2jmobius.gameserver.model.zone.type.ScriptZone;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -39,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import instances.AbstractInstance;
/**
- * @author NasSeKa
+ * @author NasSeKa, Mobius
*/
public class CommandPost extends AbstractInstance
{
@@ -47,10 +43,6 @@ public class CommandPost extends AbstractInstance
private static final int DEVIANNE = 34089;
private static final int GEORK = 26135;
private static final int BURNSTEIN = 26136;
- private static final int ELITE_KNIGHT = 23605;
- private static final int ELITE_WARRIOR = 23606;
- private static final int ELITE_ARCHER = 23607;
- private static final int ELITE_WIZARD = 23608;
private static final int ADOLPH = 23590;
private static final int BARTON = 23591;
private static final int HAYUK = 23592;
@@ -111,7 +103,6 @@ public class CommandPost extends AbstractInstance
// Zones
private static final ScriptZone FLOOR_1_TP = ZoneManager.getInstance().getZoneById(25901, ScriptZone.class);
private static final ScriptZone FLOOR_2_TP = ZoneManager.getInstance().getZoneById(25902, ScriptZone.class);
- private static final ScriptZone FLOOR_2_START = ZoneManager.getInstance().getZoneById(25903, ScriptZone.class);
// Misc
private static final int TEMPLATE_ID = 259;
@@ -120,7 +111,6 @@ public class CommandPost extends AbstractInstance
super(TEMPLATE_ID);
addStartNpc(DEVIANNE);
addTalkId(DEVIANNE);
- addEnterZoneId(FLOOR_1_TP.getId(), FLOOR_2_TP.getId(), FLOOR_2_START.getId());
addMoveFinishedId(GROUP_1);
addMoveFinishedId(GROUP_2);
addMoveFinishedId(GROUP_3);
@@ -220,8 +210,8 @@ public class CommandPost extends AbstractInstance
if (world.getAliveNpcs(FIRST_FLOOR).isEmpty())
{
showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_2ND_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
- world.setStatus(2);
world.getNpc(GEORK).teleToLocation(GEORK_FLOOR_2_SPAWN);
+ world.setStatus(2);
for (Npc monster : world.spawnGroup("group_1"))
{
monster.setInvul(true);
@@ -257,23 +247,25 @@ public class CommandPost extends AbstractInstance
}
case 2:
{
- if (!player.isGM())
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
{
- final Party party = player.getParty();
- final List members = party.getMembers();
- for (Player member : members)
+ if (!member.isTeleporting() && FLOOR_1_TP.isInsideZone(member))
{
- if (FLOOR_1_TP.isInsideZone(member))
- {
- member.teleToLocation(FLOOR_2_SPAWN);
- }
+ member.teleToLocation(FLOOR_2_SPAWN);
+ teleported++;
}
}
- else if (FLOOR_1_TP.isInsideZone(player))
+ if (teleported == world.getPlayersCount())
{
- player.teleToLocation(FLOOR_2_SPAWN);
+ world.setStatus(3);
+ world.setParameter("TELEPORTED", 0);
+ world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
@@ -285,17 +277,13 @@ public class CommandPost extends AbstractInstance
monster.setWalking();
monster.getAI().moveTo(GROUP_1_MOVE);
}
-
+ world.setStatus(4);
startQuestTimer("check_status", 3000, null, player);
break;
}
case 4:
{
- if ((world.getStatus() == 4) && //
- (!world.getNpc(ELITE_KNIGHT).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WARRIOR).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_ARCHER).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WIZARD).isInsideZone(ZoneId.SCRIPT)))
+ if (world.getAliveNpcs().size() == 19)
{
for (Npc monster : world.getNpcsOfGroup("group_2"))
{
@@ -306,13 +294,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("secondGroupId"), true);
world.setStatus(5);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 5:
{
- if (world.getAliveNpcs(GROUP_2).isEmpty())
+ if (world.getAliveNpcs().size() == 14)
{
for (Npc monster : world.getNpcsOfGroup("group_3"))
{
@@ -323,13 +310,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("thirdGroupId"), true);
world.setStatus(6);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 6:
{
- if (world.getAliveNpcs(GROUP_3).isEmpty())
+ if (world.getAliveNpcs().size() == 8)
{
for (Npc monster : world.getNpcsOfGroup("group_4"))
{
@@ -340,23 +326,43 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("fourthGroupId"), true);
world.setStatus(7);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 7:
{
- // if (world.getAliveNpcs(GROUP_4).isEmpty())
- // {
- // System.out.println("Status is 7.");
- // }
-
+ if (world.getAliveNpcs().size() == 1)
+ {
+ showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_3RD_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
+ world.getNpc(GEORK).deleteMe();
+ world.setStatus(8);
+ }
startQuestTimer("check_status", 3000, null, player);
break;
}
- default:
+ case 8:
{
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
+ {
+ if (!member.isTeleporting() && FLOOR_2_TP.isInsideZone(member))
+ {
+ member.teleToLocation(FLOOR_3_SPAWN);
+ teleported++;
+ }
+ }
+ if (teleported == world.getPlayersCount())
+ {
+ world.setStatus(9);
+ world.spawnGroup("boss");
+ world.setParameter("TELEPORTED", 0);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
+ }
startQuestTimer("check_status", 3000, null, player);
+ break;
}
}
break;
@@ -369,56 +375,14 @@ public class CommandPost extends AbstractInstance
public void onMoveFinished(Npc npc)
{
final Instance world = npc.getInstanceWorld();
- if (world != null)
+ if (isInInstance(world))
{
npc.setInvul(false);
npc.setTargetable(true);
- if (CommonUtil.contains(GROUP_1, npc.getId()))
- {
- world.setStatus(4);
- }
}
super.onMoveFinished(npc);
}
- @Override
- public String onEnterZone(Creature creature, ZoneType zone)
- {
- final Instance world = creature.getInstanceWorld();
- if (world != null)
- {
- switch (zone.getId())
- {
- case 25901:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 2))
- {
- creature.teleToLocation(FLOOR_2_SPAWN);
- }
- break;
- }
- case 25902:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 3))
- {
- creature.teleToLocation(FLOOR_3_SPAWN);
- }
- break;
- }
- case 25903:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() == 2))
- {
- world.setStatus(3);
- world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
- }
- break;
- }
- }
- }
- return super.onEnterZone(creature, zone);
- }
-
@Override
public String onKill(Npc npc, Player player, boolean isPet)
{
@@ -430,51 +394,52 @@ public class CommandPost extends AbstractInstance
case BURNSTEIN:
{
world.finishInstance();
+ showOnScreenMsg(world, NpcStringId.YOU_VE_SUCCESSFULLY_ATTACKED_THE_COMMAND_POST_AND_DEFEATED_COMMANDER_BURNSTEIN, ExShowScreenMessage.TOP_CENTER, 10000, true);
break;
}
case ADOLPH:
{
- world.spawnGroup("adolph");
- world.getNpc(ADOLPH).setInvul(true);
- world.getNpc(ADOLPH).setRandomWalking(false);
- world.getNpc(ADOLPH).setTargetable(false);
- addMoveToDesire(world.getNpc(ADOLPH), ADOLPH_MOVE, 6);
+ final Npc adolph = world.spawnGroup("adolph").stream().findFirst().get();
+ adolph.setInvul(true);
+ adolph.setRandomWalking(false);
+ adolph.setTargetable(false);
+ addMoveToDesire(adolph, ADOLPH_MOVE, 6);
break;
}
case BARTON:
{
- world.spawnGroup("barton");
- world.getNpc(BARTON).setInvul(true);
- world.getNpc(BARTON).setRandomWalking(false);
- world.getNpc(BARTON).setTargetable(false);
- addMoveToDesire(world.getNpc(BARTON), BARTON_MOVE, 6);
+ final Npc barton = world.spawnGroup("barton").stream().findFirst().get();
+ barton.setInvul(true);
+ barton.setRandomWalking(false);
+ barton.setTargetable(false);
+ addMoveToDesire(barton, BARTON_MOVE, 6);
break;
}
case HAYUK:
{
- world.spawnGroup("hayuk");
- world.getNpc(HAYUK).setInvul(true);
- world.getNpc(HAYUK).setRandomWalking(false);
- world.getNpc(HAYUK).setTargetable(false);
- addMoveToDesire(world.getNpc(HAYUK), HAYUK_MOVE, 6);
+ final Npc hayuk = world.spawnGroup("hayuk").stream().findFirst().get();
+ hayuk.setInvul(true);
+ hayuk.setRandomWalking(false);
+ hayuk.setTargetable(false);
+ addMoveToDesire(hayuk, HAYUK_MOVE, 6);
break;
}
case ELISE:
{
- world.spawnGroup("elise");
- world.getNpc(ELISE).setInvul(true);
- world.getNpc(ELISE).setRandomWalking(false);
- world.getNpc(ELISE).setTargetable(false);
- addMoveToDesire(world.getNpc(ELISE), ELISE_MOVE, 6);
+ final Npc elise = world.spawnGroup("elise").stream().findFirst().get();
+ elise.setInvul(true);
+ elise.setRandomWalking(false);
+ elise.setTargetable(false);
+ addMoveToDesire(elise, ELISE_MOVE, 6);
break;
}
case ELRYAH:
{
- world.spawnGroup("elryah");
- world.getNpc(ELRYAH).setInvul(true);
- world.getNpc(ELRYAH).setRandomWalking(false);
- world.getNpc(ELRYAH).setTargetable(false);
- addMoveToDesire(world.getNpc(ELRYAH), ELRYAH_MOVE, 6);
+ final Npc elryah = world.spawnGroup("elryah").stream().findFirst().get();
+ elryah.setInvul(true);
+ elryah.setRandomWalking(false);
+ elryah.setTargetable(false);
+ addMoveToDesire(elryah, ELRYAH_MOVE, 6);
break;
}
}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/spawns/DarkElf/AteliaFortress.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/spawns/DarkElf/AteliaFortress.xml
index 24388a465a..b2fcedf199 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/spawns/DarkElf/AteliaFortress.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/spawns/DarkElf/AteliaFortress.xml
@@ -2,6 +2,7 @@
+
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/zones/custom_script.xml b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/zones/custom_script.xml
index 0cf8508677..da839c6ff9 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/zones/custom_script.xml
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/zones/custom_script.xml
@@ -1158,22 +1158,10 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/html/default/34089-1.htm b/L2J_Mobius_05.0_Salvation/dist/game/data/html/default/34089-1.htm
index cea757c854..e6de154ff1 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/html/default/34089-1.htm
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/html/default/34089-1.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
The command Post is where the Embryo are training new recruits.
The one in charge there is Commander Burnstein. I hear all kinds of inhumane things are going inside.
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/html/default/34089.htm b/L2J_Mobius_05.0_Salvation/dist/game/data/html/default/34089.htm
index 98167c90c5..4407758e73 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/html/default/34089.htm
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/html/default/34089.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
Shh! Please be quiet. This is enemy territory.
You don't need to introduce yourself. I've heard of your accomplishments.
If only you could've come sooner... We are waiting for Burnstein to come out of the command post.
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/instances/CommandPost.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/instances/CommandPost.xml
index 439b5854a1..11ba81fe27 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/instances/CommandPost.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/instances/CommandPost.xml
@@ -80,12 +80,12 @@
-
+
-
+
@@ -96,7 +96,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
@@ -119,7 +119,7 @@
-
+
@@ -129,22 +129,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index 757ea726e6..c482b27b4c 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -19,17 +19,13 @@ package instances.CommandPost;
import java.util.List;
import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.model.zone.ZoneType;
import org.l2jmobius.gameserver.model.zone.type.ScriptZone;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -39,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import instances.AbstractInstance;
/**
- * @author NasSeKa
+ * @author NasSeKa, Mobius
*/
public class CommandPost extends AbstractInstance
{
@@ -47,10 +43,6 @@ public class CommandPost extends AbstractInstance
private static final int DEVIANNE = 34089;
private static final int GEORK = 26135;
private static final int BURNSTEIN = 26136;
- private static final int ELITE_KNIGHT = 23605;
- private static final int ELITE_WARRIOR = 23606;
- private static final int ELITE_ARCHER = 23607;
- private static final int ELITE_WIZARD = 23608;
private static final int ADOLPH = 23590;
private static final int BARTON = 23591;
private static final int HAYUK = 23592;
@@ -111,7 +103,6 @@ public class CommandPost extends AbstractInstance
// Zones
private static final ScriptZone FLOOR_1_TP = ZoneManager.getInstance().getZoneById(25901, ScriptZone.class);
private static final ScriptZone FLOOR_2_TP = ZoneManager.getInstance().getZoneById(25902, ScriptZone.class);
- private static final ScriptZone FLOOR_2_START = ZoneManager.getInstance().getZoneById(25903, ScriptZone.class);
// Misc
private static final int TEMPLATE_ID = 259;
@@ -120,7 +111,6 @@ public class CommandPost extends AbstractInstance
super(TEMPLATE_ID);
addStartNpc(DEVIANNE);
addTalkId(DEVIANNE);
- addEnterZoneId(FLOOR_1_TP.getId(), FLOOR_2_TP.getId(), FLOOR_2_START.getId());
addMoveFinishedId(GROUP_1);
addMoveFinishedId(GROUP_2);
addMoveFinishedId(GROUP_3);
@@ -220,8 +210,8 @@ public class CommandPost extends AbstractInstance
if (world.getAliveNpcs(FIRST_FLOOR).isEmpty())
{
showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_2ND_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
- world.setStatus(2);
world.getNpc(GEORK).teleToLocation(GEORK_FLOOR_2_SPAWN);
+ world.setStatus(2);
for (Npc monster : world.spawnGroup("group_1"))
{
monster.setInvul(true);
@@ -257,23 +247,25 @@ public class CommandPost extends AbstractInstance
}
case 2:
{
- if (!player.isGM())
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
{
- final Party party = player.getParty();
- final List members = party.getMembers();
- for (Player member : members)
+ if (!member.isTeleporting() && FLOOR_1_TP.isInsideZone(member))
{
- if (FLOOR_1_TP.isInsideZone(member))
- {
- member.teleToLocation(FLOOR_2_SPAWN);
- }
+ member.teleToLocation(FLOOR_2_SPAWN);
+ teleported++;
}
}
- else if (FLOOR_1_TP.isInsideZone(player))
+ if (teleported == world.getPlayersCount())
{
- player.teleToLocation(FLOOR_2_SPAWN);
+ world.setStatus(3);
+ world.setParameter("TELEPORTED", 0);
+ world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
@@ -285,17 +277,13 @@ public class CommandPost extends AbstractInstance
monster.setWalking();
monster.getAI().moveTo(GROUP_1_MOVE);
}
-
+ world.setStatus(4);
startQuestTimer("check_status", 3000, null, player);
break;
}
case 4:
{
- if ((world.getStatus() == 4) && //
- (!world.getNpc(ELITE_KNIGHT).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WARRIOR).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_ARCHER).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WIZARD).isInsideZone(ZoneId.SCRIPT)))
+ if (world.getAliveNpcs().size() == 19)
{
for (Npc monster : world.getNpcsOfGroup("group_2"))
{
@@ -306,13 +294,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("secondGroupId"), true);
world.setStatus(5);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 5:
{
- if (world.getAliveNpcs(GROUP_2).isEmpty())
+ if (world.getAliveNpcs().size() == 14)
{
for (Npc monster : world.getNpcsOfGroup("group_3"))
{
@@ -323,13 +310,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("thirdGroupId"), true);
world.setStatus(6);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 6:
{
- if (world.getAliveNpcs(GROUP_3).isEmpty())
+ if (world.getAliveNpcs().size() == 8)
{
for (Npc monster : world.getNpcsOfGroup("group_4"))
{
@@ -340,23 +326,43 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("fourthGroupId"), true);
world.setStatus(7);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 7:
{
- // if (world.getAliveNpcs(GROUP_4).isEmpty())
- // {
- // System.out.println("Status is 7.");
- // }
-
+ if (world.getAliveNpcs().size() == 1)
+ {
+ showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_3RD_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
+ world.getNpc(GEORK).deleteMe();
+ world.setStatus(8);
+ }
startQuestTimer("check_status", 3000, null, player);
break;
}
- default:
+ case 8:
{
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
+ {
+ if (!member.isTeleporting() && FLOOR_2_TP.isInsideZone(member))
+ {
+ member.teleToLocation(FLOOR_3_SPAWN);
+ teleported++;
+ }
+ }
+ if (teleported == world.getPlayersCount())
+ {
+ world.setStatus(9);
+ world.spawnGroup("boss");
+ world.setParameter("TELEPORTED", 0);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
+ }
startQuestTimer("check_status", 3000, null, player);
+ break;
}
}
break;
@@ -369,56 +375,14 @@ public class CommandPost extends AbstractInstance
public void onMoveFinished(Npc npc)
{
final Instance world = npc.getInstanceWorld();
- if (world != null)
+ if (isInInstance(world))
{
npc.setInvul(false);
npc.setTargetable(true);
- if (CommonUtil.contains(GROUP_1, npc.getId()))
- {
- world.setStatus(4);
- }
}
super.onMoveFinished(npc);
}
- @Override
- public String onEnterZone(Creature creature, ZoneType zone)
- {
- final Instance world = creature.getInstanceWorld();
- if (world != null)
- {
- switch (zone.getId())
- {
- case 25901:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 2))
- {
- creature.teleToLocation(FLOOR_2_SPAWN);
- }
- break;
- }
- case 25902:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 3))
- {
- creature.teleToLocation(FLOOR_3_SPAWN);
- }
- break;
- }
- case 25903:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() == 2))
- {
- world.setStatus(3);
- world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
- }
- break;
- }
- }
- }
- return super.onEnterZone(creature, zone);
- }
-
@Override
public String onKill(Npc npc, Player player, boolean isPet)
{
@@ -430,51 +394,52 @@ public class CommandPost extends AbstractInstance
case BURNSTEIN:
{
world.finishInstance();
+ showOnScreenMsg(world, NpcStringId.YOU_VE_SUCCESSFULLY_ATTACKED_THE_COMMAND_POST_AND_DEFEATED_COMMANDER_BURNSTEIN, ExShowScreenMessage.TOP_CENTER, 10000, true);
break;
}
case ADOLPH:
{
- world.spawnGroup("adolph");
- world.getNpc(ADOLPH).setInvul(true);
- world.getNpc(ADOLPH).setRandomWalking(false);
- world.getNpc(ADOLPH).setTargetable(false);
- addMoveToDesire(world.getNpc(ADOLPH), ADOLPH_MOVE, 6);
+ final Npc adolph = world.spawnGroup("adolph").stream().findFirst().get();
+ adolph.setInvul(true);
+ adolph.setRandomWalking(false);
+ adolph.setTargetable(false);
+ addMoveToDesire(adolph, ADOLPH_MOVE, 6);
break;
}
case BARTON:
{
- world.spawnGroup("barton");
- world.getNpc(BARTON).setInvul(true);
- world.getNpc(BARTON).setRandomWalking(false);
- world.getNpc(BARTON).setTargetable(false);
- addMoveToDesire(world.getNpc(BARTON), BARTON_MOVE, 6);
+ final Npc barton = world.spawnGroup("barton").stream().findFirst().get();
+ barton.setInvul(true);
+ barton.setRandomWalking(false);
+ barton.setTargetable(false);
+ addMoveToDesire(barton, BARTON_MOVE, 6);
break;
}
case HAYUK:
{
- world.spawnGroup("hayuk");
- world.getNpc(HAYUK).setInvul(true);
- world.getNpc(HAYUK).setRandomWalking(false);
- world.getNpc(HAYUK).setTargetable(false);
- addMoveToDesire(world.getNpc(HAYUK), HAYUK_MOVE, 6);
+ final Npc hayuk = world.spawnGroup("hayuk").stream().findFirst().get();
+ hayuk.setInvul(true);
+ hayuk.setRandomWalking(false);
+ hayuk.setTargetable(false);
+ addMoveToDesire(hayuk, HAYUK_MOVE, 6);
break;
}
case ELISE:
{
- world.spawnGroup("elise");
- world.getNpc(ELISE).setInvul(true);
- world.getNpc(ELISE).setRandomWalking(false);
- world.getNpc(ELISE).setTargetable(false);
- addMoveToDesire(world.getNpc(ELISE), ELISE_MOVE, 6);
+ final Npc elise = world.spawnGroup("elise").stream().findFirst().get();
+ elise.setInvul(true);
+ elise.setRandomWalking(false);
+ elise.setTargetable(false);
+ addMoveToDesire(elise, ELISE_MOVE, 6);
break;
}
case ELRYAH:
{
- world.spawnGroup("elryah");
- world.getNpc(ELRYAH).setInvul(true);
- world.getNpc(ELRYAH).setRandomWalking(false);
- world.getNpc(ELRYAH).setTargetable(false);
- addMoveToDesire(world.getNpc(ELRYAH), ELRYAH_MOVE, 6);
+ final Npc elryah = world.spawnGroup("elryah").stream().findFirst().get();
+ elryah.setInvul(true);
+ elryah.setRandomWalking(false);
+ elryah.setTargetable(false);
+ addMoveToDesire(elryah, ELRYAH_MOVE, 6);
break;
}
}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/spawns/DarkElf/AteliaFortress.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/spawns/DarkElf/AteliaFortress.xml
index 24388a465a..b2fcedf199 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/spawns/DarkElf/AteliaFortress.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/spawns/DarkElf/AteliaFortress.xml
@@ -2,6 +2,7 @@
+
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/zones/custom_script.xml b/L2J_Mobius_05.0_Salvation/dist/game/data/zones/custom_script.xml
index 0cf8508677..da839c6ff9 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/zones/custom_script.xml
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/zones/custom_script.xml
@@ -1158,22 +1158,10 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/html/default/34089-1.htm b/L2J_Mobius_05.5_EtinasFate/dist/game/data/html/default/34089-1.htm
index cea757c854..e6de154ff1 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/html/default/34089-1.htm
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/html/default/34089-1.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
The command Post is where the Embryo are training new recruits.
The one in charge there is Commander Burnstein. I hear all kinds of inhumane things are going inside.
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/html/default/34089.htm b/L2J_Mobius_05.5_EtinasFate/dist/game/data/html/default/34089.htm
index 82cc791f6b..2a3cbd3e9c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/html/default/34089.htm
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/html/default/34089.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
Shh! Please be quiet. This is enemy territory.
You don't need to introduce yourself. I've heard of your accomplishments.
If only you could've come sooner... We are waiting for Burnstein to come out of the command post.
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/instances/CommandPost.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/instances/CommandPost.xml
index 439b5854a1..11ba81fe27 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/instances/CommandPost.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/instances/CommandPost.xml
@@ -80,12 +80,12 @@
-
+
-
+
@@ -96,7 +96,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
@@ -119,7 +119,7 @@
-
+
@@ -129,22 +129,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index 757ea726e6..c482b27b4c 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -19,17 +19,13 @@ package instances.CommandPost;
import java.util.List;
import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.model.zone.ZoneType;
import org.l2jmobius.gameserver.model.zone.type.ScriptZone;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -39,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import instances.AbstractInstance;
/**
- * @author NasSeKa
+ * @author NasSeKa, Mobius
*/
public class CommandPost extends AbstractInstance
{
@@ -47,10 +43,6 @@ public class CommandPost extends AbstractInstance
private static final int DEVIANNE = 34089;
private static final int GEORK = 26135;
private static final int BURNSTEIN = 26136;
- private static final int ELITE_KNIGHT = 23605;
- private static final int ELITE_WARRIOR = 23606;
- private static final int ELITE_ARCHER = 23607;
- private static final int ELITE_WIZARD = 23608;
private static final int ADOLPH = 23590;
private static final int BARTON = 23591;
private static final int HAYUK = 23592;
@@ -111,7 +103,6 @@ public class CommandPost extends AbstractInstance
// Zones
private static final ScriptZone FLOOR_1_TP = ZoneManager.getInstance().getZoneById(25901, ScriptZone.class);
private static final ScriptZone FLOOR_2_TP = ZoneManager.getInstance().getZoneById(25902, ScriptZone.class);
- private static final ScriptZone FLOOR_2_START = ZoneManager.getInstance().getZoneById(25903, ScriptZone.class);
// Misc
private static final int TEMPLATE_ID = 259;
@@ -120,7 +111,6 @@ public class CommandPost extends AbstractInstance
super(TEMPLATE_ID);
addStartNpc(DEVIANNE);
addTalkId(DEVIANNE);
- addEnterZoneId(FLOOR_1_TP.getId(), FLOOR_2_TP.getId(), FLOOR_2_START.getId());
addMoveFinishedId(GROUP_1);
addMoveFinishedId(GROUP_2);
addMoveFinishedId(GROUP_3);
@@ -220,8 +210,8 @@ public class CommandPost extends AbstractInstance
if (world.getAliveNpcs(FIRST_FLOOR).isEmpty())
{
showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_2ND_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
- world.setStatus(2);
world.getNpc(GEORK).teleToLocation(GEORK_FLOOR_2_SPAWN);
+ world.setStatus(2);
for (Npc monster : world.spawnGroup("group_1"))
{
monster.setInvul(true);
@@ -257,23 +247,25 @@ public class CommandPost extends AbstractInstance
}
case 2:
{
- if (!player.isGM())
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
{
- final Party party = player.getParty();
- final List members = party.getMembers();
- for (Player member : members)
+ if (!member.isTeleporting() && FLOOR_1_TP.isInsideZone(member))
{
- if (FLOOR_1_TP.isInsideZone(member))
- {
- member.teleToLocation(FLOOR_2_SPAWN);
- }
+ member.teleToLocation(FLOOR_2_SPAWN);
+ teleported++;
}
}
- else if (FLOOR_1_TP.isInsideZone(player))
+ if (teleported == world.getPlayersCount())
{
- player.teleToLocation(FLOOR_2_SPAWN);
+ world.setStatus(3);
+ world.setParameter("TELEPORTED", 0);
+ world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
@@ -285,17 +277,13 @@ public class CommandPost extends AbstractInstance
monster.setWalking();
monster.getAI().moveTo(GROUP_1_MOVE);
}
-
+ world.setStatus(4);
startQuestTimer("check_status", 3000, null, player);
break;
}
case 4:
{
- if ((world.getStatus() == 4) && //
- (!world.getNpc(ELITE_KNIGHT).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WARRIOR).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_ARCHER).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WIZARD).isInsideZone(ZoneId.SCRIPT)))
+ if (world.getAliveNpcs().size() == 19)
{
for (Npc monster : world.getNpcsOfGroup("group_2"))
{
@@ -306,13 +294,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("secondGroupId"), true);
world.setStatus(5);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 5:
{
- if (world.getAliveNpcs(GROUP_2).isEmpty())
+ if (world.getAliveNpcs().size() == 14)
{
for (Npc monster : world.getNpcsOfGroup("group_3"))
{
@@ -323,13 +310,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("thirdGroupId"), true);
world.setStatus(6);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 6:
{
- if (world.getAliveNpcs(GROUP_3).isEmpty())
+ if (world.getAliveNpcs().size() == 8)
{
for (Npc monster : world.getNpcsOfGroup("group_4"))
{
@@ -340,23 +326,43 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("fourthGroupId"), true);
world.setStatus(7);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 7:
{
- // if (world.getAliveNpcs(GROUP_4).isEmpty())
- // {
- // System.out.println("Status is 7.");
- // }
-
+ if (world.getAliveNpcs().size() == 1)
+ {
+ showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_3RD_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
+ world.getNpc(GEORK).deleteMe();
+ world.setStatus(8);
+ }
startQuestTimer("check_status", 3000, null, player);
break;
}
- default:
+ case 8:
{
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
+ {
+ if (!member.isTeleporting() && FLOOR_2_TP.isInsideZone(member))
+ {
+ member.teleToLocation(FLOOR_3_SPAWN);
+ teleported++;
+ }
+ }
+ if (teleported == world.getPlayersCount())
+ {
+ world.setStatus(9);
+ world.spawnGroup("boss");
+ world.setParameter("TELEPORTED", 0);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
+ }
startQuestTimer("check_status", 3000, null, player);
+ break;
}
}
break;
@@ -369,56 +375,14 @@ public class CommandPost extends AbstractInstance
public void onMoveFinished(Npc npc)
{
final Instance world = npc.getInstanceWorld();
- if (world != null)
+ if (isInInstance(world))
{
npc.setInvul(false);
npc.setTargetable(true);
- if (CommonUtil.contains(GROUP_1, npc.getId()))
- {
- world.setStatus(4);
- }
}
super.onMoveFinished(npc);
}
- @Override
- public String onEnterZone(Creature creature, ZoneType zone)
- {
- final Instance world = creature.getInstanceWorld();
- if (world != null)
- {
- switch (zone.getId())
- {
- case 25901:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 2))
- {
- creature.teleToLocation(FLOOR_2_SPAWN);
- }
- break;
- }
- case 25902:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 3))
- {
- creature.teleToLocation(FLOOR_3_SPAWN);
- }
- break;
- }
- case 25903:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() == 2))
- {
- world.setStatus(3);
- world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
- }
- break;
- }
- }
- }
- return super.onEnterZone(creature, zone);
- }
-
@Override
public String onKill(Npc npc, Player player, boolean isPet)
{
@@ -430,51 +394,52 @@ public class CommandPost extends AbstractInstance
case BURNSTEIN:
{
world.finishInstance();
+ showOnScreenMsg(world, NpcStringId.YOU_VE_SUCCESSFULLY_ATTACKED_THE_COMMAND_POST_AND_DEFEATED_COMMANDER_BURNSTEIN, ExShowScreenMessage.TOP_CENTER, 10000, true);
break;
}
case ADOLPH:
{
- world.spawnGroup("adolph");
- world.getNpc(ADOLPH).setInvul(true);
- world.getNpc(ADOLPH).setRandomWalking(false);
- world.getNpc(ADOLPH).setTargetable(false);
- addMoveToDesire(world.getNpc(ADOLPH), ADOLPH_MOVE, 6);
+ final Npc adolph = world.spawnGroup("adolph").stream().findFirst().get();
+ adolph.setInvul(true);
+ adolph.setRandomWalking(false);
+ adolph.setTargetable(false);
+ addMoveToDesire(adolph, ADOLPH_MOVE, 6);
break;
}
case BARTON:
{
- world.spawnGroup("barton");
- world.getNpc(BARTON).setInvul(true);
- world.getNpc(BARTON).setRandomWalking(false);
- world.getNpc(BARTON).setTargetable(false);
- addMoveToDesire(world.getNpc(BARTON), BARTON_MOVE, 6);
+ final Npc barton = world.spawnGroup("barton").stream().findFirst().get();
+ barton.setInvul(true);
+ barton.setRandomWalking(false);
+ barton.setTargetable(false);
+ addMoveToDesire(barton, BARTON_MOVE, 6);
break;
}
case HAYUK:
{
- world.spawnGroup("hayuk");
- world.getNpc(HAYUK).setInvul(true);
- world.getNpc(HAYUK).setRandomWalking(false);
- world.getNpc(HAYUK).setTargetable(false);
- addMoveToDesire(world.getNpc(HAYUK), HAYUK_MOVE, 6);
+ final Npc hayuk = world.spawnGroup("hayuk").stream().findFirst().get();
+ hayuk.setInvul(true);
+ hayuk.setRandomWalking(false);
+ hayuk.setTargetable(false);
+ addMoveToDesire(hayuk, HAYUK_MOVE, 6);
break;
}
case ELISE:
{
- world.spawnGroup("elise");
- world.getNpc(ELISE).setInvul(true);
- world.getNpc(ELISE).setRandomWalking(false);
- world.getNpc(ELISE).setTargetable(false);
- addMoveToDesire(world.getNpc(ELISE), ELISE_MOVE, 6);
+ final Npc elise = world.spawnGroup("elise").stream().findFirst().get();
+ elise.setInvul(true);
+ elise.setRandomWalking(false);
+ elise.setTargetable(false);
+ addMoveToDesire(elise, ELISE_MOVE, 6);
break;
}
case ELRYAH:
{
- world.spawnGroup("elryah");
- world.getNpc(ELRYAH).setInvul(true);
- world.getNpc(ELRYAH).setRandomWalking(false);
- world.getNpc(ELRYAH).setTargetable(false);
- addMoveToDesire(world.getNpc(ELRYAH), ELRYAH_MOVE, 6);
+ final Npc elryah = world.spawnGroup("elryah").stream().findFirst().get();
+ elryah.setInvul(true);
+ elryah.setRandomWalking(false);
+ elryah.setTargetable(false);
+ addMoveToDesire(elryah, ELRYAH_MOVE, 6);
break;
}
}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/spawns/DarkElf/AteliaFortress.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/spawns/DarkElf/AteliaFortress.xml
index 24388a465a..b2fcedf199 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/spawns/DarkElf/AteliaFortress.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/spawns/DarkElf/AteliaFortress.xml
@@ -2,6 +2,7 @@
+
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/zones/custom_script.xml b/L2J_Mobius_05.5_EtinasFate/dist/game/data/zones/custom_script.xml
index 0cf8508677..da839c6ff9 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/zones/custom_script.xml
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/zones/custom_script.xml
@@ -1158,22 +1158,10 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/html/default/34089-1.htm b/L2J_Mobius_06.0_Fafurion/dist/game/data/html/default/34089-1.htm
index cea757c854..e6de154ff1 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/html/default/34089-1.htm
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/html/default/34089-1.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
The command Post is where the Embryo are training new recruits.
The one in charge there is Commander Burnstein. I hear all kinds of inhumane things are going inside.
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/html/default/34089.htm b/L2J_Mobius_06.0_Fafurion/dist/game/data/html/default/34089.htm
index 98167c90c5..4407758e73 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/html/default/34089.htm
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/html/default/34089.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
Shh! Please be quiet. This is enemy territory.
You don't need to introduce yourself. I've heard of your accomplishments.
If only you could've come sooner... We are waiting for Burnstein to come out of the command post.
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/instances/CommandPost.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/instances/CommandPost.xml
index 439b5854a1..11ba81fe27 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/instances/CommandPost.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/instances/CommandPost.xml
@@ -80,12 +80,12 @@
-
+
-
+
@@ -96,7 +96,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
@@ -119,7 +119,7 @@
-
+
@@ -129,22 +129,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index d117200661..c8fff6c146 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -19,17 +19,13 @@ package instances.CommandPost;
import java.util.List;
import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.model.zone.ZoneType;
import org.l2jmobius.gameserver.model.zone.type.ScriptZone;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -39,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import instances.AbstractInstance;
/**
- * @author NasSeKa
+ * @author NasSeKa, Mobius
*/
public class CommandPost extends AbstractInstance
{
@@ -47,10 +43,6 @@ public class CommandPost extends AbstractInstance
private static final int DEVIANNE = 34089;
private static final int GEORK = 26135;
private static final int BURNSTEIN = 26136;
- private static final int ELITE_KNIGHT = 23605;
- private static final int ELITE_WARRIOR = 23606;
- private static final int ELITE_ARCHER = 23607;
- private static final int ELITE_WIZARD = 23608;
private static final int ADOLPH = 23590;
private static final int BARTON = 23591;
private static final int HAYUK = 23592;
@@ -111,7 +103,6 @@ public class CommandPost extends AbstractInstance
// Zones
private static final ScriptZone FLOOR_1_TP = ZoneManager.getInstance().getZoneById(25901, ScriptZone.class);
private static final ScriptZone FLOOR_2_TP = ZoneManager.getInstance().getZoneById(25902, ScriptZone.class);
- private static final ScriptZone FLOOR_2_START = ZoneManager.getInstance().getZoneById(25903, ScriptZone.class);
// Misc
private static final int TEMPLATE_ID = 259;
@@ -120,7 +111,6 @@ public class CommandPost extends AbstractInstance
super(TEMPLATE_ID);
addStartNpc(DEVIANNE);
addTalkId(DEVIANNE);
- addEnterZoneId(FLOOR_1_TP.getId(), FLOOR_2_TP.getId(), FLOOR_2_START.getId());
addMoveFinishedId(GROUP_1);
addMoveFinishedId(GROUP_2);
addMoveFinishedId(GROUP_3);
@@ -220,8 +210,8 @@ public class CommandPost extends AbstractInstance
if (world.getAliveNpcs(FIRST_FLOOR).isEmpty())
{
showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_2ND_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
- world.setStatus(2);
world.getNpc(GEORK).teleToLocation(GEORK_FLOOR_2_SPAWN);
+ world.setStatus(2);
for (Npc monster : world.spawnGroup("group_1"))
{
monster.setInvul(true);
@@ -257,23 +247,25 @@ public class CommandPost extends AbstractInstance
}
case 2:
{
- if (!player.isGM())
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
{
- final Party party = player.getParty();
- final List members = party.getMembers();
- for (Player member : members)
+ if (!member.isTeleporting() && FLOOR_1_TP.isInsideZone(member))
{
- if (FLOOR_1_TP.isInsideZone(member))
- {
- member.teleToLocation(FLOOR_2_SPAWN);
- }
+ member.teleToLocation(FLOOR_2_SPAWN);
+ teleported++;
}
}
- else if (FLOOR_1_TP.isInsideZone(player))
+ if (teleported == world.getPlayersCount())
{
- player.teleToLocation(FLOOR_2_SPAWN);
+ world.setStatus(3);
+ world.setParameter("TELEPORTED", 0);
+ world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
@@ -285,17 +277,13 @@ public class CommandPost extends AbstractInstance
monster.setWalking();
monster.getAI().moveTo(GROUP_1_MOVE);
}
-
+ world.setStatus(4);
startQuestTimer("check_status", 3000, null, player);
break;
}
case 4:
{
- if ((world.getStatus() == 4) && //
- (!world.getNpc(ELITE_KNIGHT).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WARRIOR).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_ARCHER).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WIZARD).isInsideZone(ZoneId.SCRIPT)))
+ if (world.getAliveNpcs().size() == 19)
{
for (Npc monster : world.getNpcsOfGroup("group_2"))
{
@@ -306,13 +294,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("secondGroupId"), true);
world.setStatus(5);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 5:
{
- if (world.getAliveNpcs(GROUP_2).isEmpty())
+ if (world.getAliveNpcs().size() == 14)
{
for (Npc monster : world.getNpcsOfGroup("group_3"))
{
@@ -323,13 +310,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("thirdGroupId"), true);
world.setStatus(6);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 6:
{
- if (world.getAliveNpcs(GROUP_3).isEmpty())
+ if (world.getAliveNpcs().size() == 8)
{
for (Npc monster : world.getNpcsOfGroup("group_4"))
{
@@ -340,23 +326,43 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("fourthGroupId"), true);
world.setStatus(7);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 7:
{
- // if (world.getAliveNpcs(GROUP_4).isEmpty())
- // {
- // System.out.println("Status is 7.");
- // }
-
+ if (world.getAliveNpcs().size() == 1)
+ {
+ showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_3RD_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
+ world.getNpc(GEORK).deleteMe();
+ world.setStatus(8);
+ }
startQuestTimer("check_status", 3000, null, player);
break;
}
- default:
+ case 8:
{
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
+ {
+ if (!member.isTeleporting() && FLOOR_2_TP.isInsideZone(member))
+ {
+ member.teleToLocation(FLOOR_3_SPAWN);
+ teleported++;
+ }
+ }
+ if (teleported == world.getPlayersCount())
+ {
+ world.setStatus(9);
+ world.spawnGroup("boss");
+ world.setParameter("TELEPORTED", 0);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
+ }
startQuestTimer("check_status", 3000, null, player);
+ break;
}
}
break;
@@ -369,56 +375,14 @@ public class CommandPost extends AbstractInstance
public void onMoveFinished(Npc npc)
{
final Instance world = npc.getInstanceWorld();
- if (world != null)
+ if (isInInstance(world))
{
npc.setInvul(false);
npc.setTargetable(true);
- if (CommonUtil.contains(GROUP_1, npc.getId()))
- {
- world.setStatus(4);
- }
}
super.onMoveFinished(npc);
}
- @Override
- public String onEnterZone(Creature creature, ZoneType zone)
- {
- final Instance world = creature.getInstanceWorld();
- if (world != null)
- {
- switch (zone.getId())
- {
- case 25901:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 2))
- {
- creature.teleToLocation(FLOOR_2_SPAWN);
- }
- break;
- }
- case 25902:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 3))
- {
- creature.teleToLocation(FLOOR_3_SPAWN);
- }
- break;
- }
- case 25903:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() == 2))
- {
- world.setStatus(3);
- world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
- }
- break;
- }
- }
- }
- return super.onEnterZone(creature, zone);
- }
-
@Override
public String onKill(Npc npc, Player player, boolean isPet)
{
@@ -430,51 +394,52 @@ public class CommandPost extends AbstractInstance
case BURNSTEIN:
{
world.finishInstance();
+ showOnScreenMsg(world, NpcStringId.YOU_VE_SUCCESSFULLY_ATTACKED_THE_COMMAND_POST_AND_DEFEATED_COMMANDER_BURNSTEIN, ExShowScreenMessage.TOP_CENTER, 10000, true);
break;
}
case ADOLPH:
{
- world.spawnGroup("adolph");
- world.getNpc(ADOLPH).setInvul(true);
- world.getNpc(ADOLPH).setRandomWalking(false);
- world.getNpc(ADOLPH).setTargetable(false);
- addMoveToDesire(world.getNpc(ADOLPH), ADOLPH_MOVE, 6);
+ final Npc adolph = world.spawnGroup("adolph").stream().findFirst().get();
+ adolph.setInvul(true);
+ adolph.setRandomWalking(false);
+ adolph.setTargetable(false);
+ addMoveToDesire(adolph, ADOLPH_MOVE, 6);
break;
}
case BARTON:
{
- world.spawnGroup("barton");
- world.getNpc(BARTON).setInvul(true);
- world.getNpc(BARTON).setRandomWalking(false);
- world.getNpc(BARTON).setTargetable(false);
- addMoveToDesire(world.getNpc(BARTON), BARTON_MOVE, 6);
+ final Npc barton = world.spawnGroup("barton").stream().findFirst().get();
+ barton.setInvul(true);
+ barton.setRandomWalking(false);
+ barton.setTargetable(false);
+ addMoveToDesire(barton, BARTON_MOVE, 6);
break;
}
case HAYUK:
{
- world.spawnGroup("hayuk");
- world.getNpc(HAYUK).setInvul(true);
- world.getNpc(HAYUK).setRandomWalking(false);
- world.getNpc(HAYUK).setTargetable(false);
- addMoveToDesire(world.getNpc(HAYUK), HAYUK_MOVE, 6);
+ final Npc hayuk = world.spawnGroup("hayuk").stream().findFirst().get();
+ hayuk.setInvul(true);
+ hayuk.setRandomWalking(false);
+ hayuk.setTargetable(false);
+ addMoveToDesire(hayuk, HAYUK_MOVE, 6);
break;
}
case ELISE:
{
- world.spawnGroup("elise");
- world.getNpc(ELISE).setInvul(true);
- world.getNpc(ELISE).setRandomWalking(false);
- world.getNpc(ELISE).setTargetable(false);
- addMoveToDesire(world.getNpc(ELISE), ELISE_MOVE, 6);
+ final Npc elise = world.spawnGroup("elise").stream().findFirst().get();
+ elise.setInvul(true);
+ elise.setRandomWalking(false);
+ elise.setTargetable(false);
+ addMoveToDesire(elise, ELISE_MOVE, 6);
break;
}
case ELRYAH:
{
- world.spawnGroup("elryah");
- world.getNpc(ELRYAH).setInvul(true);
- world.getNpc(ELRYAH).setRandomWalking(false);
- world.getNpc(ELRYAH).setTargetable(false);
- addMoveToDesire(world.getNpc(ELRYAH), ELRYAH_MOVE, 6);
+ final Npc elryah = world.spawnGroup("elryah").stream().findFirst().get();
+ elryah.setInvul(true);
+ elryah.setRandomWalking(false);
+ elryah.setTargetable(false);
+ addMoveToDesire(elryah, ELRYAH_MOVE, 6);
break;
}
}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/spawns/DarkElf/AteliaFortress.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/spawns/DarkElf/AteliaFortress.xml
index 24388a465a..b2fcedf199 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/spawns/DarkElf/AteliaFortress.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/spawns/DarkElf/AteliaFortress.xml
@@ -2,6 +2,7 @@
+
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/zones/custom_script.xml b/L2J_Mobius_06.0_Fafurion/dist/game/data/zones/custom_script.xml
index 0cf8508677..da839c6ff9 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/zones/custom_script.xml
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/zones/custom_script.xml
@@ -1158,22 +1158,10 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/html/default/34089-1.htm b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/html/default/34089-1.htm
index cea757c854..e6de154ff1 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/html/default/34089-1.htm
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/html/default/34089-1.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
The command Post is where the Embryo are training new recruits.
The one in charge there is Commander Burnstein. I hear all kinds of inhumane things are going inside.
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/html/default/34089.htm b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/html/default/34089.htm
index 98167c90c5..4407758e73 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/html/default/34089.htm
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/html/default/34089.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
Shh! Please be quiet. This is enemy territory.
You don't need to introduce yourself. I've heard of your accomplishments.
If only you could've come sooner... We are waiting for Burnstein to come out of the command post.
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/instances/CommandPost.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/instances/CommandPost.xml
index 439b5854a1..11ba81fe27 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/instances/CommandPost.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/instances/CommandPost.xml
@@ -80,12 +80,12 @@
-
+
-
+
@@ -96,7 +96,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
@@ -119,7 +119,7 @@
-
+
@@ -129,22 +129,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index 712d35301b..149ae31f9d 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -19,17 +19,13 @@ package instances.CommandPost;
import java.util.List;
import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.model.zone.ZoneType;
import org.l2jmobius.gameserver.model.zone.type.ScriptZone;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -39,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import instances.AbstractInstance;
/**
- * @author NasSeKa
+ * @author NasSeKa, Mobius
*/
public class CommandPost extends AbstractInstance
{
@@ -47,10 +43,6 @@ public class CommandPost extends AbstractInstance
private static final int DEVIANNE = 34089;
private static final int GEORK = 26135;
private static final int BURNSTEIN = 26136;
- private static final int ELITE_KNIGHT = 23605;
- private static final int ELITE_WARRIOR = 23606;
- private static final int ELITE_ARCHER = 23607;
- private static final int ELITE_WIZARD = 23608;
private static final int ADOLPH = 23590;
private static final int BARTON = 23591;
private static final int HAYUK = 23592;
@@ -111,7 +103,6 @@ public class CommandPost extends AbstractInstance
// Zones
private static final ScriptZone FLOOR_1_TP = ZoneManager.getInstance().getZoneById(25901, ScriptZone.class);
private static final ScriptZone FLOOR_2_TP = ZoneManager.getInstance().getZoneById(25902, ScriptZone.class);
- private static final ScriptZone FLOOR_2_START = ZoneManager.getInstance().getZoneById(25903, ScriptZone.class);
// Misc
private static final int TEMPLATE_ID = 259;
@@ -120,7 +111,6 @@ public class CommandPost extends AbstractInstance
super(TEMPLATE_ID);
addStartNpc(DEVIANNE);
addTalkId(DEVIANNE);
- addEnterZoneId(FLOOR_1_TP.getId(), FLOOR_2_TP.getId(), FLOOR_2_START.getId());
addMoveFinishedId(GROUP_1);
addMoveFinishedId(GROUP_2);
addMoveFinishedId(GROUP_3);
@@ -220,8 +210,8 @@ public class CommandPost extends AbstractInstance
if (world.getAliveNpcs(FIRST_FLOOR).isEmpty())
{
showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_2ND_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
- world.setStatus(2);
world.getNpc(GEORK).teleToLocation(GEORK_FLOOR_2_SPAWN);
+ world.setStatus(2);
for (Npc monster : world.spawnGroup("group_1"))
{
monster.setInvul(true);
@@ -257,23 +247,25 @@ public class CommandPost extends AbstractInstance
}
case 2:
{
- if (!player.isGM())
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
{
- final Party party = player.getParty();
- final List members = party.getMembers();
- for (Player member : members)
+ if (!member.isTeleporting() && FLOOR_1_TP.isInsideZone(member))
{
- if (FLOOR_1_TP.isInsideZone(member))
- {
- member.teleToLocation(FLOOR_2_SPAWN);
- }
+ member.teleToLocation(FLOOR_2_SPAWN);
+ teleported++;
}
}
- else if (FLOOR_1_TP.isInsideZone(player))
+ if (teleported == world.getPlayersCount())
{
- player.teleToLocation(FLOOR_2_SPAWN);
+ world.setStatus(3);
+ world.setParameter("TELEPORTED", 0);
+ world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
@@ -285,17 +277,13 @@ public class CommandPost extends AbstractInstance
monster.setWalking();
monster.getAI().moveTo(GROUP_1_MOVE);
}
-
+ world.setStatus(4);
startQuestTimer("check_status", 3000, null, player);
break;
}
case 4:
{
- if ((world.getStatus() == 4) && //
- (!world.getNpc(ELITE_KNIGHT).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WARRIOR).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_ARCHER).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WIZARD).isInsideZone(ZoneId.SCRIPT)))
+ if (world.getAliveNpcs().size() == 19)
{
for (Npc monster : world.getNpcsOfGroup("group_2"))
{
@@ -306,13 +294,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("secondGroupId"), true);
world.setStatus(5);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 5:
{
- if (world.getAliveNpcs(GROUP_2).isEmpty())
+ if (world.getAliveNpcs().size() == 14)
{
for (Npc monster : world.getNpcsOfGroup("group_3"))
{
@@ -323,13 +310,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("thirdGroupId"), true);
world.setStatus(6);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 6:
{
- if (world.getAliveNpcs(GROUP_3).isEmpty())
+ if (world.getAliveNpcs().size() == 8)
{
for (Npc monster : world.getNpcsOfGroup("group_4"))
{
@@ -340,23 +326,43 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("fourthGroupId"), true);
world.setStatus(7);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 7:
{
- // if (world.getAliveNpcs(GROUP_4).isEmpty())
- // {
- // System.out.println("Status is 7.");
- // }
-
+ if (world.getAliveNpcs().size() == 1)
+ {
+ showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_3RD_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
+ world.getNpc(GEORK).deleteMe();
+ world.setStatus(8);
+ }
startQuestTimer("check_status", 3000, null, player);
break;
}
- default:
+ case 8:
{
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
+ {
+ if (!member.isTeleporting() && FLOOR_2_TP.isInsideZone(member))
+ {
+ member.teleToLocation(FLOOR_3_SPAWN);
+ teleported++;
+ }
+ }
+ if (teleported == world.getPlayersCount())
+ {
+ world.setStatus(9);
+ world.spawnGroup("boss");
+ world.setParameter("TELEPORTED", 0);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
+ }
startQuestTimer("check_status", 3000, null, player);
+ break;
}
}
break;
@@ -369,56 +375,14 @@ public class CommandPost extends AbstractInstance
public void onMoveFinished(Npc npc)
{
final Instance world = npc.getInstanceWorld();
- if (world != null)
+ if (isInInstance(world))
{
npc.setInvul(false);
npc.setTargetable(true);
- if (CommonUtil.contains(GROUP_1, npc.getId()))
- {
- world.setStatus(4);
- }
}
super.onMoveFinished(npc);
}
- @Override
- public String onEnterZone(Creature creature, ZoneType zone)
- {
- final Instance world = creature.getInstanceWorld();
- if (world != null)
- {
- switch (zone.getId())
- {
- case 25901:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 2))
- {
- creature.teleToLocation(FLOOR_2_SPAWN);
- }
- break;
- }
- case 25902:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 3))
- {
- creature.teleToLocation(FLOOR_3_SPAWN);
- }
- break;
- }
- case 25903:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() == 2))
- {
- world.setStatus(3);
- world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
- }
- break;
- }
- }
- }
- return super.onEnterZone(creature, zone);
- }
-
@Override
public String onKill(Npc npc, Player player, boolean isPet)
{
@@ -430,51 +394,52 @@ public class CommandPost extends AbstractInstance
case BURNSTEIN:
{
world.finishInstance();
+ showOnScreenMsg(world, NpcStringId.YOU_VE_SUCCESSFULLY_ATTACKED_THE_COMMAND_POST_AND_DEFEATED_COMMANDER_BURNSTEIN, ExShowScreenMessage.TOP_CENTER, 10000, true);
break;
}
case ADOLPH:
{
- world.spawnGroup("adolph");
- world.getNpc(ADOLPH).setInvul(true);
- world.getNpc(ADOLPH).setRandomWalking(false);
- world.getNpc(ADOLPH).setTargetable(false);
- addMoveToDesire(world.getNpc(ADOLPH), ADOLPH_MOVE, 6);
+ final Npc adolph = world.spawnGroup("adolph").stream().findFirst().get();
+ adolph.setInvul(true);
+ adolph.setRandomWalking(false);
+ adolph.setTargetable(false);
+ addMoveToDesire(adolph, ADOLPH_MOVE, 6);
break;
}
case BARTON:
{
- world.spawnGroup("barton");
- world.getNpc(BARTON).setInvul(true);
- world.getNpc(BARTON).setRandomWalking(false);
- world.getNpc(BARTON).setTargetable(false);
- addMoveToDesire(world.getNpc(BARTON), BARTON_MOVE, 6);
+ final Npc barton = world.spawnGroup("barton").stream().findFirst().get();
+ barton.setInvul(true);
+ barton.setRandomWalking(false);
+ barton.setTargetable(false);
+ addMoveToDesire(barton, BARTON_MOVE, 6);
break;
}
case HAYUK:
{
- world.spawnGroup("hayuk");
- world.getNpc(HAYUK).setInvul(true);
- world.getNpc(HAYUK).setRandomWalking(false);
- world.getNpc(HAYUK).setTargetable(false);
- addMoveToDesire(world.getNpc(HAYUK), HAYUK_MOVE, 6);
+ final Npc hayuk = world.spawnGroup("hayuk").stream().findFirst().get();
+ hayuk.setInvul(true);
+ hayuk.setRandomWalking(false);
+ hayuk.setTargetable(false);
+ addMoveToDesire(hayuk, HAYUK_MOVE, 6);
break;
}
case ELISE:
{
- world.spawnGroup("elise");
- world.getNpc(ELISE).setInvul(true);
- world.getNpc(ELISE).setRandomWalking(false);
- world.getNpc(ELISE).setTargetable(false);
- addMoveToDesire(world.getNpc(ELISE), ELISE_MOVE, 6);
+ final Npc elise = world.spawnGroup("elise").stream().findFirst().get();
+ elise.setInvul(true);
+ elise.setRandomWalking(false);
+ elise.setTargetable(false);
+ addMoveToDesire(elise, ELISE_MOVE, 6);
break;
}
case ELRYAH:
{
- world.spawnGroup("elryah");
- world.getNpc(ELRYAH).setInvul(true);
- world.getNpc(ELRYAH).setRandomWalking(false);
- world.getNpc(ELRYAH).setTargetable(false);
- addMoveToDesire(world.getNpc(ELRYAH), ELRYAH_MOVE, 6);
+ final Npc elryah = world.spawnGroup("elryah").stream().findFirst().get();
+ elryah.setInvul(true);
+ elryah.setRandomWalking(false);
+ elryah.setTargetable(false);
+ addMoveToDesire(elryah, ELRYAH_MOVE, 6);
break;
}
}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/spawns/DarkElf/AteliaFortress.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/spawns/DarkElf/AteliaFortress.xml
index 24388a465a..b2fcedf199 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/spawns/DarkElf/AteliaFortress.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/spawns/DarkElf/AteliaFortress.xml
@@ -2,6 +2,7 @@
+
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/zones/custom_script.xml b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/zones/custom_script.xml
index 0cf8508677..da839c6ff9 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/zones/custom_script.xml
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/zones/custom_script.xml
@@ -1158,22 +1158,10 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/34089-1.htm b/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/34089-1.htm
index cea757c854..e6de154ff1 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/34089-1.htm
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/34089-1.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
The command Post is where the Embryo are training new recruits.
The one in charge there is Commander Burnstein. I hear all kinds of inhumane things are going inside.
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/34089.htm b/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/34089.htm
index 98167c90c5..4407758e73 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/34089.htm
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/34089.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
Shh! Please be quiet. This is enemy territory.
You don't need to introduce yourself. I've heard of your accomplishments.
If only you could've come sooner... We are waiting for Burnstein to come out of the command post.
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/instances/CommandPost.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/instances/CommandPost.xml
index 439b5854a1..11ba81fe27 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/instances/CommandPost.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/instances/CommandPost.xml
@@ -80,12 +80,12 @@
-
+
-
+
@@ -96,7 +96,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
@@ -119,7 +119,7 @@
-
+
@@ -129,22 +129,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index 712d35301b..149ae31f9d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -19,17 +19,13 @@ package instances.CommandPost;
import java.util.List;
import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.model.zone.ZoneType;
import org.l2jmobius.gameserver.model.zone.type.ScriptZone;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -39,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import instances.AbstractInstance;
/**
- * @author NasSeKa
+ * @author NasSeKa, Mobius
*/
public class CommandPost extends AbstractInstance
{
@@ -47,10 +43,6 @@ public class CommandPost extends AbstractInstance
private static final int DEVIANNE = 34089;
private static final int GEORK = 26135;
private static final int BURNSTEIN = 26136;
- private static final int ELITE_KNIGHT = 23605;
- private static final int ELITE_WARRIOR = 23606;
- private static final int ELITE_ARCHER = 23607;
- private static final int ELITE_WIZARD = 23608;
private static final int ADOLPH = 23590;
private static final int BARTON = 23591;
private static final int HAYUK = 23592;
@@ -111,7 +103,6 @@ public class CommandPost extends AbstractInstance
// Zones
private static final ScriptZone FLOOR_1_TP = ZoneManager.getInstance().getZoneById(25901, ScriptZone.class);
private static final ScriptZone FLOOR_2_TP = ZoneManager.getInstance().getZoneById(25902, ScriptZone.class);
- private static final ScriptZone FLOOR_2_START = ZoneManager.getInstance().getZoneById(25903, ScriptZone.class);
// Misc
private static final int TEMPLATE_ID = 259;
@@ -120,7 +111,6 @@ public class CommandPost extends AbstractInstance
super(TEMPLATE_ID);
addStartNpc(DEVIANNE);
addTalkId(DEVIANNE);
- addEnterZoneId(FLOOR_1_TP.getId(), FLOOR_2_TP.getId(), FLOOR_2_START.getId());
addMoveFinishedId(GROUP_1);
addMoveFinishedId(GROUP_2);
addMoveFinishedId(GROUP_3);
@@ -220,8 +210,8 @@ public class CommandPost extends AbstractInstance
if (world.getAliveNpcs(FIRST_FLOOR).isEmpty())
{
showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_2ND_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
- world.setStatus(2);
world.getNpc(GEORK).teleToLocation(GEORK_FLOOR_2_SPAWN);
+ world.setStatus(2);
for (Npc monster : world.spawnGroup("group_1"))
{
monster.setInvul(true);
@@ -257,23 +247,25 @@ public class CommandPost extends AbstractInstance
}
case 2:
{
- if (!player.isGM())
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
{
- final Party party = player.getParty();
- final List members = party.getMembers();
- for (Player member : members)
+ if (!member.isTeleporting() && FLOOR_1_TP.isInsideZone(member))
{
- if (FLOOR_1_TP.isInsideZone(member))
- {
- member.teleToLocation(FLOOR_2_SPAWN);
- }
+ member.teleToLocation(FLOOR_2_SPAWN);
+ teleported++;
}
}
- else if (FLOOR_1_TP.isInsideZone(player))
+ if (teleported == world.getPlayersCount())
{
- player.teleToLocation(FLOOR_2_SPAWN);
+ world.setStatus(3);
+ world.setParameter("TELEPORTED", 0);
+ world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
@@ -285,17 +277,13 @@ public class CommandPost extends AbstractInstance
monster.setWalking();
monster.getAI().moveTo(GROUP_1_MOVE);
}
-
+ world.setStatus(4);
startQuestTimer("check_status", 3000, null, player);
break;
}
case 4:
{
- if ((world.getStatus() == 4) && //
- (!world.getNpc(ELITE_KNIGHT).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WARRIOR).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_ARCHER).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WIZARD).isInsideZone(ZoneId.SCRIPT)))
+ if (world.getAliveNpcs().size() == 19)
{
for (Npc monster : world.getNpcsOfGroup("group_2"))
{
@@ -306,13 +294,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("secondGroupId"), true);
world.setStatus(5);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 5:
{
- if (world.getAliveNpcs(GROUP_2).isEmpty())
+ if (world.getAliveNpcs().size() == 14)
{
for (Npc monster : world.getNpcsOfGroup("group_3"))
{
@@ -323,13 +310,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("thirdGroupId"), true);
world.setStatus(6);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 6:
{
- if (world.getAliveNpcs(GROUP_3).isEmpty())
+ if (world.getAliveNpcs().size() == 8)
{
for (Npc monster : world.getNpcsOfGroup("group_4"))
{
@@ -340,23 +326,43 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("fourthGroupId"), true);
world.setStatus(7);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 7:
{
- // if (world.getAliveNpcs(GROUP_4).isEmpty())
- // {
- // System.out.println("Status is 7.");
- // }
-
+ if (world.getAliveNpcs().size() == 1)
+ {
+ showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_3RD_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
+ world.getNpc(GEORK).deleteMe();
+ world.setStatus(8);
+ }
startQuestTimer("check_status", 3000, null, player);
break;
}
- default:
+ case 8:
{
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
+ {
+ if (!member.isTeleporting() && FLOOR_2_TP.isInsideZone(member))
+ {
+ member.teleToLocation(FLOOR_3_SPAWN);
+ teleported++;
+ }
+ }
+ if (teleported == world.getPlayersCount())
+ {
+ world.setStatus(9);
+ world.spawnGroup("boss");
+ world.setParameter("TELEPORTED", 0);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
+ }
startQuestTimer("check_status", 3000, null, player);
+ break;
}
}
break;
@@ -369,56 +375,14 @@ public class CommandPost extends AbstractInstance
public void onMoveFinished(Npc npc)
{
final Instance world = npc.getInstanceWorld();
- if (world != null)
+ if (isInInstance(world))
{
npc.setInvul(false);
npc.setTargetable(true);
- if (CommonUtil.contains(GROUP_1, npc.getId()))
- {
- world.setStatus(4);
- }
}
super.onMoveFinished(npc);
}
- @Override
- public String onEnterZone(Creature creature, ZoneType zone)
- {
- final Instance world = creature.getInstanceWorld();
- if (world != null)
- {
- switch (zone.getId())
- {
- case 25901:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 2))
- {
- creature.teleToLocation(FLOOR_2_SPAWN);
- }
- break;
- }
- case 25902:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 3))
- {
- creature.teleToLocation(FLOOR_3_SPAWN);
- }
- break;
- }
- case 25903:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() == 2))
- {
- world.setStatus(3);
- world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
- }
- break;
- }
- }
- }
- return super.onEnterZone(creature, zone);
- }
-
@Override
public String onKill(Npc npc, Player player, boolean isPet)
{
@@ -430,51 +394,52 @@ public class CommandPost extends AbstractInstance
case BURNSTEIN:
{
world.finishInstance();
+ showOnScreenMsg(world, NpcStringId.YOU_VE_SUCCESSFULLY_ATTACKED_THE_COMMAND_POST_AND_DEFEATED_COMMANDER_BURNSTEIN, ExShowScreenMessage.TOP_CENTER, 10000, true);
break;
}
case ADOLPH:
{
- world.spawnGroup("adolph");
- world.getNpc(ADOLPH).setInvul(true);
- world.getNpc(ADOLPH).setRandomWalking(false);
- world.getNpc(ADOLPH).setTargetable(false);
- addMoveToDesire(world.getNpc(ADOLPH), ADOLPH_MOVE, 6);
+ final Npc adolph = world.spawnGroup("adolph").stream().findFirst().get();
+ adolph.setInvul(true);
+ adolph.setRandomWalking(false);
+ adolph.setTargetable(false);
+ addMoveToDesire(adolph, ADOLPH_MOVE, 6);
break;
}
case BARTON:
{
- world.spawnGroup("barton");
- world.getNpc(BARTON).setInvul(true);
- world.getNpc(BARTON).setRandomWalking(false);
- world.getNpc(BARTON).setTargetable(false);
- addMoveToDesire(world.getNpc(BARTON), BARTON_MOVE, 6);
+ final Npc barton = world.spawnGroup("barton").stream().findFirst().get();
+ barton.setInvul(true);
+ barton.setRandomWalking(false);
+ barton.setTargetable(false);
+ addMoveToDesire(barton, BARTON_MOVE, 6);
break;
}
case HAYUK:
{
- world.spawnGroup("hayuk");
- world.getNpc(HAYUK).setInvul(true);
- world.getNpc(HAYUK).setRandomWalking(false);
- world.getNpc(HAYUK).setTargetable(false);
- addMoveToDesire(world.getNpc(HAYUK), HAYUK_MOVE, 6);
+ final Npc hayuk = world.spawnGroup("hayuk").stream().findFirst().get();
+ hayuk.setInvul(true);
+ hayuk.setRandomWalking(false);
+ hayuk.setTargetable(false);
+ addMoveToDesire(hayuk, HAYUK_MOVE, 6);
break;
}
case ELISE:
{
- world.spawnGroup("elise");
- world.getNpc(ELISE).setInvul(true);
- world.getNpc(ELISE).setRandomWalking(false);
- world.getNpc(ELISE).setTargetable(false);
- addMoveToDesire(world.getNpc(ELISE), ELISE_MOVE, 6);
+ final Npc elise = world.spawnGroup("elise").stream().findFirst().get();
+ elise.setInvul(true);
+ elise.setRandomWalking(false);
+ elise.setTargetable(false);
+ addMoveToDesire(elise, ELISE_MOVE, 6);
break;
}
case ELRYAH:
{
- world.spawnGroup("elryah");
- world.getNpc(ELRYAH).setInvul(true);
- world.getNpc(ELRYAH).setRandomWalking(false);
- world.getNpc(ELRYAH).setTargetable(false);
- addMoveToDesire(world.getNpc(ELRYAH), ELRYAH_MOVE, 6);
+ final Npc elryah = world.spawnGroup("elryah").stream().findFirst().get();
+ elryah.setInvul(true);
+ elryah.setRandomWalking(false);
+ elryah.setTargetable(false);
+ addMoveToDesire(elryah, ELRYAH_MOVE, 6);
break;
}
}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/DarkElf/AteliaFortress.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/DarkElf/AteliaFortress.xml
index db66f7242d..d74a366967 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/DarkElf/AteliaFortress.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/spawns/DarkElf/AteliaFortress.xml
@@ -2,6 +2,7 @@
+
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/zones/custom_script.xml b/L2J_Mobius_08.2_Homunculus/dist/game/data/zones/custom_script.xml
index 3e3de2fd6e..89a0271477 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/zones/custom_script.xml
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/zones/custom_script.xml
@@ -1158,24 +1158,12 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/34089-1.htm b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/34089-1.htm
index cea757c854..e6de154ff1 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/34089-1.htm
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/34089-1.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
The command Post is where the Embryo are training new recruits.
The one in charge there is Commander Burnstein. I hear all kinds of inhumane things are going inside.
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/34089.htm b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/34089.htm
index 98167c90c5..4407758e73 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/34089.htm
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/34089.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
Shh! Please be quiet. This is enemy territory.
You don't need to introduce yourself. I've heard of your accomplishments.
If only you could've come sooner... We are waiting for Burnstein to come out of the command post.
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/instances/CommandPost.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/instances/CommandPost.xml
index 439b5854a1..11ba81fe27 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/instances/CommandPost.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/instances/CommandPost.xml
@@ -80,12 +80,12 @@
-
+
-
+
@@ -96,7 +96,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
@@ -119,7 +119,7 @@
-
+
@@ -129,22 +129,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index 712d35301b..149ae31f9d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -19,17 +19,13 @@ package instances.CommandPost;
import java.util.List;
import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.model.zone.ZoneType;
import org.l2jmobius.gameserver.model.zone.type.ScriptZone;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -39,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import instances.AbstractInstance;
/**
- * @author NasSeKa
+ * @author NasSeKa, Mobius
*/
public class CommandPost extends AbstractInstance
{
@@ -47,10 +43,6 @@ public class CommandPost extends AbstractInstance
private static final int DEVIANNE = 34089;
private static final int GEORK = 26135;
private static final int BURNSTEIN = 26136;
- private static final int ELITE_KNIGHT = 23605;
- private static final int ELITE_WARRIOR = 23606;
- private static final int ELITE_ARCHER = 23607;
- private static final int ELITE_WIZARD = 23608;
private static final int ADOLPH = 23590;
private static final int BARTON = 23591;
private static final int HAYUK = 23592;
@@ -111,7 +103,6 @@ public class CommandPost extends AbstractInstance
// Zones
private static final ScriptZone FLOOR_1_TP = ZoneManager.getInstance().getZoneById(25901, ScriptZone.class);
private static final ScriptZone FLOOR_2_TP = ZoneManager.getInstance().getZoneById(25902, ScriptZone.class);
- private static final ScriptZone FLOOR_2_START = ZoneManager.getInstance().getZoneById(25903, ScriptZone.class);
// Misc
private static final int TEMPLATE_ID = 259;
@@ -120,7 +111,6 @@ public class CommandPost extends AbstractInstance
super(TEMPLATE_ID);
addStartNpc(DEVIANNE);
addTalkId(DEVIANNE);
- addEnterZoneId(FLOOR_1_TP.getId(), FLOOR_2_TP.getId(), FLOOR_2_START.getId());
addMoveFinishedId(GROUP_1);
addMoveFinishedId(GROUP_2);
addMoveFinishedId(GROUP_3);
@@ -220,8 +210,8 @@ public class CommandPost extends AbstractInstance
if (world.getAliveNpcs(FIRST_FLOOR).isEmpty())
{
showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_2ND_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
- world.setStatus(2);
world.getNpc(GEORK).teleToLocation(GEORK_FLOOR_2_SPAWN);
+ world.setStatus(2);
for (Npc monster : world.spawnGroup("group_1"))
{
monster.setInvul(true);
@@ -257,23 +247,25 @@ public class CommandPost extends AbstractInstance
}
case 2:
{
- if (!player.isGM())
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
{
- final Party party = player.getParty();
- final List members = party.getMembers();
- for (Player member : members)
+ if (!member.isTeleporting() && FLOOR_1_TP.isInsideZone(member))
{
- if (FLOOR_1_TP.isInsideZone(member))
- {
- member.teleToLocation(FLOOR_2_SPAWN);
- }
+ member.teleToLocation(FLOOR_2_SPAWN);
+ teleported++;
}
}
- else if (FLOOR_1_TP.isInsideZone(player))
+ if (teleported == world.getPlayersCount())
{
- player.teleToLocation(FLOOR_2_SPAWN);
+ world.setStatus(3);
+ world.setParameter("TELEPORTED", 0);
+ world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
@@ -285,17 +277,13 @@ public class CommandPost extends AbstractInstance
monster.setWalking();
monster.getAI().moveTo(GROUP_1_MOVE);
}
-
+ world.setStatus(4);
startQuestTimer("check_status", 3000, null, player);
break;
}
case 4:
{
- if ((world.getStatus() == 4) && //
- (!world.getNpc(ELITE_KNIGHT).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WARRIOR).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_ARCHER).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WIZARD).isInsideZone(ZoneId.SCRIPT)))
+ if (world.getAliveNpcs().size() == 19)
{
for (Npc monster : world.getNpcsOfGroup("group_2"))
{
@@ -306,13 +294,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("secondGroupId"), true);
world.setStatus(5);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 5:
{
- if (world.getAliveNpcs(GROUP_2).isEmpty())
+ if (world.getAliveNpcs().size() == 14)
{
for (Npc monster : world.getNpcsOfGroup("group_3"))
{
@@ -323,13 +310,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("thirdGroupId"), true);
world.setStatus(6);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 6:
{
- if (world.getAliveNpcs(GROUP_3).isEmpty())
+ if (world.getAliveNpcs().size() == 8)
{
for (Npc monster : world.getNpcsOfGroup("group_4"))
{
@@ -340,23 +326,43 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("fourthGroupId"), true);
world.setStatus(7);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 7:
{
- // if (world.getAliveNpcs(GROUP_4).isEmpty())
- // {
- // System.out.println("Status is 7.");
- // }
-
+ if (world.getAliveNpcs().size() == 1)
+ {
+ showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_3RD_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
+ world.getNpc(GEORK).deleteMe();
+ world.setStatus(8);
+ }
startQuestTimer("check_status", 3000, null, player);
break;
}
- default:
+ case 8:
{
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
+ {
+ if (!member.isTeleporting() && FLOOR_2_TP.isInsideZone(member))
+ {
+ member.teleToLocation(FLOOR_3_SPAWN);
+ teleported++;
+ }
+ }
+ if (teleported == world.getPlayersCount())
+ {
+ world.setStatus(9);
+ world.spawnGroup("boss");
+ world.setParameter("TELEPORTED", 0);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
+ }
startQuestTimer("check_status", 3000, null, player);
+ break;
}
}
break;
@@ -369,56 +375,14 @@ public class CommandPost extends AbstractInstance
public void onMoveFinished(Npc npc)
{
final Instance world = npc.getInstanceWorld();
- if (world != null)
+ if (isInInstance(world))
{
npc.setInvul(false);
npc.setTargetable(true);
- if (CommonUtil.contains(GROUP_1, npc.getId()))
- {
- world.setStatus(4);
- }
}
super.onMoveFinished(npc);
}
- @Override
- public String onEnterZone(Creature creature, ZoneType zone)
- {
- final Instance world = creature.getInstanceWorld();
- if (world != null)
- {
- switch (zone.getId())
- {
- case 25901:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 2))
- {
- creature.teleToLocation(FLOOR_2_SPAWN);
- }
- break;
- }
- case 25902:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 3))
- {
- creature.teleToLocation(FLOOR_3_SPAWN);
- }
- break;
- }
- case 25903:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() == 2))
- {
- world.setStatus(3);
- world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
- }
- break;
- }
- }
- }
- return super.onEnterZone(creature, zone);
- }
-
@Override
public String onKill(Npc npc, Player player, boolean isPet)
{
@@ -430,51 +394,52 @@ public class CommandPost extends AbstractInstance
case BURNSTEIN:
{
world.finishInstance();
+ showOnScreenMsg(world, NpcStringId.YOU_VE_SUCCESSFULLY_ATTACKED_THE_COMMAND_POST_AND_DEFEATED_COMMANDER_BURNSTEIN, ExShowScreenMessage.TOP_CENTER, 10000, true);
break;
}
case ADOLPH:
{
- world.spawnGroup("adolph");
- world.getNpc(ADOLPH).setInvul(true);
- world.getNpc(ADOLPH).setRandomWalking(false);
- world.getNpc(ADOLPH).setTargetable(false);
- addMoveToDesire(world.getNpc(ADOLPH), ADOLPH_MOVE, 6);
+ final Npc adolph = world.spawnGroup("adolph").stream().findFirst().get();
+ adolph.setInvul(true);
+ adolph.setRandomWalking(false);
+ adolph.setTargetable(false);
+ addMoveToDesire(adolph, ADOLPH_MOVE, 6);
break;
}
case BARTON:
{
- world.spawnGroup("barton");
- world.getNpc(BARTON).setInvul(true);
- world.getNpc(BARTON).setRandomWalking(false);
- world.getNpc(BARTON).setTargetable(false);
- addMoveToDesire(world.getNpc(BARTON), BARTON_MOVE, 6);
+ final Npc barton = world.spawnGroup("barton").stream().findFirst().get();
+ barton.setInvul(true);
+ barton.setRandomWalking(false);
+ barton.setTargetable(false);
+ addMoveToDesire(barton, BARTON_MOVE, 6);
break;
}
case HAYUK:
{
- world.spawnGroup("hayuk");
- world.getNpc(HAYUK).setInvul(true);
- world.getNpc(HAYUK).setRandomWalking(false);
- world.getNpc(HAYUK).setTargetable(false);
- addMoveToDesire(world.getNpc(HAYUK), HAYUK_MOVE, 6);
+ final Npc hayuk = world.spawnGroup("hayuk").stream().findFirst().get();
+ hayuk.setInvul(true);
+ hayuk.setRandomWalking(false);
+ hayuk.setTargetable(false);
+ addMoveToDesire(hayuk, HAYUK_MOVE, 6);
break;
}
case ELISE:
{
- world.spawnGroup("elise");
- world.getNpc(ELISE).setInvul(true);
- world.getNpc(ELISE).setRandomWalking(false);
- world.getNpc(ELISE).setTargetable(false);
- addMoveToDesire(world.getNpc(ELISE), ELISE_MOVE, 6);
+ final Npc elise = world.spawnGroup("elise").stream().findFirst().get();
+ elise.setInvul(true);
+ elise.setRandomWalking(false);
+ elise.setTargetable(false);
+ addMoveToDesire(elise, ELISE_MOVE, 6);
break;
}
case ELRYAH:
{
- world.spawnGroup("elryah");
- world.getNpc(ELRYAH).setInvul(true);
- world.getNpc(ELRYAH).setRandomWalking(false);
- world.getNpc(ELRYAH).setTargetable(false);
- addMoveToDesire(world.getNpc(ELRYAH), ELRYAH_MOVE, 6);
+ final Npc elryah = world.spawnGroup("elryah").stream().findFirst().get();
+ elryah.setInvul(true);
+ elryah.setRandomWalking(false);
+ elryah.setTargetable(false);
+ addMoveToDesire(elryah, ELRYAH_MOVE, 6);
break;
}
}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/DarkElf/AteliaFortress.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/DarkElf/AteliaFortress.xml
index db66f7242d..d74a366967 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/DarkElf/AteliaFortress.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/spawns/DarkElf/AteliaFortress.xml
@@ -2,6 +2,7 @@
+
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/zones/custom_script.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/zones/custom_script.xml
index 3e3de2fd6e..89a0271477 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/zones/custom_script.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/zones/custom_script.xml
@@ -1158,24 +1158,12 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/html/default/34089-1.htm b/L2J_Mobius_10.0_MasterClass/dist/game/data/html/default/34089-1.htm
index cea757c854..e6de154ff1 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/html/default/34089-1.htm
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/html/default/34089-1.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
The command Post is where the Embryo are training new recruits.
The one in charge there is Commander Burnstein. I hear all kinds of inhumane things are going inside.
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/html/default/34089.htm b/L2J_Mobius_10.0_MasterClass/dist/game/data/html/default/34089.htm
index 98167c90c5..4407758e73 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/html/default/34089.htm
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/html/default/34089.htm
@@ -1,4 +1,4 @@
-Truth Scholar Devianne:
+Truth Seeker Devianne:
Shh! Please be quiet. This is enemy territory.
You don't need to introduce yourself. I've heard of your accomplishments.
If only you could've come sooner... We are waiting for Burnstein to come out of the command post.
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/instances/CommandPost.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/instances/CommandPost.xml
index 439b5854a1..11ba81fe27 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/instances/CommandPost.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/instances/CommandPost.xml
@@ -80,12 +80,12 @@
-
+
-
+
@@ -96,7 +96,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
@@ -119,7 +119,7 @@
-
+
@@ -129,22 +129,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java
index 712d35301b..149ae31f9d 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/instances/CommandPost/CommandPost.java
@@ -19,17 +19,13 @@ package instances.CommandPost;
import java.util.List;
import org.l2jmobius.commons.util.Chronos;
-import org.l2jmobius.commons.util.CommonUtil;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.instancezone.Instance;
-import org.l2jmobius.gameserver.model.zone.ZoneId;
-import org.l2jmobius.gameserver.model.zone.ZoneType;
import org.l2jmobius.gameserver.model.zone.type.ScriptZone;
import org.l2jmobius.gameserver.network.NpcStringId;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -39,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import instances.AbstractInstance;
/**
- * @author NasSeKa
+ * @author NasSeKa, Mobius
*/
public class CommandPost extends AbstractInstance
{
@@ -47,10 +43,6 @@ public class CommandPost extends AbstractInstance
private static final int DEVIANNE = 34089;
private static final int GEORK = 26135;
private static final int BURNSTEIN = 26136;
- private static final int ELITE_KNIGHT = 23605;
- private static final int ELITE_WARRIOR = 23606;
- private static final int ELITE_ARCHER = 23607;
- private static final int ELITE_WIZARD = 23608;
private static final int ADOLPH = 23590;
private static final int BARTON = 23591;
private static final int HAYUK = 23592;
@@ -111,7 +103,6 @@ public class CommandPost extends AbstractInstance
// Zones
private static final ScriptZone FLOOR_1_TP = ZoneManager.getInstance().getZoneById(25901, ScriptZone.class);
private static final ScriptZone FLOOR_2_TP = ZoneManager.getInstance().getZoneById(25902, ScriptZone.class);
- private static final ScriptZone FLOOR_2_START = ZoneManager.getInstance().getZoneById(25903, ScriptZone.class);
// Misc
private static final int TEMPLATE_ID = 259;
@@ -120,7 +111,6 @@ public class CommandPost extends AbstractInstance
super(TEMPLATE_ID);
addStartNpc(DEVIANNE);
addTalkId(DEVIANNE);
- addEnterZoneId(FLOOR_1_TP.getId(), FLOOR_2_TP.getId(), FLOOR_2_START.getId());
addMoveFinishedId(GROUP_1);
addMoveFinishedId(GROUP_2);
addMoveFinishedId(GROUP_3);
@@ -220,8 +210,8 @@ public class CommandPost extends AbstractInstance
if (world.getAliveNpcs(FIRST_FLOOR).isEmpty())
{
showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_2ND_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
- world.setStatus(2);
world.getNpc(GEORK).teleToLocation(GEORK_FLOOR_2_SPAWN);
+ world.setStatus(2);
for (Npc monster : world.spawnGroup("group_1"))
{
monster.setInvul(true);
@@ -257,23 +247,25 @@ public class CommandPost extends AbstractInstance
}
case 2:
{
- if (!player.isGM())
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
{
- final Party party = player.getParty();
- final List members = party.getMembers();
- for (Player member : members)
+ if (!member.isTeleporting() && FLOOR_1_TP.isInsideZone(member))
{
- if (FLOOR_1_TP.isInsideZone(member))
- {
- member.teleToLocation(FLOOR_2_SPAWN);
- }
+ member.teleToLocation(FLOOR_2_SPAWN);
+ teleported++;
}
}
- else if (FLOOR_1_TP.isInsideZone(player))
+ if (teleported == world.getPlayersCount())
{
- player.teleToLocation(FLOOR_2_SPAWN);
+ world.setStatus(3);
+ world.setParameter("TELEPORTED", 0);
+ world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
@@ -285,17 +277,13 @@ public class CommandPost extends AbstractInstance
monster.setWalking();
monster.getAI().moveTo(GROUP_1_MOVE);
}
-
+ world.setStatus(4);
startQuestTimer("check_status", 3000, null, player);
break;
}
case 4:
{
- if ((world.getStatus() == 4) && //
- (!world.getNpc(ELITE_KNIGHT).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WARRIOR).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_ARCHER).isInsideZone(ZoneId.SCRIPT)) && //
- (!world.getNpc(ELITE_WIZARD).isInsideZone(ZoneId.SCRIPT)))
+ if (world.getAliveNpcs().size() == 19)
{
for (Npc monster : world.getNpcsOfGroup("group_2"))
{
@@ -306,13 +294,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("secondGroupId"), true);
world.setStatus(5);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 5:
{
- if (world.getAliveNpcs(GROUP_2).isEmpty())
+ if (world.getAliveNpcs().size() == 14)
{
for (Npc monster : world.getNpcsOfGroup("group_3"))
{
@@ -323,13 +310,12 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("thirdGroupId"), true);
world.setStatus(6);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 6:
{
- if (world.getAliveNpcs(GROUP_3).isEmpty())
+ if (world.getAliveNpcs().size() == 8)
{
for (Npc monster : world.getNpcsOfGroup("group_4"))
{
@@ -340,23 +326,43 @@ public class CommandPost extends AbstractInstance
world.openCloseDoor(world.getTemplateParameters().getInt("fourthGroupId"), true);
world.setStatus(7);
}
-
startQuestTimer("check_status", 3000, null, player);
break;
}
case 7:
{
- // if (world.getAliveNpcs(GROUP_4).isEmpty())
- // {
- // System.out.println("Status is 7.");
- // }
-
+ if (world.getAliveNpcs().size() == 1)
+ {
+ showOnScreenMsg(world, NpcStringId.THE_TELEPORT_GATE_TO_THE_3RD_FLOOR_HAS_BEEN_ACTIVATED, ExShowScreenMessage.TOP_CENTER, 2000, true);
+ world.getNpc(GEORK).deleteMe();
+ world.setStatus(8);
+ }
startQuestTimer("check_status", 3000, null, player);
break;
}
- default:
+ case 8:
{
+ int teleported = world.getParameters().getInt("TELEPORTED", 0);
+ for (Player member : world.getPlayers())
+ {
+ if (!member.isTeleporting() && FLOOR_2_TP.isInsideZone(member))
+ {
+ member.teleToLocation(FLOOR_3_SPAWN);
+ teleported++;
+ }
+ }
+ if (teleported == world.getPlayersCount())
+ {
+ world.setStatus(9);
+ world.spawnGroup("boss");
+ world.setParameter("TELEPORTED", 0);
+ }
+ else
+ {
+ world.setParameter("TELEPORTED", teleported);
+ }
startQuestTimer("check_status", 3000, null, player);
+ break;
}
}
break;
@@ -369,56 +375,14 @@ public class CommandPost extends AbstractInstance
public void onMoveFinished(Npc npc)
{
final Instance world = npc.getInstanceWorld();
- if (world != null)
+ if (isInInstance(world))
{
npc.setInvul(false);
npc.setTargetable(true);
- if (CommonUtil.contains(GROUP_1, npc.getId()))
- {
- world.setStatus(4);
- }
}
super.onMoveFinished(npc);
}
- @Override
- public String onEnterZone(Creature creature, ZoneType zone)
- {
- final Instance world = creature.getInstanceWorld();
- if (world != null)
- {
- switch (zone.getId())
- {
- case 25901:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 2))
- {
- creature.teleToLocation(FLOOR_2_SPAWN);
- }
- break;
- }
- case 25902:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() >= 3))
- {
- creature.teleToLocation(FLOOR_3_SPAWN);
- }
- break;
- }
- case 25903:
- {
- if (creature.isPlayer() && isInInstance(world) && (world.getStatus() == 2))
- {
- world.setStatus(3);
- world.openCloseDoor(world.getTemplateParameters().getInt("firstGroupId"), true);
- }
- break;
- }
- }
- }
- return super.onEnterZone(creature, zone);
- }
-
@Override
public String onKill(Npc npc, Player player, boolean isPet)
{
@@ -430,51 +394,52 @@ public class CommandPost extends AbstractInstance
case BURNSTEIN:
{
world.finishInstance();
+ showOnScreenMsg(world, NpcStringId.YOU_VE_SUCCESSFULLY_ATTACKED_THE_COMMAND_POST_AND_DEFEATED_COMMANDER_BURNSTEIN, ExShowScreenMessage.TOP_CENTER, 10000, true);
break;
}
case ADOLPH:
{
- world.spawnGroup("adolph");
- world.getNpc(ADOLPH).setInvul(true);
- world.getNpc(ADOLPH).setRandomWalking(false);
- world.getNpc(ADOLPH).setTargetable(false);
- addMoveToDesire(world.getNpc(ADOLPH), ADOLPH_MOVE, 6);
+ final Npc adolph = world.spawnGroup("adolph").stream().findFirst().get();
+ adolph.setInvul(true);
+ adolph.setRandomWalking(false);
+ adolph.setTargetable(false);
+ addMoveToDesire(adolph, ADOLPH_MOVE, 6);
break;
}
case BARTON:
{
- world.spawnGroup("barton");
- world.getNpc(BARTON).setInvul(true);
- world.getNpc(BARTON).setRandomWalking(false);
- world.getNpc(BARTON).setTargetable(false);
- addMoveToDesire(world.getNpc(BARTON), BARTON_MOVE, 6);
+ final Npc barton = world.spawnGroup("barton").stream().findFirst().get();
+ barton.setInvul(true);
+ barton.setRandomWalking(false);
+ barton.setTargetable(false);
+ addMoveToDesire(barton, BARTON_MOVE, 6);
break;
}
case HAYUK:
{
- world.spawnGroup("hayuk");
- world.getNpc(HAYUK).setInvul(true);
- world.getNpc(HAYUK).setRandomWalking(false);
- world.getNpc(HAYUK).setTargetable(false);
- addMoveToDesire(world.getNpc(HAYUK), HAYUK_MOVE, 6);
+ final Npc hayuk = world.spawnGroup("hayuk").stream().findFirst().get();
+ hayuk.setInvul(true);
+ hayuk.setRandomWalking(false);
+ hayuk.setTargetable(false);
+ addMoveToDesire(hayuk, HAYUK_MOVE, 6);
break;
}
case ELISE:
{
- world.spawnGroup("elise");
- world.getNpc(ELISE).setInvul(true);
- world.getNpc(ELISE).setRandomWalking(false);
- world.getNpc(ELISE).setTargetable(false);
- addMoveToDesire(world.getNpc(ELISE), ELISE_MOVE, 6);
+ final Npc elise = world.spawnGroup("elise").stream().findFirst().get();
+ elise.setInvul(true);
+ elise.setRandomWalking(false);
+ elise.setTargetable(false);
+ addMoveToDesire(elise, ELISE_MOVE, 6);
break;
}
case ELRYAH:
{
- world.spawnGroup("elryah");
- world.getNpc(ELRYAH).setInvul(true);
- world.getNpc(ELRYAH).setRandomWalking(false);
- world.getNpc(ELRYAH).setTargetable(false);
- addMoveToDesire(world.getNpc(ELRYAH), ELRYAH_MOVE, 6);
+ final Npc elryah = world.spawnGroup("elryah").stream().findFirst().get();
+ elryah.setInvul(true);
+ elryah.setRandomWalking(false);
+ elryah.setTargetable(false);
+ addMoveToDesire(elryah, ELRYAH_MOVE, 6);
break;
}
}
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/spawns/DarkElf/AteliaFortress.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/spawns/DarkElf/AteliaFortress.xml
index db66f7242d..d74a366967 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/spawns/DarkElf/AteliaFortress.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/spawns/DarkElf/AteliaFortress.xml
@@ -2,6 +2,7 @@
+
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/zones/custom_script.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/zones/custom_script.xml
index 3e3de2fd6e..89a0271477 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/zones/custom_script.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/zones/custom_script.xml
@@ -1158,24 +1158,12 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-