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

Misc updates

Browse Source
This commit is contained in:
hondacrx
2021-06-23 15:53:42 -04:00
parent 619c79e7f1
commit 1aa375a8ee
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/Language.cs
+2 -2
View File
@@ -969,14 +969,14 @@ namespace Framework.Constants
// Room for more level 3 1196-1198 not used // Room for more level 3 1196-1198 not used
// Debug Commands // Debug Commands
DebugAreatriggerLeft = 1999,
CinematicNotExist = 1200, CinematicNotExist = 1200,
MovieNotExist = 1201, MovieNotExist = 1201,
DebugAreatriggerOn = 1202, DebugAreatriggerOn = 1202,
DebugAreatriggerOff = 1203, DebugAreatriggerOff = 1203,
DebugAreatriggerEntered = 1204, DebugAreatriggerEntered = 1204,
// 1205-2002 - free // 1205-1999 - free
DebugAreatriggerLeft = 1999,
// Ticket Strings 2003-2028 // Ticket Strings 2003-2028
CommandTicketclosed = 2003, CommandTicketclosed = 2003,
CommandTicketdeleted = 2004, CommandTicketdeleted = 2004,
Source/Game/AI/CoreAI/PetAI.cs
+1 -1
View File
@@ -140,7 +140,7 @@ namespace Game.AI
if (spellInfo == null) if (spellInfo == null)
continue; continue;
if (me.GetCharmInfo() != null && me.GetSpellHistory().HasGlobalCooldown(spellInfo)) if (me.GetSpellHistory().HasGlobalCooldown(spellInfo))
continue; continue;
// check spell cooldown // check spell cooldown
Source/Game/Chat/Commands/DebugCommands.cs
+20 -11
View File
@@ -616,7 +616,7 @@ namespace Game.Chat
if (!target) if (!target)
return false; return false;
handler.SendSysMessage("Loot recipient for creature {0} (GUID {1}, DB GUID {2}) is {3}", target.GetName(), target.GetGUID().ToString(), target.GetSpawnId(), handler.SendSysMessage("Loot recipient for creature {0} (GUID {1}, SpawnID {2}) is {3}", target.GetName(), target.GetGUID().ToString(), target.GetSpawnId(),
target.HasLootRecipient() ? (target.GetLootRecipient() ? target.GetLootRecipient().GetName() : "offline") : "no loot recipient"); target.HasLootRecipient() ? (target.GetLootRecipient() ? target.GetLootRecipient().GetName() : "offline") : "no loot recipient");
return true; return true;
} }
@@ -923,21 +923,30 @@ namespace Game.Chat
handler.SendSysMessage("End of threatened-by-me list."); handler.SendSysMessage("End of threatened-by-me list.");
} }
if (!mgr.CanHaveThreatList()) if (mgr.CanHaveThreatList())
handler.SendSysMessage($"{target.GetName()} ({target.GetGUID()}) cannot have a threat list.");
else if (mgr.IsEngaged())
{ {
count = 0; if (!mgr.IsThreatListEmpty(true))
handler.SendSysMessage($"Threat list of {target.GetName()} ({target.GetGUID()}, SpawnID {(target.IsCreature() ? target.ToCreature().GetSpawnId() : 0)})");
foreach (ThreatReference refe in mgr.GetSortedThreatList())
{ {
Unit unit = refe.GetVictim(); if (mgr.IsEngaged())
handler.SendSysMessage($" {++count}. {unit.GetName()} ({unit.GetGUID()}) - threat {refe.GetThreat()}[{refe.GetTauntState()}][{refe.GetOnlineState()}]"); handler.SendSysMessage($"Threat list of {target.GetName()} ({target.GetGUID()}, SpawnID {(target.IsCreature() ? target.ToCreature().GetSpawnId() : 0)}):");
else
handler.SendSysMessage($"{target.GetName()} ({target.GetGUID()}, SpawnID {(target.IsCreature() ? target.ToCreature().GetSpawnId() : 0)}) is not engaged, but still has a threat list? Well, here it is:");
count = 0;
foreach (ThreatReference refe in mgr.GetSortedThreatList())
{
Unit unit = refe.GetVictim();
handler.SendSysMessage($" {++count}. {unit.GetName()} ({unit.GetGUID()}) - threat {refe.GetThreat()}[{refe.GetTauntState()}][{refe.GetOnlineState()}]");
}
handler.SendSysMessage("End of threat list.");
} }
handler.SendSysMessage("End of threat list."); else if (!mgr.IsEngaged())
handler.SendSysMessage($"{target.GetName()} ({target.GetGUID()}, SpawnID {(target.IsCreature() ? target.ToCreature().GetSpawnId() : 0)}) is not currently engaged.");
else
handler.SendSysMessage($"{target.GetName()} ({target.GetGUID()}, SpawnID {(target.IsCreature() ? target.ToCreature().GetSpawnId() : 0)}) seems to be engaged, but does not have a threat list??");
} }
else else
handler.SendSysMessage($"{target.GetName()} ({target.GetGUID()}, SpawnID {(target.IsCreature() ? target.ToCreature().GetSpawnId() : 0)}) is not currently engaged."); handler.SendSysMessage($"{target.GetName()} ({target.GetGUID()}) cannot have a threat list.");
return true; return true;
} }