Some Glamourer stuff

This commit is contained in:
Ottermandias 2023-04-29 12:25:24 +02:00
parent a293e7dfea
commit 7d1d6ac829
4 changed files with 42 additions and 15 deletions

View file

@ -6,6 +6,8 @@ namespace Penumbra.GameData.Structs;
[StructLayout(LayoutKind.Explicit, Pack = 1)] [StructLayout(LayoutKind.Explicit, Pack = 1)]
public struct CharacterArmor : IEquatable<CharacterArmor> public struct CharacterArmor : IEquatable<CharacterArmor>
{ {
public const int Size = 4;
[FieldOffset(0)] [FieldOffset(0)]
public uint Value; public uint Value;
@ -26,6 +28,15 @@ public struct CharacterArmor : IEquatable< CharacterArmor >
Stain = stain; Stain = stain;
} }
public CharacterArmor With(StainId stain)
=> new(Set, Variant, stain);
public CharacterWeapon ToWeapon()
=> new(Set, 0, Variant, Stain);
public CharacterWeapon ToWeapon(StainId stain)
=> new(Set, 0, Variant, stain);
public override string ToString() public override string ToString()
=> $"{Set},{Variant},{Stain}"; => $"{Set},{Variant},{Stain}";

View file

@ -6,6 +6,9 @@ namespace Penumbra.GameData.Structs;
public readonly unsafe struct CharacterEquip public readonly unsafe struct CharacterEquip
{ {
public const int Slots = 10;
public const int Size = CharacterArmor.Size * Slots;
public static readonly CharacterEquip Null = new(null); public static readonly CharacterEquip Null = new(null);
private readonly CharacterArmor* _armor; private readonly CharacterArmor* _armor;

View file

@ -40,6 +40,12 @@ public struct CharacterWeapon : IEquatable<CharacterWeapon>
Stain = (StainId)(value >> 48); Stain = (StainId)(value >> 48);
} }
public CharacterArmor ToArmor()
=> new(Set, (byte)Variant, Stain);
public CharacterArmor ToArmor(StainId stain)
=> new(Set, (byte)Variant, stain);
public static readonly CharacterWeapon Empty = new(0, 0, 0, 0); public static readonly CharacterWeapon Empty = new(0, 0, 0, 0);
public bool Equals(CharacterWeapon other) public bool Equals(CharacterWeapon other)

View file

@ -1,8 +1,9 @@
using System; using System;
using System.Numerics;
namespace Penumbra.GameData.Structs; namespace Penumbra.GameData.Structs;
public readonly struct StainId : IEquatable< StainId > public readonly struct StainId : IEquatable< StainId >, IEqualityOperators<StainId, StainId, bool>
{ {
public readonly byte Value; public readonly byte Value;
@ -26,4 +27,10 @@ public readonly struct StainId : IEquatable< StainId >
public override int GetHashCode() public override int GetHashCode()
=> Value.GetHashCode(); => Value.GetHashCode();
public static bool operator ==(StainId left, StainId right)
=> left.Value == right.Value;
public static bool operator !=(StainId left, StainId right)
=> left.Value != right.Value;
} }