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

Some stuff.

Browse source
This commit is contained in:
Ottermandias 2023-04-07 00:29:19 +02:00
parent f85fc46fb7
commit 0ed1a81c29
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Penumbra/Collections/Manager/ActiveCollections.cs
View file

@ -33,6 +33,7 @@ public class ActiveCollections : ISavable, IDisposable
Individuals = new IndividualCollections(actors.AwaitedService); Individuals = new IndividualCollections(actors.AwaitedService);
_communicator.CollectionChange.Subscribe(OnCollectionChange); _communicator.CollectionChange.Subscribe(OnCollectionChange);
LoadCollections(); LoadCollections();
UpdateCurrentCollectionInUse();
} }
public void Dispose() public void Dispose()

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

@ -6,6 +6,7 @@ using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
using Penumbra.GameData.Enums; using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs; using Penumbra.GameData.Structs;
using Penumbra.Interop.Structs; using Penumbra.Interop.Structs;
using CustomizeData = FFXIVClientStructs.FFXIV.Client.Game.Character.CustomizeData;
namespace Penumbra.Interop.ResourceTree; namespace Penumbra.Interop.ResourceTree;
@ -17,6 +18,10 @@ public class ResourceTree
public readonly string CollectionName; public readonly string CollectionName;
public readonly List<ResourceNode> Nodes; public readonly List<ResourceNode> Nodes;
public int ModelId;
public CustomizeData CustomizeData;
public GenderRace RaceCode;
public ResourceTree(string name, nint sourceAddress, bool playerRelated, string collectionName) public ResourceTree(string name, nint sourceAddress, bool playerRelated, string collectionName)
{ {
Name = name; Name = name;
@ -32,6 +37,9 @@ public class ResourceTree
var model = (CharacterBase*)character->GameObject.GetDrawObject(); var model = (CharacterBase*)character->GameObject.GetDrawObject();
var equipment = new ReadOnlySpan<CharacterArmor>(character->EquipSlotData, 10); var equipment = new ReadOnlySpan<CharacterArmor>(character->EquipSlotData, 10);
// var customize = new ReadOnlySpan<byte>( character->CustomizeData, 26 ); // var customize = new ReadOnlySpan<byte>( character->CustomizeData, 26 );
ModelId = character->ModelCharaId;
CustomizeData = character->DrawData.CustomizeData;
RaceCode = model->GetModelType() == CharacterBase.ModelType.Human ? (GenderRace) ((Human*)model)->RaceSexId : GenderRace.Unknown;
for (var i = 0; i < model->SlotCount; ++i) for (var i = 0; i < model->SlotCount; ++i)
{ {