Skip to content

Commit 7f6efed

Browse files
BAndyscBAndysc
committed
[UX] Icons
1 parent 3962777 commit 7f6efed

File tree

13 files changed

+234
-44
lines changed

13 files changed

+234
-44
lines changed

‎WDE.DatabaseEditors/DbDefinitions/creature.json

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,34 @@
120120
"foreign_table": "creature_addon"
121121
},
122122
{
123-
"name": "Bytes 1",
124-
"db_column_name": "bytes1",
125-
"value_type": "UnitBytes1Parameter",
123+
"name": "Stand state",
124+
"db_column_name": "StandState",
125+
"value_type": "StandStateParameter",
126126
"foreign_table": "creature_addon"
127127
},
128128
{
129-
"name": "Bytes 2",
130-
"db_column_name": "bytes2",
131-
"value_type": "UnitBytes2Parameter",
132-
"default": 1,
129+
"name": "AnimTier",
130+
"db_column_name": "AnimTier",
131+
"value_type": "AnimTierParameter",
132+
"foreign_table": "creature_addon"
133+
},
134+
{
135+
"name": "VisFlags",
136+
"db_column_name": "VisFlags",
137+
"value_type": "int",
138+
"foreign_table": "creature_addon"
139+
},
140+
{
141+
"name": "SheathState",
142+
"db_column_name": "SheathState",
143+
"value_type": "SheathStateParameter",
144+
"foreign_table": "creature_addon",
145+
"default": 1
146+
},
147+
{
148+
"name": "PvPFlags",
149+
"db_column_name": "PvPFlags",
150+
"value_type": "UnitPVPStateFlagParameter",
133151
"foreign_table": "creature_addon"
134152
},
135153
{

‎WDE.DatabaseEditors/DbDefinitions/creature_tcpp.json

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,16 +142,34 @@
142142
"foreign_table": "creature_addon"
143143
},
144144
{
145-
"name": "Bytes 1",
146-
"db_column_name": "bytes1",
147-
"value_type": "UnitBytes1Parameter",
145+
"name": "Stand state",
146+
"db_column_name": "StandState",
147+
"value_type": "StandStateParameter",
148148
"foreign_table": "creature_addon"
149149
},
150150
{
151-
"name": "Bytes 2",
152-
"db_column_name": "bytes2",
153-
"value_type": "UnitBytes2Parameter",
154-
"default": 1,
151+
"name": "AnimTier",
152+
"db_column_name": "AnimTier",
153+
"value_type": "AnimTierParameter",
154+
"foreign_table": "creature_addon"
155+
},
156+
{
157+
"name": "VisFlags",
158+
"db_column_name": "VisFlags",
159+
"value_type": "int",
160+
"foreign_table": "creature_addon"
161+
},
162+
{
163+
"name": "SheathState",
164+
"db_column_name": "SheathState",
165+
"value_type": "SheathStateParameter",
166+
"foreign_table": "creature_addon",
167+
"default": 1
168+
},
169+
{
170+
"name": "PvPFlags",
171+
"db_column_name": "PvPFlags",
172+
"value_type": "UnitPVPStateFlagParameter",
155173
"foreign_table": "creature_addon"
156174
},
157175
{

‎WDE.DatabaseEditors/DbDefinitions/creature_template.json

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -192,16 +192,35 @@
192192
"value_type": "CreatureParameter"
193193
},
194194
{
195-
"name": "Bytes 1",
196-
"db_column_name": "bytes1",
197-
"foreign_table": "creature_template_addon",
198-
"value_type": "uint"
195+
"name": "Stand state",
196+
"db_column_name": "StandState",
197+
"value_type": "StandStateParameter",
198+
"foreign_table": "creature_template_addon"
199+
},
200+
{
201+
"name": "AnimTier",
202+
"db_column_name": "AnimTier",
203+
"value_type": "AnimTierParameter",
204+
"foreign_table": "creature_template_addon"
205+
},
206+
{
207+
"name": "VisFlags",
208+
"db_column_name": "VisFlags",
209+
"value_type": "int",
210+
"foreign_table": "creature_template_addon"
199211
},
200212
{
201-
"name": "Bytes 2",
202-
"db_column_name": "bytes2",
213+
"name": "SheathState",
214+
"db_column_name": "SheathState",
215+
"value_type": "SheathStateParameter",
203216
"foreign_table": "creature_template_addon",
204-
"value_type": "uint"
217+
"default": 1
218+
},
219+
{
220+
"name": "PvPFlags",
221+
"db_column_name": "PvPFlags",
222+
"value_type": "UnitPVPStateFlagParameter",
223+
"foreign_table": "creature_template_addon"
205224
},
206225
{
207226
"name": "Emote",

‎WDE.DatabaseEditors/DbDefinitions/instance_template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "instance_template",
3-
"compatibility": ["TrinityWrath", "TrinityCata", "Azeroth"],
3+
"compatibility": ["TrinityWrath", "Azeroth"],
44
"name": "Instance Template",
55
"description": "Edit or create instance templates",
66
"table_name": "instance_template",

‎WDE.DatabaseEditors/DbDefinitions/instance_template_cata.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"id": "instance_template",
3+
"compatibility": ["TrinityCata"],
4+
"name": "Instance Template",
5+
"description": "Edit or create instance templates",
6+
"table_name": "instance_template",
7+
"table_index_name": "map",
8+
"record_mode": "SingleRow",
9+
"table_name_source_field": "script",
10+
"icon_path": "Icons/document_instance_template.png",
11+
"picker": "MapParameter",
12+
"group_name": "Instance",
13+
"primary_key": [
14+
"map"
15+
],
16+
"groups": [
17+
{
18+
"group_name": "Instance",
19+
"fields": [
20+
{
21+
"name": "Map",
22+
"db_column_name": "map",
23+
"value_type": "MapParameter"
24+
},
25+
{
26+
"name": "Parent map",
27+
"db_column_name": "parent",
28+
"value_type": "MapParameter"
29+
},
30+
{
31+
"name": "Script name",
32+
"db_column_name": "script",
33+
"value_type": "string"
34+
}
35+
]
36+
}
37+
]
38+
}

