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

Core/Entities: Improved UpdateAreaAndZonePhase() to allow easier building of database phase conditions

Browse Source
This commit is contained in:
hondacrx
2018-01-10 12:15:38 -05:00
parent be29343983
commit ae9b786784
1 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Object/WorldObject.cs
+19 -25
View File
@@ -2175,34 +2175,28 @@ namespace Game.Entities
public void UpdateAreaAndZonePhase() public void UpdateAreaAndZonePhase()
{ {
bool updateNeeded = false; bool updateNeeded = false;
var phases = Global.ObjectMgr.GetAreaAndZonePhases(); var allAreasPhases = Global.ObjectMgr.GetAreaAndZonePhases();
foreach (var areaOrZoneId in phases.Keys) uint[] zoneAndArea = { GetZoneId(), GetAreaId() };
// We first remove all phases from other areas & zones
foreach (var key in allAreasPhases.Keys)
foreach (PhaseInfoStruct phase in allAreasPhases[key])
if (!Global.DB2Mgr.IsInArea(GetAreaId(), key))
updateNeeded = SetInPhase(phase.Id, false, false) || updateNeeded; // not in area, remove phase, true if there was something removed
// Then we add the phases from this area and zone if conditions are met
// Zone is done before Area, so if Area does not meet condition, the phase will be removed
foreach (uint area in zoneAndArea)
{ {
foreach (var phase in phases[areaOrZoneId]) var currentPhases = Global.ObjectMgr.GetPhasesForArea(area);
if (currentPhases != null)
{ {
if (areaOrZoneId == GetAreaId() || areaOrZoneId == GetZoneId()) foreach (PhaseInfoStruct phaseInfoStruct in currentPhases)
{ {
if (Global.ConditionMgr.IsObjectMeetToConditions(this, phase.Conditions)) bool apply = Global.ConditionMgr.IsObjectMeetToConditions(this, phaseInfoStruct.Conditions);
{
// add new phase if condition passed, true if it wasnt added before // add or remove phase depending of condition
bool up = SetInPhase(phase.Id, false, true); updateNeeded = SetInPhase(phaseInfoStruct.Id, false, apply) || updateNeeded;
if (!updateNeeded && up)
updateNeeded = true;
}
else
{
// condition failed, remove phase, true if there was something removed
bool up = SetInPhase(phase.Id, false, false);
if (!updateNeeded && up)
updateNeeded = true;
}
}
else
{
// not in area, remove phase, true if there was something removed
bool up = SetInPhase(phase.Id, false, false);
if (!updateNeeded && up)
updateNeeded = true;
} }
} }
} }