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

Better naming from raidboss status getter and setter.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-07-12 09:15:47 +00:00
parent 1f164b009c
commit 38366a9017
440 changed files with 1992 additions and 1992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Anakim/Anakim.java vendored
View File

@@ -341,7 +341,7 @@ public class Anakim extends AbstractNpcAI
// Unlock
final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
final int status = GrandBossManager.getInstance().getBossStatus(ANAKIM);
final int status = GrandBossManager.getInstance().getStatus(ANAKIM);
if (status == DEAD)
{
final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -351,12 +351,12 @@ public class Anakim extends AbstractNpcAI
}
else
{
GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
}
}
else if (status != ALIVE)
{
GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
}
}
@@ -367,14 +367,14 @@ public class Anakim extends AbstractNpcAI
{
case "unlock_anakim":
{
GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
break;
}
case "check_activity_task":
{
if ((_lastAction + 900000) < System.currentTimeMillis())
{
GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
for (Creature creature : BOSS_ZONE.getCharactersInside())
{
if (creature != null)
@@ -463,9 +463,9 @@ public class Anakim extends AbstractNpcAI
}
remnant.deleteMe();
}
if (GrandBossManager.getInstance().getBossStatus(ANAKIM) != DEAD)
if (GrandBossManager.getInstance().getStatus(ANAKIM) != DEAD)
{
GrandBossManager.getInstance().setBossStatus(ANAKIM, ALIVE);
GrandBossManager.getInstance().setStatus(ANAKIM, ALIVE);
}
break;
}
@@ -483,7 +483,7 @@ public class Anakim extends AbstractNpcAI
{
if ((npc.getId() == ENTER_CUBIC) || (npc.getId() == ANAKIM_CUBIC))
{
final int _anakimStatus = GrandBossManager.getInstance().getBossStatus(ANAKIM);
final int _anakimStatus = GrandBossManager.getInstance().getStatus(ANAKIM);
if ((npc.getId() == ENTER_CUBIC) && (_anakimStatus > ALIVE))
{
return "31101-01.html";
@@ -541,7 +541,7 @@ public class Anakim extends AbstractNpcAI
if ((_anakimStatus == ALIVE) && (npc.getId() == ENTER_CUBIC))
{
GrandBossManager.getInstance().setBossStatus(ANAKIM, WAITING);
GrandBossManager.getInstance().setStatus(ANAKIM, WAITING);
_spawns.clear();
for (SpawnHolder spawn : SPAWNS)
{
@@ -554,7 +554,7 @@ public class Anakim extends AbstractNpcAI
}
else if ((_anakimStatus == WAITING) && (npc.getId() == ANAKIM_CUBIC))
{
GrandBossManager.getInstance().setBossStatus(ANAKIM, FIGHTING);
GrandBossManager.getInstance().setStatus(ANAKIM, FIGHTING);
// Spawn the rb
_anakimBoss = addSpawn(ANAKIM, 185080, -12613, -5499, 16550, false, 0);
GrandBossManager.getInstance().addBoss((GrandBoss) _anakimBoss);
@@ -610,7 +610,7 @@ public class Anakim extends AbstractNpcAI
notifyEvent("cancel_timers", null, null);
addSpawn(EXIST_CUBIC, 185082, -12606, -5499, 6133, false, 900000); // 15min
GrandBossManager.getInstance().setBossStatus(ANAKIM, DEAD);
GrandBossManager.getInstance().setStatus(ANAKIM, DEAD);
final long respawnTime = getRespawnTime();
final StatSet info = GrandBossManager.getInstance().getStatSet(ANAKIM);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);

4
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java vendored
View File

@@ -750,7 +750,7 @@ public class Antharas extends AbstractNpcAI
private int getStatus()
{
return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
return GrandBossManager.getInstance().getStatus(ANTHARAS);
}
private void addBoss(GrandBoss grandboss)
@@ -760,7 +760,7 @@ public class Antharas extends AbstractNpcAI
private void setStatus(int status)
{
GrandBossManager.getInstance().setBossStatus(ANTHARAS, status);
GrandBossManager.getInstance().setStatus(ANTHARAS, status);
}
private void setRespawn(long respawnTime)

4
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Baium/Baium.java vendored
View File

@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
private int getStatus()
{
return GrandBossManager.getInstance().getBossStatus(BAIUM);
return GrandBossManager.getInstance().getStatus(BAIUM);
}
private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,7 @@ public class Baium extends AbstractNpcAI
private void setStatus(int status)
{
GrandBossManager.getInstance().setBossStatus(BAIUM, status);
GrandBossManager.getInstance().setStatus(BAIUM, status);
}
private void setRespawn(long respawnTime)

16
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java vendored
View File

@@ -105,7 +105,7 @@ public class Beleth extends AbstractNpcAI
addTalkId(STONE_COFFIN);
addFirstTalkId(ELF);
final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
final int status = GrandBossManager.getInstance().getStatus(REAL_BELETH);
if (status == DEAD)
{
final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -115,12 +115,12 @@ public class Beleth extends AbstractNpcAI
}
else
{
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
}
}
else if (status != ALIVE)
{
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
}
DoorData.getInstance().getDoor(DOOR1).openMe();
}
@@ -132,7 +132,7 @@ public class Beleth extends AbstractNpcAI
{
case "BELETH_UNLOCK":
{
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
DoorData.getInstance().getDoor(DOOR1).openMe();
break;
}
@@ -509,7 +509,7 @@ public class Beleth extends AbstractNpcAI
{
if ((_lastAttack + 900000) < System.currentTimeMillis())
{
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
for (Creature creature : ZONE.getCharactersInside())
{
if (creature != null)
@@ -539,7 +539,7 @@ public class Beleth extends AbstractNpcAI
@Override
public String onEnterZone(Creature creature, ZoneType zone)
{
if (creature.isPlayer() && (GrandBossManager.getInstance().getBossStatus(REAL_BELETH) < FIGHT))
if (creature.isPlayer() && (GrandBossManager.getInstance().getStatus(REAL_BELETH) < FIGHT))
{
if (_priest != null)
{
@@ -550,7 +550,7 @@ public class Beleth extends AbstractNpcAI
_stone.deleteMe();
}
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, FIGHT);
GrandBossManager.getInstance().setStatus(REAL_BELETH, FIGHT);
startQuestTimer("SPAWN1", Config.BELETH_WAIT_TIME * 60 * 1000, null, null);
}
@@ -705,7 +705,7 @@ public class Beleth extends AbstractNpcAI
{
cancelQuestTimer("CHECK_ATTACK", null, null);
setBelethKiller(killer);
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
GrandBossManager.getInstance().setStatus(REAL_BELETH, DEAD);
final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);

2
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java vendored
View File

@@ -53,7 +53,7 @@ public class Wormhole extends AbstractNpcAI
{
if (event.equals("teleport"))
{
final int status = GrandBossManager.getInstance().getBossStatus(BELETH);
final int status = GrandBossManager.getInstance().getStatus(BELETH);
if (status == 1)
{
return "33901-4.html";

10
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Core/Core.java vendored
View File

@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
_firstAttacked = false;
final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
{
// Load the unlock date and time for Core from DB.
final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -97,7 +97,7 @@ public class Core extends AbstractNpcAI
{
// The time has already expired while the server was offline. Immediately spawn Core.
final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
GrandBossManager.getInstance().setStatus(CORE, ALIVE);
spawnBoss(core);
}
}
@@ -148,7 +148,7 @@ public class Core extends AbstractNpcAI
if (event.equalsIgnoreCase("core_unlock"))
{
final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
GrandBossManager.getInstance().setStatus(CORE, ALIVE);
spawnBoss(core);
}
else if (event.equalsIgnoreCase("spawn_minion"))
@@ -198,7 +198,7 @@ public class Core extends AbstractNpcAI
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
_firstAttacked = false;
GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
GrandBossManager.getInstance().setStatus(CORE, DEAD);
// Calculate Min and Max respawn times randomly.
final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
startQuestTimer("core_unlock", respawnTime, null, null);
@@ -209,7 +209,7 @@ public class Core extends AbstractNpcAI
startQuestTimer("despawn_minions", 20000, null, null);
cancelQuestTimers("spawn_minion");
}
else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
{
_minions.remove(npc);
startQuestTimer("spawn_minion", 60000, npc, null);

18
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java vendored
View File

@@ -117,7 +117,7 @@ public class Kelbim extends AbstractNpcAI
// Unlock
final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
final int status = GrandBossManager.getInstance().getStatus(KELBIM);
if (status == DEAD)
{
final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -129,14 +129,14 @@ public class Kelbim extends AbstractNpcAI
{
openDoor(DOOR1, 0);
openDoor(DOOR2, 0);
GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
}
}
else if (status != ALIVE)
{
openDoor(DOOR1, 0);
openDoor(DOOR2, 0);
GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
}
}
@@ -147,7 +147,7 @@ public class Kelbim extends AbstractNpcAI
{
case "unlock_kelbim":
{
GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
Broadcast.toAllOnlinePlayers(new Earthquake(-55754, 59903, -269, 20, 10));
openDoor(DOOR1, 0);
openDoor(DOOR2, 0);
@@ -157,7 +157,7 @@ public class Kelbim extends AbstractNpcAI
{
if ((_lastAction + 900000) < System.currentTimeMillis())
{
GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
for (Creature creature : ZONE.getCharactersInside())
{
if (creature != null)
@@ -183,7 +183,7 @@ public class Kelbim extends AbstractNpcAI
case "stage_1_start":
{
_bossStage = 1;
GrandBossManager.getInstance().setBossStatus(KELBIM, FIGHTING);
GrandBossManager.getInstance().setStatus(KELBIM, FIGHTING);
playMovie(ZONE.getPlayersInside(), Movie.SC_KELBIM_OPENING);
startQuestTimer("stage_1_kelbim_spawn", 25000, null, null);
break;
@@ -307,7 +307,7 @@ public class Kelbim extends AbstractNpcAI
{
if (npc.getId() == ENTER_DEVICE)
{
final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
final int status = GrandBossManager.getInstance().getStatus(KELBIM);
if (status > ALIVE)
{
return "34052-1.html";
@@ -349,7 +349,7 @@ public class Kelbim extends AbstractNpcAI
{
if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
GrandBossManager.getInstance().setStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
member.teleToLocation(KELBIM_LOCATION, true);
}
@@ -430,7 +430,7 @@ public class Kelbim extends AbstractNpcAI
notifyEvent("cancel_timers", null, null);
closeDoor(DOOR1, 0);
closeDoor(DOOR2, 0);
GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD);
GrandBossManager.getInstance().setStatus(KELBIM, DEAD);
final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000;
final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);

22
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lilith/Lilith.java vendored
View File

@@ -367,7 +367,7 @@ public class Lilith extends AbstractNpcAI
// Unlock
final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
final int status = GrandBossManager.getInstance().getBossStatus(LILITH);
final int status = GrandBossManager.getInstance().getStatus(LILITH);
if (status == DEAD)
{
final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -377,12 +377,12 @@ public class Lilith extends AbstractNpcAI
}
else
{
GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
}
}
else if (status != ALIVE)
{
GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
}
}
@@ -393,14 +393,14 @@ public class Lilith extends AbstractNpcAI
{
case "unlock_lilith":
{
GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
break;
}
case "check_activity_task":
{
if ((_lastAction + 900000) < System.currentTimeMillis())
{
GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
for (Creature creature : BOSS_ZONE.getCharactersInside())
{
if (creature != null)
@@ -489,9 +489,9 @@ public class Lilith extends AbstractNpcAI
}
remnant.deleteMe();
}
if (GrandBossManager.getInstance().getBossStatus(LILITH) != DEAD)
if (GrandBossManager.getInstance().getStatus(LILITH) != DEAD)
{
GrandBossManager.getInstance().setBossStatus(LILITH, ALIVE);
GrandBossManager.getInstance().setStatus(LILITH, ALIVE);
}
break;
}
@@ -509,7 +509,7 @@ public class Lilith extends AbstractNpcAI
{
if ((npc.getId() == ENTER_CUBIC) || (npc.getId() == LILITH_CUBIC))
{
final int _lilithStatus = GrandBossManager.getInstance().getBossStatus(LILITH);
final int _lilithStatus = GrandBossManager.getInstance().getStatus(LILITH);
if ((npc.getId() == ENTER_CUBIC) && (_lilithStatus > ALIVE))
{
return "31118-01.html";
@@ -567,7 +567,7 @@ public class Lilith extends AbstractNpcAI
if ((_lilithStatus == ALIVE) && (npc.getId() == ENTER_CUBIC))
{
GrandBossManager.getInstance().setBossStatus(LILITH, WAITING);
GrandBossManager.getInstance().setStatus(LILITH, WAITING);
_spawns.clear();
for (SpawnHolder spawn : SPAWNS)
{
@@ -580,7 +580,7 @@ public class Lilith extends AbstractNpcAI
}
else if ((_lilithStatus == WAITING) && (npc.getId() == LILITH_CUBIC))
{
GrandBossManager.getInstance().setBossStatus(LILITH, FIGHTING);
GrandBossManager.getInstance().setStatus(LILITH, FIGHTING);
// Spawn the rb
_lilithBoss = addSpawn(LILITH, 185062, -9605, -5499, 15640, false, 0);
GrandBossManager.getInstance().addBoss((GrandBoss) _lilithBoss);
@@ -626,7 +626,7 @@ public class Lilith extends AbstractNpcAI
notifyEvent("cancel_timers", null, null);
addSpawn(EXIST_CUBIC, 185062, -9605, -5499, 15640, false, 900000); // 15min
GrandBossManager.getInstance().setBossStatus(LILITH, DEAD);
GrandBossManager.getInstance().setStatus(LILITH, DEAD);
final long respawnTime = getRespawnTime();
final StatSet info = GrandBossManager.getInstance().getStatSet(LILITH);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);

6
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java vendored
View File

@@ -53,12 +53,12 @@ public class KatoSicanus extends AbstractNpcAI
{
if (event.equals("teleport"))
{
final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
if (player.isGM())
{
player.teleToLocation(LINDVIOR_LOCATION, true);
addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 60000, false);
GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
}
else
{
@@ -115,7 +115,7 @@ public class KatoSicanus extends AbstractNpcAI
{
member.teleToLocation(LINDVIOR_LOCATION, true);
addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 0, false);
GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
}
}
}

16
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java vendored
View File

@@ -223,7 +223,7 @@ public class Lindvior extends AbstractNpcAI
_zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
// Unlock
final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
if (status == DEAD)
{
final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -235,14 +235,14 @@ public class Lindvior extends AbstractNpcAI
{
_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
}
}
else
{
_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
}
}
@@ -428,9 +428,9 @@ public class Lindvior extends AbstractNpcAI
_zoneLair.oustAllPlayers();
_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, false));
cancelQuestTimers("attack_generator");
if (GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID) != 3)
if (GrandBossManager.getInstance().getStatus(LINDVIOR_RAID) != 3)
{
GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
}
}
@@ -660,7 +660,7 @@ public class Lindvior extends AbstractNpcAI
cancelQuestTimers("attack_generator");
_lindviorfake.setDead(true);
_lindviorfake.deleteMe();
GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, FIGHTING);
GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, FIGHTING);
_lionel = addSpawn(LIONEL_HUNTER, 42630, -48231, -792, 855, false, 0, false);
_lindvior = (GrandBoss) addSpawn(LINDVIOR_GROUND, CENTER_LOCATION, false, 0, true);
@@ -682,7 +682,7 @@ public class Lindvior extends AbstractNpcAI
{
_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
break;
}
case "stage_1_activate_generator":
@@ -851,7 +851,7 @@ public class Lindvior extends AbstractNpcAI
_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, true));
_lionel.deleteMe();
GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD);
GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, DEAD);
final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000;
final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);

10
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java vendored
View File

@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
_isTeleported = false;
_zone = ZoneManager.getInstance().getZoneById(12013);
final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
final int status = GrandBossManager.getInstance().getStatus(ORFEN);
if (status == DEAD)
{
// load the unlock date and time for Orfen from DB
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
loc = POS[3];
}
final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
spawnBoss(orfen);
}
}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
loc = POS[3];
}
final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
spawnBoss(orfen);
}
else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,7 @@ public class Orfen extends AbstractNpcAI
if (npc.getId() == ORFEN)
{
npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
GrandBossManager.getInstance().setStatus(ORFEN, DEAD);
// Calculate Min and Max respawn times randomly.
long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
respawnTime *= 3600000;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
startQuestTimer("despawn_minions", 20000, null, null);
cancelQuestTimers("spawn_minion");
}
else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
{
_minions.remove(npc);
startQuestTimer("spawn_minion", 360000, npc, null);

8
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java vendored
View File

@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
_zone = ZoneManager.getInstance().getZoneById(12012);
final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
final int status = GrandBossManager.getInstance().getStatus(QUEEN);
if (status == DEAD)
{
// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
{
// the time has already expired while the server was offline. Immediately spawn queen ant.
final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
spawnBoss(queen);
}
}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
case "queen_unlock":
{
final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
spawnBoss(queen);
break;
}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
if (npcId == QUEEN)
{
npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
GrandBossManager.getInstance().setStatus(QUEEN, DEAD);
// Calculate Min and Max respawn times randomly.
final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
startQuestTimer("queen_unlock", respawnTime, null, null);

6
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java vendored
View File

@@ -54,11 +54,11 @@ public class Daichir extends AbstractNpcAI
{
if (event.equals("enterEarthWyrnCave"))
{
final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
if (player.isGM())
{
player.teleToLocation(ENTER_LOCATION, true);
GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
}
else
{
@@ -107,7 +107,7 @@ public class Daichir extends AbstractNpcAI
if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
member.teleToLocation(ENTER_LOCATION, true);
GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
}
}
}

12
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java vendored
View File

@@ -324,7 +324,7 @@ public class Trasken extends AbstractNpcAI
}
// Unlock
final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
if (status == DEAD)
{
final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -334,12 +334,12 @@ public class Trasken extends AbstractNpcAI
}
else
{
GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
}
}
else if (status != ALIVE)
{
GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
}
}
@@ -398,7 +398,7 @@ public class Trasken extends AbstractNpcAI
}
_zoneLair.oustAllPlayers();
_zoneLair2.oustAllPlayers();
GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
}
@Override
@@ -575,7 +575,7 @@ public class Trasken extends AbstractNpcAI
{
case "unlock_trasken":
{
GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
break;
}
case "exitEarthWyrnCave":
@@ -604,7 +604,7 @@ public class Trasken extends AbstractNpcAI
ThreadPool.schedule(npc::decayMe, 10000);
cancelQuestTimer("finish", npc, null);
GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD);
GrandBossManager.getInstance().setStatus(TRASKEN, DEAD);
final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000;
final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);

