ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2026-02-22 15:37:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into luna

Browse source
This commit is contained in:
Ottermandias 2026-01-29 00:07:33 +01:00
commit 20393be689
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Glamourer/State/StateListener.cs
View file

@ -9,7 +9,6 @@ using Penumbra.GameData.Enums;
using Penumbra.GameData.Structs; using Penumbra.GameData.Structs;
using Dalamud.Game.ClientState.Conditions; using Dalamud.Game.ClientState.Conditions;
using Dalamud.Plugin.Services; using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Game.Character;
using FFXIVClientStructs.FFXIV.Client.Game.Object; using FFXIVClientStructs.FFXIV.Client.Game.Object;
using Glamourer.GameData; using Glamourer.GameData;
using Penumbra.GameData.DataContainers; using Penumbra.GameData.DataContainers;
@ -602,14 +601,21 @@ public class StateListener : IDisposable
change = UpdateState.Change; change = UpdateState.Change;
} }
if (baseData.Skeleton.Id != weapon.Skeleton.Id || baseData.Weapon.Id != weapon.Weapon.Id || baseData.Variant != weapon.Variant) var idsDiffer = baseData.Skeleton.Id != weapon.Skeleton.Id
|| baseData.Weapon.Id != weapon.Weapon.Id
|| baseData.Variant != weapon.Variant;
// Special case when nothing is equipped to the offhand which is already nothing, but we need to update the type.
var nothingDiffers = baseData.Skeleton.Id is 0 && slot is EquipSlot.OffHand;
if (idsDiffer || nothingDiffers)
{ {
if (_isPlayerNpc) if (_isPlayerNpc)
return UpdateState.Transformed; return UpdateState.Transformed;
var item = _items.Identify(slot, weapon.Skeleton, weapon.Weapon, weapon.Variant, var item = _items.Identify(slot, weapon.Skeleton, weapon.Weapon, weapon.Variant,
slot is EquipSlot.OffHand ? state.BaseData.MainhandType : FullEquipType.Unknown); slot is EquipSlot.OffHand ? state.BaseData.MainhandType : FullEquipType.Unknown);
state.BaseData.SetItem(slot, item); if (idsDiffer || item.Type != state.BaseData.OffhandType)
state.BaseData.SetItem(slot, item);
change = UpdateState.Change; change = UpdateState.Change;
} }

10
repo.json
View file

@ -17,8 +17,8 @@
"Character" "Character"
], ],
"InternalName": "Glamourer", "InternalName": "Glamourer",
"AssemblyVersion": "1.5.1.7", "AssemblyVersion": "1.5.1.8",
"TestingAssemblyVersion": "1.5.1.7", "TestingAssemblyVersion": "1.5.1.8",
"RepoUrl": "https://github.com/Ottermandias/Glamourer", "RepoUrl": "https://github.com/Ottermandias/Glamourer",
"ApplicableVersion": "any", "ApplicableVersion": "any",
"DalamudApiLevel": 14, "DalamudApiLevel": 14,
@ -27,9 +27,9 @@
"IsTestingExclusive": "False", "IsTestingExclusive": "False",
"DownloadCount": 1, "DownloadCount": 1,
"LastUpdate": 1618608322, "LastUpdate": 1618608322,
"DownloadLinkInstall": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.7/Glamourer.zip", "DownloadLinkInstall": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.8/Glamourer.zip",
"DownloadLinkUpdate": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.7/Glamourer.zip", "DownloadLinkUpdate": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.8/Glamourer.zip",
"DownloadLinkTesting": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.7/Glamourer.zip", "DownloadLinkTesting": "https://github.com/Ottermandias/Glamourer/releases/download/1.5.1.8/Glamourer.zip",
"IconUrl": "https://raw.githubusercontent.com/Ottermandias/Glamourer/main/images/icon.png" "IconUrl": "https://raw.githubusercontent.com/Ottermandias/Glamourer/main/images/icon.png"
} }
] ]