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

Core/Conditions: Refactor ConditionMgr internals to get rid of separate containers for some condition source types

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/0b5406dd882c6d96bc1be6fd0a78375c3b316415)
This commit is contained in:
hondacrx
2024-02-06 09:39:26 -05:00
parent ebcad7dbc5
commit 80936edeab
12 changed files with 292 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Creature/Gossip.cs
+2 -2
View File
@@ -789,7 +789,7 @@ namespace Game.Misc
public uint BoxBroadcastTextId;
public int? SpellID;
public int? OverrideIconID;
public List<Condition> Conditions = new();
public ConditionsReference Conditions;
}
public class GossipMenuAddon
@@ -817,6 +817,6 @@ namespace Game.Misc
{
public uint MenuId;
public uint TextId;
public List<Condition> Conditions = new();
public ConditionsReference Conditions;
}
}
Source/Game/Entities/Player/Player.Quest.cs
+1 -2
View File
@@ -3301,8 +3301,7 @@ namespace Game.Entities
var clickBounds = Global.ObjectMgr.GetSpellClickInfoMapBounds(obj.GetEntry());
foreach (var spellClickInfo in clickBounds)
{
List<Condition> conds = Global.ConditionMgr.GetConditionsForSpellClickEvent(obj.GetEntry(), spellClickInfo.spellId);
if (conds != null)
if (Global.ConditionMgr.HasConditionsForSpellClickEvent(obj.GetEntry(), spellClickInfo.spellId))
{
ObjectFieldData objMask = new();
UnitData unitMask = new();
Source/Game/Entities/Player/Player.cs
+4 -4
View File
@@ -2564,7 +2564,7 @@ namespace Game.Entities
foreach (var gossipMenuItem in menuItemBounds)
{
if (!ConditionMgr.IsObjectMeetToConditions(this, source, gossipMenuItem.Conditions))
if (!gossipMenuItem.Conditions.Meets(this, source))
continue;
bool canTalk = true;
@@ -2889,7 +2889,7 @@ namespace Game.Entities
if (menu.TextId == 0)
continue;
if (ConditionMgr.IsObjectMeetToConditions(this, source, menu.Conditions))
if (menu.Conditions.Meets(this, source))
textId = menu.TextId;
}
@@ -2913,9 +2913,9 @@ namespace Game.Entities
{
var menuBounds = ObjectMgr.GetGossipMenusMapBounds(menuId);
foreach (var itr in menuBounds)
foreach (var menu in menuBounds)
{
if (!ConditionMgr.IsObjectMeetToConditions(this, source, itr.Conditions))
if (!menu.Conditions.Meets(this, source))
continue;
menuIdToShow = menuId;