From 5bca4b91184b7400a2098e1802a2ea8db577aac6 Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Tue, 6 Aug 2024 17:38:53 +0200 Subject: [PATCH] Do not apply Nothing-shield for swords periphery. --- Glamourer/Designs/DesignEditor.cs | 2 +- Glamourer/State/StateEditor.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Glamourer/Designs/DesignEditor.cs b/Glamourer/Designs/DesignEditor.cs index df0e9ed..5328f03 100644 --- a/Glamourer/Designs/DesignEditor.cs +++ b/Glamourer/Designs/DesignEditor.cs @@ -360,7 +360,7 @@ public class DesignEditor( newOff = o; } - else if (!_forceFullItemOff && Config.ChangeEntireItem) + else if (!_forceFullItemOff && Config.ChangeEntireItem && newMain.Type is not FullEquipType.Sword) // Skip applying shields. { var defaultOffhand = Items.GetDefaultOffhand(newMain); if (Items.IsOffhandValid(newMain, defaultOffhand.ItemId, out var o)) diff --git a/Glamourer/State/StateEditor.cs b/Glamourer/State/StateEditor.cs index 95c118d..50479b2 100644 --- a/Glamourer/State/StateEditor.cs +++ b/Glamourer/State/StateEditor.cs @@ -456,6 +456,10 @@ public class StateEditor( return; var mh = newMainhand ?? state.ModelData.Item(EquipSlot.MainHand); + // Do not change Shields to nothing. + if (mh.Type is FullEquipType.Sword) + return; + var offhand = newMainhand != null ? Items.GetDefaultOffhand(mh) : state.ModelData.Item(EquipSlot.OffHand); var stains = newStains ?? state.ModelData.Stain(EquipSlot.MainHand); if (offhand.Valid)