Better naming from raidboss status getter and setter.

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

View File

@@ -751,7 +751,7 @@ public class Antharas extends AbstractNpcAI
private int getStatus()
{
return GrandBossManager.getInstance().getBossStatus(ANTHARAS);
return GrandBossManager.getInstance().getStatus(ANTHARAS);
}
private void addBoss(GrandBoss grandboss)
@@ -761,7 +761,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)

View File

@@ -644,7 +644,7 @@ public class Baium extends AbstractNpcAI
private int getStatus()
{
return GrandBossManager.getInstance().getBossStatus(BAIUM);
return GrandBossManager.getInstance().getStatus(BAIUM);
}
private void addBoss(GrandBoss grandboss)
@@ -654,7 +654,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)

View File

@@ -106,7 +106,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();
@@ -116,12 +116,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();
}
@@ -133,7 +133,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;
}
@@ -510,7 +510,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)
@@ -540,7 +540,7 @@ public class Beleth extends AbstractNpcAI
@Override
public String onEnterZone(Creature creature, ZoneType zone)
{
if (creature.isPlayer() && (GrandBossManager.getInstance().getBossStatus(REAL_BELETH) == INIT))
if (creature.isPlayer() && (GrandBossManager.getInstance().getStatus(REAL_BELETH) == INIT))
{
if (_priest != null)
{
@@ -551,7 +551,7 @@ public class Beleth extends AbstractNpcAI
_stone.deleteMe();
}
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, FIGHT);
GrandBossManager.getInstance().setStatus(REAL_BELETH, FIGHT);
startQuestTimer("SPAWN1", 300000, 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);

View File

@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
_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.broadcastPacket(new NpcSay(objId, ChatType.NPC_GENERAL, npc.getId(), NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN));
npc.broadcastPacket(new NpcSay(objId, ChatType.NPC_GENERAL, npc.getId(), 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);

View File

@@ -62,7 +62,7 @@ public class DrChaos extends AbstractNpcAI
addAttackId(CHAOS_GOLEM); // Random messages when he attacks.
final StatSet info = GrandBossManager.getInstance().getStatSet(CHAOS_GOLEM);
final int status = GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM);
final int status = GrandBossManager.getInstance().getStatus(CHAOS_GOLEM);
// Load the reset date and time for Dr. Chaos from DB.
if (status == DEAD)
@@ -77,7 +77,7 @@ public class DrChaos extends AbstractNpcAI
// The time has already expired while the server was offline. Delete the saved time and
// immediately spawn Dr. Chaos. Also the state need to be changed for NORMAL
addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false);
GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL);
GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
}
}
// Spawn the war golem.
@@ -111,7 +111,7 @@ public class DrChaos extends AbstractNpcAI
{
if (event.equalsIgnoreCase("reset_drchaos"))
{
GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL);
GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL);
addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false);
}
// despawn the live Dr. Chaos after 30 minutes of inactivity
@@ -120,7 +120,7 @@ public class DrChaos extends AbstractNpcAI
if ((npc.getId() == CHAOS_GOLEM) && ((_lastAttackVsGolem + 1800000) < System.currentTimeMillis()))
{
final Npc chaos = addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false); // spawn Dr. Chaos
GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
cancelQuestTimer("golem_despawn", chaos, null);
// Despawn the war golem.
@@ -162,7 +162,7 @@ public class DrChaos extends AbstractNpcAI
npc.deleteMe();
}
// Check every sec if someone is in range, if found, launch one task to decrease the timer.
else if (event.equalsIgnoreCase("paranoia_activity") && (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL))
else if (event.equalsIgnoreCase("paranoia_activity") && (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL))
{
for (Player obj : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 500))
{
@@ -194,7 +194,7 @@ public class DrChaos extends AbstractNpcAI
public String onFirstTalk(Npc npc, Player player)
{
String htmltext = "";
if (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL)
if (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL)
{
_pissedOffTimer -= 1 + getRandom(5); // remove 1-5 secs.
if ((_pissedOffTimer > 20) && (_pissedOffTimer <= 30))
@@ -236,7 +236,7 @@ public class DrChaos extends AbstractNpcAI
// "lock" Dr. Chaos for regular RB time (36H fixed +- 24H random)
final long respawnTime = (36 + getRandom(-24, 24)) * 3600000;
GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, DEAD);
GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, DEAD);
startQuestTimer("reset_drchaos", respawnTime, null, null, false);
// also save the respawn time so that the info is maintained past reboots
@@ -286,10 +286,10 @@ public class DrChaos extends AbstractNpcAI
*/
private void crazyMidgetBecomesAngry(Npc npc)
{
if (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL)
if (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL)
{
// Set the status to "crazy".
GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, CRAZY);
GrandBossManager.getInstance().setStatus(CHAOS_GOLEM, CRAZY);
// Cancels the paranoia timer.
cancelQuestTimer("paranoia_activity", npc, null);

View File

@@ -88,7 +88,7 @@ public class Orfen extends AbstractNpcAI
_hasTeleported = false;
ZONE = GrandBossManager.getInstance().getZone(POS[0]);
final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
if (GrandBossManager.getInstance().getBossStatus(ORFEN) == DEAD)
if (GrandBossManager.getInstance().getStatus(ORFEN) == DEAD)
{
// load the unlock date and time for Orfen from DB
final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -116,7 +116,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);
}
}
@@ -187,7 +187,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"))
@@ -319,7 +319,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.
final long respawnTime = (Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM)) * 3600000;
startQuestTimer("orfen_unlock", respawnTime, null, null);
@@ -332,7 +332,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);

View File

@@ -90,7 +90,7 @@ public class QueenAnt extends AbstractNpcAI
_zone = GrandBossManager.getInstance().getZone(QUEEN_X, QUEEN_Y, QUEEN_Z);
final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
if (GrandBossManager.getInstance().getBossStatus(QUEEN) == DEAD)
if (GrandBossManager.getInstance().getStatus(QUEEN) == DEAD)
{
// load the unlock date and time for queen ant from DB
final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -104,7 +104,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);
}
}
@@ -212,7 +212,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;
}
@@ -346,7 +346,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);

View File

@@ -123,7 +123,7 @@ public class Valakas extends AbstractNpcAI
ZONE = GrandBossManager.getInstance().getZone(212852, -114842, -1632);
final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
if (status == DEAD)
{
@@ -139,7 +139,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);
@@ -219,12 +219,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.
@@ -312,7 +312,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);
@@ -371,7 +371,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"))
{
@@ -403,7 +403,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;
@@ -440,7 +440,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);

View File

@@ -49,7 +49,7 @@ public class SteelCitadelTeleport extends AbstractNpcAI
@Override
public String onTalk(Npc npc, Player player)
{
final int belethStatus = GrandBossManager.getInstance().getBossStatus(BELETH);
final int belethStatus = GrandBossManager.getInstance().getStatus(BELETH);
if (belethStatus == 3)
{
return "32376-02.htm";
@@ -69,7 +69,7 @@ public class SteelCitadelTeleport extends AbstractNpcAI
final BossZone zone = (BossZone) ZoneManager.getInstance().getZoneById(12018);
if (zone != null)
{
GrandBossManager.getInstance().setBossStatus(BELETH, 1);
GrandBossManager.getInstance().setStatus(BELETH, 1);
for (Party party : channel.getParties())
{
if (party == null)

View File

@@ -91,7 +91,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)
@@ -114,7 +114,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

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;