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

Some cleanups. (might break build for scripts as they are a WIP)

Browse Source
This commit is contained in:
hondacrx
2023-10-08 10:35:31 -04:00
parent fa10b981bd
commit cda53c8e7f
208 changed files with 2266 additions and 2329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Scripting/CoreScripts.cs
+5 -1
View File
@@ -58,7 +58,11 @@ namespace Game.Scripting
player.PlayerTalkClass.GetGossipMenu().AddMenuItem(gossipMenuID, gossipMenuItemID, sender, action);
}
public static void SendGossipMenuFor(Player player, uint npcTextID, ObjectGuid guid) { player.PlayerTalkClass.SendGossipMenu(npcTextID, guid); }
public static void SendGossipMenuFor(Player player, uint npcTextID, Creature creature) { if (creature) SendGossipMenuFor(player, npcTextID, creature.GetGUID()); }
public static void SendGossipMenuFor(Player player, uint npcTextID, Creature creature)
{
if (creature != null)
SendGossipMenuFor(player, npcTextID, creature.GetGUID());
}
public static void CloseGossipMenuFor(Player player) { player.PlayerTalkClass.SendCloseGossip(); }
string _name;
Source/Game/Scripting/ScriptManager.cs
+16 -16
View File
@@ -547,14 +547,14 @@ namespace Game.Scripting
}
public bool OnItemUse(Player player, Item item, SpellCastTargets targets, ObjectGuid castId)
{
Cypher.Assert(player);
Cypher.Assert(item);
Cypher.Assert(player != null);
Cypher.Assert(item != null);
return RunScriptRet<ItemScript>(p => p.OnUse(player, item, targets, castId), item.GetScriptId());
}
public bool OnItemExpire(Player player, ItemTemplate proto)
{
Cypher.Assert(player);
Cypher.Assert(player != null);
Cypher.Assert(proto != null);
return RunScriptRet<ItemScript>(p => p.OnExpire(player, proto), proto.ScriptId);
@@ -951,27 +951,27 @@ namespace Game.Scripting
// GroupScript
public void OnGroupAddMember(Group group, ObjectGuid guid)
{
Cypher.Assert(group);
Cypher.Assert(group != null);
ForEach<GroupScript>(p => p.OnAddMember(group, guid));
}
public void OnGroupInviteMember(Group group, ObjectGuid guid)
{
Cypher.Assert(group);
Cypher.Assert(group != null);
ForEach<GroupScript>(p => p.OnInviteMember(group, guid));
}
public void OnGroupRemoveMember(Group group, ObjectGuid guid, RemoveMethod method, ObjectGuid kicker, string reason)
{
Cypher.Assert(group);
Cypher.Assert(group != null);
ForEach<GroupScript>(p => p.OnRemoveMember(group, guid, method, kicker, reason));
}
public void OnGroupChangeLeader(Group group, ObjectGuid newLeaderGuid, ObjectGuid oldLeaderGuid)
{
Cypher.Assert(group);
Cypher.Assert(group != null);
ForEach<GroupScript>(p => p.OnChangeLeader(group, newLeaderGuid, oldLeaderGuid));
}
public void OnGroupDisband(Group group)
{
Cypher.Assert(group);
Cypher.Assert(group != null);
ForEach<GroupScript>(p => p.OnDisband(group));
}
@@ -1010,7 +1010,7 @@ namespace Game.Scripting
// AreaTriggerEntityScript
public AreaTriggerAI GetAreaTriggerAI(AreaTrigger areaTrigger)
{
Cypher.Assert(areaTrigger);
Cypher.Assert(areaTrigger != null);
return RunScriptRet<AreaTriggerEntityScript, AreaTriggerAI>(p => p.GetAI(areaTrigger), areaTrigger.GetScriptId(), null);
}
@@ -1048,28 +1048,28 @@ namespace Game.Scripting
//SceneScript
public void OnSceneStart(Player player, uint sceneInstanceID, SceneTemplate sceneTemplate)
{
Cypher.Assert(player);
Cypher.Assert(player != null);
Cypher.Assert(sceneTemplate != null);
RunScript<SceneScript>(script => script.OnSceneStart(player, sceneInstanceID, sceneTemplate), sceneTemplate.ScriptId);
}
public void OnSceneTrigger(Player player, uint sceneInstanceID, SceneTemplate sceneTemplate, string triggerName)
{
Cypher.Assert(player);
Cypher.Assert(player != null);
Cypher.Assert(sceneTemplate != null);
RunScript<SceneScript>(script => script.OnSceneTriggerEvent(player, sceneInstanceID, sceneTemplate, triggerName), sceneTemplate.ScriptId);
}
public void OnSceneCancel(Player player, uint sceneInstanceID, SceneTemplate sceneTemplate)
{
Cypher.Assert(player);
Cypher.Assert(player != null);
Cypher.Assert(sceneTemplate != null);
RunScript<SceneScript>(script => script.OnSceneCancel(player, sceneInstanceID, sceneTemplate), sceneTemplate.ScriptId);
}
public void OnSceneComplete(Player player, uint sceneInstanceID, SceneTemplate sceneTemplate)
{
Cypher.Assert(player);
Cypher.Assert(player != null);
Cypher.Assert(sceneTemplate != null);
RunScript<SceneScript>(script => script.OnSceneComplete(player, sceneInstanceID, sceneTemplate), sceneTemplate.ScriptId);
@@ -1078,21 +1078,21 @@ namespace Game.Scripting
//QuestScript
public void OnQuestStatusChange(Player player, Quest quest, QuestStatus oldStatus, QuestStatus newStatus)
{
Cypher.Assert(player);
Cypher.Assert(player != null);
Cypher.Assert(quest != null);
RunScript<QuestScript>(script => script.OnQuestStatusChange(player, quest, oldStatus, newStatus), quest.ScriptId);
}
public void OnQuestAcknowledgeAutoAccept(Player player, Quest quest)
{
Cypher.Assert(player);
Cypher.Assert(player != null);
Cypher.Assert(quest != null);
RunScript<QuestScript>(script => script.OnAcknowledgeAutoAccept(player, quest), quest.ScriptId);
}
public void OnQuestObjectiveChange(Player player, Quest quest, QuestObjective objective, int oldAmount, int newAmount)
{
Cypher.Assert(player);
Cypher.Assert(player != null);
Cypher.Assert(quest != null);
RunScript<QuestScript>(script => script.OnQuestObjectiveChange(player, quest, objective, oldAmount, newAmount), quest.ScriptId);
Source/Game/Scripting/SpellScript.cs
+1 -1
View File
@@ -1052,7 +1052,7 @@ namespace Game.Scripting
var tempTargets = targets.Select<WorldObject, (WorldObject, int)>(target =>
{
int negativePoints = 0;
if (prioritizeGroupMembersOf && (!target.IsUnit() || target.ToUnit().IsInRaidWith(prioritizeGroupMembersOf)))
if (prioritizeGroupMembersOf != null && (!target.IsUnit() || target.ToUnit().IsInRaidWith(prioritizeGroupMembersOf)))
negativePoints |= 1 << NOT_GROUPED;
if (prioritizePlayers && !target.IsPlayer() && (!target.IsCreature() || !target.ToCreature().HasFlag(CreatureStaticFlags4.TreatAsRaidUnitForHelpfulSpells)))