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

master #3

Open
cacahuetes wants to merge 999 commits from liza/Questionable:master into cacahuetes-ShB-Healer
pull from: liza/Questionable:master
merge into: cacahuetes:cacahuetes-ShB-Healer
Conversation 0 Commits 999 Files Changed 2068 +19 -9
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d2501825c8 - Show all commits

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)