muffin v7.4.16
This commit is contained in:
parent
0b1b2d38c7
commit
e21aa9ca07
4 changed files with 1067 additions and 993 deletions
|
|
@ -38,6 +38,8 @@ internal sealed class TextAdvanceIpc : IDisposable
|
|||
|
||||
private readonly QuestController _questController;
|
||||
|
||||
private readonly FateController _fateController;
|
||||
|
||||
private readonly Configuration _configuration;
|
||||
|
||||
private readonly ICondition _condition;
|
||||
|
|
@ -52,10 +54,11 @@ internal sealed class TextAdvanceIpc : IDisposable
|
|||
|
||||
private readonly string _pluginName;
|
||||
|
||||
public TextAdvanceIpc(IDalamudPluginInterface pluginInterface, IFramework framework, QuestController questController, Configuration configuration, ICondition condition)
|
||||
public TextAdvanceIpc(IDalamudPluginInterface pluginInterface, IFramework framework, QuestController questController, FateController fateController, Configuration configuration, ICondition condition)
|
||||
{
|
||||
_framework = framework;
|
||||
_questController = questController;
|
||||
_fateController = fateController;
|
||||
_configuration = configuration;
|
||||
_condition = condition;
|
||||
_isInExternalControl = pluginInterface.GetIpcSubscriber<bool>("TextAdvance.IsInExternalControl");
|
||||
|
|
@ -76,7 +79,7 @@ internal sealed class TextAdvanceIpc : IDisposable
|
|||
|
||||
private void OnUpdate(IFramework framework)
|
||||
{
|
||||
bool flag = _questController.IsRunning || _questController.AutomationType != QuestController.EAutomationType.Manual;
|
||||
bool flag = _questController.IsRunning || _questController.AutomationType != QuestController.EAutomationType.Manual || _fateController.IsRunning;
|
||||
if (!_configuration.General.ConfigureTextAdvance || !flag)
|
||||
{
|
||||
if (_isExternalControlActivated && (_disableExternalControl.InvokeFunc(_pluginName) || !_isInExternalControl.InvokeFunc()))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue