Skip to content

Commit

Permalink
Adjust tables according to recent areatrigger refactor (#815)
Browse files Browse the repository at this point in the history 
* ref TrinityCore/TrinityCore#29500
  • Loading branch information
@meji46
meji46 authored Dec 30, 2023
1 parent 329ad8e commit a7037b6
Show file tree
Hide file tree
Showing 14 changed files with 292 additions and 132 deletions.
2 changes: 1 addition & 1 deletion ...etParser/Enums/AreaTriggerTemplateFlag.cs → .../Enums/AreaTriggerCreatePropertiesFlag.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace WowPacketParser.Enums
{
[Flags]
public enum AreaTriggerFlags : uint
public enum AreaTriggerCreatePropertiesFlags : uint
{
HasAbsoluteOrientation = 0x00001,
HasDynamicShape = 0x00002,
Expand Down
98 changes: 69 additions & 29 deletions WowPacketParser/SQL/Builders/AreaTriggers.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public static string AreaTriggerTemplateData()
[BuilderMethod]
public static string AreaTriggerCreatePropertiesData()
{
var spellareatriggers = Storage.Objects.IsEmpty()
var createPropertiesList = Storage.Objects.IsEmpty()
? new Dictionary<WowGuid, AreaTriggerCreateProperties>() // empty dict if there are no objects
: Storage.Objects.Where(
obj =>
Expand All @@ -40,32 +40,52 @@ public static string AreaTriggerCreatePropertiesData()
.OrderBy(pair => pair.Value.Item2) // order by spawn time
.ToDictionary(obj => obj.Key, obj => obj.Value.Item1 as AreaTriggerCreateProperties);

if (spellareatriggers.Count == 0)
if (createPropertiesList.Count == 0)
return string.Empty;

if (!Settings.SQLOutputFlag.HasAnyFlagBit(SQLOutput.areatrigger_create_properties))
return string.Empty;

var spellareatriggersData = new DataBag<AreaTriggerCreateProperties>();
var createPropertiesData = new DataBag<AreaTriggerCreateProperties>();
var customRows = new RowList<AreaTriggerCreatePropertiesCustom>();

foreach (var spellareatrigger in spellareatriggers)
foreach (var createProperties in createPropertiesList)
{
if (spellareatrigger.Value.spellId == 0)
continue;
// CreateProperties from spells
if (createProperties.Value.IsCustom == 0)
createPropertiesData.Add(createProperties.Value);
else
{
createPropertiesList[createProperties.Key].CustomId = $"@ATPROPERTIESID+{customRows.Count}";

Row<AreaTriggerCreatePropertiesCustom> row = new();
row.Data.AreaTriggerCreatePropertiesId = createProperties.Value.CustomId;
row.Data.AreaTriggerId = createProperties.Value.AreaTriggerId;
row.Data.IsAreatriggerCustom = createProperties.Value.IsAreatriggerCustom;
row.Data.Flags = createProperties.Value.Flags;
row.Data.AnimId = createProperties.Value.AnimId;
row.Data.AnimKitId = createProperties.Value.AnimKitId;
row.Data.DecalPropertiesId = createProperties.Value.DecalPropertiesId;
row.Data.Shape = createProperties.Value.Shape;
row.Data.ShapeData = createProperties.Value.ShapeData;
customRows.Add(row);
}
}

spellareatriggersData.Add(spellareatrigger.Value);
StringBuilder result = new StringBuilder();
if (customRows.Count > 0) {
var sql = new SQLInsert<AreaTriggerCreatePropertiesCustom>(customRows, true);
result.Append(sql.Build());
result.Append(Environment.NewLine);
}

var templateDb = SQLDatabase.Get(spellareatriggersData);
var templateDb = SQLDatabase.Get(createPropertiesData);

return SQLUtil.Compare(Settings.SQLOrderByKey ? spellareatriggersData.OrderBy(x => x.Item1.AreaTriggerId).ToArray() : spellareatriggersData.ToArray(),
return result.ToString() + SQLUtil.Compare(Settings.SQLOrderByKey ? createPropertiesData.OrderBy(x => x.Item1.AreaTriggerId).ToArray() : createPropertiesData.ToArray(),
templateDb,
x =>
{
var comment = $"Spell: {StoreGetters.GetName(StoreNameType.Spell, (int)x.spellId)}";
if ((x.AreaTriggerCreatePropertiesId & 0x80000000) != 0)
comment += " CANNOT FIND PROPERTIES ID, USED SPELL ID AS KEY (NEEDS MANUAL CORRECTION)";

return comment;
});
}
Expand All @@ -86,6 +106,7 @@ public static string AreaTriggerCreatePropertiesOrbitData()

orbit.Item1.spellId = areaTrigger.spellId;
orbit.Item1.AreaTriggerCreatePropertiesId = areaTrigger.AreaTriggerCreatePropertiesId;
orbit.Item1.IsCustom = areaTrigger.IsCustom;
}

var templateDb = SQLDatabase.Get(Storage.AreaTriggerCreatePropertiesOrbits);
Expand All @@ -95,9 +116,6 @@ public static string AreaTriggerCreatePropertiesOrbitData()
x =>
{
var comment = $"Spell: {StoreGetters.GetName(StoreNameType.Spell, (int)x.spellId)}";
if ((x.AreaTriggerCreatePropertiesId & 0x80000000) != 0)
comment += " CANNOT FIND PROPERTIES ID, USED SPELL ID AS KEY (NEEDS MANUAL CORRECTION)";

return comment;
});
}
Expand All @@ -111,25 +129,48 @@ public static string AreaTriggerCreatePropertiesPolygonVertexData()
if (!Settings.SQLOutputFlag.HasAnyFlagBit(SQLOutput.areatrigger_create_properties_polygon_vertex))
return string.Empty;

var createPropertiesPolygonVertexData = new DataBag<AreaTriggerCreatePropertiesPolygonVertex>();
var customRows = new RowList<AreaTriggerCreatePropertiesPolygonVertexCustom>();

foreach (var vertex in Storage.AreaTriggerCreatePropertiesPolygonVertices)
{
var spellAreaTriggerTuple = Storage.Objects.Where(obj => obj.Key == vertex.Item1.areatriggerGuid).First();
AreaTriggerCreateProperties areaTrigger = (AreaTriggerCreateProperties)spellAreaTriggerTuple.Value.Item1;
AreaTriggerCreateProperties createProperties = (AreaTriggerCreateProperties)spellAreaTriggerTuple.Value.Item1;

vertex.Item1.spellId = areaTrigger.spellId;
vertex.Item1.AreaTriggerCreatePropertiesId = areaTrigger.AreaTriggerCreatePropertiesId;
vertex.Item1.spellId = createProperties.spellId;
vertex.Item1.AreaTriggerCreatePropertiesId = createProperties.AreaTriggerCreatePropertiesId;
vertex.Item1.IsCustom = createProperties.IsCustom;

// CreateProperties from spells
if (createProperties.IsCustom == 0)
createPropertiesPolygonVertexData.Add(vertex.Item1);
else
{
Row<AreaTriggerCreatePropertiesPolygonVertexCustom> row = new();
row.Data.AreaTriggerCreatePropertiesId = createProperties.CustomId;
row.Data.VerticeX = vertex.Item1.VerticeX;
row.Data.VerticeY = vertex.Item1.VerticeY;
row.Data.VerticeTargetX = vertex.Item1.VerticeTargetX;
row.Data.VerticeTargetY = vertex.Item1.VerticeTargetY;
customRows.Add(row);
}
}

StringBuilder result = new StringBuilder();
if (customRows.Count > 0)
{
var sql = new SQLInsert<AreaTriggerCreatePropertiesPolygonVertexCustom>(customRows, true);
result.Append(sql.Build());
result.Append(Environment.NewLine);
}

var templateDb = SQLDatabase.Get(Storage.AreaTriggerCreatePropertiesPolygonVertices);
var templateDb = SQLDatabase.Get(createPropertiesPolygonVertexData);

return SQLUtil.Compare(Settings.SQLOrderByKey ? Storage.AreaTriggerCreatePropertiesPolygonVertices.OrderBy(x => x.Item1.AreaTriggerCreatePropertiesId).ToArray() : Storage.AreaTriggerCreatePropertiesPolygonVertices.ToArray(),
return result.ToString() + SQLUtil.Compare(Settings.SQLOrderByKey ? createPropertiesPolygonVertexData.OrderBy(x => x.Item1.AreaTriggerCreatePropertiesId).ToArray() : createPropertiesPolygonVertexData.ToArray(),
templateDb,
x =>
{
var comment = $"Spell: {StoreGetters.GetName(StoreNameType.Spell, (int)x.spellId)}";
if ((x.AreaTriggerCreatePropertiesId & 0x80000000) != 0)
comment += " CANNOT FIND PROPERTIES ID, USED SPELL ID AS KEY (NEEDS MANUAL CORRECTION)";

return comment;
});
}
Expand All @@ -150,6 +191,7 @@ public static string AreaTriggerCreatePropertiesSplinePointData()

splinePoint.Item1.spellId = areaTrigger.spellId;
splinePoint.Item1.AreaTriggerCreatePropertiesId = areaTrigger.AreaTriggerCreatePropertiesId;
splinePoint.Item1.IsCustom = areaTrigger.IsCustom;

// convert points to offsets
splinePoint.Item1.X -= areaTrigger.Movement.Position.X;
Expand All @@ -171,9 +213,6 @@ public static string AreaTriggerCreatePropertiesSplinePointData()
x =>
{
var comment = $"Spell: {StoreGetters.GetName(StoreNameType.Spell, (int)x.spellId)}";
if ((x.AreaTriggerCreatePropertiesId & 0x80000000) != 0)
comment += " CANNOT FIND PROPERTIES ID, USED SPELL ID AS KEY (NEEDS MANUAL CORRECTION)";

return comment;
});
}
Expand Down Expand Up @@ -223,8 +262,8 @@ public static string AreaTriggerData()
Row<AreaTrigger> row = new();

