ToxicMushroom/Glamourer
1
0
Fork 0
mirror of https://github.com/Ottermandias/Glamourer.git synced 2026-02-19 22:17:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add an option to track territories to revert manual changes or outdated automations when changing zone.

Browse source
This commit is contained in:
Ottermandias 2023-09-29 15:46:28 +02:00
parent 66596f8868
commit cfe306fc19
5 changed files with 47 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Glamourer/Automation/AutoDesignApplier.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Diagnostics.CodeAnalysis;
using Dalamud.Plugin.Services;
using Glamourer.Customization;
using Glamourer.Designs;
using Glamourer.Events;
@ -31,6 +32,7 @@ public class AutoDesignApplier : IDisposable
private readonly ObjectManager _objects;
private readonly WeaponLoading _weapons;
private readonly HumanModelList _humans;
private readonly IClientState _clientState;
private ActorState? _jobChangeState;
private EquipItem _jobChangeMainhand;
@ -38,7 +40,7 @@ public class AutoDesignApplier : IDisposable
public AutoDesignApplier(Configuration config, AutoDesignManager manager, StateManager state, JobService jobs,
CustomizationService customizations, ActorService actors, ItemUnlockManager itemUnlocks, CustomizeUnlockManager customizeUnlocks,
AutomationChanged @event, ObjectManager objects, WeaponLoading weapons, HumanModelList humans)
AutomationChanged @event, ObjectManager objects, WeaponLoading weapons, HumanModelList humans, IClientState clientState)
{
_config = config;
_manager = manager;
@ -52,6 +54,7 @@ public class AutoDesignApplier : IDisposable
_objects = objects;
_weapons = weapons;
_humans = humans;
_clientState = clientState;
_jobs.JobChanged += OnJobChange;
_event.Subscribe(OnAutomationChange, AutomationChanged.Priority.AutoDesignApplier);
_weapons.Subscribe(OnWeaponLoading, WeaponLoading.Priority.AutoDesignApplier);
@ -227,10 +230,15 @@ public class AutoDesignApplier : IDisposable
}
else if (!GetPlayerSet(identifier, out set!))
{
if (state.UpdateTerritory(_clientState.TerritoryType) && _config.RevertManualChangesOnZoneChange)
_state.ResetState(state, StateChanged.Source.Game);
return true;
}
Reduce(actor, state, set, true, false);
var respectManual = !state.UpdateTerritory(_clientState.TerritoryType) || !_config.RevertManualChangesOnZoneChange;
if (!respectManual)
_state.ResetState(state, StateChanged.Source.Game);
Reduce(actor, state, set, respectManual, false);
return true;
}