From 0239c2f60b2bce7202e939e27493a00a7b0d07ce Mon Sep 17 00:00:00 2001
From: Ottermandias <nickroederspam+git1@gmail.com>
Date: Wed, 25 Jan 2023 09:57:24 +0100
Subject: [PATCH] Glamourer changes

---
 Penumbra.GameData/Enums/EquipSlot.cs         |  1 -
 Penumbra.GameData/Structs/CharacterArmor.cs  | 10 ++---
 Penumbra.GameData/Structs/CharacterWeapon.cs | 46 ++++++++++----------
 3 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/Penumbra.GameData/Enums/EquipSlot.cs b/Penumbra.GameData/Enums/EquipSlot.cs
index 2afe9939..b23ae22d 100644
--- a/Penumbra.GameData/Enums/EquipSlot.cs
+++ b/Penumbra.GameData/Enums/EquipSlot.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 
 namespace Penumbra.GameData.Enums;
diff --git a/Penumbra.GameData/Structs/CharacterArmor.cs b/Penumbra.GameData/Structs/CharacterArmor.cs
index ae0f9494..f8239c0e 100644
--- a/Penumbra.GameData/Structs/CharacterArmor.cs
+++ b/Penumbra.GameData/Structs/CharacterArmor.cs
@@ -4,19 +4,19 @@ using System.Runtime.InteropServices;
 namespace Penumbra.GameData.Structs;
 
 [StructLayout( LayoutKind.Explicit, Pack = 1 )]
-public readonly struct CharacterArmor : IEquatable< CharacterArmor >
+public struct CharacterArmor : IEquatable< CharacterArmor >
 {
     [FieldOffset( 0 )]
-    public readonly uint Value;
+    public uint Value;
 
     [FieldOffset( 0 )]
-    public readonly SetId Set;
+    public SetId Set;
 
     [FieldOffset( 2 )]
-    public readonly byte Variant;
+    public byte Variant;
 
     [FieldOffset( 3 )]
-    public readonly StainId Stain;
+    public StainId Stain;
 
     public CharacterArmor( SetId set, byte variant, StainId stain )
     {
diff --git a/Penumbra.GameData/Structs/CharacterWeapon.cs b/Penumbra.GameData/Structs/CharacterWeapon.cs
index 0c25d66f..b94e0b05 100644
--- a/Penumbra.GameData/Structs/CharacterWeapon.cs
+++ b/Penumbra.GameData/Structs/CharacterWeapon.cs
@@ -3,28 +3,28 @@ using System.Runtime.InteropServices;
 
 namespace Penumbra.GameData.Structs;
 
-[StructLayout( LayoutKind.Explicit, Pack = 1, Size = 7 )]
-public readonly struct CharacterWeapon : IEquatable< CharacterWeapon >
+[StructLayout(LayoutKind.Explicit, Pack = 1, Size = 7)]
+public struct CharacterWeapon : IEquatable<CharacterWeapon>
 {
-    [FieldOffset( 0 )]
-    public readonly SetId Set;
+    [FieldOffset(0)]
+    public SetId Set;
 
-    [FieldOffset( 2 )]
-    public readonly WeaponType Type;
+    [FieldOffset(2)]
+    public WeaponType Type;
 
-    [FieldOffset( 4 )]
-    public readonly ushort Variant;
+    [FieldOffset(4)]
+    public ushort Variant;
 
-    [FieldOffset( 6 )]
-    public readonly StainId Stain;
+    [FieldOffset(6)]
+    public StainId Stain;
 
     public ulong Value
-        => ( ulong )Set | ( ( ulong )Type << 16 ) | ( ( ulong )Variant << 32 ) | ( ( ulong )Stain << 48 );
+        => (ulong)Set | ((ulong)Type << 16) | ((ulong)Variant << 32) | ((ulong)Stain << 48);
 
     public override string ToString()
         => $"{Set},{Type},{Variant},{Stain}";
 
-    public CharacterWeapon( SetId set, WeaponType type, ushort variant, StainId stain )
+    public CharacterWeapon(SetId set, WeaponType type, ushort variant, StainId stain)
     {
         Set     = set;
         Type    = type;
@@ -32,28 +32,28 @@ public readonly struct CharacterWeapon : IEquatable< CharacterWeapon >
         Stain   = stain;
     }
 
-    public CharacterWeapon( ulong value )
+    public CharacterWeapon(ulong value)
     {
-        Set     = ( SetId )value;
-        Type    = ( WeaponType )( value >> 16 );
-        Variant = ( ushort )( value     >> 32 );
-        Stain   = ( StainId )( value    >> 48 );
+        Set     = (SetId)value;
+        Type    = (WeaponType)(value >> 16);
+        Variant = (ushort)(value >> 32);
+        Stain   = (StainId)(value >> 48);
     }
 
     public static readonly CharacterWeapon Empty = new(0, 0, 0, 0);
 
-    public bool Equals( CharacterWeapon other )
+    public bool Equals(CharacterWeapon other)
         => Value == other.Value;
 
-    public override bool Equals( object? obj )
-        => obj is CharacterWeapon other && Equals( other );
+    public override bool Equals(object? obj)
+        => obj is CharacterWeapon other && Equals(other);
 
     public override int GetHashCode()
         => Value.GetHashCode();
 
-    public static bool operator ==( CharacterWeapon left, CharacterWeapon right )
+    public static bool operator ==(CharacterWeapon left, CharacterWeapon right)
         => left.Value == right.Value;
 
-    public static bool operator !=( CharacterWeapon left, CharacterWeapon right )
+    public static bool operator !=(CharacterWeapon left, CharacterWeapon right)
         => left.Value != right.Value;
-}
\ No newline at end of file
+}