row.Data.SpawnId = $"@ATSPAWNID+{count}";
row.Data.AreaTriggerId = at.Guid.GetEntry();
row.Data.IsServerSide = 0;
row.Data.AreaTriggerCreatePropertiesId = at.CustomId;
row.Data.IsCustom = at.IsCustom;

row.Data.MapId = at.Map;

Expand Down Expand Up @@ -252,7 +291,8 @@ public static string AreaTriggerData()

row.Data.Shape = at.Shape;
row.Data.ShapeData = at.ShapeData;
row.Data.SpellForVisuals = at.SpellForVisuals;
if (at.SpellForVisuals > 0)
row.Data.SpellForVisuals = at.SpellForVisuals;

row.Data.Comment = "";
row.Comment = StoreGetters.GetName(StoreNameType.Spell, (int)at.SpellForVisuals, true);
Expand Down
3 changes: 3 additions & 0 deletions WowPacketParser/SQL/SQLFile.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ public bool WriteToFile(string header)

var genAreaTriggers = Settings.SQLOutputFlag.HasAnyFlagBit(Enums.SQLOutput.areatrigger);
if (genAreaTriggers)
{
_file.WriteLine("SET @ATSPAWNID := SET_VALUE_MANUALLY_HERE;");
_file.WriteLine("SET @ATPROPERTIESID := SET_VALUE_MANUALLY_HERE;");
}

