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

Glamourer changes

Browse source
This commit is contained in:
Ottermandias 2023-01-25 09:57:24 +01:00
parent 5f63d4de38
commit 0239c2f60b
3 changed files with 28 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Penumbra.GameData/Enums/EquipSlot.cs
View file

@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using System.Linq; using System.Linq;
namespace Penumbra.GameData.Enums; namespace Penumbra.GameData.Enums;

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

@ -4,19 +4,19 @@ using System.Runtime.InteropServices;
namespace Penumbra.GameData.Structs; namespace Penumbra.GameData.Structs;
[StructLayout( LayoutKind.Explicit, Pack = 1 )] [StructLayout( LayoutKind.Explicit, Pack = 1 )]
public readonly struct CharacterArmor : IEquatable< CharacterArmor > public struct CharacterArmor : IEquatable< CharacterArmor >
{ {
[FieldOffset( 0 )] [FieldOffset( 0 )]
public readonly uint Value; public uint Value;
[FieldOffset( 0 )] [FieldOffset( 0 )]
public readonly SetId Set; public SetId Set;
[FieldOffset( 2 )] [FieldOffset( 2 )]
public readonly byte Variant; public byte Variant;
[FieldOffset( 3 )] [FieldOffset( 3 )]
public readonly StainId Stain; public StainId Stain;
public CharacterArmor( SetId set, byte variant, StainId stain ) public CharacterArmor( SetId set, byte variant, StainId stain )
{ {

10
Penumbra.GameData/Structs/CharacterWeapon.cs
View file

@ -4,19 +4,19 @@ using System.Runtime.InteropServices;
namespace Penumbra.GameData.Structs; namespace Penumbra.GameData.Structs;
[StructLayout(LayoutKind.Explicit, Pack = 1, Size = 7)] [StructLayout(LayoutKind.Explicit, Pack = 1, Size = 7)]
public readonly struct CharacterWeapon : IEquatable< CharacterWeapon > public struct CharacterWeapon : IEquatable<CharacterWeapon>
{ {
[FieldOffset(0)] [FieldOffset(0)]
public readonly SetId Set; public SetId Set;
[FieldOffset(2)] [FieldOffset(2)]
public readonly WeaponType Type; public WeaponType Type;
[FieldOffset(4)] [FieldOffset(4)]
public readonly ushort Variant; public ushort Variant;
[FieldOffset(6)] [FieldOffset(6)]
public readonly StainId Stain; public StainId Stain;
public ulong Value 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);