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

Merge pull request #105 from Diorik/redraw_command

Browse source 
Add "Reset Design" command
This commit is contained in:
Ottermandias 2025-02-06 16:38:10 +01:00 • committed by GitHub
commit 47f2cfc210
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Glamourer/Api/StateApi.cs
View file

@ -301,7 +301,7 @@ public sealed class StateApi : IGlamourerApiState, IApiService, IDisposable
private void RevertToAutomation(Actor actor, ActorState state, uint key, ApplyFlag flags) private void RevertToAutomation(Actor actor, ActorState state, uint key, ApplyFlag flags)
{ {
var source = (flags & ApplyFlag.Once) != 0 ? StateSource.IpcManual : StateSource.IpcFixed; var source = (flags & ApplyFlag.Once) != 0 ? StateSource.IpcManual : StateSource.IpcFixed;
_autoDesigns.ReapplyAutomation(actor, state.Identifier, state, true, out var forcedRedraw); _autoDesigns.ReapplyAutomation(actor, state.Identifier, state, true, false, out var forcedRedraw);
_stateManager.ReapplyAutomationState(actor, state, forcedRedraw, true, source); _stateManager.ReapplyAutomationState(actor, state, forcedRedraw, true, source);
ApiHelpers.Lock(state, key, flags); ApiHelpers.Lock(state, key, flags);
} }

4
Glamourer/Automation/AutoDesignApplier.cs
View file

@ -225,7 +225,7 @@ public sealed class AutoDesignApplier : IDisposable
_state.ReapplyState(actor, forcedRedraw, StateSource.Fixed); _state.ReapplyState(actor, forcedRedraw, StateSource.Fixed);
} }
public void ReapplyAutomation(Actor actor, ActorIdentifier identifier, ActorState state, bool reset, out bool forcedRedraw) public void ReapplyAutomation(Actor actor, ActorIdentifier identifier, ActorState state, bool reset, bool forcedNew, out bool forcedRedraw)
{ {
forcedRedraw = false; forcedRedraw = false;
if (!_config.EnableAutoDesigns) if (!_config.EnableAutoDesigns)
@ -235,7 +235,7 @@ public sealed class AutoDesignApplier : IDisposable
_state.ResetState(state, StateSource.Game); _state.ResetState(state, StateSource.Game);
if (GetPlayerSet(identifier, out var set)) if (GetPlayerSet(identifier, out var set))
Reduce(actor, state, set, false, false, false, out forcedRedraw); Reduce(actor, state, set, false, false, forcedNew, out forcedRedraw);
} }
public bool Reduce(Actor actor, ActorIdentifier identifier, [NotNullWhen(true)] out ActorState? state) public bool Reduce(Actor actor, ActorIdentifier identifier, [NotNullWhen(true)] out ActorState? state)

4
Glamourer/Gui/DesignQuickBar.cs
View file

@ -251,7 +251,7 @@ public sealed class DesignQuickBar : Window, IDisposable
foreach (var actor in data.Objects) foreach (var actor in data.Objects)
{ {
_autoDesignApplier.ReapplyAutomation(actor, id, state!, true, out var forcedRedraw); _autoDesignApplier.ReapplyAutomation(actor, id, state!, true, false, out var forcedRedraw);
_stateManager.ReapplyAutomationState(actor, forcedRedraw, true, StateSource.Manual); _stateManager.ReapplyAutomationState(actor, forcedRedraw, true, StateSource.Manual);
} }
} }
@ -291,7 +291,7 @@ public sealed class DesignQuickBar : Window, IDisposable
foreach (var actor in data.Objects) foreach (var actor in data.Objects)
{ {
_autoDesignApplier.ReapplyAutomation(actor, id, state!, false, out var forcedRedraw); _autoDesignApplier.ReapplyAutomation(actor, id, state!, false, false, out var forcedRedraw);
_stateManager.ReapplyAutomationState(actor, forcedRedraw, false, StateSource.Manual); _stateManager.ReapplyAutomationState(actor, forcedRedraw, false, StateSource.Manual);
} }
} }

4
Glamourer/Gui/Tabs/ActorTab/ActorPanel.cs
View file

