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

master #3

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

11
Questionable/Controller/Steps/Interactions/Jump.cs
View File

@ -1,4 +1,5 @@
using System;
using Dalamud.Game.ClientState.Conditions;
using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Game;
using Microsoft.Extensions.DependencyInjection;
@ -15,6 +16,7 @@ internal static class Jump
MovementController movementController,
IClientState clientState,
IFramework framework,
ICondition condition,
ILoggerFactory loggerFactory) : SimpleTaskFactory
{
public override ITask? CreateTask(Quest quest, QuestSequence sequence, QuestStep step)
@ -38,7 +40,7 @@ internal static class Jump
public ITask RepeatedJumps(uint? dataId, JumpDestination jumpDestination, string? comment)
{
return new DoRepeatedJumps(dataId, jumpDestination, comment, movementController, clientState, framework,
loggerFactory.CreateLogger<DoRepeatedJumps>());
condition, loggerFactory.CreateLogger<DoRepeatedJumps>());
}
}
@ -91,6 +93,7 @@ internal static class Jump
MovementController movementController,
IClientState clientState,
IFramework framework,
ICondition condition,
ILogger<DoRepeatedJumps> logger)
: DoSingleJump(dataId, jumpDestination, comment, movementController, clientState, framework)
{
@ -108,7 +111,7 @@ internal static class Jump
public override ETaskResult Update()
{
if (DateTime.Now < _continueAt)
if (DateTime.Now < _continueAt || condition[ConditionFlag.Jumping])
return ETaskResult.StillRunning;
float stopDistance = _jumpDestination.CalculateStopDistance();
@ -120,10 +123,10 @@ internal static class Jump
_jumpDestination.Position.Y - 0.5f);
unsafe
{
ActionManager.Instance()->UseAction(ActionType.GeneralAction, 2);
if (ActionManager.Instance()->UseAction(ActionType.GeneralAction, 2))
++_attempts;
}
++_attempts;
if (_attempts >= 50)
throw new TaskException("Tried to jump too many times, didn't reach the target");