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

Fix some bugs with respecting manual weapon changes.

Browse source
This commit is contained in:
Ottermandias 2023-09-11 16:57:22 +02:00
parent 90d4a06253
commit 8e077b16f4
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Glamourer/Automation/AutoDesignApplier.cs
View file

@ -316,10 +316,10 @@ public class AutoDesignApplier : IDisposable
if (equipFlags.HasFlag(EquipFlag.Mainhand)) if (equipFlags.HasFlag(EquipFlag.Mainhand))
{ {
var item = design.Item(EquipSlot.MainHand); var item = design.Item(EquipSlot.MainHand);
if (!_config.UnlockedItemMode var checkUnlock = !_config.UnlockedItemMode || _itemUnlocks.IsUnlocked(item.Id, out _);
|| _itemUnlocks.IsUnlocked(item.Id, out _) && !respectManual var checkState = !respectManual || state[EquipSlot.MainHand, false] is not StateChanged.Source.Manual;
|| state[EquipSlot.MainHand, false] is not StateChanged.Source.Manual) if (checkUnlock && checkState)
{ {
if (state.ModelData.Item(EquipSlot.MainHand).Type == item.Type) if (state.ModelData.Item(EquipSlot.MainHand).Type == item.Type)
{ {
@ -337,10 +337,10 @@ public class AutoDesignApplier : IDisposable
if (equipFlags.HasFlag(EquipFlag.Offhand)) if (equipFlags.HasFlag(EquipFlag.Offhand))
{ {
var item = design.Item(EquipSlot.OffHand); var item = design.Item(EquipSlot.OffHand);
if (!_config.UnlockedItemMode var checkUnlock = !_config.UnlockedItemMode || _itemUnlocks.IsUnlocked(item.Id, out _);
|| _itemUnlocks.IsUnlocked(item.Id, out _) && !respectManual var checkState = !respectManual || state[EquipSlot.OffHand, false] is not StateChanged.Source.Manual;
|| state[EquipSlot.OffHand, false] is not StateChanged.Source.Manual) if (checkUnlock && checkState)
{ {
if (state.ModelData.Item(EquipSlot.OffHand).Type == item.Type) if (state.ModelData.Item(EquipSlot.OffHand).Type == item.Type)
{ {