goatzone/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests 1 Activity

Leave TextAdvance active if waiting for a new quest sequence from the server

Browse Source
This commit is contained in:
Liza 2025-01-13 18:38:53 +01:00
parent a2a36c5156
commit 16b62316c5
Signed by: liza
GPG Key ID: 2C41B84815CF6445
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Questionable/External/TextAdvanceIpc.cs vendored
View File

@ -22,13 +22,16 @@ internal sealed class TextAdvanceIpc : IDisposable
private readonly string _pluginName; private readonly string _pluginName;
private readonly ExternalTerritoryConfig _externalTerritoryConfig = new(); private readonly ExternalTerritoryConfig _externalTerritoryConfig = new();
public TextAdvanceIpc(IDalamudPluginInterface pluginInterface, IFramework framework, QuestController questController, Configuration configuration) public TextAdvanceIpc(IDalamudPluginInterface pluginInterface, IFramework framework,
QuestController questController, Configuration configuration)
{ {
_framework = framework; _framework = framework;
_questController = questController; _questController = questController;
_configuration = configuration; _configuration = configuration;
_isInExternalControl = pluginInterface.GetIpcSubscriber<bool>("TextAdvance.IsInExternalControl"); _isInExternalControl = pluginInterface.GetIpcSubscriber<bool>("TextAdvance.IsInExternalControl");
_enableExternalControl = pluginInterface.GetIpcSubscriber<string, ExternalTerritoryConfig, bool>("TextAdvance.EnableExternalControl"); _enableExternalControl =
pluginInterface.GetIpcSubscriber<string, ExternalTerritoryConfig, bool>(
"TextAdvance.EnableExternalControl");
_disableExternalControl = pluginInterface.GetIpcSubscriber<string, bool>("TextAdvance.DisableExternalControl"); _disableExternalControl = pluginInterface.GetIpcSubscriber<string, bool>("TextAdvance.DisableExternalControl");
_pluginName = pluginInterface.InternalName; _pluginName = pluginInterface.InternalName;
_framework.Update += OnUpdate; _framework.Update += OnUpdate;
@ -37,7 +40,7 @@ internal sealed class TextAdvanceIpc : IDisposable
public void Dispose() public void Dispose()
{ {
_framework.Update -= OnUpdate; _framework.Update -= OnUpdate;
if(_isExternalControlActivated) if (_isExternalControlActivated)
{ {
_disableExternalControl.InvokeFunc(_pluginName); _disableExternalControl.InvokeFunc(_pluginName);
} }
@ -45,11 +48,13 @@ internal sealed class TextAdvanceIpc : IDisposable
private void OnUpdate(IFramework framework) private void OnUpdate(IFramework framework)
{ {
if(_configuration.General.ConfigureTextAdvance && _questController.IsRunning) bool hasActiveQuest = _questController.IsRunning ||
_questController.AutomationType != QuestController.EAutomationType.Manual;
if (_configuration.General.ConfigureTextAdvance && hasActiveQuest)
{ {
if(!_isInExternalControl.InvokeFunc()) if (!_isInExternalControl.InvokeFunc())
{ {
if(_enableExternalControl.InvokeFunc(_pluginName, _externalTerritoryConfig)) if (_enableExternalControl.InvokeFunc(_pluginName, _externalTerritoryConfig))
{ {
_isExternalControlActivated = true; _isExternalControlActivated = true;
} }
@ -57,9 +62,9 @@ internal sealed class TextAdvanceIpc : IDisposable
} }
else else
{ {
if(_isExternalControlActivated) if (_isExternalControlActivated)
{ {
if(_disableExternalControl.InvokeFunc(_pluginName) || !_isInExternalControl.InvokeFunc()) if (_disableExternalControl.InvokeFunc(_pluginName) || !_isInExternalControl.InvokeFunc())
{ {
_isExternalControlActivated = false; _isExternalControlActivated = false;
} }