liza/Questionable
liza/Questionable
2
1
Fork 28
Code Pull Requests 7 Releases 103 Activity

Don't stop Questionable/AD if dying in an AD-run dungeon

Browse Source
This commit is contained in:
Liza 2025-03-02 22:06:39 +01:00
parent a3a17c6793
commit d2501825c8
Signed by: liza
GPG Key ID: 2C41B84815CF6445
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Questionable/Controller/QuestController.cs
View File

@ -199,7 +199,11 @@ internal sealed class QuestController : MiniTaskController<QuestController>
UpdateCurrentQuest();
if (!_clientState.IsLoggedIn || _condition[ConditionFlag.Unconscious])
if (!_clientState.IsLoggedIn)
{
StopAllDueToConditionFailed("Logged out");
}
if (_condition[ConditionFlag.Unconscious])
{
if (_condition[ConditionFlag.Unconscious] &&
_condition[ConditionFlag.SufferingStatusAffliction63] &&
@ -207,22 +211,20 @@ internal sealed class QuestController : MiniTaskController<QuestController>
{
// ignore, we're in the lahabrea fight
}
else if (_taskQueue.CurrentTaskExecutor is Duty.WaitAutoDutyExecutor)
{
// ignoring death in a dungeon if it is being run by AD
}
else if (!_taskQueue.AllTasksComplete)
{
Stop("HP = 0");
_movementController.Stop();
_combatController.Stop("HP = 0");
_gatheringController.Stop("HP = 0");
StopAllDueToConditionFailed("HP = 0");
}
}
else if (_configuration.General.UseEscToCancelQuesting && _keyState[VirtualKey.ESCAPE])
{
if (!_taskQueue.AllTasksComplete)
{
Stop("ESC pressed");
_movementController.Stop();
_combatController.Stop("ESC pressed");
_gatheringController.Stop("ESC pressed");
StopAllDueToConditionFailed("ESC pressed");
}
}
@ -509,6 +511,14 @@ internal sealed class QuestController : MiniTaskController<QuestController>
}
}
private void StopAllDueToConditionFailed(string label)
{
Stop(label);
_movementController.Stop();
_combatController.Stop(label);
_gatheringController.Stop(label);
}
private void CheckNextTasks(string label)
{
if (AutomationType == EAutomationType.Automatic)