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

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

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/53b28572bf35e2bb53aba25e60fb9b4b9c73f3c8)
This commit is contained in:
hondacrx
2022-06-04 11:12:19 -04:00
parent 918974a891
commit fb84bc902e
1 changed files with 42 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Chat/Commands/CastCommands.cs
+38 -91
View File
@@ -27,7 +27,7 @@ namespace Game.Chat
class CastCommands class CastCommands
{ {
[Command("", RBACPermissions.CommandCast)] [Command("", RBACPermissions.CommandCast)]
static bool HandleCastCommand(CommandHandler handler, SpellInfo spell, string triggeredStr) static bool HandleCastCommand(CommandHandler handler, uint spellId, string triggeredStr)
{ {
Unit target = handler.GetSelectedUnit(); Unit target = handler.GetSelectedUnit();
if (!target) if (!target)
@@ -36,24 +36,19 @@ namespace Game.Chat
return false; return false;
} }
if (!CheckSpellExistsAndIsValid(handler, spell)) if (!CheckSpellExistsAndIsValid(handler, spellId))
return false; return false;
TriggerCastFlags triggerFlags = TriggerCastFlags.None; TriggerCastFlags? triggerFlags = GetTriggerFlags(triggeredStr);
if (!triggeredStr.IsEmpty()) if (!triggerFlags.HasValue)
{
if ("triggered".Contains(triggeredStr)) // check if "triggered" starts with *triggeredStr (e.g. "trig", "trigger", etc.)
triggerFlags = TriggerCastFlags.FullDebugMask;
else
return false; return false;
}
handler.GetSession().GetPlayer().CastSpell(target, spell.Id, new CastSpellExtraArgs(triggerFlags)); handler.GetSession().GetPlayer().CastSpell(target, spellId, new CastSpellExtraArgs(triggerFlags.Value));
return true; return true;
} }
[Command("back", RBACPermissions.CommandCastBack)] [Command("back", RBACPermissions.CommandCastBack)]
static bool HandleCastBackCommand(CommandHandler handler, StringArguments args) static bool HandleCastBackCommand(CommandHandler handler, uint spellId, string triggeredStr)
{ {
Creature caster = handler.GetSelectedCreature(); Creature caster = handler.GetSelectedCreature();
if (!caster) if (!caster)
@@ -62,67 +57,39 @@ namespace Game.Chat
return false; return false;
} }
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
uint spellId = handler.ExtractSpellIdFromLink(args);
if (spellId == 0)
return false;
if (CheckSpellExistsAndIsValid(handler, spellId)) if (CheckSpellExistsAndIsValid(handler, spellId))
return false; return false;
string triggeredStr = args.NextString(); TriggerCastFlags? triggerFlags = GetTriggerFlags(triggeredStr);
if (!string.IsNullOrEmpty(triggeredStr)) if (!triggerFlags.HasValue)
{
if (triggeredStr != "triggered")
return false; return false;
}
bool triggered = (triggeredStr != null); caster.CastSpell(handler.GetSession().GetPlayer(), spellId, new CastSpellExtraArgs(triggerFlags.Value));
caster.CastSpell(handler.GetSession().GetPlayer(), spellId, triggered);
return true; return true;
} }
[Command("dist", RBACPermissions.CommandCastDist)] [Command("dist", RBACPermissions.CommandCastDist)]
static bool HandleCastDistCommand(CommandHandler handler, StringArguments args) static bool HandleCastDistCommand(CommandHandler handler, uint spellId, float dist, string triggeredStr)
{ {
if (args.Empty())
return false;
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
uint spellId = handler.ExtractSpellIdFromLink(args);
if (spellId == 0)
return false;
if (CheckSpellExistsAndIsValid(handler, spellId)) if (CheckSpellExistsAndIsValid(handler, spellId))
return false; return false;
float dist = args.NextSingle(); TriggerCastFlags? triggerFlags = GetTriggerFlags(triggeredStr);
if (!triggerFlags.HasValue)
string triggeredStr = args.NextString();
if (!string.IsNullOrEmpty(triggeredStr))
{
if (triggeredStr != "triggered")
return false; return false;
}
bool triggered = (triggeredStr != null);
float x, y, z; float x, y, z;
handler.GetSession().GetPlayer().GetClosePoint(out x, out y, out z, dist); handler.GetSession().GetPlayer().GetClosePoint(out x, out y, out z, dist);
handler.GetSession().GetPlayer().CastSpell(new Position(x, y, z), spellId, new CastSpellExtraArgs(triggered)); handler.GetSession().GetPlayer().CastSpell(new Position(x, y, z), spellId, new CastSpellExtraArgs(triggerFlags.Value));
return true; return true;
} }
[Command("self", RBACPermissions.CommandCastSelf)] [Command("self", RBACPermissions.CommandCastSelf)]
static bool HandleCastSelfCommand(CommandHandler handler, StringArguments args) static bool HandleCastSelfCommand(CommandHandler handler, uint spellId, string triggeredStr)
{ {
if (args.Empty())
return false;
Unit target = handler.GetSelectedUnit(); Unit target = handler.GetSelectedUnit();
if (!target) if (!target)
{ {
@@ -130,21 +97,20 @@ namespace Game.Chat
return false; return false;
} }
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
uint spellId = handler.ExtractSpellIdFromLink(args);
if (spellId == 0)
return false;
if (!CheckSpellExistsAndIsValid(handler, spellId)) if (!CheckSpellExistsAndIsValid(handler, spellId))
return false; return false;
target.CastSpell(target, spellId, false); TriggerCastFlags? triggerFlags = GetTriggerFlags(triggeredStr);
if (!triggerFlags.HasValue)
return false;
target.CastSpell(target, spellId, new CastSpellExtraArgs(triggerFlags.Value));
return true; return true;
} }
[Command("target", RBACPermissions.CommandCastTarget)] [Command("target", RBACPermissions.CommandCastTarget)]
static bool HandleCastTargetCommad(CommandHandler handler, StringArguments args) static bool HandleCastTargetCommad(CommandHandler handler, uint spellId, string triggeredStr)
{ {
Creature caster = handler.GetSelectedCreature(); Creature caster = handler.GetSelectedCreature();
if (!caster) if (!caster)
@@ -159,30 +125,20 @@ namespace Game.Chat
return false; return false;
} }
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
uint spellId = handler.ExtractSpellIdFromLink(args);
if (spellId == 0)
return false;
if (CheckSpellExistsAndIsValid(handler, spellId)) if (CheckSpellExistsAndIsValid(handler, spellId))
return false; return false;
string triggeredStr = args.NextString(); TriggerCastFlags? triggerFlags = GetTriggerFlags(triggeredStr);
if (!string.IsNullOrEmpty(triggeredStr)) if (!triggerFlags.HasValue)
{
if (triggeredStr != "triggered")
return false; return false;
}
bool triggered = (triggeredStr != null); caster.CastSpell(caster.GetVictim(), spellId, new CastSpellExtraArgs(triggerFlags.Value));
caster.CastSpell(caster.GetVictim(), spellId, triggered);
return true; return true;
} }
[Command("dest", RBACPermissions.CommandCastDest)] [Command("dest", RBACPermissions.CommandCastDest)]
static bool HandleCastDestCommand(CommandHandler handler, StringArguments args) static bool HandleCastDestCommand(CommandHandler handler, uint spellId, float x, float y, float z, string triggeredStr)
{ {
Unit caster = handler.GetSelectedUnit(); Unit caster = handler.GetSelectedUnit();
if (!caster) if (!caster)
@@ -191,42 +147,33 @@ namespace Game.Chat
return false; return false;
} }
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
uint spellId = handler.ExtractSpellIdFromLink(args);
if (spellId == 0)
return false;
if (CheckSpellExistsAndIsValid(handler, spellId)) if (CheckSpellExistsAndIsValid(handler, spellId))
return false; return false;
float x = args.NextSingle(); TriggerCastFlags? triggerFlags = GetTriggerFlags(triggeredStr);
float y = args.NextSingle(); if (!triggerFlags.HasValue)
float z = args.NextSingle();
if (x == 0f || y == 0f || z == 0f)
return false; return false;
string triggeredStr = args.NextString(); caster.CastSpell(new Position(x, y, z), spellId, new CastSpellExtraArgs(triggerFlags.Value));
if (!string.IsNullOrEmpty(triggeredStr))
{
if (triggeredStr != "triggered")
return false;
}
bool triggered = (triggeredStr != null);
caster.CastSpell(new Position(x, y, z), spellId, new CastSpellExtraArgs(triggered));
return true; return true;
} }
static bool CheckSpellExistsAndIsValid(CommandHandler handler, uint spellId) static TriggerCastFlags? GetTriggerFlags(string triggeredStr)
{ {
return CheckSpellExistsAndIsValid(handler, Global.SpellMgr.GetSpellInfo(spellId, Difficulty.None)); if (!triggeredStr.IsEmpty())
{
if (triggeredStr.StartsWith("triggered")) // check if "triggered" starts with *triggeredStr (e.g. "trig", "trigger", etc.)
return TriggerCastFlags.FullDebugMask;
else
return null;
}
return TriggerCastFlags.None;
} }
static bool CheckSpellExistsAndIsValid(CommandHandler handler, SpellInfo spellInfo) static bool CheckSpellExistsAndIsValid(CommandHandler handler, uint spellId)
{ {
var spellInfo = Global.SpellMgr.GetSpellInfo(spellId, Difficulty.None);
if (spellInfo == null) if (spellInfo == null)
{ {
handler.SendSysMessage(CypherStrings.CommandNospellfound); handler.SendSysMessage(CypherStrings.CommandNospellfound);