@ -393,7 +393,7 @@ public class ActorPanel
"Reapply the current automation state for the character on top of its current state..", "Reapply the current automation state for the character on top of its current state..",
!_config.EnableAutoDesigns || _state!.IsLocked)) !_config.EnableAutoDesigns || _state!.IsLocked))
{ {
_autoDesignApplier.ReapplyAutomation(_actor, _identifier, _state!, false, out var forcedRedraw); _autoDesignApplier.ReapplyAutomation(_actor, _identifier, _state!, false, false, out var forcedRedraw);
_stateManager.ReapplyAutomationState(_actor, forcedRedraw, false, StateSource.Manual); _stateManager.ReapplyAutomationState(_actor, forcedRedraw, false, StateSource.Manual);
} }
@ -402,7 +402,7 @@ public class ActorPanel
"Try to revert the character to the state it would have using automated designs.", "Try to revert the character to the state it would have using automated designs.",
!_config.EnableAutoDesigns || _state!.IsLocked)) !_config.EnableAutoDesigns || _state!.IsLocked))
{ {
_autoDesignApplier.ReapplyAutomation(_actor, _identifier, _state!, true, out var forcedRedraw); _autoDesignApplier.ReapplyAutomation(_actor, _identifier, _state!, true, false, out var forcedRedraw);
_stateManager.ReapplyAutomationState(_actor, forcedRedraw, true, StateSource.Manual); _stateManager.ReapplyAutomationState(_actor, forcedRedraw, true, StateSource.Manual);
} }

11
Glamourer/Services/CommandService.cs
View file

@ -121,8 +121,9 @@ public class CommandService : IDisposable, IApiService
"apply" => Apply(argument), "apply" => Apply(argument),
"reapply" => ReapplyState(argument), "reapply" => ReapplyState(argument),
"revert" => Revert(argument), "revert" => Revert(argument),
"reapplyautomation" => ReapplyAutomation(argument, "reapplyautomation", false), "reapplyautomation" => ReapplyAutomation(argument, "reapplyautomation", false, false),
"reverttoautomation" => ReapplyAutomation(argument, "reverttoautomation", true), "reverttoautomation" => ReapplyAutomation(argument, "reverttoautomation", true, false),
"resetdesign" => ReapplyAutomation(argument, "resetdesign", false, true),
"automation" => SetAutomation(argument), "automation" => SetAutomation(argument),
"copy" => CopyState(argument), "copy" => CopyState(argument),
"save" => SaveState(argument), "save" => SaveState(argument),
@ -151,6 +152,8 @@ public class CommandService : IDisposable, IApiService
"Reapplies the current automation state on top of the characters current state.. Use without arguments for help.").BuiltString); "Reapplies the current automation state on top of the characters current state.. Use without arguments for help.").BuiltString);
_chat.Print(new SeStringBuilder().AddCommand("reverttoautomation", _chat.Print(new SeStringBuilder().AddCommand("reverttoautomation",
"Reverts a given character to its supposed state using automated designs. Use without arguments for help.").BuiltString); "Reverts a given character to its supposed state using automated designs. Use without arguments for help.").BuiltString);
_chat.Print(new SeStringBuilder().AddCommand("resetdesign",
"Reapplies the current automation and resets the random design. Use without arguments for help.").BuiltString);
_chat.Print(new SeStringBuilder() _chat.Print(new SeStringBuilder()
.AddCommand("copy", "Copy the current state of a character to clipboard. Use without arguments for help.").BuiltString); .AddCommand("copy", "Copy the current state of a character to clipboard. Use without arguments for help.").BuiltString);
_chat.Print(new SeStringBuilder() _chat.Print(new SeStringBuilder()
@ -306,7 +309,7 @@ public class CommandService : IDisposable, IApiService
return true; return true;
} }
private bool ReapplyAutomation(string argument, string command, bool revert) private bool ReapplyAutomation(string argument, string command, bool revert, bool forcedNew)
{ {
if (argument.Length == 0) if (argument.Length == 0)
{ {
@ -328,7 +331,7 @@ public class CommandService : IDisposable, IApiService
{ {
if (_stateManager.GetOrCreate(identifier, actor, out var state)) if (_stateManager.GetOrCreate(identifier, actor, out var state))
{ {
_autoDesignApplier.ReapplyAutomation(actor, identifier, state, revert, out var forcedRedraw); _autoDesignApplier.ReapplyAutomation(actor, identifier, state, revert, forcedNew, out var forcedRedraw);
_stateManager.ReapplyAutomationState(actor, forcedRedraw, revert, StateSource.Manual); _stateManager.ReapplyAutomationState(actor, forcedRedraw, revert, StateSource.Manual);
} }
} }