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

4
L2J_Mobius_Classic_Interlude/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_Classic_Interlude/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)

10
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Core/Core.java vendored
View File

@@ -83,7 +83,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();
@@ -96,7 +96,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);
}
}
@@ -147,7 +147,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"))
@@ -196,7 +196,7 @@ public class Core extends AbstractNpcAI
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN);
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);
@@ -207,7 +207,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_Classic_Interlude/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java vendored
View File

@@ -63,7 +63,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)
@@ -78,7 +78,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.
@@ -112,7 +112,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
@@ -126,7 +126,7 @@ public class DrChaos extends AbstractNpcAI
npc.deleteMe();
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", npc, null);
}
}
@@ -168,7 +168,7 @@ public class DrChaos extends AbstractNpcAI
// Check every sec if someone is in range, if found, launch one task to decrease the timer.
else if (event.equalsIgnoreCase("paranoia_activity"))
{
if (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL)
if (GrandBossManager.getInstance().getStatus(CHAOS_GOLEM) == NORMAL)
{
for (Player obj : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 500))
{
@@ -201,7 +201,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 + Rnd.get(5); // remove 1-5 secs.
if ((_pissedOffTimer > 20) && (_pissedOffTimer <= 30))
@@ -243,7 +243,7 @@ public class DrChaos extends AbstractNpcAI
// "lock" Dr. Chaos for regular RB time (36H fixed +- 24H random)
final long respawnTime = (36 + Rnd.get(-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
@@ -293,10 +293,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);

10
L2J_Mobius_Classic_Interlude/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_Classic_Interlude/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);

16
L2J_Mobius_Classic_Interlude/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);

6
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java vendored
View File

@@ -49,7 +49,7 @@ public class Zaken extends AbstractNpcAI
addKillId(ZAKEN);
final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN);
final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
final int status = GrandBossManager.getInstance().getStatus(ZAKEN);
if (status == DEAD)
{
// load the unlock date and time from DB
@@ -82,7 +82,7 @@ public class Zaken extends AbstractNpcAI
private void spawnBoss()
{
final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, ZAKEN_X, ZAKEN_Y, ZAKEN_Z, 0, false, 0);
GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
GrandBossManager.getInstance().addBoss(zaken);
zaken.broadcastPacket(new PlaySound(1, "BS01_A", 1, zaken.getObjectId(), zaken.getX(), zaken.getY(), zaken.getZ()));
}
@@ -91,7 +91,7 @@ public class Zaken extends AbstractNpcAI
public String onKill(Npc npc, Player killer, boolean isSummon)
{
npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD);
GrandBossManager.getInstance().setStatus(ZAKEN, DEAD);
// Calculate Min and Max respawn times randomly.
final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000;
startQuestTimer("zaken_unlock", respawnTime, null, null);

4
L2J_Mobius_Classic_Interlude/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_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java vendored
View File

@@ -200,7 +200,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_Classic_Interlude/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_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
View File

@@ -107,7 +107,7 @@ 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)
{
if (!_bossStatus.containsKey(bossId))
{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
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 + ".");