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

Move Entries to GameData.

Browse source
This commit is contained in:
Ottermandias 2021-07-25 02:36:21 +02:00
parent 4cfd7f56c0
commit b93c5376de
12 changed files with 71 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Penumbra/Game/EqdpEntry.cs → Penumbra.GameData/Structs/EqdpEntry.cs
View file

@ -1,9 +1,8 @@
using System;
using System.ComponentModel;
using Penumbra.GameData.Enums;
using Penumbra.Meta;
namespace Penumbra.Game
namespace Penumbra.GameData.Structs
{
[Flags]
public enum EqdpEntry : ushort
@ -105,24 +104,4 @@ namespace Penumbra.Game
};
}
}
public static class EqdpEntryExtension
{
public static bool Apply( this ref EqdpEntry entry, MetaManipulation manipulation )
{
if( manipulation.Type != MetaType.Eqdp )
{
return false;
}
var mask = Eqdp.Mask( manipulation.EqdpIdentifier.Slot );
var result = ( entry & ~mask ) | manipulation.EqdpValue;
var ret = result == entry;
entry = result;
return ret;
}
public static EqdpEntry Reduce( this EqdpEntry entry, EquipSlot slot )
=> entry & Eqdp.Mask( slot );
}
}

23
Penumbra/Game/EqpEntry.cs → Penumbra.GameData/Structs/EqpEntry.cs
View file

@ -1,9 +1,8 @@
using System;
using System.ComponentModel;
using Penumbra.GameData.Enums;
using Penumbra.Meta;
namespace Penumbra.Game
namespace Penumbra.GameData.Structs
{
[Flags]
public enum EqpEntry : ulong
@ -128,24 +127,4 @@ namespace Penumbra.Game
};
}
}
public static class EqpEntryExtension
{
public static bool Apply( this ref EqpEntry entry, MetaManipulation manipulation )
{
if( manipulation.Type != MetaType.Eqp )
{
return false;
}
var mask = Eqp.Mask( manipulation.EqpIdentifier.Slot );
var result = ( entry & ~mask ) | manipulation.EqpValue;
var ret = result != entry;
entry = result;
return ret;
}
public static EqpEntry Reduce( this EqpEntry entry, EquipSlot slot )
=> entry & Eqp.Mask( slot );
}
}

14
Penumbra/Game/GmpEntry.cs → Penumbra.GameData/Structs/GmpEntry.cs
View file

@ -1,7 +1,6 @@
using System.IO;
using Penumbra.Meta;
namespace Penumbra.Game
namespace Penumbra.GameData.Structs
{
public struct GmpEntry
{
@ -89,16 +88,5 @@ namespace Penumbra.Game
public static explicit operator GmpEntry( ulong entry )
=> new() { Value = entry };
public GmpEntry Apply( MetaManipulation manipulation )
{
if( manipulation.Type != MetaType.Gmp )
{
return this;
}
Value = manipulation.GmpValue.Value;
return this;
}
}
}

2
Penumbra/Game/RspEntry.cs → Penumbra.GameData/Structs/RspEntry.cs
View file

@ -4,7 +4,7 @@ using System.IO;
using System.Runtime.InteropServices;
using Penumbra.GameData.Enums;
namespace Penumbra.Game
namespace Penumbra.GameData.Structs
{
[StructLayout( LayoutKind.Sequential, Pack = 1 )]
public readonly struct RspEntry

1
Penumbra/Importer/TexToolsMeta.cs
View file

@ -6,6 +6,7 @@ using Dalamud.Plugin;
using Lumina.Data.Files;
using Penumbra.Game;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs;
using Penumbra.GameData.Util;
using Penumbra.Meta;
using Penumbra.Meta.Files;

60
Penumbra/Meta/EntryExtensions.cs Normal file
View file

@ -0,0 +1,60 @@
using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs;
namespace Penumbra.Meta
{
public static class EqdpEntryExtensions
{
public static bool Apply( this ref EqdpEntry entry, MetaManipulation manipulation )
{
if( manipulation.Type != MetaType.Eqdp )
{
return false;
}
var mask = Eqdp.Mask( manipulation.EqdpIdentifier.Slot );
var result = ( entry & ~mask ) | manipulation.EqdpValue;
var ret = result == entry;
entry = result;
return ret;
}
public static EqdpEntry Reduce( this EqdpEntry entry, EquipSlot slot )
=> entry & Eqdp.Mask( slot );
}
public static class EqpEntryExtensions
{
public static bool Apply( this ref EqpEntry entry, MetaManipulation manipulation )
{
if( manipulation.Type != MetaType.Eqp )
{
return false;
}
var mask = Eqp.Mask( manipulation.EqpIdentifier.Slot );
var result = ( entry & ~mask ) | manipulation.EqpValue;
var ret = result != entry;
entry = result;
return ret;
}
public static EqpEntry Reduce( this EqpEntry entry, EquipSlot slot )
=> entry & Eqp.Mask( slot );
}
public static class GmpEntryExtension
{
public static GmpEntry Apply( this GmpEntry entry, MetaManipulation manipulation )
{
if( manipulation.Type != MetaType.Gmp )
{
return entry;
}
entry.Value = manipulation.GmpValue.Value;
return entry;
}
}
}

1
Penumbra/Meta/Files/CmpFile.cs
View file

@ -4,6 +4,7 @@ using System.IO;
using System.Linq;
using Penumbra.Game;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs;
namespace Penumbra.Meta.Files
{

2
Penumbra/Meta/Files/EqdpFile.cs
View file

@ -2,7 +2,7 @@ using System;
using System.IO;
using System.Linq;
using Lumina.Data;
using Penumbra.Game;
using Penumbra.GameData.Structs;
namespace Penumbra.Meta.Files
{

1
Penumbra/Meta/Files/EqpFile.cs
View file

@ -3,6 +3,7 @@ using System.IO;
using System.Linq;
using Lumina.Data;
using Penumbra.Game;
using Penumbra.GameData.Structs;
namespace Penumbra.Meta.Files
{

1
Penumbra/Meta/Files/GmpFile.cs
View file

@ -1,5 +1,6 @@
using Lumina.Data;
using Penumbra.Game;
using Penumbra.GameData.Structs;
namespace Penumbra.Meta.Files
{

2
Penumbra/Meta/MetaManipulation.cs
View file

@ -3,8 +3,8 @@ using System.ComponentModel;
using System.IO;
using System.Runtime.InteropServices;
using Newtonsoft.Json;
using Penumbra.Game;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs;
using Penumbra.GameData.Util;
using Penumbra.Meta.Files;
using Swan;

1
Penumbra/UI/MenuTabs/TabInstalled/TabInstalledDetailsManipulations.cs
View file

@ -8,6 +8,7 @@ using ImGuiNET;
using Lumina.Data.Files;
using Penumbra.Game;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs;
using Penumbra.Meta;
using Penumbra.Meta.Files;
using Penumbra.Util;