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

Some Glamourer stuff

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

37
Penumbra.GameData/Structs/CharacterArmor.cs
View file

@ -3,22 +3,24 @@ using System.Runtime.InteropServices;
namespace Penumbra.GameData.Structs; namespace Penumbra.GameData.Structs;
[StructLayout( LayoutKind.Explicit, Pack = 1 )] [StructLayout(LayoutKind.Explicit, Pack = 1)]
public struct CharacterArmor : IEquatable< CharacterArmor > public struct CharacterArmor : IEquatable<CharacterArmor>
{ {
[FieldOffset( 0 )] public const int Size = 4;
[FieldOffset(0)]
public uint Value; public uint Value;
[FieldOffset( 0 )] [FieldOffset(0)]
public SetId Set; public SetId Set;
[FieldOffset( 2 )] [FieldOffset(2)]
public byte Variant; public byte Variant;
[FieldOffset( 3 )] [FieldOffset(3)]
public StainId Stain; public StainId Stain;
public CharacterArmor( SetId set, byte variant, StainId stain ) public CharacterArmor(SetId set, byte variant, StainId stain)
{ {
Value = 0; Value = 0;
Set = set; Set = set;
@ -26,23 +28,32 @@ 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}";
public static readonly CharacterArmor Empty; public static readonly CharacterArmor Empty;
public bool Equals( CharacterArmor other ) public bool Equals(CharacterArmor other)
=> Value == other.Value; => Value == other.Value;
public override bool Equals( object? obj ) public override bool Equals(object? obj)
=> obj is CharacterArmor other && Equals( other ); => obj is CharacterArmor other && Equals(other);
public override int GetHashCode() public override int GetHashCode()
=> ( int )Value; => (int)Value;
public static bool operator ==( CharacterArmor left, CharacterArmor right ) public static bool operator ==(CharacterArmor left, CharacterArmor right)
=> left.Value == right.Value; => left.Value == right.Value;
public static bool operator !=( CharacterArmor left, CharacterArmor right ) public static bool operator !=(CharacterArmor left, CharacterArmor right)
=> left.Value != right.Value; => left.Value != right.Value;
} }

3
Penumbra.GameData/Structs/CharacterEquip.cs
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;

6
Penumbra.GameData/Structs/CharacterWeapon.cs
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)

9
Penumbra.GameData/Structs/StainId.cs
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;
} }