muffin v7.38
This commit is contained in:
parent
411c0bbe76
commit
e5b98b3d57
35 changed files with 10700 additions and 7610 deletions
|
|
@ -142,6 +142,14 @@ internal sealed class QuestController : MiniTaskController<QuestController>
|
|||
|
||||
private DateTime _lastAutoRefresh = DateTime.MinValue;
|
||||
|
||||
private bool _lastEscDown;
|
||||
|
||||
private int _escPressCount;
|
||||
|
||||
private DateTime _lastEscPressTime = DateTime.MinValue;
|
||||
|
||||
private static readonly TimeSpan EscDoublePressWindow = TimeSpan.FromSeconds(1L);
|
||||
|
||||
private const char ClipboardSeparator = ';';
|
||||
|
||||
public EAutomationType AutomationType
|
||||
|
|
@ -307,9 +315,40 @@ internal sealed class QuestController : MiniTaskController<QuestController>
|
|||
StopAllDueToConditionFailed("HP = 0");
|
||||
}
|
||||
}
|
||||
else if (_configuration.General.UseEscToCancelQuesting && _keyState[VirtualKey.ESCAPE] && !_taskQueue.AllTasksComplete)
|
||||
else if (_configuration.General.UseEscToCancelQuesting)
|
||||
{
|
||||
StopAllDueToConditionFailed("ESC pressed");
|
||||
if (_keyState[VirtualKey.ESCAPE] && !_lastEscDown)
|
||||
{
|
||||
DateTime now = DateTime.Now;
|
||||
if (now - _lastEscPressTime <= EscDoublePressWindow)
|
||||
{
|
||||
_escPressCount++;
|
||||
}
|
||||
else
|
||||
{
|
||||
_escPressCount = 1;
|
||||
}
|
||||
_lastEscPressTime = now;
|
||||
if (_escPressCount >= 2)
|
||||
{
|
||||
if (!_taskQueue.AllTasksComplete)
|
||||
{
|
||||
StopAllDueToConditionFailed("ESC pressed twice");
|
||||
}
|
||||
_escPressCount = 0;
|
||||
}
|
||||
}
|
||||
if (!_keyState[VirtualKey.ESCAPE] && DateTime.Now - _lastEscPressTime > EscDoublePressWindow)
|
||||
{
|
||||
_escPressCount = 0;
|
||||
}
|
||||
_lastEscDown = _keyState[VirtualKey.ESCAPE];
|
||||
}
|
||||
else
|
||||
{
|
||||
_lastEscDown = _keyState[VirtualKey.ESCAPE];
|
||||
_escPressCount = 0;
|
||||
_lastEscPressTime = DateTime.MinValue;
|
||||
}
|
||||
if (_configuration.Stop.Enabled && _configuration.Stop.LevelToStopAfter && _clientState.LocalPlayer != null)
|
||||
{
|
||||
|
|
@ -344,14 +383,14 @@ internal sealed class QuestController : MiniTaskController<QuestController>
|
|||
if (step == 0 || step == 255)
|
||||
{
|
||||
flag2 = true;
|
||||
goto IL_0422;
|
||||
goto IL_04f5;
|
||||
}
|
||||
}
|
||||
flag2 = false;
|
||||
goto IL_0422;
|
||||
goto IL_04f5;
|
||||
}
|
||||
goto IL_0426;
|
||||
IL_0426:
|
||||
goto IL_04f9;
|
||||
IL_04f9:
|
||||
if (flag && DateTime.Now >= CurrentQuest.StepProgress.StartedAt.AddSeconds(15.0))
|
||||
{
|
||||
lock (_progressLock)
|
||||
|
|
@ -367,9 +406,9 @@ internal sealed class QuestController : MiniTaskController<QuestController>
|
|||
UpdateCurrentTask();
|
||||
}
|
||||
return;
|
||||
IL_0422:
|
||||
IL_04f5:
|
||||
flag = flag2;
|
||||
goto IL_0426;
|
||||
goto IL_04f9;
|
||||
}
|
||||
|
||||
private void CheckAutoRefreshCondition()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue