Skip to content

Commit decd677

Browse files
committed
[Database] GetAreaTriggerTemplate(int)
1 parent 43b92eb commit decd677

File tree

12 files changed

+39
-7
lines changed

12 files changed

+39
-7
lines changed

WDE.MySqlDatabaseCommon/Database/World/CachedDatabaseProvider.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ public IEnumerable<IGameObjectTemplate> GetGameObjectTemplates()
178178
}
179179

180180
public Task<IAreaTriggerScript?> GetAreaTriggerScript(int entry) => nonCachedDatabase.GetAreaTriggerScript(entry);
181+
182+
public async Task<IAreaTriggerTemplate?> GetAreaTriggerTemplate(int entry) => null;
181183

182184
public IEnumerable<ICreatureTemplate> GetCreatureTemplates()
183185
{

WDE.MySqlDatabaseCommon/Database/World/NullWorldDatabaseProvider.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ public class NullWorldDatabaseProvider : IAsyncDatabaseProvider
1818
public IEnumerable<IGameObjectTemplate> GetGameObjectTemplates() => Enumerable.Empty<IGameObjectTemplate>();
1919

2020
public Task<IAreaTriggerScript?> GetAreaTriggerScript(int entry) => Task.FromResult<IAreaTriggerScript?>(null);
21+
22+
public async Task<IAreaTriggerTemplate?> GetAreaTriggerTemplate(int entry) => null;
2123

2224
public IQuestTemplate? GetQuestTemplate(uint entry) => null;
2325

WDE.MySqlDatabaseCommon/Database/World/WorldDatabaseDecorator.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public WorldDatabaseDecorator(IDatabaseProvider provider)
2020
public IGameObjectTemplate? GetGameObjectTemplate(uint entry) => impl.GetGameObjectTemplate(entry);
2121
public IEnumerable<IGameObjectTemplate> GetGameObjectTemplates() => impl.GetGameObjectTemplates();
2222
public Task<IAreaTriggerScript?> GetAreaTriggerScript(int entry) => impl.GetAreaTriggerScript(entry);
23+
public Task<IAreaTriggerTemplate?> GetAreaTriggerTemplate(int entry) => impl.GetAreaTriggerTemplate(entry);
2324

2425
public IQuestTemplate? GetQuestTemplate(uint entry) => impl.GetQuestTemplate(entry);
2526
public IEnumerable<IAreaTriggerTemplate> GetAreaTriggerTemplates() => impl.GetAreaTriggerTemplates();

WoWDatabaseEditor.Common/WDE.CMMySqlDatabase/Database/BaseDatabaseProvider.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ public async Task<List<INpcText>> GetNpcTextsAsync()
175175
{
176176
return null;
177177
}
178+
179+
public async Task<IAreaTriggerTemplate?> GetAreaTriggerTemplate(int entry) => null;
178180

179181
public IEnumerable<IAreaTriggerTemplate> GetAreaTriggerTemplates()
180182
{

WoWDatabaseEditor.Common/WDE.CMMySqlDatabase/Models/TBC/CreatureTemplate.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ public class CreatureTemplateTBC : ICreatureTemplate
2626

2727
[Column("Name")]
2828
public string Name { get; set; } = "";
29-
29+
30+
[Column(Name = "SubName")]
31+
public string? SubName { get; set; } = "";
32+
3033
[Column("AIName")]
3134
public string AIName { get; set; } = "";
3235

WoWDatabaseEditor.Common/WDE.Common/Database/IAreaTriggerTemplate.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ public interface IAreaTriggerTemplate
44
{
55
public uint Id { get; }
66
bool IsServerSide { get; }
7-
// string? ScriptName { get; }
7+
string? Name { get; }
8+
string? ScriptName { get; }
9+
string? AIName { get; }
810
}
911
}

WoWDatabaseEditor.Common/WDE.Common/Database/ICreatureTemplate.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public interface ICreatureTemplate
1010
short MinLevel { get; }
1111
short MaxLevel { get; }
1212
string Name { get; }
13+
string? SubName { get; }
1314
string AIName { get; }
1415
string ScriptName { get; }
1516
public GameDefines.UnitFlags UnitFlags { get; }

WoWDatabaseEditor.Common/WDE.Common/Database/IDatabaseProvider.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ public interface IDatabaseProvider
1818
IEnumerable<IGameObjectTemplate> GetGameObjectTemplates();
1919

2020
Task<IAreaTriggerScript?> GetAreaTriggerScript(int entry);
21+
Task<IAreaTriggerTemplate?> GetAreaTriggerTemplate(int entry);
2122
IEnumerable<IAreaTriggerTemplate> GetAreaTriggerTemplates();
2223

2324
IEnumerable<ICreatureClassLevelStat> GetCreatureClassLevelStats();

WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Database/BaseTrinityMySqlDatabaseProvider.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,11 @@ public async Task<List<INpcText>> GetNpcTextsAsync()
192192
return await model.AreaTriggerScript.FirstOrDefaultAsync(script => script.Entry == entry);
193193
}
194194

195+
public virtual async Task<IAreaTriggerTemplate?> GetAreaTriggerTemplate(int entry)
196+
{
197+
return null;
198+
}
199+
195200
public IEnumerable<IAreaTriggerTemplate> GetAreaTriggerTemplates()
196201
{
197202
if (currentCoreVersion.Current.DatabaseFeatures.UnsupportedTables.Contains(typeof(IAreaTriggerTemplate)))

WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Database/TrinityMasterMySqlDatabaseProvider.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,4 +321,10 @@ public override async Task<IList<IQuestObjective>> GetQuestObjectives(uint quest
321321
await using var model = Database();
322322
return await model.QuestObjective.FirstOrDefaultAsync(x => x.ObjectiveId == objectiveId);
323323
}
324+
325+
public override async Task<IAreaTriggerTemplate?> GetAreaTriggerTemplate(int entry)
326+
{
327+
await using var model = Database();
328+
return await model.AreaTriggerTemplate.FirstOrDefaultAsync(x => x.Id == entry);
329+
}
324330
}

WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/MySqlAreaTriggerTemplate.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ public class MySqlAreaTriggerTemplate : IAreaTriggerTemplate
1313
[PrimaryKey]
1414
[Column(Name = "IsServerSide")]
1515
public bool IsServerSide { get; set; }
16-
17-
// [Column(Name = "ScriptName")]
18-
// public string? ScriptName { get; set; }
16+
17+
public string? Name => null;
18+
public string? ScriptName => null;
19+
public string? AIName => null;
1920
}
2021
}

WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/MySqlCreatureTemplateWrath.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ public class MySqlCreatureTemplateWrath : ICreatureTemplate
4040

4141
[Column(Name = "name")]
4242
public string Name { get; set; } = "";
43-
43+
44+
[Column(Name = "subname")]
45+
public string? SubName { get; set; } = "";
46+
4447
[Column(Name = "AIName")]
4548
public string AIName { get; set; } = "";
4649

@@ -96,7 +99,10 @@ public class MySqlCreatureTemplateMaster : ICreatureTemplate
9699

97100
[Column(Name = "name")]
98101
public string Name { get; set; } = "";
99-
102+
103+
[Column(Name = "subname")]
104+
public string? SubName { get; set; } = "";
105+
100106
[Column(Name = "AIName")]
101107
public string AIName { get; set; } = "";
102108

0 commit comments

Comments
 (0)