From 7334327ef14e28331324f72ac68562d4566c11f8 Mon Sep 17 00:00:00 2001 From: Blitz54 Date: Fri, 25 Apr 2025 12:09:34 -0500 Subject: [PATCH 1/3] Some Spec.lua changes --- src/Export/Classes/GGPKData.lua | 1 + src/Export/spec.lua | 286 ++++++++++++++++++++++++++++++-- 2 files changed, 274 insertions(+), 13 deletions(-) diff --git a/src/Export/Classes/GGPKData.lua b/src/Export/Classes/GGPKData.lua index df4c31ede..0e09aced2 100644 --- a/src/Export/Classes/GGPKData.lua +++ b/src/Export/Classes/GGPKData.lua @@ -304,6 +304,7 @@ function GGPKClass:GetNeededFiles() "Data/PassiveNodeUIArtOverride.dat", "Data/PlayerMinionIntrinsicStats.dat", "Data/MonsterCategories.dat", + "Data/BeltTypes.dat", } local csdFiles = { "^Metadata/StatDescriptions/specific_skill_stat_descriptions/\\w+.csd$", diff --git a/src/Export/spec.lua b/src/Export/spec.lua index 30891ab8a..5d32f931e 100644 --- a/src/Export/spec.lua +++ b/src/Export/spec.lua @@ -1020,11 +1020,27 @@ return { }, alternateskilltargetingbehaviours={ [1]={ + enumBase=0, list=false, name="Id", refTo="", type="String", width=270 + }, + [2]={ + list=false, + name="", + refTo="", + type="Int", + width=60 + }, + [3]={ + enumBase=0, + list=false, + name="ClientStrings", + refTo="ClientStrings", + type="Key", + width=220 } }, alternatetreeart={ @@ -1428,6 +1444,7 @@ return { width=50 }, [3]={ + enumBase=0, list=true, name="Class", refTo="Characters", @@ -1757,6 +1774,7 @@ return { width=560 }, [2]={ + enumBase=0, list=false, name="ItemClass", refTo="ItemClasses", @@ -1982,6 +2000,22 @@ return { }, battlepasstracks={ }, + belttypes={ + [1]={ + list=false, + name="Id", + refTo="BaseItemTypes", + type="Key", + width=210 + }, + [2]={ + list=false, + name="", + refTo="", + type="Int", + width=150 + } + }, bestiarycapturablemonsters={ }, bestiaryencounters={ @@ -4574,7 +4608,42 @@ return { name="Id", refTo="", type="String", - width=280 + width=290 + }, + [2]={ + list=false, + name="", + refTo="", + type="Int", + width=70 + }, + [3]={ + list=true, + name="", + refTo="", + type="Int", + width=80 + }, + [4]={ + list=false, + name="UnlockType", + refTo="", + type="String", + width=150 + }, + [5]={ + list=true, + name="", + refTo="", + type="Int", + width=150 + }, + [6]={ + list=false, + name="ObtainedFrom", + refTo="", + type="String", + width=150 } }, craftingitemclasscategories={ @@ -5290,25 +5359,26 @@ return { }, essences={ [1]={ + enumBase=0, list=false, name="BaseItemType", refTo="BaseItemTypes", type="Key", - width=350 + width=370 }, [2]={ list=false, name="HASH32", refTo="", type="UInt", - width=150 + width=100 }, [3]={ list=false, name="Unknown2", refTo="", type="Int", - width=150 + width=60 }, [4]={ enumBase=0, @@ -5323,14 +5393,14 @@ return { name="Unknown4", refTo="", type="Int", - width=120 + width=60 }, [6]={ list=false, name="", refTo="", type="Int", - width=150 + width=70 }, [7]={ list=false, @@ -5344,14 +5414,57 @@ return { name="", refTo="", type="Bool", - width=150 + width=80 }, [9]={ + list=false, + name="ModTag", + refTo="Tags", + type="Key", + width=90 + }, + [10]={ + enumBase=0, + list=false, + name="", + refTo="", + type="ShortKey", + width=50 + }, + [11]={ + list=false, + name="EssenceTier", + refTo="", + type="Int", + width=80 + }, + [12]={ list=false, name="", - refTo="Mod", + refTo="", + type="Key", + width=90 + }, + [13]={ + list=false, + name="CraftedMod", + refTo="Mods", type="Key", width=150 + }, + [14]={ + list=true, + name="ItemClasses", + refTo="ItemClasses", + type="Key", + width=150 + }, + [15]={ + list=false, + name="", + refTo="", + type="Int", + width=150 } }, essencestashtablayout={ @@ -10647,10 +10760,129 @@ return { npcs={ [1]={ list=false, - name="", + name="Id", refTo="", type="String", width=360 + }, + [2]={ + list=false, + name="Name", + refTo="", + type="String", + width=150 + }, + [3]={ + list=false, + name="MetaData", + refTo="", + type="String", + width=150 + }, + [4]={ + list=false, + name="", + refTo="", + type="Key", + width=150 + }, + [5]={ + list=false, + name="", + refTo="NPCMaster", + type="Key", + width=150 + }, + [6]={ + list=false, + name="ShortName", + refTo="", + type="String", + width=150 + }, + [7]={ + list=false, + name="", + refTo="", + type="Int", + width=150 + }, + [8]={ + list=true, + name="NPCAudios1", + refTo="NPCAudio", + type="Key", + width=150 + }, + [9]={ + list=true, + name="NPCAudios2", + refTo="NPCAudio", + type="Key", + width=150 + }, + [10]={ + list=false, + name="HASH16", + refTo="", + type="UInt16", + width=150 + }, + [11]={ + list=false, + name="Model?", + refTo="npcs", + type="ShortKey", + width=230 + }, + [12]={ + list=false, + name="", + refTo="", + type="Key", + width=100 + }, + [13]={ + list=false, + name="", + refTo="", + type="Key", + width=100 + }, + [14]={ + list=false, + name="", + refTo="", + type="Key", + width=100 + }, + [15]={ + list=false, + name="Gender", + refTo="", + type="String", + width=150 + }, + [16]={ + list=false, + name="", + refTo="", + type="Bool", + width=100 + }, + [17]={ + list=false, + name="", + refTo="", + type="String", + width=150 + }, + [18]={ + list=false, + name="", + refTo="", + type="Key", + width=150 } }, npcshop={ @@ -12352,6 +12584,34 @@ return { } }, playertradewhisperformats={ + [1]={ + list=false, + name="Id", + refTo="", + type="String", + width=170 + }, + [2]={ + list=false, + name="Whisper", + refTo="", + type="String", + width=150 + }, + [3]={ + list=false, + name="InStash", + refTo="", + type="Bool", + width=150 + }, + [4]={ + list=false, + name="IsPriced", + refTo="", + type="Bool", + width=150 + } }, portalaudio={ }, @@ -13131,7 +13391,7 @@ return { }, [7]={ list=false, - name="", + name="AscendancyPointsRewarded", refTo="", type="Int", width=150 @@ -13145,7 +13405,7 @@ return { }, [9]={ list=false, - name="", + name="WeaponSetPointsRewarded", refTo="", type="Int", width=150 @@ -15353,14 +15613,14 @@ return { }, [2]={ list=false, - name="", + name="DetonationType", refTo="", type="Int", width=100 }, [3]={ list=false, - name="", + name="ThrowTime", refTo="", type="Int", width=100 From ee9687d07d878e066935bd9d8d0a97af1eef2bd4 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Thu, 1 May 2025 21:18:22 +1000 Subject: [PATCH 2/3] Fix spec Fixed the essences table and removed the random enum values in there --- src/Export/spec.lua | 100 +++++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 48 deletions(-) diff --git a/src/Export/spec.lua b/src/Export/spec.lua index 5d32f931e..35ec302e3 100644 --- a/src/Export/spec.lua +++ b/src/Export/spec.lua @@ -1020,7 +1020,6 @@ return { }, alternateskilltargetingbehaviours={ [1]={ - enumBase=0, list=false, name="Id", refTo="", @@ -1035,12 +1034,39 @@ return { width=60 }, [3]={ - enumBase=0, list=false, name="ClientStrings", refTo="ClientStrings", type="Key", width=220 + }, + [4]={ + list=false, + name="", + refTo="", + type="Int", + width=50 + }, + [5]={ + list=false, + name="", + refTo="", + type="Int", + width=50 + }, + [6]={ + list=false, + name="", + refTo="", + type="Int", + width=50 + }, + [7]={ + list=true, + name="", + refTo="", + type="Int", + width=50 } }, alternatetreeart={ @@ -1444,7 +1470,6 @@ return { width=50 }, [3]={ - enumBase=0, list=true, name="Class", refTo="Characters", @@ -1774,7 +1799,6 @@ return { width=560 }, [2]={ - enumBase=0, list=false, name="ItemClass", refTo="ItemClasses", @@ -2000,22 +2024,6 @@ return { }, battlepasstracks={ }, - belttypes={ - [1]={ - list=false, - name="Id", - refTo="BaseItemTypes", - type="Key", - width=210 - }, - [2]={ - list=false, - name="", - refTo="", - type="Int", - width=150 - } - }, bestiarycapturablemonsters={ }, bestiaryencounters={ @@ -4866,7 +4874,6 @@ return { width=100 }, [17]={ - enumBase=0, list=false, name="CannotBlockFlag", refTo="Stats", @@ -5359,7 +5366,6 @@ return { }, essences={ [1]={ - enumBase=0, list=false, name="BaseItemType", refTo="BaseItemTypes", @@ -5375,25 +5381,24 @@ return { }, [3]={ list=false, - name="Unknown2", + name="", refTo="", type="Int", - width=60 + width=50 }, [4]={ - enumBase=0, list=false, - name="Unknown3", + name="", refTo="", - type="Key", - width=110 + type="Int", + width=50 }, [5]={ - list=false, - name="Unknown4", - refTo="", - type="Int", - width=60 + list=true, + name="MonsterMod1", + refTo="Mods", + type="Key", + width=250 }, [6]={ list=false, @@ -5404,7 +5409,7 @@ return { }, [7]={ list=false, - name="Mod", + name="MonsterMod2", refTo="Mods", type="Key", width=260 @@ -5421,15 +5426,14 @@ return { name="ModTag", refTo="Tags", type="Key", - width=90 + width=70 }, [10]={ - enumBase=0, list=false, - name="", - refTo="", + name="GreaterVariant", + refTo="Essences", type="ShortKey", - width=50 + width=250 }, [11]={ list=false, @@ -5440,10 +5444,10 @@ return { }, [12]={ list=false, - name="", - refTo="", + name="MapMod", + refTo="Stats", type="Key", - width=90 + width=250 }, [13]={ list=false, @@ -5464,7 +5468,7 @@ return { name="", refTo="", type="Int", - width=150 + width=40 } }, essencestashtablayout={ @@ -13352,21 +13356,21 @@ return { name="QuestFlag", refTo="questflags", type="Key", - width=270 + width=250 }, [2]={ list=false, name="Acts", refTo="", type="Int", - width=150 + width=50 }, [3]={ list=false, name="WeaponPassives", refTo="", type="Int", - width=150 + width=100 }, [4]={ list=true, @@ -13398,7 +13402,7 @@ return { }, [8]={ list=false, - name="", + name="ClientString", refTo="clientstrings", type="Key", width=250 @@ -13415,7 +13419,7 @@ return { name="", refTo="", type="Bool", - width=150 + width=50 } }, questtrackergroup={ From 872eb9c2e6dc554d2022bc86d5bb8c0f31a02147 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Thu, 1 May 2025 21:19:04 +1000 Subject: [PATCH 3/3] Remove belttype dat as it no longer exists --- src/Export/Classes/GGPKData.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Export/Classes/GGPKData.lua b/src/Export/Classes/GGPKData.lua index 0e09aced2..df4c31ede 100644 --- a/src/Export/Classes/GGPKData.lua +++ b/src/Export/Classes/GGPKData.lua @@ -304,7 +304,6 @@ function GGPKClass:GetNeededFiles() "Data/PassiveNodeUIArtOverride.dat", "Data/PlayerMinionIntrinsicStats.dat", "Data/MonsterCategories.dat", - "Data/BeltTypes.dat", } local csdFiles = { "^Metadata/StatDescriptions/specific_skill_stat_descriptions/\\w+.csd$",