16
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java vendored
View File

@@ -124,7 +124,7 @@ public class Valakas extends AbstractNpcAI
ZONE = ZoneManager.getInstance().getZoneById(12010);
final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
if (status == DEAD)
{
@@ -140,7 +140,7 @@ public class Valakas extends AbstractNpcAI
// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
valakas.setInvul(true);
@@ -220,12 +220,12 @@ public class Valakas extends AbstractNpcAI
else if (event.equalsIgnoreCase("regen_task"))
{
// Inactivity task - 15min
if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
{
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
npc.teleToLocation(VALAKAS_REGENERATION_LOC);
GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
// Drop all players from the zone.
@@ -313,7 +313,7 @@ public class Valakas extends AbstractNpcAI
}
else if (event.equalsIgnoreCase("spawn_10"))
{
GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
npc.setInvul(false);
startQuestTimer("regen_task", 60000, npc, null, true);
@@ -372,7 +372,7 @@ public class Valakas extends AbstractNpcAI
valakas.setRunning();
valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
}
else if (event.equalsIgnoreCase("remove_players"))
{
@@ -404,7 +404,7 @@ public class Valakas extends AbstractNpcAI
return null;
}
if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
{
attacker.teleToLocation(ATTACKER_REMOVE);
return null;
@@ -441,7 +441,7 @@ public class Valakas extends AbstractNpcAI
startQuestTimer("die_7", 14000, npc, null); // 700
startQuestTimer("die_8", 16500, npc, null); // 2500
GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
// Calculate Min and Max respawn times randomly.
final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
startQuestTimer("valakas_unlock", respawnTime, null, null);

4
L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java vendored
View File

@@ -90,7 +90,7 @@ public class ValakasTeleporters extends AbstractNpcAI
{
if (valakasAI() != null)
{
final int status = GrandBossManager.getInstance().getBossStatus(29028);
final int status = GrandBossManager.getInstance().getStatus(29028);
if ((status == 0) || (status == 1))
{
if (playerCount >= 200)
@@ -107,7 +107,7 @@ public class ValakasTeleporters extends AbstractNpcAI
{
final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
GrandBossManager.getInstance().setBossStatus(29028, 1);
GrandBossManager.getInstance().setStatus(29028, 1);
}
}
else

2
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java vendored
View File

@@ -204,7 +204,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
{
if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId))
{
final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
NoRestartZone bossZone = null;
String textColor = null;
String text = null;

6
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -505,11 +505,11 @@ public class DBSpawnManager
}
/**
* Gets the raid npc status id.
* Gets the raid npc status.
* @param npcId the npc id
* @return the raid npc status id
* @return the raid npc status
*/
public RaidBossStatus getNpcStatusId(int npcId)
public RaidBossStatus getStatus(int npcId)
{
if (_npcs.containsKey(npcId))
{

4
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
View File

@@ -107,12 +107,12 @@ public class GrandBossManager implements IStorable
ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
}
public int getBossStatus(int bossId)
public int getStatus(int bossId)
{
return _bossStatus.get(bossId);
}
public void setBossStatus(int bossId, int status)
public void setStatus(int bossId, int status)
{
_bossStatus.put(bossId, status);
LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");