ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2025-12-14 20:54:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix palettes not resetting on Reapply Automation with Use Game State as Base.

Browse source
This commit is contained in:
Ottermandias 2024-01-17 13:31:22 +01:00
parent 1ab9d5a2a7
commit 3b5f89e6a1
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Glamourer/Automation/AutoDesignApplier.cs
View file

@ -274,7 +274,7 @@ public class AutoDesignApplier : IDisposable
CustomizeParameterFlag totalParameterFlags = 0; CustomizeParameterFlag totalParameterFlags = 0;
byte totalMetaFlags = 0; byte totalMetaFlags = 0;
if (set.BaseState == AutoDesignSet.Base.Game) if (set.BaseState == AutoDesignSet.Base.Game)
_state.ResetStateFixed(state); _state.ResetStateFixed(state, respectManual);
else if (!respectManual) else if (!respectManual)
state.RemoveFixedDesignSources(); state.RemoveFixedDesignSources();

11
Glamourer/State/StateManager.cs
View file

@ -504,7 +504,7 @@ public class StateManager(
_event.Invoke(StateChanged.Type.Reset, StateChanged.Source.Manual, state, actors, null); _event.Invoke(StateChanged.Type.Reset, StateChanged.Source.Manual, state, actors, null);
} }
public void ResetStateFixed(ActorState state, uint key = 0) public void ResetStateFixed(ActorState state, bool respectManualPalettes, uint key = 0)
{ {
if (!state.Unlock(key)) if (!state.Unlock(key))
return; return;
@ -541,10 +541,13 @@ public class StateManager(
foreach (var flag in CustomizeParameterExtensions.AllFlags) foreach (var flag in CustomizeParameterExtensions.AllFlags)
{ {
if (state[flag] is StateChanged.Source.Fixed) switch (state[flag])
{ {
state[flag] = StateChanged.Source.Game; case StateChanged.Source.Fixed:
state.ModelData.Parameters[flag] = state.BaseData.Parameters[flag]; case StateChanged.Source.Manual when !respectManualPalettes:
state[flag] = StateChanged.Source.Game;
state.ModelData.Parameters[flag] = state.BaseData.Parameters[flag];
break;
} }
} }