ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-02-22 07:47:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add slots to demihuman imc.

Browse source
This commit is contained in:
Ottermandias 2022-12-17 16:30:20 +01:00
parent d0ed8abab8
commit f63903e3e6
3 changed files with 77 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Penumbra/Meta/Manipulations/ImcManipulation.cs
View file

@ -16,8 +16,8 @@ public readonly struct ImcManipulation : IMetaManipulation< ImcManipulation >
{
public ImcEntry Entry { get; private init; }
public ushort PrimaryId { get; private init; }
public ushort Variant { get; private init; }
public ushort SecondaryId { get; private init; }
public byte Variant { get; private init; }
[JsonConverter( typeof( StringEnumConverter ) )]
public ObjectType ObjectType { get; private init; }
@ -32,25 +32,13 @@ public readonly struct ImcManipulation : IMetaManipulation< ImcManipulation >
{
Entry = entry;
PrimaryId = primaryId;
Variant = variant;
Variant = ( byte )variant;
SecondaryId = 0;
ObjectType = equipSlot.IsAccessory() ? ObjectType.Accessory : ObjectType.Equipment;
EquipSlot = equipSlot;
BodySlot = BodySlot.Unknown;
}
public ImcManipulation( ObjectType objectType, BodySlot bodySlot, ushort primaryId, ushort secondaryId, ushort variant,
ImcEntry entry )
{
Entry = entry;
ObjectType = objectType;
BodySlot = bodySlot;
SecondaryId = secondaryId;
PrimaryId = primaryId;
Variant = variant;
EquipSlot = EquipSlot.Unknown;
}
[JsonConstructor]
internal ImcManipulation( ObjectType objectType, BodySlot bodySlot, ushort primaryId, ushort secondaryId, ushort variant,
EquipSlot equipSlot, ImcEntry entry )
@ -58,13 +46,19 @@ public readonly struct ImcManipulation : IMetaManipulation< ImcManipulation >
Entry = entry;
ObjectType = objectType;
PrimaryId = primaryId;
Variant = variant;
Variant = ( byte )variant;
if( objectType is ObjectType.Accessory or ObjectType.Equipment )
{
BodySlot = BodySlot.Unknown;
SecondaryId = 0;
EquipSlot = equipSlot;
}
else if( objectType is ObjectType.DemiHuman )
{
BodySlot = BodySlot.Unknown;
SecondaryId = secondaryId;
EquipSlot = equipSlot;
}
else
{
BodySlot = bodySlot;
@ -115,6 +109,15 @@ public readonly struct ImcManipulation : IMetaManipulation< ImcManipulation >
return e != 0 ? e : Variant.CompareTo( other.Variant );
}
if( ObjectType is ObjectType.DemiHuman )
{
var e = EquipSlot.CompareTo( other.EquipSlot );
if( e != 0 )
{
return e;
}
}
var s = SecondaryId.CompareTo( other.SecondaryId );
if( s != 0 )
{