From 91b38527ce6d0aa0a1f75e2c6911e9d8d07725b9 Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Wed, 14 Feb 2024 04:07:24 +0300 Subject: [PATCH 01/20] Update BGSMessage.h --- CommonLibSF/include/RE/B/BGSMessage.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CommonLibSF/include/RE/B/BGSMessage.h b/CommonLibSF/include/RE/B/BGSMessage.h index a5cd8bba..cc8d30b5 100644 --- a/CommonLibSF/include/RE/B/BGSMessage.h +++ b/CommonLibSF/include/RE/B/BGSMessage.h @@ -30,6 +30,8 @@ namespace RE struct MESSAGEBOX_BUTTON { public: + SF_HEAP_REDEFINE_NEW(MESSAGEBOX_BUTTON); + // members BSFixedString text; // 00 BSFixedString unk08; // 08 From daf2ff504b6d7d99ed6856178dabe0c71c8758ca Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Wed, 14 Feb 2024 11:21:07 +0300 Subject: [PATCH 02/20] Update AVMData.h --- CommonLibSF/include/RE/A/AVMData.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CommonLibSF/include/RE/A/AVMData.h b/CommonLibSF/include/RE/A/AVMData.h index 961b4e55..921dd95a 100644 --- a/CommonLibSF/include/RE/A/AVMData.h +++ b/CommonLibSF/include/RE/A/AVMData.h @@ -2,6 +2,7 @@ #include "RE/B/BSFixedString.h" #include "RE/C/Color.h" +#include "RE/M/MemoryManager.h" namespace RE { @@ -18,10 +19,12 @@ namespace RE struct Entry { + SF_HEAP_REDEFINE_NEW(AVMData::Entry); + BSFixedString name; // 00 BSFixedString texturePath; // 08 Color color; // 10 - std::uint32_t intensity; // 14 + std::uint32_t intensity; // 14 In existing game entries is set to 64 for AVMD(confirmed for BGSAVMData(form) ) }; // members From 196b92692d33a5265c845f285ba78d9c3d0a5dee Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Wed, 14 Feb 2024 11:24:13 +0300 Subject: [PATCH 03/20] Update BGSMessage.h --- CommonLibSF/include/RE/B/BGSMessage.h | 1 + 1 file changed, 1 insertion(+) diff --git a/CommonLibSF/include/RE/B/BGSMessage.h b/CommonLibSF/include/RE/B/BGSMessage.h index cc8d30b5..f1d9dcbc 100644 --- a/CommonLibSF/include/RE/B/BGSMessage.h +++ b/CommonLibSF/include/RE/B/BGSMessage.h @@ -5,6 +5,7 @@ #include "RE/T/TESDescription.h" #include "RE/T/TESForm.h" #include "RE/T/TESFullName.h" +#include "RE/M/MemoryManager.h" namespace RE { From dc1795ad90e719a4a0730975571de6771d178148 Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Fri, 16 Feb 2024 18:25:24 +0300 Subject: [PATCH 04/20] Update EffectItem.h --- CommonLibSF/include/RE/E/EffectItem.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CommonLibSF/include/RE/E/EffectItem.h b/CommonLibSF/include/RE/E/EffectItem.h index 61bcde50..88e1d5e1 100644 --- a/CommonLibSF/include/RE/E/EffectItem.h +++ b/CommonLibSF/include/RE/E/EffectItem.h @@ -20,6 +20,8 @@ namespace RE class EffectItem { public: + SF_HEAP_REDEFINE_NEW(EffectItem); + // members EffectItemData data; // 00 EffectSetting* effectSetting; // 10 From c062ba2f5fc608264442ba3a1ab500f090165e99 Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Mon, 19 Feb 2024 17:05:02 +0300 Subject: [PATCH 05/20] Update TESLeveledList.h --- CommonLibSF/include/RE/T/TESLeveledList.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CommonLibSF/include/RE/T/TESLeveledList.h b/CommonLibSF/include/RE/T/TESLeveledList.h index 41265b49..e554889d 100644 --- a/CommonLibSF/include/RE/T/TESLeveledList.h +++ b/CommonLibSF/include/RE/T/TESLeveledList.h @@ -25,7 +25,7 @@ namespace RE TESCondition* conditions; // 10 std::uint16_t count; // 18 std::uint16_t level; // 1A - std::uint8_t unk1C; // 1C + std::uint8_t chanceNone; // 1C std::uint8_t unk1D; // 1D }; static_assert(sizeof(LEVELED_OBJECT) == 0x20); From e7a1e71df5dfe1269c019c98cc7d3810823f160d Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Thu, 22 Feb 2024 10:08:41 +0300 Subject: [PATCH 06/20] Update TESLeveledList.h --- CommonLibSF/include/RE/T/TESLeveledList.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CommonLibSF/include/RE/T/TESLeveledList.h b/CommonLibSF/include/RE/T/TESLeveledList.h index e554889d..1a963966 100644 --- a/CommonLibSF/include/RE/T/TESLeveledList.h +++ b/CommonLibSF/include/RE/T/TESLeveledList.h @@ -19,6 +19,8 @@ namespace RE struct LEVELED_OBJECT { public: + SF_HEAP_REDEFINE_NEW(LEVELED_OBJECT); + // members TESForm* form; // 00 ContainerItemExtra* itemExtra; // 08 From 42374426d18835df5297ed5b97e0302e082f635b Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Thu, 22 Feb 2024 12:28:15 +0300 Subject: [PATCH 07/20] Update TESContainer.h --- CommonLibSF/include/RE/T/TESContainer.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CommonLibSF/include/RE/T/TESContainer.h b/CommonLibSF/include/RE/T/TESContainer.h index ffff5035..f54a48d9 100644 --- a/CommonLibSF/include/RE/T/TESContainer.h +++ b/CommonLibSF/include/RE/T/TESContainer.h @@ -11,6 +11,8 @@ namespace RE struct ContainerObject { public: + SF_HEAP_REDEFINE_NEW(ContainerObject); + // members std::int32_t count; // 00 TESBoundObject* obj; // 08 From aab56bf306626ac79d8924a14e4aa3b23940ff03 Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Fri, 23 Feb 2024 13:13:11 +0300 Subject: [PATCH 08/20] Update TESLeveledList.h --- CommonLibSF/include/RE/T/TESLeveledList.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CommonLibSF/include/RE/T/TESLeveledList.h b/CommonLibSF/include/RE/T/TESLeveledList.h index 1a963966..0e532cd9 100644 --- a/CommonLibSF/include/RE/T/TESLeveledList.h +++ b/CommonLibSF/include/RE/T/TESLeveledList.h @@ -67,11 +67,11 @@ namespace RE BSTArray>* keywordChances; // 30 LEVELED_OBJECT* leveledLists; // 38 LEVELED_OBJECT** scriptAddedLists; // 40 - std::int8_t scriptListCount; // 48 + std::int8_t scriptListCount; // 48 std::uint32_t unk4C; // 4C stl::enumeration flags; // 50 std::uint8_t unk51; // 51 - std::int8_t baseListCount; // 52 + std::uint8_t baseListCount; // 52 std::uint8_t unk53; // 53 std::uint8_t unk54; // 54 BSFixedString overrideName; // 58 From fa28ce707bcdd51310392df7ccee62e648f51257 Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Sun, 3 Mar 2024 18:26:22 +0300 Subject: [PATCH 09/20] Update TESNPC.h --- CommonLibSF/include/RE/T/TESNPC.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CommonLibSF/include/RE/T/TESNPC.h b/CommonLibSF/include/RE/T/TESNPC.h index a24cbc43..108c184b 100644 --- a/CommonLibSF/include/RE/T/TESNPC.h +++ b/CommonLibSF/include/RE/T/TESNPC.h @@ -54,6 +54,13 @@ namespace RE [[nodiscard]] bool HasKeyword(std::string_view a_editorID); [[nodiscard]] bool IsInFaction(TESFaction* a_faction) const; + struct MorphWeight + { + float thin; + float muscular; + float fat; + }; + // members BGSAttachParentArray attachParents; // 2E8 std::uint32_t unk308; // 308 @@ -66,7 +73,7 @@ namespace RE std::uint32_t unk334; // 334 TESRace* originalRace; // 338 TESNPC* faceNPC; // 340 - NiPoint3 morphWeight; // 348 + MorphWeight morphWeight; // 348 float height; // 354 float heightMax; // 358 std::uint32_t unk35C; // 35C From 5a2657d4605ee449dbdf8c7577c6c3482fabde37 Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Sun, 3 Mar 2024 19:12:03 +0300 Subject: [PATCH 10/20] Update TESRace.h --- CommonLibSF/include/RE/T/TESRace.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CommonLibSF/include/RE/T/TESRace.h b/CommonLibSF/include/RE/T/TESRace.h index 9e1e0344..d30f56cc 100644 --- a/CommonLibSF/include/RE/T/TESRace.h +++ b/CommonLibSF/include/RE/T/TESRace.h @@ -32,6 +32,13 @@ namespace RE class TESObjectWEAP; class TESQuest; + struct MorphWeight + { + float thin; + float muscular; + float fat; + }; + struct RACE_DATA { std::uint32_t unk00; // 00 @@ -58,7 +65,7 @@ namespace RE std::uint32_t unk58; // 58 std::uint32_t unk5C; // 5C float height[SEXES::kTotal]; // 60 - NiPoint3 weight[SEXES::kTotal]; // 68 + MorphWeight weight[SEXES::kTotal]; // 68 std::uint64_t unk80; // 80 std::int32_t unk88; // 88 std::int32_t unk8C; // 8C From 66f4ceacacb14e3c7347b23fce38914022d65871 Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Fri, 8 Mar 2024 22:22:19 +0300 Subject: [PATCH 11/20] Update BGSMod.h --- CommonLibSF/include/RE/B/BGSMod.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/CommonLibSF/include/RE/B/BGSMod.h b/CommonLibSF/include/RE/B/BGSMod.h index df4005bf..c485f3fb 100644 --- a/CommonLibSF/include/RE/B/BGSMod.h +++ b/CommonLibSF/include/RE/B/BGSMod.h @@ -31,7 +31,22 @@ namespace RE::BGSMod { public: // members - BSTArray includes; // 00 + enum class IncludesFlag + { + kNone = 0, + kOptional = 1 << 0, + kDontUseAll = 1 << 1 + }; + + struct Include + { + RE::BGSMod::Attachment::Mod* Mod; + std::uint8_t level; + stl::enumeration flags; + }; + static_assert(sizeof(Include) == 0x10); + + BSTArray includes; // 00 BSTArray properties; // 10 }; static_assert(sizeof(Data) == 0x20); From 372289949b2b91eb39f63c099d95021cc991b209 Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Fri, 8 Mar 2024 22:57:15 +0300 Subject: [PATCH 12/20] Update BGSMod.h --- CommonLibSF/include/RE/B/BGSMod.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CommonLibSF/include/RE/B/BGSMod.h b/CommonLibSF/include/RE/B/BGSMod.h index c485f3fb..a78e89a0 100644 --- a/CommonLibSF/include/RE/B/BGSMod.h +++ b/CommonLibSF/include/RE/B/BGSMod.h @@ -40,9 +40,9 @@ namespace RE::BGSMod struct Include { - RE::BGSMod::Attachment::Mod* Mod; - std::uint8_t level; - stl::enumeration flags; + RE::BGSMod::Attachment::Mod* mod; + std::uint8_t level; + stl::enumeration flags; }; static_assert(sizeof(Include) == 0x10); From b867e8818a72374242168d0ec02c499a313df78f Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Thu, 14 Mar 2024 09:48:35 +0300 Subject: [PATCH 13/20] Update Script.h --- CommonLibSF/include/RE/S/Script.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CommonLibSF/include/RE/S/Script.h b/CommonLibSF/include/RE/S/Script.h index 400ee5bf..1651b72e 100644 --- a/CommonLibSF/include/RE/S/Script.h +++ b/CommonLibSF/include/RE/S/Script.h @@ -149,8 +149,8 @@ namespace RE enum { - kNumConsoleCommands = 0x0245, - kNumScriptCommands = 0x03C0, + kNumConsoleCommands = 0x0244, + kNumScriptCommands = 0x03C1, kConsoleOpBase = 0x0100, kScriptOpBase = 0x1000, From ffb6ab72d22f422e9a4b95f311e82977dfca6a80 Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Thu, 14 Mar 2024 15:31:39 +0300 Subject: [PATCH 14/20] Update BGSPlanetData.h --- CommonLibSF/include/RE/B/BGSPlanetData.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CommonLibSF/include/RE/B/BGSPlanetData.h b/CommonLibSF/include/RE/B/BGSPlanetData.h index 44856db0..f426542c 100644 --- a/CommonLibSF/include/RE/B/BGSPlanetData.h +++ b/CommonLibSF/include/RE/B/BGSPlanetData.h @@ -21,11 +21,11 @@ namespace RE // members BGSSurface::Tree* surfaceTree; // 30 - std::uint64_t unk38; // 38 - std::uint32_t unk40; // 40 - std::uint32_t unk44; // 44 - std::uint32_t unk48; // 48 - std::uint32_t unk4C; // 4C + float unk38; // 38 + float temperatureCelcius; //3C + float density; //40 + float periAngleInDegrees;//44 + std::uint32_t resourceCreationSpeed; // 48 }; static_assert(sizeof(PlanetData) == 0x50); } From 29a468b9315a558b62b4050d2ec790accb7aa737 Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Sat, 16 Mar 2024 09:52:39 +0300 Subject: [PATCH 15/20] Update TESFile.h --- CommonLibSF/include/RE/T/TESFile.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CommonLibSF/include/RE/T/TESFile.h b/CommonLibSF/include/RE/T/TESFile.h index f308f3a8..d980605f 100644 --- a/CommonLibSF/include/RE/T/TESFile.h +++ b/CommonLibSF/include/RE/T/TESFile.h @@ -6,5 +6,9 @@ namespace RE { public: SF_RTTI_VTABLE(TESFile); + + std::uint8_t pad0[0x38]; + char fileName[260]; + // }; } From fafdf6f8b241275e05b706391dd41a317f01c333 Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Fri, 22 Mar 2024 20:42:03 +0300 Subject: [PATCH 16/20] Update BGSMessage.h --- CommonLibSF/include/RE/B/BGSMessage.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CommonLibSF/include/RE/B/BGSMessage.h b/CommonLibSF/include/RE/B/BGSMessage.h index f1d9dcbc..13f53faa 100644 --- a/CommonLibSF/include/RE/B/BGSMessage.h +++ b/CommonLibSF/include/RE/B/BGSMessage.h @@ -1,11 +1,12 @@ #pragma once #include "RE/B/BSTArray.h" +#include "RE/M/MemoryManager.h" #include "RE/T/TESCondition.h" #include "RE/T/TESDescription.h" #include "RE/T/TESForm.h" #include "RE/T/TESFullName.h" -#include "RE/M/MemoryManager.h" + namespace RE { From 310a270e90a0840de78c99fdc2bca2fa3a2b8597 Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Fri, 22 Mar 2024 20:43:08 +0300 Subject: [PATCH 17/20] Update BGSPlanetData.h --- CommonLibSF/include/RE/B/BGSPlanetData.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CommonLibSF/include/RE/B/BGSPlanetData.h b/CommonLibSF/include/RE/B/BGSPlanetData.h index f426542c..e053977f 100644 --- a/CommonLibSF/include/RE/B/BGSPlanetData.h +++ b/CommonLibSF/include/RE/B/BGSPlanetData.h @@ -20,12 +20,12 @@ namespace RE ~PlanetData() override; // 00 // members - BGSSurface::Tree* surfaceTree; // 30 - float unk38; // 38 - float temperatureCelcius; //3C - float density; //40 - float periAngleInDegrees;//44 - std::uint32_t resourceCreationSpeed; // 48 + BGSSurface::Tree* surfaceTree; // 30 + float unk38; // 38 + float temperatureCelcius; // 3C + float density; // 40 + float periAngleInDegrees; // 44 + std::uint32_t resourceCreationSpeed; // 48 }; static_assert(sizeof(PlanetData) == 0x50); } From 64eccf1ccfc2e57627b82d309e8a17c81d4bf2e9 Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Fri, 22 Mar 2024 20:43:59 +0300 Subject: [PATCH 18/20] Update BGSMod.h --- CommonLibSF/include/RE/B/BGSMod.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CommonLibSF/include/RE/B/BGSMod.h b/CommonLibSF/include/RE/B/BGSMod.h index a78e89a0..c63492ba 100644 --- a/CommonLibSF/include/RE/B/BGSMod.h +++ b/CommonLibSF/include/RE/B/BGSMod.h @@ -46,8 +46,8 @@ namespace RE::BGSMod }; static_assert(sizeof(Include) == 0x10); - BSTArray includes; // 00 - BSTArray properties; // 10 + BSTArray includes; // 00 + BSTArray properties; // 10 }; static_assert(sizeof(Data) == 0x20); From 6d64c363a6c8a190efb1ff02a01f5f1ae0014c65 Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Mon, 25 Mar 2024 20:21:58 +0300 Subject: [PATCH 19/20] Update TESFile.h --- CommonLibSF/include/RE/T/TESFile.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CommonLibSF/include/RE/T/TESFile.h b/CommonLibSF/include/RE/T/TESFile.h index d980605f..6d844309 100644 --- a/CommonLibSF/include/RE/T/TESFile.h +++ b/CommonLibSF/include/RE/T/TESFile.h @@ -7,8 +7,7 @@ namespace RE public: SF_RTTI_VTABLE(TESFile); - std::uint8_t pad0[0x38]; - char fileName[260]; - // + std::uint8_t pad0[0x38]; //0 + char fileName[260]; //38 }; } From 47e7f773764729f9af73fc3bc0a664cbca53d09b Mon Sep 17 00:00:00 2001 From: TommInfinite <81481291+TommInfinite@users.noreply.github.com> Date: Mon, 25 Mar 2024 20:23:58 +0300 Subject: [PATCH 20/20] Update BGSMod.h --- CommonLibSF/include/RE/B/BGSMod.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CommonLibSF/include/RE/B/BGSMod.h b/CommonLibSF/include/RE/B/BGSMod.h index c63492ba..4a55ce88 100644 --- a/CommonLibSF/include/RE/B/BGSMod.h +++ b/CommonLibSF/include/RE/B/BGSMod.h @@ -30,7 +30,7 @@ namespace RE::BGSMod struct Data { public: - // members + enum class IncludesFlag { kNone = 0, @@ -46,6 +46,7 @@ namespace RE::BGSMod }; static_assert(sizeof(Include) == 0x10); + // members BSTArray includes; // 00 BSTArray properties; // 10 };