‎WDE.DatabaseEditors/DbDefinitions/tcpp/creature_template.json

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -214,16 +214,35 @@
214214
"value_type": "CreatureParameter"
215215
},
216216
{
217-
"name": "Bytes 1",
218-
"db_column_name": "bytes1",
219-
"foreign_table": "creature_template_addon",
220-
"value_type": "uint"
217+
"name": "Stand state",
218+
"db_column_name": "StandState",
219+
"value_type": "StandStateParameter",
220+
"foreign_table": "creature_template_addon"
221+
},
222+
{
223+
"name": "AnimTier",
224+
"db_column_name": "AnimTier",
225+
"value_type": "AnimTierParameter",
226+
"foreign_table": "creature_template_addon"
227+
},
228+
{
229+
"name": "VisFlags",
230+
"db_column_name": "VisFlags",
231+
"value_type": "int",
232+
"foreign_table": "creature_template_addon"
221233
},
222234
{
223-
"name": "Bytes 2",
224-
"db_column_name": "bytes2",
235+
"name": "SheathState",
236+
"db_column_name": "SheathState",
237+
"value_type": "SheathStateParameter",
225238
"foreign_table": "creature_template_addon",
226-
"value_type": "uint"
239+
"default": 1
240+
},
241+
{
242+
"name": "PvPFlags",
243+
"db_column_name": "PvPFlags",
244+
"value_type": "UnitPVPStateFlagParameter",
245+
"foreign_table": "creature_template_addon"
227246
},
228247
{
229248
"name": "Emote",

‎WDE.MySqlDatabaseCommon/CommonModels/MySqlCreatureAddon.cs

Lines changed: 90 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@ public abstract class MySqlBaseCreatureAddon : IBaseCreatureAddon
1212

1313
public abstract uint MountCreatureId { get; set; }
1414

15-
[Column(Name = "bytes1")]
16-
public uint Bytes1 { get; set; }
17-
18-
[Column(Name = "bytes2")]
19-
public uint Bytes2 { get; set; }
15+
public abstract uint Bytes1 { get; }
16+
public abstract byte Sheath { get; }
17+
public abstract byte PvP { get; }
2018

2119
[Column(Name = "emote")]
2220
public uint Emote { get; set; }
@@ -26,14 +24,26 @@ public abstract class MySqlBaseCreatureAddon : IBaseCreatureAddon
2624

2725
[Column(Name = "auras")]
2826
public string? Auras { get; set; }
27+
}
2928

