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

Merge branch 'main' of https://github.com/anya-hichu/Glamourer

Browse source
This commit is contained in:
anya-hichu 2024-10-15 12:46:59 +02:00
commit 40993ff0b0
5 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Glamourer/Designs/DesignData.cs
View file

@ -112,7 +112,7 @@ public unsafe struct DesignData
=> slot switch
{
// @formatter:off
BonusItemFlag.Glasses => EquipItem.FromIds(_bonusIds[0], _iconIds[12], _bonusModelIds[0], 0, _bonusVariants[0], FullEquipType.Glasses, 0, _nameGlasses),
BonusItemFlag.Glasses => EquipItem.FromBonusIds(_bonusIds[0], _iconIds[12], _bonusModelIds[0], _bonusVariants[0], BonusItemFlag.Glasses, _nameGlasses),
_ => EquipItem.BonusItemNothing(slot),
// @formatter:on
};

15
Glamourer/Gui/Tabs/DebugTab/ActiveStatePanel.cs
View file

@ -9,7 +9,6 @@ using OtterGui;
using OtterGui.Raii;
using Penumbra.GameData.Enums;
using Penumbra.GameData.Gui.Debug;
using FFXIVClientStructs.FFXIV.Shader;
namespace Glamourer.Gui.Tabs.DebugTab;
@ -67,7 +66,13 @@ public class ActiveStatePanel(StateManager _stateManager, ObjectManager _objectM
static string ItemString(in DesignData data, EquipSlot slot)
{
var item = data.Item(slot);
return $"{item.Name} ({item.PrimaryId.Id}{(item.SecondaryId != 0 ? $"-{item.SecondaryId.Id}" : string.Empty)}-{item.Variant})";
return $"{item.Name} ({item.Id.ToDiscriminatingString()} {item.PrimaryId.Id}{(item.SecondaryId != 0 ? $"-{item.SecondaryId.Id}" : string.Empty)}-{item.Variant})";
}
static string BonusItemString(in DesignData data, BonusItemFlag slot)
{
var item = data.BonusItem(slot);
return $"{item.Name} ({item.Id.ToDiscriminatingString()} {item.PrimaryId.Id}{(item.SecondaryId != 0 ? $"-{item.SecondaryId.Id}" : string.Empty)}-{item.Variant})";
}
PrintRow("Model ID", state.BaseData.ModelId, state.ModelData.ModelId, state.Sources[MetaIndex.ModelId]);
@ -93,6 +98,12 @@ public class ActiveStatePanel(StateManager _stateManager, ObjectManager _objectM
ImGuiUtil.DrawTableColumn(state.Sources[slot, true].ToString());
}
foreach (var slot in BonusExtensions.AllFlags)
{
PrintRow(slot.ToName(), BonusItemString(state.BaseData, slot), BonusItemString(state.ModelData, slot), state.Sources[slot]);
ImGui.TableNextRow();
}
foreach (var type in Enum.GetValues<CustomizeIndex>())
{
PrintRow(type.ToDefaultName(), state.BaseData.Customize[type].Value, state.ModelData.Customize[type].Value,

4
Glamourer/Services/ItemManager.cs
View file

@ -142,7 +142,7 @@ public class ItemManager
public EquipItem Resolve(BonusItemFlag slot, CustomItemId id)
{
// Only from early designs as migration.
if (!id.IsBonusItem)
if (!id.IsBonusItem || id.Id == 0)
{
IsBonusItemValid(slot, (BonusItemId)id.Id, out var item);
return item;
@ -207,7 +207,7 @@ public class ItemManager
if (itemId.Id != 0)
return DictBonusItems.TryGetValue(itemId, out item) && slot == item.Type.ToBonus();
item = new EquipItem(Nothing, (BonusItemId)0, 0, 0, 0, 0, slot.ToEquipType(), 0, 0, 0);
item = EquipItem.BonusItemNothing(slot);
return true;
}

2
Penumbra.GameData

@ -1 +1 @@
Subproject commit 2f6acca678b71203763ac4404c3f054747c14f75
Subproject commit 554e28a3d1fca9394a20fd9856f6387e2a5e4a57

4
repo.json
View file

@ -18,7 +18,7 @@
],
"InternalName": "Glamourer",
"AssemblyVersion": "1.3.2.0",
"TestingAssemblyVersion": "1.3.2.0",
"TestingAssemblyVersion": "1.3.2.2",
"RepoUrl": "https://github.com/Ottermandias/Glamourer",
"ApplicableVersion": "any",
"DalamudApiLevel": 10,
@ -29,7 +29,7 @@
"LastUpdate": 1618608322,
"DownloadLinkInstall": "https://github.com/Ottermandias/Glamourer/releases/download/1.3.2.0/Glamourer.zip",
"DownloadLinkUpdate": "https://github.com/Ottermandias/Glamourer/releases/download/1.3.2.0/Glamourer.zip",
"DownloadLinkTesting": "https://github.com/Ottermandias/Glamourer/releases/download/1.3.2.0/Glamourer.zip",
"DownloadLinkTesting": "https://github.com/Ottermandias/Glamourer/releases/download/testing_1.3.2.2/Glamourer.zip",
"IconUrl": "https://raw.githubusercontent.com/Ottermandias/Glamourer/main/images/icon.png"
}
]