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

Core/SpawnTracking: Allow linking a spawn to more than one quest objective

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/138b1b1a21ff871b54f1f2bd815de30a93b803eb)
This commit is contained in:
Hondacrx
2025-08-19 17:18:59 -04:00
parent a9fc9f454f
commit 877fb1a76f
7 changed files with 173 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Object/Update/UpdateFields.cs
+67 -6
View File
@@ -9,6 +9,7 @@ using Game.Networking.Packets;
using Game.Spells;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
namespace Game.Entities
@@ -166,8 +167,8 @@ namespace Game.Entities
dynFlags |= (uint)GameObjectDynamicLowFlags.NoInterract;
var data = Global.ObjectMgr.GetSpawnMetadata(SpawnObjectType.GameObject, gameObject.GetSpawnId());
if (data != null && data.spawnTrackingQuestObjectiveId != 0 && data.spawnTrackingData != null)
if (receiver.GetSpawnTrackingStateByObjective(data.spawnTrackingData.SpawnTrackingId, data.spawnTrackingQuestObjectiveId) != SpawnTrackingState.Active)
if (data.spawnTrackingData != null && !data.spawnTrackingQuestObjectives.Empty())
if (receiver.GetSpawnTrackingStateByObjectives(data.spawnTrackingData.SpawnTrackingId, data.spawnTrackingQuestObjectives) != SpawnTrackingState.Active)
dynFlags &= ~(uint)GameObjectDynamicLowFlags.Activate;
}
@@ -1295,7 +1296,7 @@ namespace Game.Entities
var stateWorldEffectIDs = GetViewerDependentStateWorldEffectIDs(this, owner, receiver);
data.WriteInt32(stateWorldEffectIDs.Count);
data.WriteUInt32(StateWorldEffectsQuestObjectiveID);
data.WriteUInt32(GetViewerDependentStateWorldEffectsQuestObjectiveID(this, owner, receiver));
data.WriteInt32(SpellOverrideNameID);
for (int i = 0; i < stateWorldEffectIDs.Count; ++i)
data.WriteUInt32(stateWorldEffectIDs[i]);
@@ -1623,7 +1624,7 @@ namespace Game.Entities
}
if (changesMask[12])
{
data.WriteUInt32(StateWorldEffectsQuestObjectiveID);
data.WriteUInt32(GetViewerDependentStateWorldEffectsQuestObjectiveID(this, owner, receiver));
}
if (changesMask[13])
{
@@ -2574,6 +2575,36 @@ namespace Game.Entities
return stateAnimKitId;
}
uint GetViewerDependentStateWorldEffectsQuestObjectiveID(UnitData unitData, Unit unit, Player receiver)
{
uint stateWorldEffectsQuestObjectiveId = unitData.StateWorldEffectsQuestObjectiveID;
if (stateWorldEffectsQuestObjectiveId == 0 && unit.IsCreature())
{
CreatureData data = unit.ToCreature().GetCreatureData();
if (data != null)
{
if (data.spawnTrackingQuestObjectives.Any())
{
// If there is no valid objective for player, fill UF with first objective (if any)
stateWorldEffectsQuestObjectiveId = data.spawnTrackingQuestObjectives.First();
int i = 0;
while (++i <= data.spawnTrackingQuestObjectives.Count)
{
var id = data.spawnTrackingQuestObjectives[i];
if (receiver.GetSpawnTrackingStateByObjective(data.spawnTrackingData.SpawnTrackingId, id) != SpawnTrackingState.Active)
continue;
stateWorldEffectsQuestObjectiveId = id;
break;
}
}
}
}
return stateWorldEffectsQuestObjectiveId;
}
}
public class ChrCustomizationChoice : IComparable<ChrCustomizationChoice>
@@ -7640,7 +7671,7 @@ namespace Game.Entities
data.WriteUInt32(GetViewerDependentSpawnTrackingStateAnimKitID(this, owner, receiver));
var stateWorldEffectIDs = GetViewerDependentStateWorldEffectIDs(this, owner, receiver);
data.WriteInt32(stateWorldEffectIDs.Count);
data.WriteUInt32(StateWorldEffectsQuestObjectiveID);
data.WriteUInt32(GetViewerDependentStateWorldEffectsQuestObjectiveID(this, owner, receiver));
for (int i = 0; i < stateWorldEffectIDs.Count; ++i)
{
data.WriteUInt32(stateWorldEffectIDs[i]);
@@ -7762,7 +7793,7 @@ namespace Game.Entities
}
if (changesMask[9])
{
data.WriteUInt32(StateWorldEffectsQuestObjectiveID);
data.WriteUInt32(GetViewerDependentStateWorldEffectsQuestObjectiveID(this, owner, receiver));
}
if (changesMask[10])
{
@@ -7918,6 +7949,36 @@ namespace Game.Entities
return stateAnimKitId;
}
uint GetViewerDependentStateWorldEffectsQuestObjectiveID(GameObjectFieldData gameObjectData, GameObject gameObject, Player receiver)
{
uint stateWorldEffectsQuestObjectiveId = gameObjectData.StateWorldEffectsQuestObjectiveID;
if (stateWorldEffectsQuestObjectiveId == 0)
{
GameObjectData data = gameObject.GetGameObjectData();
if (data != null)
{
if (data.spawnTrackingQuestObjectives.Any())
{
// If there is no valid objective for player, fill UF with first objective (if any)
stateWorldEffectsQuestObjectiveId = data.spawnTrackingQuestObjectives.First();
int i = 0;
while (++i <= data.spawnTrackingQuestObjectives.Count)
{
var id = data.spawnTrackingQuestObjectives[i];
if (receiver.GetSpawnTrackingStateByObjective(data.spawnTrackingData.SpawnTrackingId, id) != SpawnTrackingState.Active)
continue;
stateWorldEffectsQuestObjectiveId = id;
break;
}
}
}
}
return stateWorldEffectsQuestObjectiveId;
}
}
public class DynamicObjectData : HasChangesMask