Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scripts/Commands: Adjust .list respawns to use enum iteration. Add enum iteration capability to SpawnObjectTypes.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/e270351a16702fabedc8651afe6030d12792fdbe)
This commit is contained in:
hondacrx
2022-01-01 15:49:43 -05:00
parent 1b09affe9e
commit 278cac8bec
2 changed files with 23 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/Language.cs
+2 -2
View File
@@ -1088,8 +1088,8 @@ namespace Framework.Constants
ListRespawnsZone = 5078, ListRespawnsZone = 5078,
ListRespawnsListheader = 5079, ListRespawnsListheader = 5079,
ListRespawnsOverdue = 5080, ListRespawnsOverdue = 5080,
ListRespawnsCreatures = 5081, // unused 5081
ListRespawnsGameobjects = 5082, // unused 5082
ObjectInfoAIType = 5083, ObjectInfoAIType = 5083,
NpcinfoUnitFieldFlags2 = 5084, NpcinfoUnitFieldFlags2 = 5084,
Source/Game/Chat/Commands/ListCommands.cs
+21 -44
View File
@@ -575,56 +575,33 @@ namespace Game.Chat.Commands
if (!args.Empty()) if (!args.Empty())
range = args.NextUInt32(); range = args.NextUInt32();
List<RespawnInfo> respawns = new();
Locale locale = handler.GetSession().GetSessionDbcLocale(); Locale locale = handler.GetSession().GetSessionDbcLocale();
string stringOverdue = Global.ObjectMgr.GetCypherString(CypherStrings.ListRespawnsOverdue, locale); string stringOverdue = Global.ObjectMgr.GetCypherString(CypherStrings.ListRespawnsOverdue, locale);
string stringCreature = Global.ObjectMgr.GetCypherString(CypherStrings.ListRespawnsCreatures, locale);
string stringGameobject = Global.ObjectMgr.GetCypherString(CypherStrings.ListRespawnsGameobjects, locale);
uint zoneId = player.GetZoneId(); uint zoneId = player.GetZoneId();
if (range != 0)
handler.SendSysMessage(CypherStrings.ListRespawnsRange, stringCreature, range); for (SpawnObjectType type = 0; type < SpawnObjectType.Max; type++)
else
handler.SendSysMessage(CypherStrings.ListRespawnsZone, stringCreature, GetZoneName(zoneId, handler.GetSessionDbcLocale()), zoneId);
handler.SendSysMessage(CypherStrings.ListRespawnsListheader);
map.GetRespawnInfo(respawns, SpawnObjectTypeMask.Creature, range != 0 ? 0 : zoneId);
foreach (RespawnInfo ri in respawns)
{ {
CreatureData data = Global.ObjectMgr.GetCreatureData(ri.spawnId); if (range != 0)
if (data == null) handler.SendSysMessage(CypherStrings.ListRespawnsRange, type, range);
continue; else
handler.SendSysMessage(CypherStrings.ListRespawnsZone, type, GetZoneName(zoneId, locale), zoneId);
handler.SendSysMessage(CypherStrings.ListRespawnsListheader);
List<RespawnInfo> respawns = new();
map.GetRespawnInfo(respawns, (SpawnObjectTypeMask)(1 << (int)type), range != 0 ? 0 : zoneId);
foreach (RespawnInfo ri in respawns)
{
SpawnData data = Global.ObjectMgr.GetSpawnData(ri.type, ri.spawnId);
if (data == null)
continue;
if (range != 0 && !player.IsInDist(data.spawnPoint, range))
continue;
uint gridY = ri.gridId / MapConst.MaxGrids;
uint gridX = ri.gridId % MapConst.MaxGrids;
if (range != 0 && !player.IsInDist(data.spawnPoint, range)) string respawnTime = ri.respawnTime > GameTime.GetGameTime() ? Time.secsToTimeString((ulong)(ri.respawnTime - GameTime.GetGameTime()), true) : stringOverdue;
continue; handler.SendSysMessage($"{ri.spawnId} | {ri.entry} | [{gridX:2},{gridY:2}] | {GetZoneName(ri.zoneId, locale)} ({ri.zoneId}) | {respawnTime}{(map.IsSpawnGroupActive(data.spawnGroupData.groupId) ? "" : " (inactive)")}");
}
uint gridY = ri.gridId / MapConst.MaxGrids;
uint gridX = ri.gridId % MapConst.MaxGrids;
string respawnTime = ri.respawnTime > GameTime.GetGameTime() ? Time.secsToTimeString((ulong)(ri.respawnTime - GameTime.GetGameTime()), true) : stringOverdue;
handler.SendSysMessage($"{ri.spawnId} | {ri.entry} | [{gridX},{gridY}] | {GetZoneName(ri.zoneId, handler.GetSessionDbcLocale())} ({ri.zoneId}) | {respawnTime}{(map.IsSpawnGroupActive(data.spawnGroupData.groupId) ? "" : " (inactive)")}");
}
respawns.Clear();
if (range != 0)
handler.SendSysMessage(CypherStrings.ListRespawnsRange, stringGameobject, range);
else
handler.SendSysMessage(CypherStrings.ListRespawnsZone, stringGameobject, GetZoneName(zoneId, handler.GetSessionDbcLocale()), zoneId);
handler.SendSysMessage(CypherStrings.ListRespawnsListheader);
map.GetRespawnInfo(respawns, SpawnObjectTypeMask.GameObject, range != 0 ? 0 : zoneId);
foreach (RespawnInfo ri in respawns)
{
GameObjectData data = Global.ObjectMgr.GetGameObjectData(ri.spawnId);
if (data == null)
continue;
if (range != 0 && !player.IsInDist(data.spawnPoint, range))
continue;
uint gridY = ri.gridId / MapConst.MaxGrids;
uint gridX = ri.gridId % MapConst.MaxGrids;
string respawnTime = ri.respawnTime > GameTime.GetGameTime() ? Time.secsToTimeString((ulong)(ri.respawnTime - GameTime.GetGameTime()), true) : stringOverdue;
handler.SendSysMessage($"{ri.spawnId} | {ri.entry} | [{gridX},{gridY}] | {GetZoneName(ri.zoneId, handler.GetSessionDbcLocale())} ({ri.zoneId}) | {respawnTime}{(map.IsSpawnGroupActive(data.spawnGroupData.groupId) ? "" : " (inactive)")}");
} }
return true; return true;
} }