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

Core/AreaTriggers: Move SpellForVisuals override from AT spawn to properties

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/2ad7c7829b17bb9e6e951632e8e0e68f68b9aa44)
This commit is contained in:
Hondacrx
2024-08-25 00:09:30 -04:00
parent f48b091380
commit a4baf73814
3 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/DataStorage/AreaTriggerDataStorage.cs
+21 -21
View File
@@ -122,9 +122,9 @@ namespace Game.DataStorage
// 0 1 2 3 4 // 0 1 2 3 4
SQLResult areatriggerCreateProperties = DB.World.Query("SELECT Id, IsCustom, AreaTriggerId, IsAreatriggerCustom, Flags, " + SQLResult areatriggerCreateProperties = DB.World.Query("SELECT Id, IsCustom, AreaTriggerId, IsAreatriggerCustom, Flags, " +
//5 6 7 8 9 10 11 12 13 + //5 6 7 8 9 10 11 12 13 14
"MoveCurveId, ScaleCurveId, MorphCurveId, FacingCurveId, AnimId, AnimKitId, DecalPropertiesId, TimeToTarget, TimeToTargetScale, " + "MoveCurveId, ScaleCurveId, MorphCurveId, FacingCurveId, AnimId, AnimKitId, DecalPropertiesId, SpellForVisuals, TimeToTarget, TimeToTargetScale, " +
//14 15 16 17 18 19 20 21 22 23 //15 16 17 18 19 20 21 22 23 24
"Shape, ShapeData0, ShapeData1, ShapeData2, ShapeData3, ShapeData4, ShapeData5, ShapeData6, ShapeData7, ScriptName FROM `areatrigger_create_properties`"); "Shape, ShapeData0, ShapeData1, ShapeData2, ShapeData3, ShapeData4, ShapeData5, ShapeData6, ShapeData7, ScriptName FROM `areatrigger_create_properties`");
if (!areatriggerCreateProperties.IsEmpty()) if (!areatriggerCreateProperties.IsEmpty())
{ {
@@ -139,7 +139,7 @@ namespace Game.DataStorage
createProperties.Flags = (AreaTriggerCreatePropertiesFlag)areatriggerCreateProperties.Read<uint>(4); createProperties.Flags = (AreaTriggerCreatePropertiesFlag)areatriggerCreateProperties.Read<uint>(4);
AreaTriggerShapeType shape = (AreaTriggerShapeType)areatriggerCreateProperties.Read<byte>(14); AreaTriggerShapeType shape = (AreaTriggerShapeType)areatriggerCreateProperties.Read<byte>(15);
if (areaTriggerId.Id != 0 && createProperties.Template == null) if (areaTriggerId.Id != 0 && createProperties.Template == null)
{ {
@@ -173,17 +173,27 @@ namespace Game.DataStorage
createProperties.AnimKitId = areatriggerCreateProperties.Read<uint>(10); createProperties.AnimKitId = areatriggerCreateProperties.Read<uint>(10);
createProperties.DecalPropertiesId = areatriggerCreateProperties.Read<uint>(11); createProperties.DecalPropertiesId = areatriggerCreateProperties.Read<uint>(11);
createProperties.TimeToTarget = areatriggerCreateProperties.Read<uint>(12); if (!areatriggerCreateProperties.IsNull(12))
createProperties.TimeToTargetScale = areatriggerCreateProperties.Read<uint>(13); {
createProperties.SpellForVisuals = areatriggerCreateProperties.Read<uint>(12);
if (!Global.SpellMgr.HasSpellInfo(createProperties.SpellForVisuals.Value, Difficulty.None))
{
Log.outError(LogFilter.Sql, $"Table `areatrigger_create_properties` has AreaTriggerCreatePropertiesId (Id: {createPropertiesId.Id}, IsCustom: {createPropertiesId.IsCustom}) with invalid SpellForVisual {createProperties.SpellForVisuals.Value}, set to none.");
createProperties.SpellForVisuals = null;
}
}
createProperties.TimeToTarget = areatriggerCreateProperties.Read<uint>(13);
createProperties.TimeToTargetScale = areatriggerCreateProperties.Read<uint>(14);
createProperties.Shape.TriggerType = shape; createProperties.Shape.TriggerType = shape;
unsafe unsafe
{ {
for (byte i = 0; i < SharedConst.MaxAreatriggerEntityData; ++i) for (byte i = 0; i < SharedConst.MaxAreatriggerEntityData; ++i)
createProperties.Shape.DefaultDatas.Data[i] = areatriggerCreateProperties.Read<float>(15 + i); createProperties.Shape.DefaultDatas.Data[i] = areatriggerCreateProperties.Read<float>(16 + i);
} }
createProperties.ScriptId = Global.ObjectMgr.GetScriptId(areatriggerCreateProperties.Read<string>(23)); createProperties.ScriptId = Global.ObjectMgr.GetScriptId(areatriggerCreateProperties.Read<string>(24));
if (shape == AreaTriggerShapeType.Polygon) if (shape == AreaTriggerShapeType.Polygon)
{ {
@@ -274,8 +284,8 @@ namespace Game.DataStorage
uint oldMSTime = Time.GetMSTime(); uint oldMSTime = Time.GetMSTime();
// Load area trigger positions (to put them on the server) // Load area trigger positions (to put them on the server)
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 // 0 1 2 3 4 5 6 7 8 9 10 11 12
SQLResult result = DB.World.Query("SELECT SpawnId, AreaTriggerCreatePropertiesId, IsCustom, MapId, SpawnDifficulties, PosX, PosY, PosZ, Orientation, PhaseUseFlags, PhaseId, PhaseGroup, SpellForVisuals, ScriptName FROM `areatrigger`"); SQLResult result = DB.World.Query("SELECT SpawnId, AreaTriggerCreatePropertiesId, IsCustom, MapId, SpawnDifficulties, PosX, PosY, PosZ, Orientation, PhaseUseFlags, PhaseId, PhaseGroup, ScriptName FROM `areatrigger`");
if (!result.IsEmpty()) if (!result.IsEmpty())
{ {
do do
@@ -344,17 +354,7 @@ namespace Game.DataStorage
spawn.PhaseId = result.Read<uint>(10); spawn.PhaseId = result.Read<uint>(10);
spawn.PhaseGroup = result.Read<uint>(11); spawn.PhaseGroup = result.Read<uint>(11);
if (!result.IsNull(12)) spawn.ScriptId = Global.ObjectMgr.GetScriptId(result.Read<string>(12));
{
spawn.SpellForVisuals = result.Read<uint>(12);
if (!Global.SpellMgr.HasSpellInfo(spawn.SpellForVisuals.Value, Difficulty.None))
{
Log.outError(LogFilter.Sql, $"Table `areatrigger` has areatrigger (GUID: {spawnId}) with invalid SpellForVisual {spawn.SpellForVisuals}, set to none.");
spawn.SpellForVisuals = null;
}
}
spawn.ScriptId = Global.ObjectMgr.GetScriptId(result.Read<string>(13));
spawn.spawnGroupData = Global.ObjectMgr.GetLegacySpawnGroup(); spawn.spawnGroupData = Global.ObjectMgr.GetLegacySpawnGroup();
// Add the trigger to a map::cell map, which is later used by GridLoader to query // Add the trigger to a map::cell map, which is later used by GridLoader to query
Source/Game/Entities/AreaTrigger/AreaTrigger.cs
+12 -11
View File
@@ -128,8 +128,17 @@ namespace Game.Entities
if (spellInfo != null && !IsStaticSpawn()) if (spellInfo != null && !IsStaticSpawn())
SetUpdateFieldValue(areaTriggerData.ModifyValue(m_areaTriggerData.SpellID), spellInfo.Id); SetUpdateFieldValue(areaTriggerData.ModifyValue(m_areaTriggerData.SpellID), spellInfo.Id);
if (spellInfo != null)
SetUpdateFieldValue(areaTriggerData.ModifyValue(m_areaTriggerData.SpellForVisuals), spellInfo.Id); SpellInfo spellForVisuals = spellInfo;
if (GetCreateProperties().SpellForVisuals.HasValue)
{
spellForVisuals = Global.SpellMgr.GetSpellInfo(GetCreateProperties().SpellForVisuals.Value, Difficulty.None);
if (spellForVisuals != null)
spellVisual.SpellXSpellVisualID = spellForVisuals.GetSpellXSpellVisualId();
}
if (spellForVisuals != null)
SetUpdateFieldValue(areaTriggerData.ModifyValue(m_areaTriggerData.SpellForVisuals), spellForVisuals.Id);
SpellCastVisualField spellCastVisual = areaTriggerData.ModifyValue(m_areaTriggerData.SpellVisual); SpellCastVisualField spellCastVisual = areaTriggerData.ModifyValue(m_areaTriggerData.SpellVisual);
SetUpdateFieldValue(ref spellCastVisual.SpellXSpellVisualID, spellVisual.SpellXSpellVisualID); SetUpdateFieldValue(ref spellCastVisual.SpellXSpellVisualID, spellVisual.SpellXSpellVisualID);
@@ -268,15 +277,7 @@ namespace Game.Entities
if (createProperties == null) if (createProperties == null)
return false; return false;
SpellInfo spellInfo = null; return Create(spawnData.Id, map, spawnData.SpawnPoint, -1, spawnData);
SpellCastVisual spellVisual = default;
if (spawnData.SpellForVisuals.HasValue)
{
spellInfo = Global.SpellMgr.GetSpellInfo(spawnData.SpellForVisuals.Value, Difficulty.None);
if (spellInfo != null)
spellVisual.SpellXSpellVisualID = spellInfo.GetSpellXSpellVisualId();
}
return Create(spawnData.Id, map, spawnData.SpawnPoint, -1, spawnData, null, null, spellVisual, spellInfo);
} }
public override void Update(uint diff) public override void Update(uint diff)
Source/Game/Entities/AreaTrigger/AreaTriggerTemplate.cs
+2 -1
View File
@@ -262,6 +262,8 @@ namespace Game.Entities
public uint DecalPropertiesId; public uint DecalPropertiesId;
public uint? SpellForVisuals;
public uint TimeToTarget; public uint TimeToTarget;
public uint TimeToTargetScale; public uint TimeToTargetScale;
@@ -286,7 +288,6 @@ namespace Game.Entities
public class AreaTriggerSpawn : SpawnData public class AreaTriggerSpawn : SpawnData
{ {
public new AreaTriggerId Id; public new AreaTriggerId Id;
public uint? SpellForVisuals;
public AreaTriggerSpawn() : base(SpawnObjectType.AreaTrigger) { } public AreaTriggerSpawn() : base(SpawnObjectType.AreaTrigger) { }
} }