liza/Questionable
liza/Questionable
2
1
Fork 26
Code Pull Requests 1 Releases 100 Activity

Stop AD when questionable is currently running an AD dungeon/trial

Browse Source
This commit is contained in:
Liza 2025-02-08 00:21:18 +01:00
parent 21721e34b4
commit 48cc37dd05
Signed by: liza
GPG Key ID: 2C41B84815CF6445
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Questionable/Controller/QuestController.cs
View File

@ -473,6 +473,9 @@ internal sealed class QuestController : MiniTaskController<QuestController>
private void ClearTasksInternal() private void ClearTasksInternal()
{ {
//_logger.LogDebug("Clearing task (internally)"); //_logger.LogDebug("Clearing task (internally)");
if (_taskQueue.CurrentTaskExecutor is IStoppableTaskExecutor stoppableTaskExecutor)
stoppableTaskExecutor.StopNow();
_taskQueue.Reset(); _taskQueue.Reset();
_yesAlreadyIpc.RestoreYesAlready(); _yesAlreadyIpc.RestoreYesAlready();

8
Questionable/Controller/Steps/Interactions/Duty.cs
View File

@ -49,7 +49,7 @@ internal static class Duty
TerritoryData territoryData, TerritoryData territoryData,
IClientState clientState, IClientState clientState,
IChatGui chatGui, IChatGui chatGui,
SendNotification.Executor sendNotificationExecutor) : TaskExecutor<StartAutoDutyTask> SendNotification.Executor sendNotificationExecutor) : TaskExecutor<StartAutoDutyTask>, IStoppableTaskExecutor
{ {
protected override bool Start() protected override bool Start()
{ {
@ -94,6 +94,8 @@ internal static class Duty
: ETaskResult.StillRunning; : ETaskResult.StillRunning;
} }
public void StopNow() => autoDutyIpc.Stop();
public override bool ShouldInterruptOnDamage() => false; public override bool ShouldInterruptOnDamage() => false;
} }
@ -105,7 +107,7 @@ internal static class Duty
internal sealed class WaitAutoDutyExecutor( internal sealed class WaitAutoDutyExecutor(
AutoDutyIpc autoDutyIpc, AutoDutyIpc autoDutyIpc,
TerritoryData territoryData, TerritoryData territoryData,
IClientState clientState) : TaskExecutor<WaitAutoDutyTask> IClientState clientState) : TaskExecutor<WaitAutoDutyTask>, IStoppableTaskExecutor
{ {
protected override bool Start() => true; protected override bool Start() => true;
@ -120,6 +122,8 @@ internal static class Duty
: ETaskResult.StillRunning; : ETaskResult.StillRunning;
} }
public void StopNow() => autoDutyIpc.Stop();
public override bool ShouldInterruptOnDamage() => false; public override bool ShouldInterruptOnDamage() => false;
} }

5
Questionable/Controller/Steps/TaskExecutor.cs
View File

@ -25,6 +25,11 @@ internal interface IExtraTaskCreator : ITaskExecutor
IEnumerable<ITask> CreateExtraTasks(); IEnumerable<ITask> CreateExtraTasks();
} }
internal interface IStoppableTaskExecutor : ITaskExecutor
{
void StopNow();
}
internal abstract class TaskExecutor<T> : ITaskExecutor internal abstract class TaskExecutor<T> : ITaskExecutor
where T : class, ITask where T : class, ITask
{ {