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

StatsSet properly named as StatSet.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-01-26 15:07:31 +00:00
parent 9d155febb7
commit 8b5af84230
10201 changed files with 38171 additions and 38171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java vendored
View File

@@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.World;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance;
@@ -242,7 +242,7 @@ public class Antharas extends Quest
if (FWA_OLDANTHARAS || (status == WAITING))
{
final StatsSet info = GrandBossManager.getInstance().getStatsSet(ANTHARASOLDID);
final StatSet info = GrandBossManager.getInstance().getStatSet(ANTHARASOLDID);
final Long respawnTime = info.getLong("respawn_time");
if ((status == DEAD) && (respawnTime <= System.currentTimeMillis()))
{
@@ -305,7 +305,7 @@ public class Antharas extends Quest
}
if ((antharasId != 0) && (status == FIGHTING))
{
final StatsSet info = GrandBossManager.getInstance().getStatsSet(antharasId);
final StatSet info = GrandBossManager.getInstance().getStatSet(antharasId);
final int loc_x = info.getInt("loc_x");
final int loc_y = info.getInt("loc_y");
final int loc_z = info.getInt("loc_z");
@@ -321,7 +321,7 @@ public class Antharas extends Quest
}
else if ((antharasId != 0) && (status == DEAD))
{
final StatsSet info = GrandBossManager.getInstance().getStatsSet(antharasId);
final StatSet info = GrandBossManager.getInstance().getStatSet(antharasId);
final Long respawnTime = info.getLong("respawn_time");
if (respawnTime <= System.currentTimeMillis())
{
@@ -967,9 +967,9 @@ public class Antharas extends Quest
final long respawnTime = (Config.ANTHARAS_RESP_FIRST + Rnd.get(Config.ANTHARAS_RESP_SECOND)) * 3600000;
ThreadPool.schedule(new UnlockAntharas(npc.getNpcId()), respawnTime);
// also save the respawn time so that the info is maintained past reboots
final StatsSet info = GrandBossManager.getInstance().getStatsSet(npc.getNpcId());
final StatSet info = GrandBossManager.getInstance().getStatSet(npc.getNpcId());
info.set("respawn_time", (System.currentTimeMillis() + respawnTime));
GrandBossManager.getInstance().setStatsSet(npc.getNpcId(), info);
GrandBossManager.getInstance().setStatSet(npc.getNpcId(), info);
}
}
else if (npc.getNpcId() == 29069)

8
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java vendored
View File

@@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.geoengine.GeoEngine;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.Effect;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Summon;
@@ -109,7 +109,7 @@ public class Baium extends Quest
addTalkId(STONE_BAIUM);
addTalkId(ANGELIC_VORTEX);
_zone = GrandBossManager.getInstance().getZone(113100, 14500, 10077);
final StatsSet info = GrandBossManager.getInstance().getStatsSet(LIVE_BAIUM);
final StatSet info = GrandBossManager.getInstance().getStatSet(LIVE_BAIUM);
final Integer status = GrandBossManager.getInstance().getBossStatus(LIVE_BAIUM);
@@ -430,9 +430,9 @@ public class Baium extends Quest
GrandBossManager.getInstance().setBossStatus(LIVE_BAIUM, DEAD);
startQuestTimer("baium_unlock", respawnTime, null, null);
// also save the respawn time so that the info is maintained past reboots
final StatsSet info = GrandBossManager.getInstance().getStatsSet(LIVE_BAIUM);
final StatSet info = GrandBossManager.getInstance().getStatSet(LIVE_BAIUM);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatsSet(LIVE_BAIUM, info);
GrandBossManager.getInstance().setStatSet(LIVE_BAIUM, info);
}
for (NpcInstance minion : _minions)

8
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java vendored
View File

@@ -26,7 +26,7 @@ import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
@@ -99,7 +99,7 @@ public class Core extends Quest
}
_firstAttacked = false;
final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE);
final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
{
// Load the unlock date and time for Core from DB.
@@ -239,9 +239,9 @@ public class Core extends Quest
final long respawnTime = (Config.CORE_RESP_FIRST + Rnd.get(Config.CORE_RESP_SECOND)) * 3600000;
startQuestTimer("core_unlock", respawnTime, null, null);
// Also save the respawn time so that the info is maintained past reboots.
final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE);
final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatsSet(CORE, info);
GrandBossManager.getInstance().setStatSet(CORE, info);
startQuestTimer("despawn_minions", 20000, null, null);
cancelQuestTimers("spawn_minion");
}

8
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java vendored
View File

@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Party;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance;
@@ -310,7 +310,7 @@ public class Frintezza extends Quest
addStartNpc(CUBE);
addTalkId(CUBE);
final StatsSet info = GrandBossManager.getInstance().getStatsSet(FRINTEZZA);
final StatSet info = GrandBossManager.getInstance().getStatSet(FRINTEZZA);
final Integer status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA);
if (status == DEAD)
{
@@ -1741,9 +1741,9 @@ public class Frintezza extends Quest
final long respawnTime = (Config.FRINTEZZA_RESP_FIRST + Rnd.get(Config.FRINTEZZA_RESP_SECOND)) * 3600000;
startQuestTimer("frintezza_unlock", respawnTime, npc, null);
// also save the respawn time so that the info is maintained past reboots
final StatsSet info = GrandBossManager.getInstance().getStatsSet(FRINTEZZA);
final StatSet info = GrandBossManager.getInstance().getStatSet(FRINTEZZA);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatsSet(FRINTEZZA, info);
GrandBossManager.getInstance().setStatSet(FRINTEZZA, info);
}
}
else if (npc.getNpcId() == 18328)

14
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java vendored
View File

