ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-23 08:59:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix CharacterUtility.

Browse source
This commit is contained in:
Ottermandias 2022-08-24 22:39:19 +02:00
parent 901b54805a
commit 62eb032765
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra/Interop/CharacterUtility.cs
View file

@ -33,7 +33,7 @@ public unsafe class CharacterUtility : IDisposable
.Append( Structs.CharacterUtility.EqpIdx ) .Append( Structs.CharacterUtility.EqpIdx )
.Append( Structs.CharacterUtility.GmpIdx ) .Append( Structs.CharacterUtility.GmpIdx )
.Concat( Enumerable.Range( Structs.CharacterUtility.EqdpStartIdx, Structs.CharacterUtility.NumEqdpFiles ) .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 ) .Append( Structs.CharacterUtility.HumanCmpIdx )
.Concat( Enumerable.Range( Structs.CharacterUtility.FaceEstIdx, 4 ) ) .Concat( Enumerable.Range( Structs.CharacterUtility.FaceEstIdx, 4 ) )
.ToArray(); .ToArray();

16
Penumbra/Interop/Structs/CharacterUtility.cs
View file

@ -12,15 +12,15 @@ public unsafe struct CharacterUtility
public static readonly int[] EqdpIndices public static readonly int[] EqdpIndices
= Enumerable.Range( EqdpStartIdx, NumEqdpFiles ).Where( i => i != EqdpStartIdx + 15 && i != EqdpStartIdx + 15 + NumEqdpFiles / 2 ).ToArray(); = 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 EqpIdx = 0;
public const int GmpIdx = 1; public const int GmpIdx = 2;
public const int HumanCmpIdx = 63; public const int HumanCmpIdx = 64;
public const int FaceEstIdx = 64; public const int FaceEstIdx = 65;
public const int HairEstIdx = 65; public const int HairEstIdx = 66;
public const int HeadEstIdx = 66; public const int HeadEstIdx = 67;
public const int BodyEstIdx = 67; public const int BodyEstIdx = 68;
public const int EqdpStartIdx = 2; public const int EqdpStartIdx = 3;
public const int NumEqdpFiles = 2 * 28; public const int NumEqdpFiles = 2 * 28;
public static int EqdpIdx( GenderRace raceCode, bool accessory ) public static int EqdpIdx( GenderRace raceCode, bool accessory )