30-
public byte Sheath => (byte)(Bytes2 & 0xFF);
29+
public abstract class MySqlBaseCreatureAddonTrinity : MySqlBaseCreatureAddon
30+
{
31+
public override uint Bytes1 => StandState;
32+
public override byte Sheath => sheath;
33+
public override byte PvP => pvP;
34+
35+
[Column(Name = "StandState")]
36+
public byte StandState { get; set; }
3137

32-
public byte PvP => (byte)((Bytes2 >> 8) & 0xFF);
38+
[Column(Name = "SheathState")]
39+
public byte sheath { get; set; }
40+
41+
[Column(Name = "PvPFlags")]
42+
public byte pvP { get; set; }
3343
}
3444

3545
[Table(Name = "creature_addon")]
36-
public class MySqlCreatureAddon : MySqlBaseCreatureAddon, ICreatureAddon
46+
public class MySqlCreatureAddonWrath : MySqlBaseCreatureAddonTrinity, ICreatureAddon
3747
{
3848
[PrimaryKey]
3949
[Identity]
@@ -48,7 +58,7 @@ public class MySqlCreatureAddon : MySqlBaseCreatureAddon, ICreatureAddon
4858
}
4959

5060
[Table(Name = "creature_template_addon")]
51-
public class MySqlCreatureTemplateAddon : MySqlBaseCreatureAddon, ICreatureTemplateAddon
61+
public class MySqlCreatureTemplateAddon : MySqlBaseCreatureAddonTrinity, ICreatureTemplateAddon
5262
{
5363
[PrimaryKey]
5464
[Identity]
@@ -62,9 +72,8 @@ public class MySqlCreatureTemplateAddon : MySqlBaseCreatureAddon, ICreatureTempl
6272
public override uint MountCreatureId { get; set; }
6373
}
6474

65-
6675
[Table(Name = "creature_addon")]
67-
public class MySqlCreatureAddonCata : MySqlBaseCreatureAddon, ICreatureAddon
76+
public class MySqlCreatureAddonCata : MySqlBaseCreatureAddonTrinity, ICreatureAddon
6877
{
6978
[PrimaryKey]
7079
[Identity]
@@ -78,7 +87,7 @@ public class MySqlCreatureAddonCata : MySqlBaseCreatureAddon, ICreatureAddon
7887
}
7988

8089
[Table(Name = "creature_template_addon")]
81-
public class MySqlCreatureTemplateAddonCata : MySqlBaseCreatureAddon, ICreatureTemplateAddon
90+
public class MySqlCreatureTemplateAddonCata : MySqlBaseCreatureAddonTrinity, ICreatureTemplateAddon
8291
{
8392
[PrimaryKey]
8493
[Identity]
@@ -91,6 +100,55 @@ public class MySqlCreatureTemplateAddonCata : MySqlBaseCreatureAddon, ICreatureT
91100
public override uint MountCreatureId { get; set; }
92101
}
93102

