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

Update gamedata.

Browse source
This commit is contained in:
Ottermandias 2023-12-22 14:24:41 +01:00
parent 4aa19e49d5
commit dc583cb8e2
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra.GameData

@ -1 +1 @@
Subproject commit 58a3e7947c207452f5fa0d328c47c5ed6bdd9a0f
Subproject commit ed37f83424c11a5a601e74f4660cd52ebd68a7b3

5
Penumbra/Interop/ResourceTree/ResolveContext.PathResolution.cs
View file

@ -1,4 +1,3 @@
using Dalamud.Game.ClientState.Objects.Enums;
using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
using FFXIVClientStructs.FFXIV.Client.System.Resource.Handle;
using Penumbra.GameData.Data;
@ -239,8 +238,8 @@ internal partial record ResolveContext
return (characterRaceCode, "base", 1);
case 1:
var faceId = human->FaceId;
var tribe = human->Customize[(int)CustomizeIndex.Tribe];
var modelType = human->Customize[(int)CustomizeIndex.ModelType];
var tribe = human->Customize[(int)Dalamud.Game.ClientState.Objects.Enums.CustomizeIndex.Tribe];
var modelType = human->Customize[(int)Dalamud.Game.ClientState.Objects.Enums.CustomizeIndex.ModelType];
if (faceId < 201)
{
faceId -= tribe switch

2
Penumbra/Interop/ResourceTree/ResourceTree.cs
View file

@ -6,9 +6,9 @@ using FFXIVClientStructs.FFXIV.Client.System.Resource.Handle;
using Penumbra.GameData.Data;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs;
using Penumbra.String.Classes;
using Penumbra.UI;
using CustomizeData = FFXIVClientStructs.FFXIV.Client.Game.Character.CustomizeData;
using CustomizeIndex = Dalamud.Game.ClientState.Objects.Enums.CustomizeIndex;
namespace Penumbra.Interop.ResourceTree;

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

@ -88,7 +88,7 @@ public class DebugTab : Window, ITab
private readonly TextureManager _textureManager;
private readonly SkinFixer _skinFixer;
private readonly RedrawService _redraws;
private readonly DictEmotes _emotes;
private readonly DictEmote _emotes;
private readonly Diagnostics _diagnostics;
private readonly IObjectTable _objects;
private readonly IClientState _clientState;
@ -99,7 +99,7 @@ public class DebugTab : Window, ITab
ResourceManagerService resourceManager, PenumbraIpcProviders ipc, CollectionResolver collectionResolver,
DrawObjectState drawObjectState, PathState pathState, SubfileHelper subfileHelper, IdentifiedCollectionCache identifiedCollectionCache,
CutsceneService cutsceneService, ModImportManager modImporter, ImportPopup importPopup, FrameworkManager framework,
TextureManager textureManager, SkinFixer skinFixer, RedrawService redraws, DictEmotes emotes, Diagnostics diagnostics, IpcTester ipcTester)
TextureManager textureManager, SkinFixer skinFixer, RedrawService redraws, DictEmote emotes, Diagnostics diagnostics, IpcTester ipcTester)
: base("Penumbra Debug Window", ImGuiWindowFlags.NoCollapse)
{
IsOpen = true;