From 62eb032765ad96db0b96088c253209b0d24397b2 Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Wed, 24 Aug 2022 22:39:19 +0200 Subject: [PATCH] Fix CharacterUtility. --- Penumbra/Interop/CharacterUtility.cs | 2 +- Penumbra/Interop/Structs/CharacterUtility.cs | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Penumbra/Interop/CharacterUtility.cs b/Penumbra/Interop/CharacterUtility.cs index b4632ba6..0f6db067 100644 --- a/Penumbra/Interop/CharacterUtility.cs +++ b/Penumbra/Interop/CharacterUtility.cs @@ -33,7 +33,7 @@ public unsafe class CharacterUtility : IDisposable .Append( Structs.CharacterUtility.EqpIdx ) .Append( Structs.CharacterUtility.GmpIdx ) .Concat( Enumerable.Range( Structs.CharacterUtility.EqdpStartIdx, Structs.CharacterUtility.NumEqdpFiles ) - .Where( i => i != 17 ) ) // TODO: Female Hrothgar + .Where( i => i is not Structs.CharacterUtility.EqdpStartIdx + 15 or Structs.CharacterUtility.EqdpStartIdx + 15 + Structs.CharacterUtility.NumEqdpFiles / 2 ) ) // TODO: Female Hrothgar .Append( Structs.CharacterUtility.HumanCmpIdx ) .Concat( Enumerable.Range( Structs.CharacterUtility.FaceEstIdx, 4 ) ) .ToArray(); diff --git a/Penumbra/Interop/Structs/CharacterUtility.cs b/Penumbra/Interop/Structs/CharacterUtility.cs index 32770fe6..02426db7 100644 --- a/Penumbra/Interop/Structs/CharacterUtility.cs +++ b/Penumbra/Interop/Structs/CharacterUtility.cs @@ -12,15 +12,15 @@ public unsafe struct CharacterUtility public static readonly int[] EqdpIndices = Enumerable.Range( EqdpStartIdx, NumEqdpFiles ).Where( i => i != EqdpStartIdx + 15 && i != EqdpStartIdx + 15 + NumEqdpFiles / 2 ).ToArray(); - public const int NumResources = 85; + public const int NumResources = 86; public const int EqpIdx = 0; - public const int GmpIdx = 1; - public const int HumanCmpIdx = 63; - public const int FaceEstIdx = 64; - public const int HairEstIdx = 65; - public const int HeadEstIdx = 66; - public const int BodyEstIdx = 67; - public const int EqdpStartIdx = 2; + public const int GmpIdx = 2; + public const int HumanCmpIdx = 64; + public const int FaceEstIdx = 65; + public const int HairEstIdx = 66; + public const int HeadEstIdx = 67; + public const int BodyEstIdx = 68; + public const int EqdpStartIdx = 3; public const int NumEqdpFiles = 2 * 28; public static int EqdpIdx( GenderRace raceCode, bool accessory )