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

Scripts/Commands: Convert argument parsing of most list commands to new system

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/e9209c3131a673a488fda0b429a0e7bdd2d317c7)
This commit is contained in:
hondacrx
2022-06-04 10:28:57 -04:00
parent 93b5ccd454
commit c3f3cc1c7d
1 changed files with 13 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Chat/Commands/ListCommands.cs
+13 -70
View File
@@ -30,7 +30,7 @@ namespace Game.Chat.Commands
class ListCommands class ListCommands
{ {
[Command("auras", RBACPermissions.CommandListAuras)] [Command("auras", RBACPermissions.CommandListAuras)]
static bool HandleListAurasCommand(CommandHandler handler, StringArguments args) static bool HandleListAurasCommand(CommandHandler handler)
{ {
Unit unit = handler.GetSelectedUnit(); Unit unit = handler.GetSelectedUnit();
if (!unit) if (!unit)
@@ -44,10 +44,8 @@ namespace Game.Chat.Commands
var auras = unit.GetAppliedAuras(); var auras = unit.GetAppliedAuras();
handler.SendSysMessage(CypherStrings.CommandTargetListauras, auras.Count); handler.SendSysMessage(CypherStrings.CommandTargetListauras, auras.Count);
foreach (var pair in auras) foreach (var (_, aurApp) in auras)
{ {
AuraApplication aurApp = pair.Value;
Aura aura = aurApp.GetBase(); Aura aura = aurApp.GetBase();
string name = aura.GetSpellInfo().SpellName[handler.GetSessionDbcLocale()]; string name = aura.GetSpellInfo().SpellName[handler.GetSessionDbcLocale()];
bool talent = aura.GetSpellInfo().HasAttribute(SpellCustomAttributes.IsTalent); bool talent = aura.GetSpellInfo().HasAttribute(SpellCustomAttributes.IsTalent);
@@ -69,30 +67,16 @@ namespace Game.Chat.Commands
handler.SendSysMessage(CypherStrings.CommandTargetListauratype, auraList.Count, i); handler.SendSysMessage(CypherStrings.CommandTargetListauratype, auraList.Count, i);
foreach (var eff in auraList) foreach (var effect in auraList)
handler.SendSysMessage(CypherStrings.CommandTargetAurasimple, eff.GetId(), eff.GetEffIndex(), eff.GetAmount()); handler.SendSysMessage(CypherStrings.CommandTargetAurasimple, effect.GetId(), effect.GetEffIndex(), effect.GetAmount());
} }
return true; return true;
} }
[Command("creature", RBACPermissions.CommandListCreature, true)] [Command("creature", RBACPermissions.CommandListCreature, true)]
static bool HandleListCreatureCommand(CommandHandler handler, StringArguments args) static bool HandleListCreatureCommand(CommandHandler handler, uint creatureId, uint? countArg)
{ {
if (args.Empty())
return false;
// number or [name] Shift-click form |color|Hcreature_entry:creature_id|h[name]|h|r
string id = handler.ExtractKeyFromLink(args, "Hcreature_entry");
if (string.IsNullOrEmpty(id))
return false;
if (!uint.TryParse(id, out uint creatureId) || creatureId == 0)
{
handler.SendSysMessage(CypherStrings.CommandInvalidcreatureid, creatureId);
return false;
}
CreatureTemplate cInfo = Global.ObjectMgr.GetCreatureTemplate(creatureId); CreatureTemplate cInfo = Global.ObjectMgr.GetCreatureTemplate(creatureId);
if (cInfo == null) if (cInfo == null)
{ {
@@ -100,8 +84,7 @@ namespace Game.Chat.Commands
return false; return false;
} }
if (!uint.TryParse(args.NextString(), out uint count)) uint count = countArg.GetValueOrDefault(10);
count = 10;
if (count == 0) if (count == 0)
return false; return false;
@@ -173,30 +156,9 @@ namespace Game.Chat.Commands
} }
[Command("item", RBACPermissions.CommandListItem, true)] [Command("item", RBACPermissions.CommandListItem, true)]
static bool HandleListItemCommand(CommandHandler handler, StringArguments args) static bool HandleListItemCommand(CommandHandler handler, uint itemId, uint? countArg)
{ {
if (args.Empty()) uint count = countArg.GetValueOrDefault(10);
return false;
string id = handler.ExtractKeyFromLink(args, "Hitem");
if (string.IsNullOrEmpty(id))
return false;
if (!uint.TryParse(id, out uint itemId) || itemId == 0)
{
handler.SendSysMessage(CypherStrings.CommandItemidinvalid, itemId);
return false;
}
ItemTemplate itemTemplate = Global.ObjectMgr.GetItemTemplate(itemId);
if (itemTemplate == null)
{
handler.SendSysMessage(CypherStrings.CommandItemidinvalid, itemId);
return false;
}
if (!uint.TryParse(args.NextString(), out uint count))
count = 10;
if (count == 0) if (count == 0)
return false; return false;
@@ -471,22 +433,8 @@ namespace Game.Chat.Commands
} }
[Command("object", RBACPermissions.CommandListObject, true)] [Command("object", RBACPermissions.CommandListObject, true)]
static bool HandleListObjectCommand(CommandHandler handler, StringArguments args) static bool HandleListObjectCommand(CommandHandler handler, uint gameObjectId, uint? countArg)
{ {
if (args.Empty())
return false;
// number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r
string id = handler.ExtractKeyFromLink(args, "Hgameobject_entry");
if (string.IsNullOrEmpty(id))
return false;
if (!uint.TryParse(id, out uint gameObjectId) || gameObjectId == 0)
{
handler.SendSysMessage(CypherStrings.CommandListobjinvalidid, gameObjectId);
return false;
}
GameObjectTemplate gInfo = Global.ObjectMgr.GetGameObjectTemplate(gameObjectId); GameObjectTemplate gInfo = Global.ObjectMgr.GetGameObjectTemplate(gameObjectId);
if (gInfo == null) if (gInfo == null)
{ {
@@ -494,8 +442,7 @@ namespace Game.Chat.Commands
return false; return false;
} }
if (!uint.TryParse(args.NextString(), out uint count)) uint count = countArg.GetValueOrDefault(10);
count = 10;
if (count == 0) if (count == 0)
return false; return false;
@@ -568,15 +515,11 @@ namespace Game.Chat.Commands
} }
[Command("respawns", RBACPermissions.CommandListRespawns)] [Command("respawns", RBACPermissions.CommandListRespawns)]
static bool HandleListRespawnsCommand(CommandHandler handler, StringArguments args) static bool HandleListRespawnsCommand(CommandHandler handler, uint range)
{ {
Player player = handler.GetSession().GetPlayer(); Player player = handler.GetSession().GetPlayer();
Map map = player.GetMap(); Map map = player.GetMap();
uint range = 0;
if (!args.Empty())
range = args.NextUInt32();
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);
@@ -626,7 +569,7 @@ namespace Game.Chat.Commands
} }
[Command("scenes", RBACPermissions.CommandListScenes)] [Command("scenes", RBACPermissions.CommandListScenes)]
static bool HandleListScenesCommand(CommandHandler handler, StringArguments args) static bool HandleListScenesCommand(CommandHandler handler)
{ {
Player target = handler.GetSelectedPlayer(); Player target = handler.GetSelectedPlayer();
if (!target) if (!target)
@@ -649,7 +592,7 @@ namespace Game.Chat.Commands
} }
[Command("spawnpoints", RBACPermissions.CommandListSpawnpoints)] [Command("spawnpoints", RBACPermissions.CommandListSpawnpoints)]
static bool HandleListSpawnPointsCommand(CommandHandler handler, StringArguments args) static bool HandleListSpawnPointsCommand(CommandHandler handler)
{ {
Player player = handler.GetSession().GetPlayer(); Player player = handler.GetSession().GetPlayer();
Map map = player.GetMap(); Map map = player.GetMap();