Glamourer/Designs/Design.cs

@@ -100,7 +100,7 @@ public sealed class Design : DesignBase, ISavable, IDesignStandIn
 
     public new JObject JsonSerialize()
     {
-        var ret = new JObject
+        var ret = new JObject()
         {
             ["FileVersion"]            = FileVersion,
             ["Identifier"]             = Identifier,
@@ -131,17 +131,12 @@ public sealed class Design : DesignBase, ISavable, IDesignStandIn
         var ret = new JArray();
         foreach (var (mod, settings) in AssociatedMods)
         {
-            var obj = new JObject
+            var obj = new JObject()
             {
                 ["Name"]      = mod.Name,
                 ["Directory"] = mod.DirectoryName,
+                ["Enabled"]   = settings.Enabled,
             };
-            if (settings.Remove)
-                obj["Remove"] = true;
-            else if (settings.ForceInherit)
-                obj["Inherit"] = true;
-            else
-                obj["Enabled"] = settings.Enabled;
             if (settings.Enabled)
             {
                 obj["Priority"] = settings.Priority;

Glamourer/Designs/DesignManager.cs

@@ -557,7 +557,7 @@ public sealed class DesignManager : DesignEditor
         try
         {
             File.Move(SaveService.FileNames.MigrationDesignFile,
-                Path.ChangeExtension(SaveService.FileNames.MigrationDesignFile, ".json.bak"), true);
+                Path.ChangeExtension(SaveService.FileNames.MigrationDesignFile, ".json.bak"));
             Glamourer.Log.Information($"Moved migrated design file {SaveService.FileNames.MigrationDesignFile} to backup file.");
         }
         catch (Exception ex)

Glamourer/Gui/PenumbraChangedItemTooltip.cs

@@ -22,12 +22,11 @@ public sealed class PenumbraChangedItemTooltip : IDisposable
     private readonly CustomizeService   _customize;
     private readonly GPoseService       _gpose;
 
-    private readonly EquipItem[] _lastItems = new EquipItem[EquipFlagExtensions.NumEquipFlags / 2 + BonusExtensions.AllFlags.Count];
+    private readonly EquipItem[] _lastItems = new EquipItem[EquipFlagExtensions.NumEquipFlags / 2];
 
-    public IEnumerable<KeyValuePair<object, EquipItem>> LastItems
+    public IEnumerable<KeyValuePair<EquipSlot, EquipItem>> LastItems
-        => EquipSlotExtensions.EqdpSlots.Cast<object>().Append(EquipSlot.MainHand).Append(EquipSlot.OffHand)
+        => EquipSlotExtensions.EqdpSlots.Append(EquipSlot.MainHand).Append(EquipSlot.OffHand).Zip(_lastItems)
-            .Concat(BonusExtensions.AllFlags.Cast<object>()).Zip(_lastItems)
+            .Select(p => new KeyValuePair<EquipSlot, EquipItem>(p.First, p.Second));
-            .Select(p => new KeyValuePair<object, EquipItem>(p.First, p.Second));
 
     public ChangedItemType LastType    { get; private set; } = ChangedItemType.None;
     public uint            LastId      { get; private set; }
@@ -73,21 +72,6 @@ public sealed class PenumbraChangedItemTooltip : IDisposable
         if (!Player())
             return;
 
-        var bonusSlot = item.Type.ToBonus();
-        if (bonusSlot is not BonusItemFlag.Unknown)
-        {
-            // + 2 due to weapons.
-            var glasses = _lastItems[bonusSlot.ToSlot() + 2];
-            using (_ = !openTooltip ? null : ImRaii.Tooltip())
-            {
-                ImGui.TextUnformatted($"{prefix}Right-Click to apply to current actor.");
-                if (glasses.Valid)
-                    ImGui.TextUnformatted($"{prefix}Control + Right-Click to re-apply {glasses.Name} to current actor.");
-            }
-
-            return;
-        }
-
         var slot = item.Type.ToSlot();
         var last = _lastItems[slot.ToIndex()];
         switch (slot)
@@ -125,27 +109,6 @@ public sealed class PenumbraChangedItemTooltip : IDisposable
 
     public void ApplyItem(ActorState state, EquipItem item)
     {
-        var bonusSlot = item.Type.ToBonus();
-        if (bonusSlot is not BonusItemFlag.Unknown)
-        {
-            // + 2 due to weapons.
-            var glasses = _lastItems[bonusSlot.ToSlot() + 2];
-            if (ImGui.GetIO().KeyCtrl && glasses.Valid)
-            {
-                Glamourer.Log.Debug($"Re-Applying {glasses.Name} to {bonusSlot.ToName()}.");
-                SetLastItem(bonusSlot, default, state);
-                _stateManager.ChangeBonusItem(state, bonusSlot, glasses, ApplySettings.Manual);
-            }
-            else
-            {
-                Glamourer.Log.Debug($"Applying {item.Name} to {bonusSlot.ToName()}.");
-                SetLastItem(bonusSlot, item, state);
-                _stateManager.ChangeBonusItem(state, bonusSlot, item, ApplySettings.Manual);
-            }
-
-            return;
-        }
-
         var slot = item.Type.ToSlot();
         var last = _lastItems[slot.ToIndex()];
         switch (slot)
@@ -302,22 +265,7 @@ public sealed class PenumbraChangedItemTooltip : IDisposable
         {
             var oldItem = state.ModelData.Item(slot);
             if (oldItem.Id != item.Id)
-                last = oldItem;
+                _lastItems[slot.ToIndex()] = oldItem;
-        }
-    }
-
-    private void SetLastItem(BonusItemFlag slot, EquipItem item, ActorState state)
-    {
-        ref var last = ref _lastItems[slot.ToSlot() + 2];
-        if (!item.Valid)
-        {
-            last = default;
-        }
-        else
-        {
-            var oldItem = state.ModelData.BonusItem(slot);
-            if (oldItem.Id != item.Id)
-                last = oldItem;
         }
     }
 

Glamourer/Gui/Tabs/DebugTab/PenumbraPanel.cs

@@ -89,13 +89,7 @@ public unsafe class PenumbraPanel(PenumbraService _penumbra, PenumbraChangedItem
         ImGui.Separator();
         foreach (var (slot, item) in _penumbraTooltip.LastItems)
         {
-            switch (slot)
+            ImGuiUtil.DrawTableColumn($"{slot.ToName()} Revert-Item");
-            {
-                case EquipSlot e:     ImGuiUtil.DrawTableColumn($"{e.ToName()} Revert-Item"); break;
-                case BonusItemFlag f: ImGuiUtil.DrawTableColumn($"{f.ToName()} Revert-Item"); break;
-                default:              ImGuiUtil.DrawTableColumn("Unk Revert-Item"); break;
-            }
-
             ImGuiUtil.DrawTableColumn(item.Valid ? item.Name : "None");
             ImGui.TableNextColumn();
         }

OtterGui

@@ -1 +1 @@
-Subproject commit 1459e2b8f5e1687f659836709e23571235d4206c
+Subproject commit a63f6735cf4bed4f7502a022a10378607082b770

repo.json

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