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

Make customizations right-clickable in penumbra.

Browse source
This commit is contained in:
Ottermandias 2024-02-13 00:24:40 +01:00
parent 72f1663e28
commit f5666680ff
3 changed files with 51 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

61
Glamourer/Gui/PenumbraChangedItemTooltip.cs
View file

@ -1,4 +1,5 @@
using Glamourer.Designs;
using Dalamud;
using Glamourer.Designs;
using Glamourer.Interop;
using Glamourer.Interop.Penumbra;
using Glamourer.Services;
@ -13,10 +14,11 @@ namespace Glamourer.Gui;
public sealed class PenumbraChangedItemTooltip : IDisposable
{
private readonly PenumbraService _penumbra;
private readonly StateManager _stateManager;
private readonly ItemManager _items;
private readonly ObjectManager _objects;
private readonly PenumbraService _penumbra;
private readonly StateManager _stateManager;
private readonly ItemManager _items;
private readonly ObjectManager _objects;
private readonly CustomizeService _customize;
private readonly EquipItem[] _lastItems = new EquipItem[EquipFlagExtensions.NumEquipFlags / 2];
@ -27,12 +29,14 @@ public sealed class PenumbraChangedItemTooltip : IDisposable
public DateTime LastTooltip { get; private set; } = DateTime.MinValue;
public DateTime LastClick { get; private set; } = DateTime.MinValue;
public PenumbraChangedItemTooltip(PenumbraService penumbra, StateManager stateManager, ItemManager items, ObjectManager objects)
public PenumbraChangedItemTooltip(PenumbraService penumbra, StateManager stateManager, ItemManager items, ObjectManager objects,
CustomizeService customize)
{
_penumbra = penumbra;
_stateManager = stateManager;
_items = items;
_objects = objects;
_customize = customize;
_penumbra.Tooltip += OnPenumbraTooltip;
_penumbra.Click += OnPenumbraClick;
}
@ -166,6 +170,16 @@ public sealed class PenumbraChangedItemTooltip : IDisposable
CreateTooltip(item, "[Glamourer] ", false);
return;
case ChangedItemType.Customization:
var (race, gender, index, value) = ChangedItemExtensions.Split(id);
if (!_objects.Player.Model.IsHuman)
return;
var customize = _objects.Player.Model.GetCustomize();
if (CheckGenderRace(customize, race, gender) && VerifyValue(customize, index, value))
ImGui.TextUnformatted("[Glamourer] Right-Click to apply to current actor.");
return;
}
}
@ -182,21 +196,27 @@ public sealed class PenumbraChangedItemTooltip : IDisposable
private void OnPenumbraClick(MouseButton button, ChangedItemType type, uint id)
{
LastClick = DateTime.UtcNow;
if (button is not MouseButton.Right)
return;
if (!Player(out var state))
return;
switch (type)
{
case ChangedItemType.Item:
case ChangedItemType.ItemOffhand:
if (button is not MouseButton.Right)
return;
if (!Player(out var state))
return;
if (!_items.ItemData.TryGetValue(id, type is ChangedItemType.Item ? EquipSlot.MainHand : EquipSlot.OffHand, out var item))
return;
ApplyItem(state, item);
return;
case ChangedItemType.Customization:
var (race, gender, index, value) = ChangedItemExtensions.Split(id);
var customize = state.ModelData.Customize;
if (CheckGenderRace(customize, race, gender) && VerifyValue(customize, index, value))
_stateManager.ChangeCustomize(state, index, value, ApplySettings.Manual);
return;
}
}
@ -214,4 +234,21 @@ public sealed class PenumbraChangedItemTooltip : IDisposable
_lastItems[slot.ToIndex()] = oldItem;
}
}
private static bool CheckGenderRace(in CustomizeArray customize, ModelRace race, Gender gender)
{
if (race is ModelRace.Unknown && gender is Gender.Unknown)
return true;
if (gender != customize.Gender)
return false;
if (race.ToRace() != customize.Race)
return false;
if (race is ModelRace.Highlander && customize.Clan is not SubRace.Highlander)
return false;
return true;
}
private bool VerifyValue(in CustomizeArray customize, CustomizeIndex index, CustomizeValue value)
=> _customize.IsCustomizationValid(customize.Clan, customize.Gender, customize.Face, index, value);
}

2
Penumbra.Api

@ -1 +1 @@
Subproject commit cfc51714f74cae93608bc507775a9580cd1801de
Subproject commit a28219ac57b53c3be6ca8c252ceb9f76ae0b6c21

2
Penumbra.GameData

@ -1 +1 @@
Subproject commit fb18c80551203a1cf6cd01ec2b0850fbc8e44240
Subproject commit 3a7f6d86c9975a4892f58be3c629b7664e6c3733