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

Minor ARR updates

Browse Source
This commit is contained in:
Liza 2025-02-18 17:32:02 +01:00
parent 04ab38cc59
commit 11cde2a2d6
Signed by: liza
GPG Key ID: 2C41B84815CF6445
5 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QuestPaths/2.x - A Realm Reborn/MSQ-2/E1-2.1/3874_Moving On.json
View File

@ -102,7 +102,7 @@
}, },
"TerritoryId": 137, "TerritoryId": 137,
"InteractionType": "WalkTo", "InteractionType": "WalkTo",
"Fly": true "Mount": true
}, },
{ {
"Position": { "Position": {

9
QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1457_Recruiting the Realm.json
View File

@ -120,6 +120,15 @@
8 8
] ]
}, },
{
"Position": {
"X": -140.77458,
"Y": 39.99999,
"Z": 155.4174
},
"TerritoryId": 128,
"InteractionType": "WalkTo"
},
{ {
"DataId": 1009133, "DataId": 1009133,
"Position": { "Position": {

3
QuestPaths/2.x - A Realm Reborn/Unlocks/Misc/1162_My Feisty Little Chocobo.json
View File

@ -80,7 +80,8 @@
}, },
"TerritoryId": 148, "TerritoryId": 148,
"InteractionType": "UseItem", "InteractionType": "UseItem",
"ItemId": 4868 "ItemId": 4868,
"Fly": true
}, },
{ {
"Position": { "Position": {

4
Questionable/Controller/QuestController.cs
View File

@ -757,6 +757,10 @@ internal sealed class QuestController : MiniTaskController<QuestController>
if (ManualPriorityQuests.Contains(currentQuest.Quest)) if (ManualPriorityQuests.Contains(currentQuest.Quest))
return false; return false;
// "ifrit bleeds, we can kill it" isn't listed as priority quest, as we accept it during the MSQ 'Moving On'
if (currentQuest.Quest.Id is QuestId { Value: 1048 })
return false;
if (currentQuest.Quest.Info.AlliedSociety != EAlliedSociety.None) if (currentQuest.Quest.Info.AlliedSociety != EAlliedSociety.None)
return false; return false;

4
Questionable/Controller/Steps/Common/Mount.cs
View File

@ -37,7 +37,7 @@ internal static class Mount
private bool _mountTriggered; private bool _mountTriggered;
private DateTime _retryAt = DateTime.MinValue; private DateTime _retryAt = DateTime.MinValue;
public MountResult EvaluateMountState() public unsafe MountResult EvaluateMountState()
{ {
if (condition[ConditionFlag.Mounted]) if (condition[ConditionFlag.Mounted])
return MountResult.DontMount; return MountResult.DontMount;
@ -58,7 +58,7 @@ internal static class Mount
{ {
Vector3 playerPosition = clientState.LocalPlayer?.Position ?? Vector3.Zero; Vector3 playerPosition = clientState.LocalPlayer?.Position ?? Vector3.Zero;
float distance = System.Numerics.Vector3.Distance(playerPosition, Task.Position.GetValueOrDefault()); float distance = System.Numerics.Vector3.Distance(playerPosition, Task.Position.GetValueOrDefault());
if (Task.TerritoryId == clientState.TerritoryType && distance < 30f && !Conditions.IsDiving) if (Task.TerritoryId == clientState.TerritoryType && distance < 30f && !Conditions.Instance()->Diving)
{ {
logger.LogInformation("Not using mount, as we're close to the target"); logger.LogInformation("Not using mount, as we're close to the target");
return MountResult.DontMount; return MountResult.DontMount;