103+
[Table(Name = "creature_addon")]
104+
public class MySqlCreatureAddonMaster: MySqlBaseCreatureAddon, ICreatureAddon
105+
{
106+
[PrimaryKey]
107+
[Identity]
108+
[Column(Name = "guid")]
109+
public uint Guid { get; set; }
110+
111+
[Column(Name = "path_id")]
112+
public override uint PathId { get; set; }
113+
114+
[Column(Name = "MountCreatureID")]
115+
public override uint MountCreatureId { get; set; }
116+
117+
public override uint Bytes1 => bytes1;
118+
public override byte Sheath => (byte)(bytes2 & 0xFF);
119+
public override byte PvP => (byte)((bytes2 >> 8) & 0xFF);
120+
121+
[Column(Name = "bytes1")]
122+
public uint bytes1 { get; set; }
123+
124+
[Column(Name = "bytes2")]
125+
public uint bytes2 { get; set; }
126+
}
127+
128+
[Table(Name = "creature_template_addon")]
129+
public class MySqlCreatureTemplateAddonMaster : MySqlBaseCreatureAddon, ICreatureTemplateAddon
130+
{
131+
[PrimaryKey]
132+
[Identity]
133+
[Column(Name = "entry")]
134+
public uint Entry { get; set; }
135+
136+
[Column(Name = "path_id")]
137+
public override uint PathId { get; set; }
138+
139+
[Column(Name = "MountCreatureID")]
140+
public override uint MountCreatureId { get; set; }
141+
142+
public override uint Bytes1 => bytes1;
143+
public override byte Sheath => (byte)(bytes2 & 0xFF);
144+
public override byte PvP => (byte)((bytes2 >> 8) & 0xFF);
145+
146+
[Column(Name = "bytes1")]
147+
public uint bytes1 { get; set; }
148+
149+
[Column(Name = "bytes2")]
150+
public uint bytes2 { get; set; }
151+
}
94152

95153
[Table(Name = "creature_addon")]
96154
public class MySqlCreatureAddonAC: MySqlBaseCreatureAddon, ICreatureAddon
@@ -104,6 +162,16 @@ public class MySqlCreatureAddonAC: MySqlBaseCreatureAddon, ICreatureAddon
104162
public override uint PathId { get; set; }
105163

106164
public override uint MountCreatureId { get; set; }
165+
166+
public override uint Bytes1 => bytes1;
167+
public override byte Sheath => (byte)(bytes2 & 0xFF);
168+
public override byte PvP => (byte)((bytes2 >> 8) & 0xFF);
169+
170+
[Column(Name = "bytes1")]
171+
public uint bytes1 { get; set; }
172+
173+
[Column(Name = "bytes2")]
174+
public uint bytes2 { get; set; }
107175
}
108176

109177
[Table(Name = "creature_template_addon")]
@@ -118,4 +186,14 @@ public class MySqlCreatureTemplateAddonAC : MySqlBaseCreatureAddon, ICreatureTem
118186
public override uint PathId { get; set; }
119187

120188
public override uint MountCreatureId { get; set; }
189+
190+
public override uint Bytes1 => bytes1;
191+
public override byte Sheath => (byte)(bytes2 & 0xFF);
192+
public override byte PvP => (byte)((bytes2 >> 8) & 0xFF);
193+
194+
[Column(Name = "bytes1")]
195+
public uint bytes1 { get; set; }
196+
197+
[Column(Name = "bytes2")]
198+
public uint bytes2 { get; set; }
121199
}

‎WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Models/Databases/TrinityMasterDatabase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public class TrinityMasterDatabase : BaseTrinityDatabase
1313
public ITable<TrinityMasterMySqlServersideSpell> SpellDbc => GetTable<TrinityMasterMySqlServersideSpell>();
1414
public ITable<MySqlGameObjectCata> GameObject => GetTable<MySqlGameObjectCata>();
1515
public ITable<MySqlCreatureModelInfoShadowlands> CreatureModelInfo => GetTable<MySqlCreatureModelInfoShadowlands>();
16-
public ITable<MySqlCreatureAddon> CreatureAddon => GetTable<MySqlCreatureAddon>();
17-
public ITable<MySqlCreatureTemplateAddon> CreatureTemplateAddon => GetTable<MySqlCreatureTemplateAddon>();
16+
public ITable<MySqlCreatureAddonMaster> CreatureAddon => GetTable<MySqlCreatureAddonMaster>();
17+
public ITable<MySqlCreatureTemplateAddonMaster> CreatureTemplateAddon => GetTable<MySqlCreatureTemplateAddonMaster>();
1818
public ITable<MySqlWrathQuestTemplateAddon> QuestTemplateAddon => GetTable<MySqlWrathQuestTemplateAddon>();
1919
public ITable<MySqlPlayerChoice> PlayerChoice => GetTable<MySqlPlayerChoice>();
2020
public ITable<MySqlPlayerChoiceResponse> PlayerChoiceResponse => GetTable<MySqlPlayerChoiceResponse>();

0 commit comments

Comments
 (0)