if (genCreatures || genGameObjects || genAreaTriggers)
_file.WriteLine();
Expand Down
16 changes: 9 additions & 7 deletions WowPacketParser/Store/Objects/AreaTrigger.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ public sealed record AreaTrigger : IDataModel
[DBFieldName("SpawnId", true, true)]
public string SpawnId;

[DBFieldName("AreaTriggerId")]
public uint? AreaTriggerId;
[DBFieldName("AreaTriggerCreatePropertiesId", TargetedDatabaseFlag.SinceDragonflight, false, true)]
[DBFieldName("AreaTriggerId", TargetedDatabaseFlag.TillShadowlands, false, true)]
public string AreaTriggerCreatePropertiesId;

[DBFieldName("IsServerSide")]
public byte? IsServerSide;
[DBFieldName("IsCustom", TargetedDatabaseFlag.SinceDragonflight)]
[DBFieldName("IsServerSide", TargetedDatabaseFlag.TillShadowlands)]
public byte? IsCustom;

[DBFieldName("MapId")]
public uint? MapId;
Expand All @@ -40,13 +42,13 @@ public sealed record AreaTrigger : IDataModel
[DBFieldName("PhaseGroup")]
public uint? PhaseGroup;

[DBFieldName("Shape")]
[DBFieldName("Shape", TargetedDatabaseFlag.TillShadowlands)]
public byte? Shape;

[DBFieldName("ShapeData", 8, true)] // kept in TargetedDatabase.Shadowlands to preserve data for non-spell areatriggers
[DBFieldName("ShapeData", TargetedDatabaseFlag.TillShadowlands, 8, true)] // kept in TargetedDatabase.Shadowlands to preserve data for non-spell areatriggers
public float?[] ShapeData = { 0, 0, 0, 0, 0, 0, 0, 0 };

[DBFieldName("SpellForVisuals")]
[DBFieldName("SpellForVisuals", false, false, true)]
public uint? SpellForVisuals;

[DBFieldName("Comment")]
Expand Down
75 changes: 71 additions & 4 deletions WowPacketParser/Store/Objects/AreaTriggerCreateProperties.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using WowPacketParser.Enums;
using WowPacketParser.Misc;
using WowPacketParser.SQL;
using WowPacketParser.SQL.Builders;
using WowPacketParser.Store.Objects.UpdateFields;
using WowPacketParser.Store.Objects.UpdateFields.LegacyImplementation;

Expand All @@ -16,9 +17,18 @@ public sealed record AreaTriggerCreateProperties : WoWObject, IDataModel
[DBFieldName("Id", TargetedDatabaseFlag.SinceShadowlands, true)]
public uint? AreaTriggerCreatePropertiesId;

[DBFieldName("IsCustom", TargetedDatabaseFlag.SinceDragonflight, true)]
public byte? IsCustom;

[DBFieldName("AreaTriggerId")]
public uint? AreaTriggerId;

