From 4c9f8de18e36c3dde3bd02c5105dbbb7daf43d45 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Sun, 24 Nov 2024 16:30:49 +1100 Subject: [PATCH] Fix export scripts latest updated add a row to Mods.dat which has no ModFamily entry --- src/Data/ModItem.lua | 4 + src/Data/TimelessJewelData/LegionPassives.lua | 270 +++++++++--------- src/Export/Scripts/enchant.lua | 6 +- src/Export/Scripts/mods.lua | 4 +- src/Export/spec.lua | 8 +- 5 files changed, 150 insertions(+), 142 deletions(-) diff --git a/src/Data/ModItem.lua b/src/Data/ModItem.lua index 21eb51b096..e001610501 100644 --- a/src/Data/ModItem.lua +++ b/src/Data/ModItem.lua @@ -663,6 +663,7 @@ return { ["LocalBaseEnergyShieldAndMana4"] = { type = "Prefix", affix = "Bishop's", "+(26-30) to maximum Energy Shield", "+(23-25) to maximum Mana", statOrderKey = "1419,1439", statOrder = { 1419, 1439 }, level = 78, group = "LocalBaseEnergyShieldAndMana", weightKey = { "shield", "boots", "gloves", "helmet", "int_armour", "str_int_armour", "dex_int_armour", "str_dex_int_armour", "default", }, weightVal = { 0, 0, 0, 0, 500, 250, 250, 166, 0 }, modTags = { "resource", "mana", "defences", "energy_shield" }, }, ["MovementVelocity1"] = { type = "Prefix", affix = "Runner's", "10% increased Movement Speed", statOrderKey = "1657", statOrder = { 1657 }, level = 1, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, }, ["MovementVelocity2"] = { type = "Prefix", affix = "Sprinter's", "15% increased Movement Speed", statOrderKey = "1657", statOrder = { 1657 }, level = 15, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, }, + ["MovementVelocity2Royale"] = { type = "Prefix", affix = "Sprinter's", "(15-25)% increased Movement Speed", statOrderKey = "1657", statOrder = { 1657 }, level = 5, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, }, ["MovementVelocity3"] = { type = "Prefix", affix = "Stallion's", "20% increased Movement Speed", statOrderKey = "1657", statOrder = { 1657 }, level = 30, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, }, ["MovementVelocity4"] = { type = "Prefix", affix = "Gazelle's", "25% increased Movement Speed", statOrderKey = "1657", statOrder = { 1657 }, level = 40, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, }, ["MovementVelocity5"] = { type = "Prefix", affix = "Cheetah's", "30% increased Movement Speed", statOrderKey = "1657", statOrder = { 1657 }, level = 55, group = "MovementVelocity", weightKey = { "boots", "default", }, weightVal = { 1000, 0 }, modTags = { "speed" }, }, @@ -826,6 +827,7 @@ return { ["ItemFoundRarityIncreasePrefix4_"] = { type = "Prefix", affix = "Perandus'", "(25-28)% increased Rarity of Items found", statOrderKey = "1456", statOrder = { 1456 }, level = 84, group = "ItemFoundRarityIncreasePrefix", weightKey = { "ring", "amulet", "default", }, weightVal = { 1000, 1000, 0 }, modTags = { "drop" }, }, ["IncreasedCastSpeed1"] = { type = "Suffix", affix = "of Talent", "(5-8)% increased Cast Speed", statOrderKey = "1308", statOrder = { 1308 }, level = 2, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "attack_dagger", "dagger", "sceptre", "ring", "amulet", "default", }, weightVal = { 1000, 0, 0, 1000, 1000, 800, 800, 0 }, modTags = { "caster", "speed" }, }, ["IncreasedCastSpeed2"] = { type = "Suffix", affix = "of Nimbleness", "(9-12)% increased Cast Speed", statOrderKey = "1308", statOrder = { 1308 }, level = 15, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "attack_dagger", "dagger", "sceptre", "ring", "amulet", "default", }, weightVal = { 1000, 0, 0, 1000, 1000, 800, 800, 0 }, modTags = { "caster", "speed" }, }, + ["IncreasedCastSpeed2Royale"] = { type = "Suffix", affix = "of Nimbleness", "(8-15)% increased Cast Speed", statOrderKey = "1308", statOrder = { 1308 }, level = 4, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "sceptre", "amulet", "focus", "str_int_shield", "dex_int_shield", "gloves", "default", }, weightVal = { 1000, 0, 1000, 800, 1000, 1000, 1000, 500, 0 }, modTags = { "caster", "speed" }, }, ["IncreasedCastSpeed3"] = { type = "Suffix", affix = "of Expertise", "(13-16)% increased Cast Speed", statOrderKey = "1308", statOrder = { 1308 }, level = 30, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "attack_dagger", "dagger", "sceptre", "ring", "amulet", "default", }, weightVal = { 1000, 0, 0, 1000, 1000, 800, 800, 0 }, modTags = { "caster", "speed" }, }, ["IncreasedCastSpeed4"] = { type = "Suffix", affix = "of Legerdemain", "(17-20)% increased Cast Speed", statOrderKey = "1308", statOrder = { 1308 }, level = 40, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "attack_dagger", "dagger", "sceptre", "amulet", "default", }, weightVal = { 1000, 0, 0, 1000, 1000, 800, 0 }, modTags = { "caster", "speed" }, }, ["IncreasedCastSpeed5"] = { type = "Suffix", affix = "of Prestidigitation", "(21-24)% increased Cast Speed", statOrderKey = "1308", statOrder = { 1308 }, level = 55, group = "IncreasedCastSpeed", weightKey = { "wand", "staff", "attack_dagger", "dagger", "sceptre", "default", }, weightVal = { 1000, 0, 0, 1000, 1000, 0 }, modTags = { "caster", "speed" }, }, @@ -847,6 +849,7 @@ return { ["IncreasedCastSpeedFishing"] = { type = "Suffix", affix = "of Casting", "(24-28)% increased Cast Speed", statOrderKey = "1308", statOrder = { 1308 }, level = 10, group = "IncreasedCastSpeedFishing", weightKey = { "fishing_rod", "default", }, weightVal = { 1000, 0 }, modTags = { "red_herring", "caster", "speed" }, }, ["LocalIncreasedAttackSpeed1"] = { type = "Suffix", affix = "of Skill", "(5-7)% increased Attack Speed", statOrderKey = "1276", statOrder = { 1276 }, level = 1, group = "LocalIncreasedAttackSpeed", weightKey = { "weapon", "default", }, weightVal = { 1000, 0 }, modTags = { "attack", "speed" }, }, ["LocalIncreasedAttackSpeed2"] = { type = "Suffix", affix = "of Ease", "(8-10)% increased Attack Speed", statOrderKey = "1276", statOrder = { 1276 }, level = 11, group = "LocalIncreasedAttackSpeed", weightKey = { "weapon", "default", }, weightVal = { 1000, 0 }, modTags = { "attack", "speed" }, }, + ["LocalIncreasedAttackSpeed2Royale____"] = { type = "Suffix", affix = "of Ease", "(15-25)% increased Attack Speed", statOrderKey = "1276", statOrder = { 1276 }, level = 4, group = "LocalIncreasedAttackSpeed", weightKey = { "weapon", "default", }, weightVal = { 1000, 0 }, modTags = { "attack", "speed" }, }, ["LocalIncreasedAttackSpeed3"] = { type = "Suffix", affix = "of Mastery", "(11-13)% increased Attack Speed", statOrderKey = "1276", statOrder = { 1276 }, level = 22, group = "LocalIncreasedAttackSpeed", weightKey = { "weapon", "default", }, weightVal = { 1000, 0 }, modTags = { "attack", "speed" }, }, ["LocalIncreasedAttackSpeed4"] = { type = "Suffix", affix = "of Renown", "(14-16)% increased Attack Speed", statOrderKey = "1276", statOrder = { 1276 }, level = 30, group = "LocalIncreasedAttackSpeed", weightKey = { "ranged", "weapon", "default", }, weightVal = { 500, 1000, 0 }, modTags = { "attack", "speed" }, }, ["LocalIncreasedAttackSpeed5"] = { type = "Suffix", affix = "of Acclaim", "(17-19)% increased Attack Speed", statOrderKey = "1276", statOrder = { 1276 }, level = 37, group = "LocalIncreasedAttackSpeed", weightKey = { "ranged", "weapon", "default", }, weightVal = { 500, 1000, 0 }, modTags = { "attack", "speed" }, }, @@ -862,6 +865,7 @@ return { ["LocalIncreasedAttackSpeedRangedEnhancedMod_"] = { type = "Suffix", affix = "of Tacati", "Adds (23-36) to (49-61) Chaos Damage", "(14-16)% increased Attack Speed", statOrderKey = "1253,1276", statOrder = { 1253, 1276 }, level = 1, group = "LocalIncreasedAttackSpeedAddedChaos", weightKey = { "default", }, weightVal = { 0 }, modTags = { "chaos_damage", "damage", "chaos", "attack", "speed" }, }, ["IncreasedAttackSpeed1"] = { type = "Suffix", affix = "of Skill", "(5-7)% increased Attack Speed", statOrderKey = "1273", statOrder = { 1273 }, level = 1, group = "IncreasedAttackSpeed", weightKey = { "ring", "gloves", "quiver", "dex_shield", "str_dex_shield", "dex_int_shield", "default", }, weightVal = { 500, 500, 500, 500, 500, 500, 0 }, modTags = { "attack", "speed" }, }, ["IncreasedAttackSpeed2"] = { type = "Suffix", affix = "of Ease", "(8-10)% increased Attack Speed", statOrderKey = "1273", statOrder = { 1273 }, level = 11, group = "IncreasedAttackSpeed", weightKey = { "gloves", "quiver", "dex_shield", "str_dex_shield", "dex_int_shield", "default", }, weightVal = { 500, 500, 500, 500, 500, 0 }, modTags = { "attack", "speed" }, }, + ["IncreasedAttackSpeed2Royale"] = { type = "Suffix", affix = "of Ease", "(8-15)% increased Attack Speed", statOrderKey = "1273", statOrder = { 1273 }, level = 4, group = "IncreasedAttackSpeed", weightKey = { "gloves", "quiver", "dex_shield", "str_dex_shield", "dex_int_shield", "default", }, weightVal = { 500, 500, 500, 500, 500, 0 }, modTags = { "attack", "speed" }, }, ["IncreasedAttackSpeed3"] = { type = "Suffix", affix = "of Mastery", "(11-13)% increased Attack Speed", statOrderKey = "1273", statOrder = { 1273 }, level = 22, group = "IncreasedAttackSpeed", weightKey = { "gloves", "quiver", "dex_shield", "str_dex_shield", "dex_int_shield", "default", }, weightVal = { 500, 500, 500, 500, 500, 0 }, modTags = { "attack", "speed" }, }, ["IncreasedAttackSpeed4"] = { type = "Suffix", affix = "of Grandmastery", "(14-16)% increased Attack Speed", statOrderKey = "1273", statOrder = { 1273 }, level = 76, group = "IncreasedAttackSpeed", weightKey = { "gloves", "quiver", "dex_shield", "str_dex_shield", "dex_int_shield", "default", }, weightVal = { 500, 500, 500, 500, 500, 0 }, modTags = { "attack", "speed" }, }, ["IncreasedAttackSpeedEssenceGloves7"] = { type = "Suffix", affix = "of the Essence", "(17-18)% increased Attack Speed", statOrderKey = "1273", statOrder = { 1273 }, level = 82, group = "IncreasedAttackSpeed", weightKey = { "default", }, weightVal = { 0 }, modTags = { "attack", "speed" }, }, diff --git a/src/Data/TimelessJewelData/LegionPassives.lua b/src/Data/TimelessJewelData/LegionPassives.lua index bbcb916e8c..c803d254e4 100644 --- a/src/Data/TimelessJewelData/LegionPassives.lua +++ b/src/Data/TimelessJewelData/LegionPassives.lua @@ -368,7 +368,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 79420, + ["oidx"] = 79440, ["g"] = 1000000000, }, [6] = { @@ -407,7 +407,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 69885, + ["oidx"] = 97049, ["g"] = 1000000000, }, [7] = { @@ -446,7 +446,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 59010, + ["oidx"] = 33869, ["g"] = 1000000000, }, [8] = { @@ -485,7 +485,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 75322, + ["oidx"] = 20074, ["g"] = 1000000000, }, [9] = { @@ -524,7 +524,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 8097, + ["oidx"] = 29349, ["g"] = 1000000000, }, [10] = { @@ -563,7 +563,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 66110, + ["oidx"] = 39254, ["g"] = 1000000000, }, [11] = { @@ -602,7 +602,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 33933, + ["oidx"] = 74833, ["g"] = 1000000000, }, [12] = { @@ -641,7 +641,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 73573, + ["oidx"] = 56253, ["g"] = 1000000000, }, [13] = { @@ -680,7 +680,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 42668, + ["oidx"] = 82715, ["g"] = 1000000000, }, [14] = { @@ -719,7 +719,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 56859, + ["oidx"] = 52436, ["g"] = 1000000000, }, [15] = { @@ -758,7 +758,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 11446, + ["oidx"] = 2468, ["g"] = 1000000000, }, [16] = { @@ -797,7 +797,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 5489, + ["oidx"] = 30208, ["g"] = 1000000000, }, [17] = { @@ -836,7 +836,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 97416, + ["oidx"] = 29546, ["g"] = 1000000000, }, [18] = { @@ -875,7 +875,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 70539, + ["oidx"] = 20764, ["g"] = 1000000000, }, [19] = { @@ -914,7 +914,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 17595, + ["oidx"] = 7170, ["g"] = 1000000000, }, [20] = { @@ -953,7 +953,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 97479, + ["oidx"] = 95734, ["g"] = 1000000000, }, [21] = { @@ -992,7 +992,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 27693, + ["oidx"] = 81354, ["g"] = 1000000000, }, [22] = { @@ -1031,7 +1031,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 35409, + ["oidx"] = 78304, ["g"] = 1000000000, }, [23] = { @@ -1070,7 +1070,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 47236, + ["oidx"] = 15373, ["g"] = 1000000000, }, [24] = { @@ -1109,7 +1109,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 67900, + ["oidx"] = 27792, ["g"] = 1000000000, }, [25] = { @@ -1148,7 +1148,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 57514, + ["oidx"] = 27192, ["g"] = 1000000000, }, [26] = { @@ -1187,7 +1187,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 79693, + ["oidx"] = 45680, ["g"] = 1000000000, }, [27] = { @@ -1226,7 +1226,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 45174, + ["oidx"] = 79160, ["g"] = 1000000000, }, [28] = { @@ -1265,7 +1265,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 18201, + ["oidx"] = 64617, ["g"] = 1000000000, }, [29] = { @@ -1304,7 +1304,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 65999, + ["oidx"] = 27124, ["g"] = 1000000000, }, [30] = { @@ -1343,7 +1343,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 21117, + ["oidx"] = 82620, ["g"] = 1000000000, }, [31] = { @@ -1382,7 +1382,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 59672, + ["oidx"] = 84022, ["g"] = 1000000000, }, [32] = { @@ -1421,7 +1421,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 14411, + ["oidx"] = 37694, ["g"] = 1000000000, }, [33] = { @@ -1460,7 +1460,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 82991, + ["oidx"] = 88895, ["g"] = 1000000000, }, [34] = { @@ -1499,7 +1499,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 58330, + ["oidx"] = 78681, ["g"] = 1000000000, }, [35] = { @@ -1538,7 +1538,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 2479, + ["oidx"] = 55867, ["g"] = 1000000000, }, [36] = { @@ -1577,7 +1577,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 83640, + ["oidx"] = 79194, ["g"] = 1000000000, }, [37] = { @@ -1616,7 +1616,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 4960, + ["oidx"] = 1855, ["g"] = 1000000000, }, [38] = { @@ -1655,7 +1655,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 82957, + ["oidx"] = 55548, ["g"] = 1000000000, }, [39] = { @@ -1694,7 +1694,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 62650, + ["oidx"] = 87796, ["g"] = 1000000000, }, [40] = { @@ -1733,7 +1733,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 82675, + ["oidx"] = 29714, ["g"] = 1000000000, }, [41] = { @@ -1772,7 +1772,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 18075, + ["oidx"] = 51555, ["g"] = 1000000000, }, [42] = { @@ -1811,7 +1811,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 25548, + ["oidx"] = 60518, ["g"] = 1000000000, }, [43] = { @@ -1859,7 +1859,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 92114, + ["oidx"] = 32845, ["g"] = 1000000000, }, [44] = { @@ -1907,7 +1907,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 31696, + ["oidx"] = 40214, ["g"] = 1000000000, }, [45] = { @@ -1955,7 +1955,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 7855, + ["oidx"] = 87392, ["g"] = 1000000000, }, [46] = { @@ -2003,7 +2003,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 35484, + ["oidx"] = 88901, ["g"] = 1000000000, }, [47] = { @@ -2051,7 +2051,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 92100, + ["oidx"] = 1088, ["g"] = 1000000000, }, [48] = { @@ -2099,7 +2099,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 2503, + ["oidx"] = 25300, ["g"] = 1000000000, }, [49] = { @@ -2147,7 +2147,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 67692, + ["oidx"] = 5536, ["g"] = 1000000000, }, [50] = { @@ -2195,7 +2195,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 74451, + ["oidx"] = 40288, ["g"] = 1000000000, }, [51] = { @@ -2243,7 +2243,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 55329, + ["oidx"] = 50505, ["g"] = 1000000000, }, [52] = { @@ -2291,7 +2291,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 11777, + ["oidx"] = 94233, ["g"] = 1000000000, }, [53] = { @@ -2339,7 +2339,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 13357, + ["oidx"] = 33401, ["g"] = 1000000000, }, [54] = { @@ -2387,7 +2387,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 3316, + ["oidx"] = 93327, ["g"] = 1000000000, }, [55] = { @@ -2435,7 +2435,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 49930, + ["oidx"] = 14140, ["g"] = 1000000000, }, [56] = { @@ -2483,7 +2483,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 68927, + ["oidx"] = 55075, ["g"] = 1000000000, }, [57] = { @@ -2531,7 +2531,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 50654, + ["oidx"] = 5174, ["g"] = 1000000000, }, [58] = { @@ -2579,7 +2579,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 85555, + ["oidx"] = 29868, ["g"] = 1000000000, }, [59] = { @@ -2627,7 +2627,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 13953, + ["oidx"] = 64578, ["g"] = 1000000000, }, [60] = { @@ -2675,7 +2675,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 29305, + ["oidx"] = 81826, ["g"] = 1000000000, }, [61] = { @@ -2723,7 +2723,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 87752, + ["oidx"] = 90899, ["g"] = 1000000000, }, [62] = { @@ -2771,7 +2771,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 76549, + ["oidx"] = 57536, ["g"] = 1000000000, }, [63] = { @@ -2819,7 +2819,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 69557, + ["oidx"] = 55389, ["g"] = 1000000000, }, [64] = { @@ -2867,7 +2867,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 64898, + ["oidx"] = 93616, ["g"] = 1000000000, }, [65] = { @@ -2915,7 +2915,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 83885, + ["oidx"] = 99322, ["g"] = 1000000000, }, [66] = { @@ -2963,7 +2963,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 1049, + ["oidx"] = 79942, ["g"] = 1000000000, }, [67] = { @@ -3011,7 +3011,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 5394, + ["oidx"] = 23145, ["g"] = 1000000000, }, [68] = { @@ -3059,7 +3059,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 76907, + ["oidx"] = 33128, ["g"] = 1000000000, }, [69] = { @@ -3107,7 +3107,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 40498, + ["oidx"] = 39249, ["g"] = 1000000000, }, [70] = { @@ -3155,7 +3155,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 95964, + ["oidx"] = 35273, ["g"] = 1000000000, }, [71] = { @@ -3203,7 +3203,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 98699, + ["oidx"] = 28021, ["g"] = 1000000000, }, [72] = { @@ -3251,7 +3251,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 38490, + ["oidx"] = 19644, ["g"] = 1000000000, }, [73] = { @@ -3299,7 +3299,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 29481, + ["oidx"] = 21331, ["g"] = 1000000000, }, [74] = { @@ -3347,7 +3347,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 27195, + ["oidx"] = 99442, ["g"] = 1000000000, }, [75] = { @@ -3395,7 +3395,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 88478, + ["oidx"] = 2420, ["g"] = 1000000000, }, [76] = { @@ -3443,7 +3443,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 95624, + ["oidx"] = 20860, ["g"] = 1000000000, }, [77] = { @@ -3473,7 +3473,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 59351, + ["oidx"] = 48261, ["g"] = 1000000000, }, [78] = { @@ -3503,7 +3503,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 75827, + ["oidx"] = 6017, ["g"] = 1000000000, }, [79] = { @@ -4028,7 +4028,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 6194, + ["oidx"] = 50410, ["g"] = 1000000000, }, [92] = { @@ -4067,7 +4067,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 36277, + ["oidx"] = 44196, ["g"] = 1000000000, }, [93] = { @@ -4106,7 +4106,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 64088, + ["oidx"] = 20341, ["g"] = 1000000000, }, [94] = { @@ -4145,7 +4145,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 94707, + ["oidx"] = 54200, ["g"] = 1000000000, }, [95] = { @@ -4184,7 +4184,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 74973, + ["oidx"] = 2450, ["g"] = 1000000000, }, [96] = { @@ -4223,7 +4223,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 10172, + ["oidx"] = 91756, ["g"] = 1000000000, }, [97] = { @@ -4262,7 +4262,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 17606, + ["oidx"] = 1205, ["g"] = 1000000000, }, [98] = { @@ -4301,7 +4301,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 5178, + ["oidx"] = 69797, ["g"] = 1000000000, }, [99] = { @@ -4340,7 +4340,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 22257, + ["oidx"] = 50579, ["g"] = 1000000000, }, [100] = { @@ -4379,7 +4379,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 14760, + ["oidx"] = 93563, ["g"] = 1000000000, }, [101] = { @@ -4418,7 +4418,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 42889, + ["oidx"] = 18807, ["g"] = 1000000000, }, [102] = { @@ -4457,7 +4457,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 60270, + ["oidx"] = 81217, ["g"] = 1000000000, }, [103] = { @@ -4496,7 +4496,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 27127, + ["oidx"] = 91332, ["g"] = 1000000000, }, [104] = { @@ -4535,7 +4535,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 82503, + ["oidx"] = 65329, ["g"] = 1000000000, }, [105] = { @@ -4574,7 +4574,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 28525, + ["oidx"] = 31284, ["g"] = 1000000000, }, [106] = { @@ -4766,7 +4766,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 20196, + ["oidx"] = 10883, ["g"] = 1000000000, }, [111] = { @@ -4805,7 +4805,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 14977, + ["oidx"] = 17069, ["g"] = 1000000000, }, [112] = { @@ -4844,7 +4844,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 76777, + ["oidx"] = 823, ["g"] = 1000000000, }, [113] = { @@ -4883,7 +4883,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 5183, + ["oidx"] = 84913, ["g"] = 1000000000, }, [114] = { @@ -4922,7 +4922,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 80316, + ["oidx"] = 21216, ["g"] = 1000000000, }, [115] = { @@ -4961,7 +4961,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 68905, + ["oidx"] = 27467, ["g"] = 1000000000, }, [116] = { @@ -5000,7 +5000,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 14480, + ["oidx"] = 4261, ["g"] = 1000000000, }, [117] = { @@ -5039,7 +5039,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 93682, + ["oidx"] = 72550, ["g"] = 1000000000, }, [118] = { @@ -5078,7 +5078,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 80835, + ["oidx"] = 37140, ["g"] = 1000000000, }, [119] = { @@ -5117,7 +5117,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 38654, + ["oidx"] = 66288, ["g"] = 1000000000, }, [120] = { @@ -5156,7 +5156,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 79623, + ["oidx"] = 64997, ["g"] = 1000000000, }, [121] = { @@ -5195,7 +5195,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 6774, + ["oidx"] = 41353, ["g"] = 1000000000, }, [122] = { @@ -5234,7 +5234,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 68329, + ["oidx"] = 67352, ["g"] = 1000000000, }, [123] = { @@ -5273,7 +5273,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 52806, + ["oidx"] = 57033, ["g"] = 1000000000, }, [124] = { @@ -5312,7 +5312,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 79878, + ["oidx"] = 4248, ["g"] = 1000000000, }, [125] = { @@ -5351,7 +5351,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 7265, + ["oidx"] = 67444, ["g"] = 1000000000, }, [126] = { @@ -5390,7 +5390,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 51502, + ["oidx"] = 7065, ["g"] = 1000000000, }, [127] = { @@ -5429,7 +5429,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 69709, + ["oidx"] = 69156, ["g"] = 1000000000, }, [128] = { @@ -5468,7 +5468,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 54984, + ["oidx"] = 95243, ["g"] = 1000000000, }, [129] = { @@ -5507,7 +5507,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 9731, + ["oidx"] = 11898, ["g"] = 1000000000, }, [130] = { @@ -5546,7 +5546,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 65124, + ["oidx"] = 56195, ["g"] = 1000000000, }, [131] = { @@ -5585,7 +5585,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 7309, + ["oidx"] = 21068, ["g"] = 1000000000, }, [132] = { @@ -5624,7 +5624,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 19927, + ["oidx"] = 59069, ["g"] = 1000000000, }, [133] = { @@ -5663,7 +5663,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 80563, + ["oidx"] = 78292, ["g"] = 1000000000, }, [134] = { @@ -5702,7 +5702,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 68382, + ["oidx"] = 28934, ["g"] = 1000000000, }, [135] = { @@ -5741,7 +5741,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 99311, + ["oidx"] = 11897, ["g"] = 1000000000, }, [136] = { @@ -5780,7 +5780,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 67225, + ["oidx"] = 31734, ["g"] = 1000000000, }, [137] = { @@ -5819,7 +5819,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 82524, + ["oidx"] = 65592, ["g"] = 1000000000, }, [138] = { @@ -5858,7 +5858,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 98014, + ["oidx"] = 67482, ["g"] = 1000000000, }, [139] = { @@ -5897,7 +5897,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 36656, + ["oidx"] = 9669, ["g"] = 1000000000, }, [140] = { @@ -5945,7 +5945,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 36158, + ["oidx"] = 47823, ["g"] = 1000000000, }, [141] = { @@ -5984,7 +5984,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 94297, + ["oidx"] = 74980, ["g"] = 1000000000, }, [142] = { @@ -6023,7 +6023,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 94732, + ["oidx"] = 10189, ["g"] = 1000000000, }, [143] = { @@ -6062,7 +6062,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 81833, + ["oidx"] = 27945, ["g"] = 1000000000, }, [144] = { @@ -6101,7 +6101,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 86198, + ["oidx"] = 47171, ["g"] = 1000000000, }, [145] = { @@ -6140,7 +6140,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 67997, + ["oidx"] = 1000, ["g"] = 1000000000, }, [146] = { @@ -6179,7 +6179,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 65414, + ["oidx"] = 29863, ["g"] = 1000000000, }, [147] = { @@ -6218,7 +6218,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 54300, + ["oidx"] = 38723, ["g"] = 1000000000, }, [148] = { @@ -6257,7 +6257,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 88577, + ["oidx"] = 56838, ["g"] = 1000000000, }, [149] = { @@ -6296,7 +6296,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 40681, + ["oidx"] = 60021, ["g"] = 1000000000, }, [150] = { @@ -6335,7 +6335,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 5337, + ["oidx"] = 55198, ["g"] = 1000000000, }, [151] = { @@ -6374,7 +6374,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 35290, + ["oidx"] = 32616, ["g"] = 1000000000, }, [152] = { @@ -6413,7 +6413,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 1685, + ["oidx"] = 49588, ["g"] = 1000000000, }, [153] = { @@ -6452,7 +6452,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 9588, + ["oidx"] = 41934, ["g"] = 1000000000, }, [154] = { @@ -6491,7 +6491,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 56816, + ["oidx"] = 22560, ["g"] = 1000000000, }, [155] = { @@ -6530,7 +6530,7 @@ return { ["ia"] = 0, ["spc"] = { }, - ["oidx"] = 66099, + ["oidx"] = 45308, ["g"] = 1000000000, }, }, diff --git a/src/Export/Scripts/enchant.lua b/src/Export/Scripts/enchant.lua index 7874fc308c..603416ee05 100644 --- a/src/Export/Scripts/enchant.lua +++ b/src/Export/Scripts/enchant.lua @@ -50,7 +50,7 @@ local sourceOrder = { "NORMAL", "CRUEL", "MERCILESS", "ENDGAME", "DEDICATION", " local function doLabEnchantment(fileName, group) local byDiff = { } for _, mod in ipairs(dat("Mods"):GetRowList("GenerationType", 10)) do - if mod.Family[1].Id == group and mod.SpawnWeights[1] > 0 then + if mod.Family[1] and mod.Family[1].Id == group and mod.SpawnWeights[1] > 0 then local stats, orders = describeMod(mod) local diff = lab[mod.Level] byDiff[diff] = byDiff[diff] or { } @@ -91,7 +91,7 @@ local function doOtherEnchantment(fileName, groupsList) end else for _, mod in ipairs(dat("Mods"):GetRowList("GenerationType", generation)) do - if groupsList[generation][mod.Family[1].Id] then + if mod.Family[1] and groupsList[generation][mod.Family[1].Id] then local stats, orders = describeMod(mod) local diff = groupsList[generation][mod.Family[1].Id] byDiff[diff] = byDiff[diff] or { } @@ -281,7 +281,7 @@ local skillMap = { local bySkill = { } for _, mod in ipairs(dat("Mods"):GetRowList("GenerationType", 10)) do - if mod.Family[1].Id == "SkillEnchantment" and mod.SpawnWeights[1] > 0 then + if mod.Family[1] and mod.Family[1].Id == "SkillEnchantment" and mod.SpawnWeights[1] > 0 then local stats = { mod.Stat1, mod.Stat2, mod.Stat3, mod.Stat4, mod.Stat5, mod.Stat6 } local skill for _, stat in pairs(stats) do diff --git a/src/Export/Scripts/mods.lua b/src/Export/Scripts/mods.lua index d789602ce0..6eee513d50 100644 --- a/src/Export/Scripts/mods.lua +++ b/src/Export/Scripts/mods.lua @@ -33,7 +33,7 @@ local function writeMods(outName, condFunc) print("[Jewel]: Skipping '" .. mod.Id .. "'") goto continue end - elseif mod.Family[1].Id ~= "AuraBonus" and mod.Family[1].Id ~= "ArbalestBonus" and mod.GenerationType == 3 and not (mod.Domain == 16 or (mod.Domain == 1 and mod.Id:match("^Synthesis"))) then + elseif mod.Family[1] and mod.Family[1].Id ~= "AuraBonus" and mod.Family[1].Id ~= "ArbalestBonus" and mod.GenerationType == 3 and not (mod.Domain == 16 or (mod.Domain == 1 and mod.Id:match("^Synthesis"))) then goto continue end local stats, orders = describeMod(mod) @@ -158,7 +158,7 @@ writeMods("../Data/ModJewelCharm.lua", function(mod) return (mod.Domain == 35) and (mod.GenerationType == 1 or mod.GenerationType == 2) end) writeMods("../Data/Uniques/Special/WatchersEye.lua", function(mod) - return (mod.Family[1].Id == "AuraBonus" or mod.Family[1].Id == "ArbalestBonus") and mod.GenerationType == 3 and not mod.Id:match("^Synthesis") + return mod.Family[1] and (mod.Family[1].Id == "AuraBonus" or mod.Family[1].Id == "ArbalestBonus") and mod.GenerationType == 3 and not mod.Id:match("^Synthesis") end) writeMods("../Data/ModVeiled.lua", function(mod) return mod.Domain == 28 and (mod.GenerationType == 1 or mod.GenerationType == 2) diff --git a/src/Export/spec.lua b/src/Export/spec.lua index 8bd07afb61..19313a4805 100644 --- a/src/Export/spec.lua +++ b/src/Export/spec.lua @@ -5650,6 +5650,8 @@ return { width=150 } }, + influencetypes={ + }, invasionmonstergroups={ }, invasionmonsterrestrictions={ @@ -6951,7 +6953,7 @@ return { list=false, name="Domain", refTo="ModDomains", - type="Enum", + type="Int", width=60 }, [10]={ @@ -6965,7 +6967,7 @@ return { list=false, name="GenerationType", refTo="ModGenerationType", - type="Enum", + type="Int", width=100 }, [12]={ @@ -9658,6 +9660,8 @@ return { }, passiveskilltreeuiart={ }, + passiveskilltypes={ + }, passivetreeexpansionjewels={ [1]={ list=false,