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

Fallen Emperors Throne improvements.

Browse Source 
Contributed by CostyKiller.
This commit is contained in:
MobiusDevelopment
2021-05-28 14:30:42 +00:00
parent 5b3f016026
commit 00bfe2cd0d
2 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java vendored
View File

@@ -75,12 +75,6 @@ public class FallenEmperorsThrone extends AbstractInstance
public void onInstanceCreated(Instance world, PlayerInstance player) public void onInstanceCreated(Instance world, PlayerInstance player)
{ {
world.setStatus(0); world.setStatus(0);
world.getParameters().set("ACTIVATED", false);
world.getParameters().set("STAGE1_50", false);
world.getParameters().set("STAGE2_50", false);
world.getParameters().set("HELIOS_80", false);
world.getParameters().set("HELIOS_50", false);
world.getParameters().set("ANNOUNCE", false);
} }
@Override @Override
@@ -91,14 +85,16 @@ public class FallenEmperorsThrone extends AbstractInstance
case "enterInstance": case "enterInstance":
{ {
enterInstance(player, npc, TEMPLATE_ID); enterInstance(player, npc, TEMPLATE_ID);
startQuestTimer("beggining", 10000, npc, player); startQuestTimer("beginning", 10000, null, player);
break; break;
} }
case "beggining": case "beginning":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (isInInstance(world)) final boolean SPAWNED = world.getParameters().getBoolean("SPAWNED", false);
if (isInInstance(world) && !SPAWNED)
{ {
world.getParameters().set("SPAWNED", true);
world.spawnGroup("FE_HELIOS1"); world.spawnGroup("FE_HELIOS1");
world.spawnGroup("MINIONS"); world.spawnGroup("MINIONS");
} }
@@ -161,8 +157,7 @@ public class FallenEmperorsThrone extends AbstractInstance
int count = world.getPlayersCount(); int count = world.getPlayersCount();
if (count > 0) if (count > 0)
{ {
// PlayerInstance randomPlayer = bossZone.getPlayersInside().get(getRandom(count)); final PlayerInstance randomPlayer = world.getPlayers().stream().findAny().get();
PlayerInstance randomPlayer = world.getPlayers().iterator().next();
final Npc leopold = world.getNpc(LEOPOLD); final Npc leopold = world.getNpc(LEOPOLD);
if (leopold != null) if (leopold != null)
{ {
@@ -205,8 +200,7 @@ public class FallenEmperorsThrone extends AbstractInstance
int count = world.getPlayersCount(); int count = world.getPlayersCount();
if (count > 0) if (count > 0)
{ {
// PlayerInstance randomPlayer = bossZone.getPlayersInside().get(getRandom(count)); final PlayerInstance randomPlayer = world.getPlayers().stream().findAny().get();
PlayerInstance randomPlayer = world.getPlayers().iterator().next();
final Npc blueLightning = world.getNpc(HELIOS_BLUE_LIGHTNING); final Npc blueLightning = world.getNpc(HELIOS_BLUE_LIGHTNING);
if (blueLightning != null) if (blueLightning != null)
{ {
@@ -226,8 +220,7 @@ public class FallenEmperorsThrone extends AbstractInstance
int count = world.getPlayersCount(); int count = world.getPlayersCount();
if (count > 0) if (count > 0)
{ {
// PlayerInstance randomPlayer = bossZone.getPlayersInside().get(getRandom(count)); final PlayerInstance randomPlayer = world.getPlayers().stream().findAny().get();
PlayerInstance randomPlayer = world.getPlayers().iterator().next();
final Npc redLightning = world.getNpc(HELIOS_RED_LIGHTNING); final Npc redLightning = world.getNpc(HELIOS_RED_LIGHTNING);
if (redLightning != null) if (redLightning != null)
{ {

23
L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/FallenEmperorsThrone/FallenEmperorsThrone.java vendored
View File

@@ -75,12 +75,6 @@ public class FallenEmperorsThrone extends AbstractInstance
public void onInstanceCreated(Instance world, PlayerInstance player) public void onInstanceCreated(Instance world, PlayerInstance player)
{ {
world.setStatus(0); world.setStatus(0);
world.getParameters().set("ACTIVATED", false);
world.getParameters().set("STAGE1_50", false);
world.getParameters().set("STAGE2_50", false);
world.getParameters().set("HELIOS_80", false);
world.getParameters().set("HELIOS_50", false);
world.getParameters().set("ANNOUNCE", false);
} }
@Override @Override
@@ -91,14 +85,16 @@ public class FallenEmperorsThrone extends AbstractInstance
case "enterInstance": case "enterInstance":
{ {
enterInstance(player, npc, TEMPLATE_ID); enterInstance(player, npc, TEMPLATE_ID);
startQuestTimer("beggining", 10000, npc, player); startQuestTimer("beginning", 10000, null, player);
break; break;
} }
case "beggining": case "beginning":
{ {
final Instance world = player.getInstanceWorld(); final Instance world = player.getInstanceWorld();
if (isInInstance(world)) final boolean SPAWNED = world.getParameters().getBoolean("SPAWNED", false);
if (isInInstance(world) && !SPAWNED)
{ {
world.getParameters().set("SPAWNED", true);
world.spawnGroup("FE_HELIOS1"); world.spawnGroup("FE_HELIOS1");
world.spawnGroup("MINIONS"); world.spawnGroup("MINIONS");
} }
@@ -161,8 +157,7 @@ public class FallenEmperorsThrone extends AbstractInstance
int count = world.getPlayersCount(); int count = world.getPlayersCount();
if (count > 0) if (count > 0)
{ {
// PlayerInstance randomPlayer = bossZone.getPlayersInside().get(getRandom(count)); final PlayerInstance randomPlayer = world.getPlayers().stream().findAny().get();
PlayerInstance randomPlayer = world.getPlayers().iterator().next();
final Npc leopold = world.getNpc(LEOPOLD); final Npc leopold = world.getNpc(LEOPOLD);
if (leopold != null) if (leopold != null)
{ {
@@ -205,8 +200,7 @@ public class FallenEmperorsThrone extends AbstractInstance
int count = world.getPlayersCount(); int count = world.getPlayersCount();
if (count > 0) if (count > 0)
{ {
// PlayerInstance randomPlayer = bossZone.getPlayersInside().get(getRandom(count)); final PlayerInstance randomPlayer = world.getPlayers().stream().findAny().get();
PlayerInstance randomPlayer = world.getPlayers().iterator().next();
final Npc blueLightning = world.getNpc(HELIOS_BLUE_LIGHTNING); final Npc blueLightning = world.getNpc(HELIOS_BLUE_LIGHTNING);
if (blueLightning != null) if (blueLightning != null)
{ {
@@ -226,8 +220,7 @@ public class FallenEmperorsThrone extends AbstractInstance
int count = world.getPlayersCount(); int count = world.getPlayersCount();
if (count > 0) if (count > 0)
{ {
// PlayerInstance randomPlayer = bossZone.getPlayersInside().get(getRandom(count)); final PlayerInstance randomPlayer = world.getPlayers().stream().findAny().get();
PlayerInstance randomPlayer = world.getPlayers().iterator().next();
final Npc redLightning = world.getNpc(HELIOS_RED_LIGHTNING); final Npc redLightning = world.getNpc(HELIOS_RED_LIGHTNING);
if (redLightning != null) if (redLightning != null)
{ {