From 5f2af00520d8481e558e4e7e1ce2a3cf11b68758 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Sun, 1 Dec 2024 13:55:40 +1100 Subject: [PATCH] Use new datc64 files for export Changes the exporter to use the new datc64 files and the regular dat64 files be be deprecated at some point Fixes the spec for a number of tables that were changed to use the new UInt16 type --- src/Data/TimelessJewelData/LegionPassives.lua | 270 +++++++++--------- src/Export/Classes/Dat64File.lua | 6 +- src/Export/Classes/GGPKData.lua | 4 +- src/Export/Main.lua | 2 +- src/Export/Scripts/enums.lua | 4 +- src/Export/spec.lua | 28 +- 6 files changed, 164 insertions(+), 150 deletions(-) diff --git a/src/Data/TimelessJewelData/LegionPassives.lua b/src/Data/TimelessJewelData/LegionPassives.lua index c803d254e4..bbcb916e8c 100644 --- a/src/Data/TimelessJewelData/LegionPassives.lua +++ b/src/Data/TimelessJewelData/LegionPassives.lua @@ -368,7 +368,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 79440, + ["oidx"] = 79420, ["g"] = 1000000000, }, [6] = { @@ -407,7 +407,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 97049, + ["oidx"] = 69885, ["g"] = 1000000000, }, [7] = { @@ -446,7 +446,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 33869, + ["oidx"] = 59010, ["g"] = 1000000000, }, [8] = { @@ -485,7 +485,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 20074, + ["oidx"] = 75322, ["g"] = 1000000000, }, [9] = { @@ -524,7 +524,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 29349, + ["oidx"] = 8097, ["g"] = 1000000000, }, [10] = { @@ -563,7 +563,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 39254, + ["oidx"] = 66110, ["g"] = 1000000000, }, [11] = { @@ -602,7 +602,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 74833, + ["oidx"] = 33933, ["g"] = 1000000000, }, [12] = { @@ -641,7 +641,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 56253, + ["oidx"] = 73573, ["g"] = 1000000000, }, [13] = { @@ -680,7 +680,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 82715, + ["oidx"] = 42668, ["g"] = 1000000000, }, [14] = { @@ -719,7 +719,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 52436, + ["oidx"] = 56859, ["g"] = 1000000000, }, [15] = { @@ -758,7 +758,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 2468, + ["oidx"] = 11446, ["g"] = 1000000000, }, [16] = { @@ -797,7 +797,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 30208, + ["oidx"] = 5489, ["g"] = 1000000000, }, [17] = { @@ -836,7 +836,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 29546, + ["oidx"] = 97416, ["g"] = 1000000000, }, [18] = { @@ -875,7 +875,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 20764, + ["oidx"] = 70539, ["g"] = 1000000000, }, [19] = { @@ -914,7 +914,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 7170, + ["oidx"] = 17595, ["g"] = 1000000000, }, [20] = { @@ -953,7 +953,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 95734, + ["oidx"] = 97479, ["g"] = 1000000000, }, [21] = { @@ -992,7 +992,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 81354, + ["oidx"] = 27693, ["g"] = 1000000000, }, [22] = { @@ -1031,7 +1031,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 78304, + ["oidx"] = 35409, ["g"] = 1000000000, }, [23] = { @@ -1070,7 +1070,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 15373, + ["oidx"] = 47236, ["g"] = 1000000000, }, [24] = { @@ -1109,7 +1109,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 27792, + ["oidx"] = 67900, ["g"] = 1000000000, }, [25] = { @@ -1148,7 +1148,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 27192, + ["oidx"] = 57514, ["g"] = 1000000000, }, [26] = { @@ -1187,7 +1187,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 45680, + ["oidx"] = 79693, ["g"] = 1000000000, }, [27] = { @@ -1226,7 +1226,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 79160, + ["oidx"] = 45174, ["g"] = 1000000000, }, [28] = { @@ -1265,7 +1265,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 64617, + ["oidx"] = 18201, ["g"] = 1000000000, }, [29] = { @@ -1304,7 +1304,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 27124, + ["oidx"] = 65999, ["g"] = 1000000000, }, [30] = { @@ -1343,7 +1343,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 82620, + ["oidx"] = 21117, ["g"] = 1000000000, }, [31] = { @@ -1382,7 +1382,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 84022, + ["oidx"] = 59672, ["g"] = 1000000000, }, [32] = { @@ -1421,7 +1421,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 37694, + ["oidx"] = 14411, ["g"] = 1000000000, }, [33] = { @@ -1460,7 +1460,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 88895, + ["oidx"] = 82991, ["g"] = 1000000000, }, [34] = { @@ -1499,7 +1499,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 78681, + ["oidx"] = 58330, ["g"] = 1000000000, }, [35] = { @@ -1538,7 +1538,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 55867, + ["oidx"] = 2479, ["g"] = 1000000000, }, [36] = { @@ -1577,7 +1577,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 79194, + ["oidx"] = 83640, ["g"] = 1000000000, }, [37] = { @@ -1616,7 +1616,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 1855, + ["oidx"] = 4960, ["g"] = 1000000000, }, [38] = { @@ -1655,7 +1655,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 55548, + ["oidx"] = 82957, ["g"] = 1000000000, }, [39] = { @@ -1694,7 +1694,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 87796, + ["oidx"] = 62650, ["g"] = 1000000000, }, [40] = { @@ -1733,7 +1733,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 29714, + ["oidx"] = 82675, ["g"] = 1000000000, }, [41] = { @@ -1772,7 +1772,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 51555, + ["oidx"] = 18075, ["g"] = 1000000000, }, [42] = { @@ -1811,7 +1811,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 60518, + ["oidx"] = 25548, ["g"] = 1000000000, }, [43] = { @@ -1859,7 +1859,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 32845, + ["oidx"] = 92114, ["g"] = 1000000000, }, [44] = { @@ -1907,7 +1907,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 40214, + ["oidx"] = 31696, ["g"] = 1000000000, }, [45] = { @@ -1955,7 +1955,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 87392, + ["oidx"] = 7855, ["g"] = 1000000000, }, [46] = { @@ -2003,7 +2003,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 88901, + ["oidx"] = 35484, ["g"] = 1000000000, }, [47] = { @@ -2051,7 +2051,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 1088, + ["oidx"] = 92100, ["g"] = 1000000000, }, [48] = { @@ -2099,7 +2099,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 25300, + ["oidx"] = 2503, ["g"] = 1000000000, }, [49] = { @@ -2147,7 +2147,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 5536, + ["oidx"] = 67692, ["g"] = 1000000000, }, [50] = { @@ -2195,7 +2195,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 40288, + ["oidx"] = 74451, ["g"] = 1000000000, }, [51] = { @@ -2243,7 +2243,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 50505, + ["oidx"] = 55329, ["g"] = 1000000000, }, [52] = { @@ -2291,7 +2291,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 94233, + ["oidx"] = 11777, ["g"] = 1000000000, }, [53] = { @@ -2339,7 +2339,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 33401, + ["oidx"] = 13357, ["g"] = 1000000000, }, [54] = { @@ -2387,7 +2387,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 93327, + ["oidx"] = 3316, ["g"] = 1000000000, }, [55] = { @@ -2435,7 +2435,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 14140, + ["oidx"] = 49930, ["g"] = 1000000000, }, [56] = { @@ -2483,7 +2483,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 55075, + ["oidx"] = 68927, ["g"] = 1000000000, }, [57] = { @@ -2531,7 +2531,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 5174, + ["oidx"] = 50654, ["g"] = 1000000000, }, [58] = { @@ -2579,7 +2579,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 29868, + ["oidx"] = 85555, ["g"] = 1000000000, }, [59] = { @@ -2627,7 +2627,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 64578, + ["oidx"] = 13953, ["g"] = 1000000000, }, [60] = { @@ -2675,7 +2675,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 81826, + ["oidx"] = 29305, ["g"] = 1000000000, }, [61] = { @@ -2723,7 +2723,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 90899, + ["oidx"] = 87752, ["g"] = 1000000000, }, [62] = { @@ -2771,7 +2771,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 57536, + ["oidx"] = 76549, ["g"] = 1000000000, }, [63] = { @@ -2819,7 +2819,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 55389, + ["oidx"] = 69557, ["g"] = 1000000000, }, [64] = { @@ -2867,7 +2867,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 93616, + ["oidx"] = 64898, ["g"] = 1000000000, }, [65] = { @@ -2915,7 +2915,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 99322, + ["oidx"] = 83885, ["g"] = 1000000000, }, [66] = { @@ -2963,7 +2963,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 79942, + ["oidx"] = 1049, ["g"] = 1000000000, }, [67] = { @@ -3011,7 +3011,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 23145, + ["oidx"] = 5394, ["g"] = 1000000000, }, [68] = { @@ -3059,7 +3059,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 33128, + ["oidx"] = 76907, ["g"] = 1000000000, }, [69] = { @@ -3107,7 +3107,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 39249, + ["oidx"] = 40498, ["g"] = 1000000000, }, [70] = { @@ -3155,7 +3155,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 35273, + ["oidx"] = 95964, ["g"] = 1000000000, }, [71] = { @@ -3203,7 +3203,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 28021, + ["oidx"] = 98699, ["g"] = 1000000000, }, [72] = { @@ -3251,7 +3251,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 19644, + ["oidx"] = 38490, ["g"] = 1000000000, }, [73] = { @@ -3299,7 +3299,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 21331, + ["oidx"] = 29481, ["g"] = 1000000000, }, [74] = { @@ -3347,7 +3347,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 99442, + ["oidx"] = 27195, ["g"] = 1000000000, }, [75] = { @@ -3395,7 +3395,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 2420, + ["oidx"] = 88478, ["g"] = 1000000000, }, [76] = { @@ -3443,7 +3443,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 20860, + ["oidx"] = 95624, ["g"] = 1000000000, }, [77] = { @@ -3473,7 +3473,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 48261, + ["oidx"] = 59351, ["g"] = 1000000000, }, [78] = { @@ -3503,7 +3503,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 6017, + ["oidx"] = 75827, ["g"] = 1000000000, }, [79] = { @@ -4028,7 +4028,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 50410, + ["oidx"] = 6194, ["g"] = 1000000000, }, [92] = { @@ -4067,7 +4067,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 44196, + ["oidx"] = 36277, ["g"] = 1000000000, }, [93] = { @@ -4106,7 +4106,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 20341, + ["oidx"] = 64088, ["g"] = 1000000000, }, [94] = { @@ -4145,7 +4145,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 54200, + ["oidx"] = 94707, ["g"] = 1000000000, }, [95] = { @@ -4184,7 +4184,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 2450, + ["oidx"] = 74973, ["g"] = 1000000000, }, [96] = { @@ -4223,7 +4223,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 91756, + ["oidx"] = 10172, ["g"] = 1000000000, }, [97] = { @@ -4262,7 +4262,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 1205, + ["oidx"] = 17606, ["g"] = 1000000000, }, [98] = { @@ -4301,7 +4301,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 69797, + ["oidx"] = 5178, ["g"] = 1000000000, }, [99] = { @@ -4340,7 +4340,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 50579, + ["oidx"] = 22257, ["g"] = 1000000000, }, [100] = { @@ -4379,7 +4379,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 93563, + ["oidx"] = 14760, ["g"] = 1000000000, }, [101] = { @@ -4418,7 +4418,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 18807, + ["oidx"] = 42889, ["g"] = 1000000000, }, [102] = { @@ -4457,7 +4457,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 81217, + ["oidx"] = 60270, ["g"] = 1000000000, }, [103] = { @@ -4496,7 +4496,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 91332, + ["oidx"] = 27127, ["g"] = 1000000000, }, [104] = { @@ -4535,7 +4535,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 65329, + ["oidx"] = 82503, ["g"] = 1000000000, }, [105] = { @@ -4574,7 +4574,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 31284, + ["oidx"] = 28525, ["g"] = 1000000000, }, [106] = { @@ -4766,7 +4766,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 10883, + ["oidx"] = 20196, ["g"] = 1000000000, }, [111] = { @@ -4805,7 +4805,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 17069, + ["oidx"] = 14977, ["g"] = 1000000000, }, [112] = { @@ -4844,7 +4844,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 823, + ["oidx"] = 76777, ["g"] = 1000000000, }, [113] = { @@ -4883,7 +4883,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 84913, + ["oidx"] = 5183, ["g"] = 1000000000, }, [114] = { @@ -4922,7 +4922,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 21216, + ["oidx"] = 80316, ["g"] = 1000000000, }, [115] = { @@ -4961,7 +4961,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 27467, + ["oidx"] = 68905, ["g"] = 1000000000, }, [116] = { @@ -5000,7 +5000,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 4261, + ["oidx"] = 14480, ["g"] = 1000000000, }, [117] = { @@ -5039,7 +5039,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 72550, + ["oidx"] = 93682, ["g"] = 1000000000, }, [118] = { @@ -5078,7 +5078,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 37140, + ["oidx"] = 80835, ["g"] = 1000000000, }, [119] = { @@ -5117,7 +5117,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 66288, + ["oidx"] = 38654, ["g"] = 1000000000, }, [120] = { @@ -5156,7 +5156,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 64997, + ["oidx"] = 79623, ["g"] = 1000000000, }, [121] = { @@ -5195,7 +5195,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 41353, + ["oidx"] = 6774, ["g"] = 1000000000, }, [122] = { @@ -5234,7 +5234,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 67352, + ["oidx"] = 68329, ["g"] = 1000000000, }, [123] = { @@ -5273,7 +5273,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 57033, + ["oidx"] = 52806, ["g"] = 1000000000, }, [124] = { @@ -5312,7 +5312,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 4248, + ["oidx"] = 79878, ["g"] = 1000000000, }, [125] = { @@ -5351,7 +5351,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 67444, + ["oidx"] = 7265, ["g"] = 1000000000, }, [126] = { @@ -5390,7 +5390,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 7065, + ["oidx"] = 51502, ["g"] = 1000000000, }, [127] = { @@ -5429,7 +5429,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 69156, + ["oidx"] = 69709, ["g"] = 1000000000, }, [128] = { @@ -5468,7 +5468,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 95243, + ["oidx"] = 54984, ["g"] = 1000000000, }, [129] = { @@ -5507,7 +5507,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 11898, + ["oidx"] = 9731, ["g"] = 1000000000, }, [130] = { @@ -5546,7 +5546,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 56195, + ["oidx"] = 65124, ["g"] = 1000000000, }, [131] = { @@ -5585,7 +5585,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 21068, + ["oidx"] = 7309, ["g"] = 1000000000, }, [132] = { @@ -5624,7 +5624,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 59069, + ["oidx"] = 19927, ["g"] = 1000000000, }, [133] = { @@ -5663,7 +5663,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 78292, + ["oidx"] = 80563, ["g"] = 1000000000, }, [134] = { @@ -5702,7 +5702,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 28934, + ["oidx"] = 68382, ["g"] = 1000000000, }, [135] = { @@ -5741,7 +5741,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 11897, + ["oidx"] = 99311, ["g"] = 1000000000, }, [136] = { @@ -5780,7 +5780,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 31734, + ["oidx"] = 67225, ["g"] = 1000000000, }, [137] = { @@ -5819,7 +5819,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 65592, + ["oidx"] = 82524, ["g"] = 1000000000, }, [138] = { @@ -5858,7 +5858,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 67482, + ["oidx"] = 98014, ["g"] = 1000000000, }, [139] = { @@ -5897,7 +5897,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 9669, + ["oidx"] = 36656, ["g"] = 1000000000, }, [140] = { @@ -5945,7 +5945,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 47823, + ["oidx"] = 36158, ["g"] = 1000000000, }, [141] = { @@ -5984,7 +5984,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 74980, + ["oidx"] = 94297, ["g"] = 1000000000, }, [142] = { @@ -6023,7 +6023,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 10189, + ["oidx"] = 94732, ["g"] = 1000000000, }, [143] = { @@ -6062,7 +6062,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 27945, + ["oidx"] = 81833, ["g"] = 1000000000, }, [144] = { @@ -6101,7 +6101,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 47171, + ["oidx"] = 86198, ["g"] = 1000000000, }, [145] = { @@ -6140,7 +6140,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 1000, + ["oidx"] = 67997, ["g"] = 1000000000, }, [146] = { @@ -6179,7 +6179,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 29863, + ["oidx"] = 65414, ["g"] = 1000000000, }, [147] = { @@ -6218,7 +6218,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 38723, + ["oidx"] = 54300, ["g"] = 1000000000, }, [148] = { @@ -6257,7 +6257,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 56838, + ["oidx"] = 88577, ["g"] = 1000000000, }, [149] = { @@ -6296,7 +6296,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 60021, + ["oidx"] = 40681, ["g"] = 1000000000, }, [150] = { @@ -6335,7 +6335,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 55198, + ["oidx"] = 5337, ["g"] = 1000000000, }, [151] = { @@ -6374,7 +6374,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 32616, + ["oidx"] = 35290, ["g"] = 1000000000, }, [152] = { @@ -6413,7 +6413,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 49588, + ["oidx"] = 1685, ["g"] = 1000000000, }, [153] = { @@ -6452,7 +6452,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 41934, + ["oidx"] = 9588, ["g"] = 1000000000, }, [154] = { @@ -6491,7 +6491,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 22560, + ["oidx"] = 56816, ["g"] = 1000000000, }, [155] = { @@ -6530,7 +6530,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 45308, + ["oidx"] = 66099, ["g"] = 1000000000, }, }, diff --git a/src/Export/Classes/Dat64File.lua b/src/Export/Classes/Dat64File.lua index 927b2a8963..5ee4992089 100644 --- a/src/Export/Classes/Dat64File.lua +++ b/src/Export/Classes/Dat64File.lua @@ -100,7 +100,7 @@ local Dat64FileClass = newClass("Dat64File", function(self, name, raw) local colMeta = { __index = function(t, key) local colIndex = self.colMap[key] if not colIndex then - error("Unknown key "..key.." for "..self.name..".dat64") + error("Unknown key "..key.." for "..self.name..".datc64") end t[key] = self:ReadCell(t._rowIndex, colIndex) return rawget(t, key) @@ -155,7 +155,7 @@ end function Dat64FileClass:GetRow(key, value) local keyIndex = self.colMap[key] if not keyIndex then - error("Unknown key "..key.." for "..self.name..".dat64") + error("Unknown key "..key.." for "..self.name..".datc64") end if not self.indexes[key] then self.indexes[key] = { } @@ -187,7 +187,7 @@ end function Dat64FileClass:GetRowList(key, value, match) local keyIndex = self.colMap[key] if not keyIndex then - error("Unknown key "..key.." for "..self.name..".dat64") + error("Unknown key "..key.." for "..self.name..".datc64") end local isList = self.spec[keyIndex].list if not self.indexes[key] then diff --git a/src/Export/Classes/GGPKData.lua b/src/Export/Classes/GGPKData.lua index d571dcc975..b326e375a6 100644 --- a/src/Export/Classes/GGPKData.lua +++ b/src/Export/Classes/GGPKData.lua @@ -69,7 +69,7 @@ function GGPKClass:ExtractFiles() local fileList = '' for _, fname in ipairs(datList) do if USE_DAT64 then - fileList = fileList .. '"' .. fname .. '64" ' + fileList = fileList .. '"' .. fname .. 'c64" ' else fileList = fileList .. '"' .. fname .. '" ' end @@ -123,7 +123,7 @@ function GGPKClass:AddDatFiles() end function GGPKClass:AddDat64Files() - local datFiles = scanDir(self.oozPath .. "Data\\", '%w+%.dat64$') + local datFiles = scanDir(self.oozPath .. "Data\\", '%w+%.datc64$') for _, f in ipairs(datFiles) do local record = { } record.name = f diff --git a/src/Export/Main.lua b/src/Export/Main.lua index 61e652c1ff..ec2e0c553e 100644 --- a/src/Export/Main.lua +++ b/src/Export/Main.lua @@ -460,7 +460,7 @@ function main:LoadDat64Files() ConPrintf("DAT64 find: %d ms", GetTime() - now) now = GetTime() end - local datFile = new("Dat64File", record.name:gsub("%.dat64$",""), record.data) + local datFile = new("Dat64File", record.name:gsub("%.datc64$",""), record.data) t_insert(self.datFileList, datFile) self.datFileByName[datFile.name] = datFile end diff --git a/src/Export/Scripts/enums.lua b/src/Export/Scripts/enums.lua index 9ba27487d7..9326450c1c 100644 --- a/src/Export/Scripts/enums.lua +++ b/src/Export/Scripts/enums.lua @@ -59,11 +59,11 @@ local influenceTypes = { "None" } -writeEnum("influenceTypes.dat64", influenceTypes) +writeEnum("influenceTypes.datc64", influenceTypes) -- passive Skills types local passiveSkillTypes = { "Passive Tree", "Atlas Tree" } -writeEnum("passiveSkillTypes.dat64", passiveSkillTypes) +writeEnum("passiveSkillTypes.datc64", passiveSkillTypes) diff --git a/src/Export/spec.lua b/src/Export/spec.lua index 19313a4805..422cbc8d50 100644 --- a/src/Export/spec.lua +++ b/src/Export/spec.lua @@ -103,7 +103,7 @@ return { list=false, name="", refTo="", - type="Int", + type="UInt16", width=150 }, [3]={ @@ -801,7 +801,7 @@ return { list=false, name="HASH16", refTo="", - type="Int", + type="UInt16", width=80 }, [9]={ @@ -1716,7 +1716,7 @@ return { list=false, name="HASH32", refTo="", - type="Int", + type="UInt", width=100 }, [17]={ @@ -1837,6 +1837,13 @@ return { refTo="", type="Bool", width=50 + }, + [34]={ + list=false, + name="", + refTo="", + type="Key", + width=150 } }, battlepasses={ @@ -2990,7 +2997,7 @@ return { list=false, name="HASH32", refTo="", - type="Int", + type="UInt", width=150 }, [6]={ @@ -6091,7 +6098,7 @@ return { list=false, name="Hash", refTo="", - type="Int", + type="UInt16", width=70 }, [6]={ @@ -8239,7 +8246,7 @@ return { list=false, name="Hash", refTo="", - type="Int", + type="UInt16", width=50 }, [55]={ @@ -9045,7 +9052,7 @@ return { list=false, name="Hash", refTo="", - type="Int", + type="UInt16", width=80 }, [3]={ @@ -9082,6 +9089,13 @@ return { refTo="AchievementItems", type="Key", width=150 + }, + [8]={ + list=false, + name="", + refTo="", + type="Key", + width=150 } }, passiveskillmasterygroups={