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

Make penumbra preview work in gpose for all weapons.

Browse source
This commit is contained in:
Ottermandias 2024-03-14 16:22:41 +01:00
parent 5ddf882077
commit 6362c79aa2
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Glamourer/Gui/PenumbraChangedItemTooltip.cs
View file

@ -1,5 +1,6 @@
using Dalamud; using Dalamud;
using Glamourer.Designs; using Glamourer.Designs;
using Glamourer.Events;
using Glamourer.Interop; using Glamourer.Interop;
using Glamourer.Interop.Penumbra; using Glamourer.Interop.Penumbra;
using Glamourer.Services; using Glamourer.Services;
@ -19,6 +20,7 @@ public sealed class PenumbraChangedItemTooltip : IDisposable
private readonly ItemManager _items; private readonly ItemManager _items;
private readonly ObjectManager _objects; private readonly ObjectManager _objects;
private readonly CustomizeService _customize; private readonly CustomizeService _customize;
private readonly GPoseService _gpose;
private readonly EquipItem[] _lastItems = new EquipItem[EquipFlagExtensions.NumEquipFlags / 2]; private readonly EquipItem[] _lastItems = new EquipItem[EquipFlagExtensions.NumEquipFlags / 2];
@ -30,13 +32,14 @@ public sealed class PenumbraChangedItemTooltip : IDisposable
public DateTime LastClick { 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) CustomizeService customize, GPoseService gpose)
{ {
_penumbra = penumbra; _penumbra = penumbra;
_stateManager = stateManager; _stateManager = stateManager;
_items = items; _items = items;
_objects = objects; _objects = objects;
_customize = customize; _customize = customize;
_gpose = gpose;
_penumbra.Tooltip += OnPenumbraTooltip; _penumbra.Tooltip += OnPenumbraTooltip;
_penumbra.Click += OnPenumbraClick; _penumbra.Click += OnPenumbraClick;
} }
@ -185,6 +188,9 @@ public sealed class PenumbraChangedItemTooltip : IDisposable
private bool CanApplyWeapon(EquipSlot slot, EquipItem item) private bool CanApplyWeapon(EquipSlot slot, EquipItem item)
{ {
if (_gpose.InGPose && slot is EquipSlot.MainHand)
return true;
var main = _objects.Player.GetMainhand(); var main = _objects.Player.GetMainhand();
var mainItem = _items.Identify(slot, main.Skeleton, main.Weapon, main.Variant); var mainItem = _items.Identify(slot, main.Skeleton, main.Weapon, main.Variant);
if (slot == EquipSlot.MainHand) if (slot == EquipSlot.MainHand)