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

Update GameData

Browse source
This commit is contained in:
Exter-N 2024-08-04 00:57:39 +02:00
parent c01aa000fb
commit ee086e3e76
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra.GameData

@ -1 +1 @@
Subproject commit ee6c6faa1e4a3e96279cb6c89df96e351f112c6a Subproject commit 1ec903d53747fc16f62139e2ed3541f224ee3403

4
Penumbra/Services/StainService.cs
View file

@ -16,7 +16,7 @@ namespace Penumbra.Services;
public class StainService : IService public class StainService : IService
{ {
public sealed class StainTemplateCombo<TDyePack>(FilterComboColors[] stainCombos, StmFile<TDyePack> stmFile) public sealed class StainTemplateCombo<TDyePack>(FilterComboColors[] stainCombos, StmFile<TDyePack> stmFile)
: FilterComboCache<ushort>(stmFile.Entries.Keys.Prepend((ushort)0), MouseWheelType.None, Penumbra.Log) where TDyePack : unmanaged, IDyePack<TDyePack> : FilterComboCache<ushort>(stmFile.Entries.Keys.Prepend((ushort)0), MouseWheelType.None, Penumbra.Log) where TDyePack : unmanaged, IDyePack
{ {
// FIXME There might be a better way to handle that. // FIXME There might be a better way to handle that.
public int CurrentDyeChannel = 0; public int CurrentDyeChannel = 0;
@ -102,7 +102,7 @@ public class StainService : IService
}; };
/// <summary> Loads a STM file. Opportunistically attempts to re-use the file already read by the game, with Lumina fallback. </summary> /// <summary> Loads a STM file. Opportunistically attempts to re-use the file already read by the game, with Lumina fallback. </summary>
private static unsafe StmFile<TDyePack> LoadStmFile<TDyePack>(ResourceHandle* stmResourceHandle, IDataManager dataManager) where TDyePack : unmanaged, IDyePack<TDyePack> private static unsafe StmFile<TDyePack> LoadStmFile<TDyePack>(ResourceHandle* stmResourceHandle, IDataManager dataManager) where TDyePack : unmanaged, IDyePack
{ {
if (stmResourceHandle != null) if (stmResourceHandle != null)
{ {

2
Penumbra/UI/Tabs/Debug/DebugTab.cs
View file

@ -713,7 +713,7 @@ public class DebugTab : Window, ITab, IUiService
} }
} }
private static void DrawStainTemplatesFile<TDyePack>(StmFile<TDyePack> stmFile) where TDyePack : unmanaged, IDyePack<TDyePack> private static void DrawStainTemplatesFile<TDyePack>(StmFile<TDyePack> stmFile) where TDyePack : unmanaged, IDyePack
{ {
foreach (var (key, data) in stmFile.Entries) foreach (var (key, data) in stmFile.Entries)
{ {