aboutsummaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/extractor_common/ExtractorDB2LoadInfo.h204
-rw-r--r--src/tools/map_extractor/System.cpp2
2 files changed, 131 insertions, 75 deletions
diff --git a/src/tools/extractor_common/ExtractorDB2LoadInfo.h b/src/tools/extractor_common/ExtractorDB2LoadInfo.h
index 95560740d2f..b1cb9e326ee 100644
--- a/src/tools/extractor_common/ExtractorDB2LoadInfo.h
+++ b/src/tools/extractor_common/ExtractorDB2LoadInfo.h
@@ -15,8 +15,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ExtractorDB2LoadInfo_h__
-#define ExtractorDB2LoadInfo_h__
+#ifndef TRINITYCORE_EXTRACTOR_DB2_LOAD_INFO_H
+#define TRINITYCORE_EXTRACTOR_DB2_LOAD_INFO_H
#include "DB2FileLoader.h"
#include "DB2Meta.h"
@@ -25,13 +25,22 @@ struct CinematicCameraLoadInfo
{
static constexpr DB2MetaField MetaFields[4] =
{
- { FT_FLOAT, 3, true },
- { FT_INT, 1, false },
- { FT_FLOAT, 1, true },
- { FT_INT, 1, false },
+ { .Type = FT_FLOAT, .ArraySize = 3, .IsSigned = true },
+ { .Type = FT_INT, .ArraySize = 1, .IsSigned = false },
+ { .Type = FT_FLOAT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_INT, .ArraySize = 1, .IsSigned = false },
};
- static constexpr DB2Meta MetaInstance{ 1294214, -1, 4, 4, 0xF96842A0, MetaFields, -1 };
+ static constexpr DB2Meta MetaInstance =
+ {
+ .FileDataId = 1294214,
+ .IndexField = -1,
+ .ParentIndexField = -1,
+ .FieldCount = 4,
+ .FileFieldCount = 4,
+ .LayoutHash = 0xF96842A0,
+ .Fields = MetaFields
+ };
static constexpr DB2FieldMeta Fields[7] =
{
@@ -51,16 +60,25 @@ struct GameobjectDisplayInfoLoadInfo
{
static constexpr DB2MetaField MetaFields[7] =
{
- { FT_STRING_NOT_LOCALIZED, 1, true },
- { FT_FLOAT, 6, true },
- { FT_INT, 1, true },
- { FT_SHORT, 1, true },
- { FT_FLOAT, 1, true },
- { FT_FLOAT, 1, true },
- { FT_SHORT, 1, false },
+ { .Type = FT_STRING_NOT_LOCALIZED, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_FLOAT, .ArraySize = 6, .IsSigned = true },
+ { .Type = FT_INT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_SHORT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_FLOAT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_FLOAT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_SHORT, .ArraySize = 1, .IsSigned = false },
};
- static constexpr DB2Meta MetaInstance{ 1266277, -1, 7, 7, 0x7C5F0B90, MetaFields, -1 };
+ static constexpr DB2Meta MetaInstance =
+ {
+ .FileDataId = 1266277,
+ .IndexField = -1,
+ .ParentIndexField = -1,
+ .FieldCount = 7,
+ .FileFieldCount = 7,
+ .LayoutHash = 0x7C5F0B90,
+ .Fields = MetaFields
+ };
static constexpr DB2FieldMeta Fields[13] =
{
@@ -86,16 +104,25 @@ struct LiquidMaterialLoadInfo
{
static constexpr DB2MetaField MetaFields[2] =
{
- { FT_BYTE, 1, true },
- { FT_BYTE, 1, true },
+ { .Type = FT_INT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_BYTE, .ArraySize = 1, .IsSigned = true },
};
- static constexpr DB2Meta MetaInstance{ 1132538, -1, 2, 2, 0x01033D2A, MetaFields, -1 };
+ static constexpr DB2Meta MetaInstance =
+ {
+ .FileDataId = 1132538,
+ .IndexField = -1,
+ .ParentIndexField = -1,
+ .FieldCount = 2,
+ .FileFieldCount = 2,
+ .LayoutHash = 0x98E5D7AA,
+ .Fields = MetaFields
+ };
static constexpr DB2FieldMeta Fields[3] =
{
{ false, FT_INT, "ID" },
- { true, FT_BYTE, "Flags" },
+ { true, FT_INT, "Flags" },
{ true, FT_BYTE, "LVF" },
};
@@ -106,14 +133,23 @@ struct LiquidObjectLoadInfo
{
static constexpr DB2MetaField MetaFields[5] =
{
- { FT_FLOAT, 1, true },
- { FT_FLOAT, 1, true },
- { FT_SHORT, 1, true },
- { FT_BYTE, 1, false },
- { FT_BYTE, 1, false },
+ { .Type = FT_FLOAT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_FLOAT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_SHORT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_BYTE, .ArraySize = 1, .IsSigned = false },
+ { .Type = FT_BYTE, .ArraySize = 1, .IsSigned = false },
};
- static constexpr DB2Meta MetaInstance{ 1308058, -1, 5, 5, 0xCB0D39E8, MetaFields, -1 };
+ static constexpr DB2Meta MetaInstance =
+ {
+ .FileDataId = 1308058,
+ .IndexField = -1,
+ .ParentIndexField = -1,
+ .FieldCount = 5,
+ .FileFieldCount = 5,
+ .LayoutHash = 0xCB0D39E8,
+ .Fields = MetaFields
+ };
static constexpr DB2FieldMeta Fields[6] =
{
@@ -125,37 +161,46 @@ struct LiquidObjectLoadInfo
{ false, FT_BYTE, "Reflection" },
};
- static constexpr DB2FileLoadInfo Instance{ Fields, 3, & MetaInstance };
+ static constexpr DB2FileLoadInfo Instance{ Fields, 6, &MetaInstance };
};
struct LiquidTypeLoadInfo
{
static constexpr DB2MetaField MetaFields[21] =
{
- { FT_STRING_NOT_LOCALIZED, 1, true },
- { FT_STRING_NOT_LOCALIZED, 6, true },
- { FT_SHORT, 1, false },
- { FT_BYTE, 1, false },
- { FT_INT, 1, false },
- { FT_INT, 1, false },
- { FT_FLOAT, 1, true },
- { FT_FLOAT, 1, true },
- { FT_FLOAT, 1, true },
- { FT_FLOAT, 1, true },
- { FT_SHORT, 1, false },
- { FT_FLOAT, 1, true },
- { FT_BYTE, 1, false },
- { FT_BYTE, 1, false },
- { FT_BYTE, 1, false },
- { FT_INT, 1, true },
- { FT_BYTE, 6, false },
- { FT_INT, 2, true },
- { FT_FLOAT, 18, true },
- { FT_INT, 4, false },
- { FT_FLOAT, 4, true },
+ { .Type = FT_STRING_NOT_LOCALIZED, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_STRING_NOT_LOCALIZED, .ArraySize = 6, .IsSigned = true },
+ { .Type = FT_INT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_BYTE, .ArraySize = 1, .IsSigned = false },
+ { .Type = FT_INT, .ArraySize = 1, .IsSigned = false },
+ { .Type = FT_INT, .ArraySize = 1, .IsSigned = false },
+ { .Type = FT_FLOAT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_FLOAT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_FLOAT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_FLOAT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_SHORT, .ArraySize = 1, .IsSigned = false },
+ { .Type = FT_FLOAT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_BYTE, .ArraySize = 1, .IsSigned = false },
+ { .Type = FT_BYTE, .ArraySize = 1, .IsSigned = false },
+ { .Type = FT_BYTE, .ArraySize = 1, .IsSigned = false },
+ { .Type = FT_INT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_BYTE, .ArraySize = 6, .IsSigned = false },
+ { .Type = FT_INT, .ArraySize = 2, .IsSigned = true },
+ { .Type = FT_FLOAT, .ArraySize = 18, .IsSigned = true },
+ { .Type = FT_INT, .ArraySize = 4, .IsSigned = false },
+ { .Type = FT_FLOAT, .ArraySize = 4, .IsSigned = true },
};
- static constexpr DB2Meta MetaInstance{ 1371380, -1, 21, 21, 0x95DB15B6, MetaFields, -1 };
+ static constexpr DB2Meta MetaInstance =
+ {
+ .FileDataId = 1371380,
+ .IndexField = -1,
+ .ParentIndexField = -1,
+ .FieldCount = 21,
+ .FileFieldCount = 21,
+ .LayoutHash = 0x4397CEE6,
+ .Fields = MetaFields
+ };
static constexpr DB2FieldMeta Fields[56] =
{
@@ -167,7 +212,7 @@ struct LiquidTypeLoadInfo
{ false, FT_STRING_NOT_LOCALIZED, "Texture4" },
{ false, FT_STRING_NOT_LOCALIZED, "Texture5" },
{ false, FT_STRING_NOT_LOCALIZED, "Texture6" },
- { false, FT_SHORT, "Flags" },
+ { true, FT_INT, "Flags" },
{ false, FT_BYTE, "SoundBank" },
{ false, FT_INT, "SoundID" },
{ false, FT_INT, "SpellID" },
@@ -224,32 +269,41 @@ struct MapLoadInfo
{
static constexpr DB2MetaField MetaFields[23] =
{
- { FT_STRING_NOT_LOCALIZED, 1, true },
- { FT_STRING, 1, true },
- { FT_STRING, 1, true },
- { FT_STRING, 1, true },
- { FT_STRING, 1, true },
- { FT_STRING, 1, true },
- { FT_BYTE, 1, false },
- { FT_BYTE, 1, true },
- { FT_BYTE, 1, false },
- { FT_SHORT, 1, false },
- { FT_SHORT, 1, true },
- { FT_SHORT, 1, true },
- { FT_SHORT, 1, true },
- { FT_SHORT, 1, true },
- { FT_BYTE, 1, false },
- { FT_FLOAT, 1, true },
- { FT_INT, 1, true },
- { FT_SHORT, 1, true },
- { FT_BYTE, 1, false },
- { FT_SHORT, 1, true },
- { FT_INT, 1, true },
- { FT_INT, 1, true },
- { FT_INT, 3, true },
+ { .Type = FT_STRING_NOT_LOCALIZED, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_STRING, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_STRING, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_STRING, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_STRING, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_STRING, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_BYTE, .ArraySize = 1, .IsSigned = false },
+ { .Type = FT_BYTE, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_BYTE, .ArraySize = 1, .IsSigned = false },
+ { .Type = FT_SHORT, .ArraySize = 1, .IsSigned = false },
+ { .Type = FT_SHORT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_SHORT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_SHORT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_SHORT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_BYTE, .ArraySize = 1, .IsSigned = false },
+ { .Type = FT_FLOAT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_INT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_SHORT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_BYTE, .ArraySize = 1, .IsSigned = false },
+ { .Type = FT_SHORT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_INT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_INT, .ArraySize = 1, .IsSigned = true },
+ { .Type = FT_INT, .ArraySize = 3, .IsSigned = true },
};
- static constexpr DB2Meta MetaInstance{ 1349477, -1, 23, 23, 0x32401DC5, MetaFields, -1 };
+ static constexpr DB2Meta MetaInstance =
+ {
+ .FileDataId = 1349477,
+ .IndexField = -1,
+ .ParentIndexField = -1,
+ .FieldCount = 23,
+ .FileFieldCount = 23,
+ .LayoutHash = 0x32401DC5,
+ .Fields = MetaFields
+ };
static constexpr DB2FieldMeta Fields[26] =
{
@@ -275,7 +329,7 @@ struct MapLoadInfo
{ false, FT_BYTE, "MaxPlayers" },
{ true, FT_SHORT, "WindSettingsID" },
{ true, FT_INT, "ZmpFileDataID" },
- { true, FT_INT, "Unknown1154" },
+ { true, FT_INT, "PreloadFileDataID" },
{ true, FT_INT, "Flags1" },
{ true, FT_INT, "Flags2" },
{ true, FT_INT, "Flags3" },
@@ -284,4 +338,4 @@ struct MapLoadInfo
static constexpr DB2FileLoadInfo Instance{ Fields, 26, &MetaInstance };
};
-#endif // ExtractorDB2LoadInfo_h__
+#endif // TRINITYCORE_EXTRACTOR_DB2_LOAD_INFO_H
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
index 42b37f1a431..27ec0ddd40d 100644
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -1334,6 +1334,8 @@ void ExtractGameTables()
DB2FileInfo GameTables[] =
{
{ 1391663, "BarberShopCostBase.txt" },
+ { 1391667, "ChallengeModeDamage.txt" },
+ { 1391668, "ChallengeModeHealth.txt" },
{ 3999262, "ChanceToMeleeCrit.txt" },
{ 3999263, "ChanceToMeleeCritBase.txt" },
{ 3999265, "ChanceToSpellCrit.txt" },