From c3a71ab95e65c5f97038d8fcb06635803378122b Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Thu, 9 Feb 2023 20:46:35 +0100 Subject: [PATCH] Update BannerInterfaceStorage for 6.31h --- OtterGui | 2 +- Penumbra.GameData/Actors/AgentBannerParty.cs | 26 ++++++++++---------- Penumbra.GameData/Actors/ScreenActor.cs | 6 +++-- Penumbra.String | 2 +- Penumbra/UI/ConfigWindow.Changelog.cs | 12 +++++++++ 5 files changed, 31 insertions(+), 17 deletions(-) diff --git a/OtterGui b/OtterGui index 407aa485..9a574c4a 160000 --- a/OtterGui +++ b/OtterGui @@ -1 +1 @@ -Subproject commit 407aa4857ead69a03793a62b889452529c9bc572 +Subproject commit 9a574c4a50b86a5ff84544d989608d2339b713b2 diff --git a/Penumbra.GameData/Actors/AgentBannerParty.cs b/Penumbra.GameData/Actors/AgentBannerParty.cs index 9756a289..2de95c8c 100644 --- a/Penumbra.GameData/Actors/AgentBannerParty.cs +++ b/Penumbra.GameData/Actors/AgentBannerParty.cs @@ -46,12 +46,12 @@ public unsafe struct AgentBannerMIP // Client::UI::Agent::AgentBannerInterface::Storage // destructed in Client::UI::Agent::AgentBannerInterface::dtor -[StructLayout( LayoutKind.Explicit, Size = 0x3BB0 )] +[StructLayout( LayoutKind.Explicit, Size = 0x3B30 )] public unsafe struct BannerInterfaceStorage { // vtable: 48 8D 05 ?? ?? ?? ?? 48 89 01 48 8B F9 7E // dtor: E8 ?? ?? ?? ?? 48 83 EF ?? 75 ?? BA ?? ?? ?? ?? 48 8B CE E8 ?? ?? ?? ?? 48 89 7D - [StructLayout( LayoutKind.Explicit, Size = 0x770 )] + [StructLayout( LayoutKind.Explicit, Size = 0x760 )] public struct CharacterData { [FieldOffset( 0x000 )] public void** VTable; @@ -67,8 +67,8 @@ public unsafe struct BannerInterfaceStorage [FieldOffset( 0x2B0 )] public void* CharaView; [FieldOffset( 0x5D0 )] public AtkTexture AtkTexture; - [FieldOffset( 0x6F8 )] public Utf8String Title; - [FieldOffset( 0x768 )] public void* SomePointer; + [FieldOffset( 0x6E0 )] public Utf8String Title; + [FieldOffset( 0x750 )] public void* SomePointer; } @@ -78,14 +78,14 @@ public unsafe struct BannerInterfaceStorage [FieldOffset( 0x0014 )] public uint Unk2; [FieldOffset( 0x0020 )] public CharacterData Character1; - [FieldOffset( 0x0790 )] public CharacterData Character2; - [FieldOffset( 0x0F00 )] public CharacterData Character3; - [FieldOffset( 0x1670 )] public CharacterData Character4; - [FieldOffset( 0x1DE0 )] public CharacterData Character5; - [FieldOffset( 0x2550 )] public CharacterData Character6; - [FieldOffset( 0x2CC0 )] public CharacterData Character7; - [FieldOffset( 0x3430 )] public CharacterData Character8; + [FieldOffset( 0x0780 )] public CharacterData Character2; + [FieldOffset( 0x0EE0 )] public CharacterData Character3; + [FieldOffset( 0x1640 )] public CharacterData Character4; + [FieldOffset( 0x1DA0 )] public CharacterData Character5; + [FieldOffset( 0x2500 )] public CharacterData Character6; + [FieldOffset( 0x2C60 )] public CharacterData Character7; + [FieldOffset( 0x33C0 )] public CharacterData Character8; - [FieldOffset( 0x3BA0 )] public long Unk3; - [FieldOffset( 0x3BA8 )] public long Unk4; + [FieldOffset( 0x3B20 )] public long Unk3; + [FieldOffset( 0x3B28 )] public long Unk4; } \ No newline at end of file diff --git a/Penumbra.GameData/Actors/ScreenActor.cs b/Penumbra.GameData/Actors/ScreenActor.cs index bc046407..00cf66fc 100644 --- a/Penumbra.GameData/Actors/ScreenActor.cs +++ b/Penumbra.GameData/Actors/ScreenActor.cs @@ -2,9 +2,10 @@ namespace Penumbra.GameData.Actors; public enum ScreenActor : ushort { - CutsceneStart = 200, + CutsceneStart = 200, + GPosePlayer = 201, CutsceneEnd = 240, - CharacterScreen = 240, + CharacterScreen = CutsceneEnd, ExamineScreen = 241, FittingRoom = 242, DyePreview = 243, @@ -12,4 +13,5 @@ public enum ScreenActor : ushort Card6 = 245, Card7 = 246, Card8 = 247, + ScreenEnd = Card8 + 1, } diff --git a/Penumbra.String b/Penumbra.String index 5ae32fd5..2f396444 160000 --- a/Penumbra.String +++ b/Penumbra.String @@ -1 +1 @@ -Subproject commit 5ae32fd5f19fcc641d5f2d777de2276186900c0b +Subproject commit 2f396444c80ef2d2dca30b32c8f0ef787a928534 diff --git a/Penumbra/UI/ConfigWindow.Changelog.cs b/Penumbra/UI/ConfigWindow.Changelog.cs index e595fb91..50c80eea 100644 --- a/Penumbra/UI/ConfigWindow.Changelog.cs +++ b/Penumbra/UI/ConfigWindow.Changelog.cs @@ -34,10 +34,22 @@ public partial class ConfigWindow Add6_3_0( ret ); Add6_4_0( ret ); Add6_5_0( ret ); + Add6_5_2( ret ); return ret; } + private static void Add6_5_2( Changelog log ) + => log.NextVersion( "Version 0.6.5.2" ) + .RegisterEntry( "Updated for game version 6.31 Hotfix." ) + .RegisterEntry( "Added option-specific descriptions for mods, instead of having just descriptions for groups of options. (Thanks Caraxi!)" ) + .RegisterEntry( "Those are now accurately parsed from TTMPs, too.", 1 ) + .RegisterEntry( "Improved launch times somewhat through parallelization of some tasks." ) + .RegisterEntry( "Added some performance tracking for start-up durations and for real time data to Release builds. They can be seen and enabled in the Debug tab when Debug Mode is enabled." ) + .RegisterEntry( "Fixed an issue with IMC changes and Mare Synchronos interoperability." ) + .RegisterEntry( "Fixed an issue with housing mannequins crashing the game when resource logging was enabled." ) + .RegisterEntry( "Fixed an issue generating Mip Maps for texture import on Wine." ); + private static void Add6_5_0( Changelog log ) => log.NextVersion( "Version 0.6.5.0" ) .RegisterEntry( "Fixed an issue with Item Swaps not using applied IMC changes in some cases." )