Fix sources, let invalid model state weapons reset to base if necessa…

…ry, check design application against base type.
Ottermandias · Mar 7, 2024 · c99aa51 · c99aa51
1 parent ee426eb
commit c99aa51
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Glamourer/Designs/Links/MergedDesign.cs b/Glamourer/Designs/Links/MergedDesign.cs
@@ -1,6 +1,4 @@
-using Glamourer.Events;
-using Glamourer.GameData;
-using Glamourer.Interop.Penumbra;
+using Glamourer.Interop.Penumbra;
 using Glamourer.State;
 using Penumbra.GameData.Enums;
 using Penumbra.GameData.Structs;

diff --git a/Glamourer/State/StateEditor.cs b/Glamourer/State/StateEditor.cs
@@ -276,7 +276,6 @@ public void ApplyDesign(object data, MergedDesign mergedDesign, ApplySettings se
                 if (settings.RespectManual && state.Sources[weaponSlot, false].IsManual())
                     continue;
 
-                var currentType = state.ModelData.Item(weaponSlot).Type;
                 if (!settings.FromJobChange)
                 {
                     if (gPose.InGPose)
@@ -291,10 +290,11 @@ public void ApplyDesign(object data, MergedDesign mergedDesign, ApplySettings se
                         });
                     }
 
+                    var currentType = state.BaseData.Item(weaponSlot).Type;
                     if (mergedDesign.Weapons.TryGetValue(currentType, out var weapon))
                     {
                         var source = settings.UseSingleSource ? settings.Source :
-                            weapon.Item2 is StateSource.Game  ? StateSource.Game : weapon.Item2;
+                            weapon.Item2 is StateSource.Game  ? StateSource.Game : settings.Source;
                         Editor.ChangeItem(state, weaponSlot, weapon.Item1, source, out _,
                             settings.Key);
                     }
@@ -304,7 +304,7 @@ public void ApplyDesign(object data, MergedDesign mergedDesign, ApplySettings se
             if (settings.FromJobChange)
                 jobChange.Set(state, mergedDesign.Weapons.Values.Select(m =>
                     (m.Item1, settings.UseSingleSource ? settings.Source :
-                        m.Item2 is StateSource.Game    ? StateSource.Game : m.Item2)));
+                        m.Item2 is StateSource.Game    ? StateSource.Game : settings.Source)));
 
             foreach (var meta in MetaExtensions.AllRelevant.Where(mergedDesign.Design.DoApplyMeta))
             {

diff --git a/Glamourer/State/StateListener.cs b/Glamourer/State/StateListener.cs
@@ -331,7 +331,8 @@ private void OnWeaponLoading(Actor actor, EquipSlot slot, ref CharacterWeapon we
             {
                 if (weapon.Skeleton.Id != 0)
                     weapon = weapon.With(newWeapon.Stain);
-                _manager.ChangeItem(state, slot, state.BaseData.Item(slot), ApplySettings.Game);
+                // Force unlock if necessary.
+                _manager.ChangeItem(state, slot, state.BaseData.Item(slot), ApplySettings.Game with { Key = state.Combination });
             }
         }