@@ -21,7 +21,7 @@ import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -55,7 +55,7 @@ public class Orfen extends Quest
{
super(-1, "ai/bosses");
final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN);
final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
final Integer status = GrandBossManager.getInstance().getBossStatus(ORFEN);
addEventId(ORFEN, EventType.ON_KILL);
@@ -152,11 +152,11 @@ public class Orfen extends Quest
double hp = -1;
if ((npc.getNpcId() == ORFEN) && !npc.getSpawn().isCustomBossInstance())
{
hp = GrandBossManager.getInstance().getStatsSet(ORFEN).getDouble("currentHP");
hp = GrandBossManager.getInstance().getStatSet(ORFEN).getDouble("currentHP");
if (hp < npc.getCurrentHp())
{
npc.setCurrentHp(hp);
GrandBossManager.getInstance().getStatsSet(ORFEN).set("currentHP", npc.getMaxHp());
GrandBossManager.getInstance().getStatSet(ORFEN).set("currentHP", npc.getMaxHp());
}
}
if ((_teleported && (npc.getCurrentHp() > (npc.getMaxHp() * 0.95))))
@@ -205,7 +205,7 @@ public class Orfen extends Quest
{
if (((npc.getCurrentHp() - damage) < (npc.getMaxHp() / 2)) && !_teleported)
{
GrandBossManager.getInstance().getStatsSet(ORFEN).set("currentHP", npc.getCurrentHp());
GrandBossManager.getInstance().getStatSet(ORFEN).set("currentHP", npc.getCurrentHp());
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
_teleported = true;
npc.getSpawn().setX(43577);
@@ -245,9 +245,9 @@ public class Orfen extends Quest
cancelQuestTimer("ORFEN_REFRESH", npc, null);
startQuestTimer("ORFEN_SPAWN", respawnTime, null, null);
// also save the respawn time so that the info is maintained past reboots
final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN);
final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatsSet(ORFEN, info);
GrandBossManager.getInstance().setStatSet(ORFEN, info);
}
}

8
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java vendored
View File

@@ -24,7 +24,7 @@ import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.ai.CtrlIntention;
import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance;
import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
@@ -91,7 +91,7 @@ public class QueenAnt extends Quest
_zone = GrandBossManager.getInstance().getZone(-21610, 181594, -5734);
final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN);
final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
final Integer status = GrandBossManager.getInstance().getBossStatus(QUEEN);
@@ -382,9 +382,9 @@ public class QueenAnt extends Quest
cancelQuestTimer("HEAL", null, null);
// cancelQuestTimer("CHECK_QA_ZONE", npc, null);
// also save the respawn time so that the info is maintained past reboots
final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN);
final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatsSet(QUEEN, info);
GrandBossManager.getInstance().setStatSet(QUEEN, info);
}
startQuestTimer("DESPAWN_MINIONS", 10000, null, null);

8
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java vendored
View File

@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.Effect;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Summon;
@@ -91,7 +91,7 @@ public class Valakas extends Quest
i_quest0 = 0;
lastAttackTime = System.currentTimeMillis();
_Zone = GrandBossManager.getInstance().getZone(212852, -114842, -1632);
final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS);
final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
final Integer status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
@@ -610,9 +610,9 @@ public class Valakas extends Quest
startQuestTimer("valakas_unlock", respawnTime, null, null);
// also save the respawn time so that the info is maintained past reboots
final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS);
final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
info.set("respawn_time", (System.currentTimeMillis() + respawnTime));
GrandBossManager.getInstance().setStatsSet(VALAKAS, info);
GrandBossManager.getInstance().setStatSet(VALAKAS, info);
}
return super.onKill(npc, killer, isPet);

8
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java vendored
View File

@@ -41,7 +41,7 @@ import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.Effect;
import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.instance.DoorInstance;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -1277,13 +1277,13 @@ public class VanHalter extends Quest
if (status != INTERVAL)
{
final long interval = Rnd.get(Config.HPH_FIXINTERVALOFHALTER, Config.HPH_FIXINTERVALOFHALTER + Config.HPH_RANDOMINTERVALOFHALTER)/* * 3600000 */;
final StatsSet info = GrandBossManager.getInstance().getStatsSet(29062);
final StatSet info = GrandBossManager.getInstance().getStatSet(29062);
info.set("respawn_time", (System.currentTimeMillis() + interval));
GrandBossManager.getInstance().setStatsSet(29062, info);
GrandBossManager.getInstance().setStatSet(29062, info);
GrandBossManager.getInstance().setBossStatus(29062, INTERVAL);
}
final StatsSet info = GrandBossManager.getInstance().getStatsSet(29062);
final StatSet info = GrandBossManager.getInstance().getStatSet(29062);
final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
_intervalTask = ThreadPool.schedule(new Interval(), temp);
}

8
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java vendored
View File

@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.datatables.xml.DoorData;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.Effect;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance;
@@ -163,7 +163,7 @@ public class Zaken extends Quest
_Zone = GrandBossManager.getInstance().getZone(55312, 219168, -3223);
final StatsSet info = GrandBossManager.getInstance().getStatsSet(ZAKEN);
final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN);
final Integer status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
if (status == DEAD)
{
@@ -869,9 +869,9 @@ public class Zaken extends Quest
cancelQuestTimer("1001", npc, null);
cancelQuestTimer("1003", npc, null);
// also save the respawn time so that the info is maintained past reboots
final StatsSet info = GrandBossManager.getInstance().getStatsSet(ZAKEN);
final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatsSet(ZAKEN, info);
GrandBossManager.getInstance().setStatSet(ZAKEN, info);
}
}
else if (status == ALIVE)