From a48f2736e2ca3e3c174b2d917ae4d0a68360e8e4 Mon Sep 17 00:00:00 2001
From: Judd <ipajudd@gmail.com>
Date: Tue, 13 Oct 2026 11:55:41 -0700
Subject: [PATCH] Fix two tables that did not read and correct key targets in
 eight more

PoE 1 MapDeviceLayouts and PoE 2 ExpeditionDeals read offsets that were never
written. MapDeviceLayouts has a bool, an i32 and a list of i32 where the schema
had i32, string, bool, i32, i32. ExpeditionDeals has one key to SoundEffects
where the schema had a string and two i32. PoE 1 calls the same key NPCShop,
but it reads UseOrb on 81 deals and Sharpening on set_quality.

Two targets from #249 were wrong. AfflictionQuestFogBankValues points at
EndgameMapAtlas: its keys are the 20 AtlasLeagueDeliriumInnerNode rows.
CharacterStartStates.SupportGems holds attribute passives that are also in the
row's PassiveSkillsKeys, and the list after it names the attribute chosen for
each. The two untargeted lists before them hold passives as well.

QuestAchievements.QuestStates is a list of QuestFlags keys in both games. In
PoE 2, NPCTalk.Music1 and Music2 are WorldAreas, MapDeviceRecipes.WorldArea is
a list, and the first unnamed columns of WeaponImpactSoundData and
RecombinableClasses are keys to WeaponSoundTypes and BaseItemTypes.

Checked against PoE 2 0.5.5.4.2 and PoE 1 3.29.3.3.
---
 dat-schema/3_15_Expedition.gql |  2 +-
 dat-schema/_Core.gql           |  6 ++----
 dat-schema/poe2/_Core.gql      | 36 +++++++++++++---------------------
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/dat-schema/3_15_Expedition.gql b/dat-schema/3_15_Expedition.gql
index ce421c9..2cf3d13 100644
--- a/dat-schema/3_15_Expedition.gql
+++ b/dat-schema/3_15_Expedition.gql
@@ -46,7 +46,7 @@ type ExpeditionDeals {
   TextAudio: NPCTextAudio
   Description: string @localized
   BuyAchievements: [AchievementItems]
-  NPCShop: NPCShop
+  SoundEffect: SoundEffects
   DealFamily: ExpeditionDealFamilies
 }
 
diff --git a/dat-schema/_Core.gql b/dat-schema/_Core.gql
index 23f43ef..caccaba 100644
--- a/dat-schema/_Core.gql
+++ b/dat-schema/_Core.gql
@@ -2941,11 +2941,9 @@ type MapDeviceLayouts {
   _: [f32]
   _: [f32]
   MapKey: MapKeys
-  _: i32
-  _: string
   _: bool
   _: i32
-  _: i32
+  _: [i32]
   _: [i32]
   _: i32
 }
@@ -4940,7 +4938,7 @@ type Quest {
 
 type QuestAchievements {
   Id: string @unique
-  QuestStates: [i32]
+  QuestFlags: [QuestFlags]
   _: [i32]
   AchievementItems: [AchievementItems]
   NPCs: [NPCs]
diff --git a/dat-schema/poe2/_Core.gql b/dat-schema/poe2/_Core.gql
index 341b75f..d3fad40 100644
--- a/dat-schema/poe2/_Core.gql
+++ b/dat-schema/poe2/_Core.gql
@@ -267,13 +267,13 @@ type AfflictionEmotionCraftingAudio {
 
 # Added 0.5
 type AfflictionQuestFogBankValues {
-  _: NPCs
-  _: [NPCs]
+  _: EndgameMapAtlas
+  _: [EndgameMapAtlas]
   _: [i32]
   _: [i32]
-  _: NPCs
+  _: EndgameMapAtlas
   _: i32
-  _: [NPCs]
+  _: [EndgameMapAtlas]
 }
 
 # Added 0.5
@@ -1333,12 +1333,12 @@ type CharacterStartStates {
   _: bool
   InfoText: string
   Ascendancy: Ascendancy
-  _: [rid]
-  _: [rid]
+  _: [PassiveSkills]
+  _: [PassiveSkills]
   _: [_] # All rows empty
   _: [_] # All rows empty
-  SupportGems: [SupportGems]
-  _: [rid]
+  AttributePassives: [PassiveSkills]
+  AttributeChoices: [PassiveSkills]
   _: bool
 }
 
@@ -2529,9 +2529,7 @@ type ExpeditionDeals {
   _: i32
   Description: string @localized
   _: [_] # All rows empty
-  _: string
-  _: i32
-  _: i32
+  SoundEffect: SoundEffects
   DealFamily: ExpeditionDealFamilies
 }
 
@@ -4081,7 +4079,7 @@ type MapDevices {
 type MapDeviceRecipes @tags(list: ["item:recipe"]) {
   Id: string @unique
   RecipeItems: [BaseItemTypes]
-  WorldArea: WorldAreas
+  WorldAreas: [WorldAreas]
   MicrotransactionPortalVariation: MicrotransactionPortalVariations
   AreaLevel: i32
   QuestFlag: QuestFlags
@@ -5273,11 +5271,11 @@ type NPCTalk {
   _: bool
   DialogueOption2: string
   ConsoleQuickAction: NPCTalkConsoleQuickActions
-  Music1: Music
+  WorldArea1: WorldAreas
   _: i32
   Characters: [Characters]
   _: i32
-  Music2: Music
+  WorldArea2: WorldAreas
   _: i32
   QuestFlag3: QuestFlags
   _: bool
@@ -6018,10 +6016,7 @@ type RecheckActiveSkillEnabledStats {
 
 type RecombinableClasses {
   Id: ItemClasses
-  _: i32
-  _: i32
-  _: i32
-  _: i32
+  Currency: BaseItemTypes
   _: i32
 }
 
@@ -7372,10 +7367,7 @@ type WeaponClasses {
 
 type WeaponImpactSoundData {
   Id: string @unique
-  _: i32
-  _: i32
-  _: i32
-  _: i32
+  WeaponSoundType: WeaponSoundTypes
   _: i32
   _: i32
   _: i32