Various mapping fixes

pm2845 · Oct 7, 2023 · b8d4cef · b8d4cef
1 parent 08dc8fb
commit b8d4cef
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -354,3 +354,5 @@ package-signer.key
 TestModule/Mods/BG3Ext_Testsuite/.vscode/settings.json
 *.symtab
 BG3Extender/Lua.bundle
+BG3Extender/GameDefinitions/PropertyMaps/Generated.inl
+BG3Extender/GameDefinitions/Components/GeneratedComponentTypes.inl
diff --git a/BG3Extender/GameDefinitions/Components/Spell.h b/BG3Extender/GameDefinitions/Components/Spell.h
@@ -124,14 +124,20 @@ struct InterruptType8
 	int field_4C;
 };
 
+struct InterruptEntities
+{
+	EntityHandle field_0;
+	EntityHandle field_8;
+};
+
 struct InterruptVariant2
 {
 	std::variant<InterruptType0, InterruptType1, InterruptType2, InterruptType3, InterruptType4, InterruptType5, InterruptType6, InterruptType7, InterruptType8> Variant;
 	EntityHandle field_B0;
 	EntityHandle field_B8;
 	EntityHandle field_C0;
 	EntityHandle field_C8;
-	Array<std::pair<EntityHandle, EntityHandle>> field_D0;
+	Array<InterruptEntities> field_D0;
 	__int64 field_E0;
 	__int64 field_E8;
 	__int64 field_F0;
@@ -154,7 +160,7 @@ struct ActionStateComponent : public BaseComponent
 	static constexpr auto EngineClass = "eoc::interrupt::ActionStateComponent";
 
 	InterruptVariant2 Variant;
-	Array<std::pair<EntityHandle, EntityHandle>> Arr_EHx2;
+	Array<InterruptEntities> Arr_EHx2;
 	Guid field_118;
 };
 
@@ -660,7 +666,7 @@ struct ActionRequest4
 {
 	struct RequestElement
 	{
-		Array<std::pair<EntityHandle, EntityHandle>> field_0;
+		Array<bg3se::interrupt::InterruptEntities> field_0;
 		__int64 field_10;
 		int field_18;
 		__int64 field_20;

diff --git a/BG3Extender/GameDefinitions/Components/Stats.h b/BG3Extender/GameDefinitions/Components/Stats.h
@@ -346,7 +346,7 @@ namespace bg3se
 
 		Guid Race;
 		Guid SubRace;
-		uint8_t field_20;
+		uint8_t BodyType;
 		uint8_t field_21;
 		STDString Name;
 		std::array<int32_t, 7> Abilities;

diff --git a/BG3Extender/GameDefinitions/PropertyMaps/Components.inl b/BG3Extender/GameDefinitions/PropertyMaps/Components.inl
@@ -448,7 +448,7 @@ BEGIN_CLS(CharacterCreationStatsComponent)
 INHERIT(BaseComponent)
 P(Race)
 P(SubRace)
-P(field_20)
+P(BodyType)
 P(field_21)
 P(Name)
 P(Abilities)