[DBFieldName("IsAreatriggerCustom", TargetedDatabaseFlag.SinceDragonflight)]
public byte? IsAreatriggerCustom = 0;

[DBFieldName("Flags", TargetedDatabaseFlag.SinceDragonflight)]
public uint? Flags;

[DBFieldName("MoveCurveId")]
public int? MoveCurveId = 0;

Expand Down Expand Up @@ -60,6 +70,8 @@ public sealed record AreaTriggerCreateProperties : WoWObject, IDataModel

public uint SpellForVisuals;

public string CustomId;

public IAreaTriggerData AreaTriggerData;

public AreaTriggerCreateProperties() : base()
Expand All @@ -75,11 +87,9 @@ public override void LoadValuesFromUpdateFields()
TimeToTarget = AreaTriggerData.TimeToTarget;
TimeToTargetScale = AreaTriggerData.TimeToTargetScale;
AreaTriggerCreatePropertiesId = GetAreaTriggerCreatePropertiesIdFromSpellId(spellId);
IsCustom = 0;
if (AreaTriggerCreatePropertiesId == null)
{
// this is a hack to allow generating statements
AreaTriggerCreatePropertiesId = 0x80000000 | spellId;
}
IsCustom = 1;

if (ClientVersion.AddedInVersion(ClientVersionBuild.V9_1_5_40772))
{
Expand Down Expand Up @@ -123,4 +133,61 @@ public override void LoadValuesFromUpdateFields()
return areaTriggerCreatePropertiesId;
}
}

[DBTableName("spell_areatrigger", TargetedDatabaseFlag.TillBattleForAzeroth)]
[DBTableName("areatrigger_create_properties", TargetedDatabaseFlag.SinceShadowlands)]
public sealed record AreaTriggerCreatePropertiesCustom : IDataModel
{
[DBFieldName("SpellMiscId", TargetedDatabaseFlag.TillBattleForAzeroth, true, true)]
[DBFieldName("Id", TargetedDatabaseFlag.SinceShadowlands, true, true)]
public string AreaTriggerCreatePropertiesId;

[DBFieldName("IsCustom", TargetedDatabaseFlag.SinceDragonflight, true)]
public byte? IsCustom = 1;

[DBFieldName("AreaTriggerId")]
public uint? AreaTriggerId;

[DBFieldName("IsAreatriggerCustom", TargetedDatabaseFlag.SinceDragonflight)]
public byte? IsAreatriggerCustom;

[DBFieldName("Flags", TargetedDatabaseFlag.SinceDragonflight)]
public uint? Flags;

[DBFieldName("MoveCurveId")]
public int? MoveCurveId = 0;

[DBFieldName("ScaleCurveId")]
public int? ScaleCurveId = 0;

[DBFieldName("MorphCurveId")]
public int? MorphCurveId = 0;

[DBFieldName("FacingCurveId")]
public int? FacingCurveId = 0;

[DBFieldName("AnimId")]
public int? AnimId = ClientVersion.AddedInVersion(ClientVersionBuild.V9_1_5_40772) ? -1 : 0;

[DBFieldName("AnimKitId")]
public int? AnimKitId = 0;

[DBFieldName("DecalPropertiesId")]
public uint? DecalPropertiesId = 0;

[DBFieldName("TimeToTarget")]
public uint? TimeToTarget = 0;

[DBFieldName("TimeToTargetScale")]
public uint? TimeToTargetScale = 0;

[DBFieldName("Shape", TargetedDatabaseFlag.SinceShadowlands)]
public byte? Shape;

[DBFieldName("ShapeData", TargetedDatabaseFlag.SinceShadowlands, 8, true)]
public float?[] ShapeData = { 0, 0, 0, 0, 0, 0, 0, 0 };

[DBFieldName("VerifiedBuild")]
public int? VerifiedBuild = ClientVersion.BuildInt;
}
}
6 changes: 5 additions & 1 deletion WowPacketParser/Store/Objects/AreaTriggerCreatePropertiesOrbit.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WowPacketParser.Enums;
using WowPacketParser.Misc;
using WowPacketParser.SQL;

Expand All @@ -11,9 +12,12 @@ namespace WowPacketParser.Store.Objects
[DBTableName("areatrigger_create_properties_orbit")]
public sealed record AreaTriggerCreatePropertiesOrbit : IDataModel
{
[DBFieldName("AreaTriggerCreatePropertiesId", true)]
[DBFieldName("AreaTriggerCreatePropertiesId", true, true)]
public uint? AreaTriggerCreatePropertiesId;

[DBFieldName("IsCustom", TargetedDatabaseFlag.SinceDragonflight, true)]
public byte? IsCustom;

[DBFieldName("StartDelay")]
public uint? StartDelay;

Expand Down
Loading

0 comments on commit a7037b6

Please sign in to comment.