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

Add snipe cheat

chore-fix-dt-dungeon-unlock
Liza 2024-09-11 16:58:07 +02:00
parent 8b07532080
commit 320bb5edbe
Signed by: liza
GPG Key ID: 7199F8D727D55F67
34 changed files with 102 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QuestPaths/4.x - Stormblood/Aether Currents/The Azim Steppe/2771_Sheep Snatcher.json
View File

@ -28,7 +28,7 @@
"Z": -210.22363
},
"TerritoryId": 622,
"InteractionType": "Instruction",
"InteractionType": "Snipe",
"Comment": "Snipe sheep"
}
]

2
QuestPaths/4.x - Stormblood/Alliance Raid Quests/3091_Desire.json
View File

@ -54,7 +54,7 @@
"Z": 208.484
},
"TerritoryId": 787,
"InteractionType": "Instruction",
"InteractionType": "Snipe",
"Comment": "Far on the left"
}
]

6
QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia 1/2495_A New Ruby Tithe.json
View File

@ -111,7 +111,7 @@
"Z": 147.23425
},
"TerritoryId": 614,
"InteractionType": "Instruction",
"InteractionType": "Snipe",
"Comment": "Snipe soldiers"
}
]
@ -127,7 +127,7 @@
"Z": 237.04883
},
"TerritoryId": 614,
"InteractionType": "Instruction",
"InteractionType": "Snipe",
"Comment": "Snipe soldiers"
}
]
@ -158,7 +158,7 @@
"Z": 603.2959
},
"TerritoryId": 614,
"InteractionType": "Instruction",
"InteractionType": "Snipe",
"Comment": "Snipe soldiers"
}
]

4
QuestPaths/4.x - Stormblood/MSQ/B-4.1/2970_Securing the Saltery.json
View File

@ -62,7 +62,7 @@
"Z": 196.55139
},
"TerritoryId": 621,
"InteractionType": "Instruction",
"InteractionType": "Snipe",
"Comment": "Aim at jaw",
"Fly": true
}
@ -95,7 +95,7 @@
"Z": 282.7954
},
"TerritoryId": 621,
"InteractionType": "Instruction",
"InteractionType": "Snipe",
"Fly": true,
"Comment": "Aim at nearest eye"
}

2
QuestPaths/5.x - Shadowbringers/Allied Societies/Pixies/Dailies/3707_Not the Beavers.json
View File

@ -28,7 +28,7 @@
"Z": 755.58093
},
"TerritoryId": 816,
"InteractionType": "Instruction",
"InteractionType": "Snipe",
"Fly": true,
"Comment": "Throw Porxies at Beavers"
}

2
QuestPaths/5.x - Shadowbringers/MSQ/A2-Kholusia 1/3285_A Fickle Existence.json
View File

@ -48,7 +48,7 @@
"Z": 656.9772
},
"TerritoryId": 814,
"InteractionType": "Instruction",
"InteractionType": "Snipe",
"Comment": "Click the guy in front of (or near) the light house stairs"
}
]

2
QuestPaths/5.x - Shadowbringers/MSQ/A3-Amh Araeng 1/3292_City of the Mord.json
View File

@ -48,7 +48,7 @@
"Z": -186.14484
},
"TerritoryId": 815,
"InteractionType": "Instruction",
"InteractionType": "Snipe",
"Comment": "Click all four foods"
}
]

2
QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3323_A Little Faith.json
View File

@ -104,7 +104,7 @@
"Z": -92.97333
},
"TerritoryId": 813,
"InteractionType": "WaitForManualProgress",
"InteractionType": "Snipe",
"Comment": "Tablet is on the right middle shelf of the table"
}
]

2
QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3330_A Beeautiful Plan.json
View File

@ -84,7 +84,7 @@
"Z": -359.4873
},
"TerritoryId": 817,
"InteractionType": "WaitForManualProgress",
"InteractionType": "Snipe",
"Comment": "Click murals"
}
]

2
QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3634_The View from Above.json
View File

@ -73,7 +73,7 @@
"Z": 22.47644
},
"TerritoryId": 814,
"InteractionType": "WaitForManualProgress",
"InteractionType": "Snipe",
"Comment": "Click on the guy left of the the rock"
}
]

4
QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3637_Meet the Tholls.json
View File

@ -59,7 +59,7 @@
"Z": -616.47974
},
"TerritoryId": 814,
"InteractionType": "WaitForManualProgress",
"InteractionType": "Snipe",
"Comment": "Click red hat dwarf (always shows up in the same location)"
}
]
@ -75,7 +75,7 @@
"Z": -616.47974
},
"TerritoryId": 814,
"InteractionType": "WaitForManualProgress",
"InteractionType": "Snipe",
"Comment": "Click red hat dwarf"
}
]

2
QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3649_City of the Ancients.json
View File

@ -54,7 +54,7 @@
"Z": -414.38928
},
"TerritoryId": 818,
"InteractionType": "WaitForManualProgress",
"InteractionType": "Snipe",
"Comment": "Click top left (broken) window",
"CompletionQuestVariablesFlags": [
null,

2
QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3680_Finding Good Help.json
View File

@ -44,7 +44,7 @@
"Z": -161.45575
},
"TerritoryId": 814,
"InteractionType": "WaitForManualProgress",
"InteractionType": "Snipe",
"Comment": "Help Master Chai dodge enemies"
}
]

2
QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4363_Deeper into the Maze.json
View File

@ -119,7 +119,7 @@
"Z": -519.18823
},
"TerritoryId": 956,
"InteractionType": "WaitForManualProgress",
"InteractionType": "Snipe",
"Comment": "Shoot Large Green Bird"
}
]

2
QuestPaths/6.x - Endwalker/MSQ/C-MareLamentorum/4406_Setting Things Straight.json
View File

@ -160,7 +160,7 @@
"Z": -654.13904
},
"TerritoryId": 959,
"InteractionType": "WaitForManualProgress",
"InteractionType": "Snipe",
"Comment": "Find \"Runninway?\""
}
]

2
QuestPaths/6.x - Endwalker/MSQ/F-Labyrinthos2/4443_Wise Guides.json
View File

@ -45,7 +45,7 @@
},
"StopDistance": 5,
"TerritoryId": 956,
"InteractionType": "WaitForManualProgress",
"InteractionType": "Snipe",
"Comment": "Find Points of Interest"
}
]

2
QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4460_x.json
View File

@ -104,7 +104,7 @@
"Z": 375.50916
},
"TerritoryId": 960,
"InteractionType": "WaitForManualProgress",
"InteractionType": "Snipe",
"Comment": "Find Errant Omicron"
}
]

2
QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4461_Hello World.json
View File

@ -44,7 +44,7 @@
"Z": 398.42822
},
"TerritoryId": 960,
"InteractionType": "WaitForManualProgress",
"InteractionType": "Snipe",
"Comment": "Identify Anomaly (Head, Elbow or Knee)"
}
]

2
QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4181_Scholarly Perspective.json
View File

@ -28,7 +28,7 @@
"Z": 276.81384
},
"TerritoryId": 962,
"InteractionType": "Instruction",
"InteractionType": "Snipe",
"Comment": "Click ewer, head and feet",
"AethernetShortcut": [
"[Old Sharlayan] Aetheryte Plaza",

2
QuestPaths/7.x - Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4867_The Feat of Reeds.json
View File

@ -136,7 +136,7 @@
"Z": -532.15845
},
"TerritoryId": 1188,
"InteractionType": "WaitForManualProgress",
"InteractionType": "Snipe",
"Comment": "Inspect Eye, Carrying Pole and Tail",
"AetheryteShortcut": "Kozama'uka - Ok'hanu"
}

2
QuestPaths/7.x - Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4881_Lending a Helphand.json
View File

@ -28,7 +28,7 @@
"Z": 343.7704
},
"TerritoryId": 1188,
"InteractionType": "WaitForManualProgress",
"InteractionType": "Snipe",
"Comment": "Click (from left to right) worn tools, Kaahe, crafting materials, untouched meal"
}
]

2
QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4921_Pick up the Pieces.json
View File

@ -28,7 +28,7 @@
"Z": 25.680908
},
"TerritoryId": 1185,
"InteractionType": "WaitForManualProgress",
"InteractionType": "Snipe",
"Comment": "Inspect Helm, Corpse, Weapon"
}
]

2
QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5126_A Refined Perspective.json
View File

@ -28,7 +28,7 @@
"Z": -141.92426
},
"TerritoryId": 1190,
"InteractionType": "Instruction",
"InteractionType": "Snipe",
"Comment": "Click (from left to right) pump, middle of the connecting pipes, barrels"
}
]

2
QuestPaths/7.x - Dawntrail/Side Quests/Yak T'el/5100_Carved in Stone.json
View File

@ -28,7 +28,7 @@
"Z": 557.7018
},
"TerritoryId": 1189,
"InteractionType": "Instruction",
"InteractionType": "Snipe",
"Comment": "Inspect Flag, Red Head, Blue Head"
}
]

1
QuestPaths/quest-v1.json
View File

@ -130,6 +130,7 @@
"Jump",
"Dive",
"Craft",
"Snipe",
"Instruction",
"AcceptQuest",
"CompleteQuest",

1
Questionable.Model/Questing/Converter/InteractionTypeConverter.cs
View File

@ -27,6 +27,7 @@ public sealed class InteractionTypeConverter() : EnumConverter<EInteractionType>
{ EInteractionType.Jump, "Jump" },
{ EInteractionType.Dive, "Dive" },
{ EInteractionType.Craft, "Craft" },
{ EInteractionType.Snipe, "Snipe" },
{ EInteractionType.Instruction, "Instruction" },
{ EInteractionType.AcceptQuest, "AcceptQuest" },
{ EInteractionType.CompleteQuest, "CompleteQuest" },

1
Questionable.Model/Questing/EInteractionType.cs
View File

@ -26,6 +26,7 @@ public enum EInteractionType
Jump,
Dive,
Craft,
Snipe,
/// <summary>
/// Needs to be manually continued.

1
Questionable/Configuration.cs
View File

@ -19,6 +19,7 @@ internal sealed class Configuration : IPluginConfiguration
public bool HideInAllInstances { get; set; } = true;
public bool UseEscToCancelQuesting { get; set; } = true;
public bool ShowIncompleteSeasonalEvents { get; set; } = true;
public bool AutomaticallyCompleteSnipeTasks { get; set; }
}
internal sealed class AdvancedConfiguration

8
Questionable/Controller/Steps/Interactions/Interact.cs
View File

@ -16,7 +16,8 @@ namespace Questionable.Controller.Steps.Interactions;
internal static class Interact
{
internal sealed class Factory(GameFunctions gameFunctions, ICondition condition, ILoggerFactory loggerFactory)
internal sealed class Factory(GameFunctions gameFunctions, Configuration configuration, ICondition condition,
ILoggerFactory loggerFactory)
: ITaskFactory
{
public IEnumerable<ITask> CreateAllTasks(Quest quest, QuestSequence sequence, QuestStep step)
@ -37,6 +38,11 @@ internal static class Interact
if (step.DataId == null)
yield break;
}
else if (step.InteractionType == EInteractionType.Snipe)
{
if (!configuration.General.AutomaticallyCompleteSnipeTasks)
yield break;
}
else if (step.InteractionType != EInteractionType.Interact)
yield break;

1
Questionable/Controller/Steps/Shared/WaitAtEnd.cs
View File

@ -49,6 +49,7 @@ internal static class WaitAtEnd
case EInteractionType.WaitForManualProgress:
case EInteractionType.Instruction:
case EInteractionType.Snipe:
return [new WaitNextStepOrSequence()];
case EInteractionType.Duty:

48
Questionable/Controller/Utils/AutoSnipeHandler.cs Normal file
View File

@ -0,0 +1,48 @@
using System;
using Dalamud.Hooking;
using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Game.Event;
using FFXIVClientStructs.FFXIV.Common.Lua;
namespace Questionable.Controller.Utils;
internal sealed unsafe class AutoSnipeHandler : IDisposable
{
private readonly QuestController _questController;
private readonly Configuration _configuration;
private readonly Hook<EnqueueSnipeTaskDelegate> _enqueueSnipeTaskHook;
private delegate ulong EnqueueSnipeTaskDelegate(EventSceneModuleImplBase* scene, lua_State* state);
public AutoSnipeHandler(QuestController questController, Configuration configuration, IGameInteropProvider gameInteropProvider)
{
_questController = questController;
_configuration = configuration;
_enqueueSnipeTaskHook =
gameInteropProvider.HookFromSignature<EnqueueSnipeTaskDelegate>(
"48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 48 83 EC 50 48 8B F1 48 8D 4C 24 ?? E8 ?? ?? ?? ?? 48 8B 4C 24 ??",
EnqueueSnipeTask);
}
public void Enable() => _enqueueSnipeTaskHook.Enable();
private ulong EnqueueSnipeTask(EventSceneModuleImplBase* scene, lua_State* state)
{
if (_configuration.General.AutomaticallyCompleteSnipeTasks && _questController.IsRunning)
{
var val = state->top;
val->tt = 3;
val->value.n = 1;
state->top += 1;
return 1;
}
else
return _enqueueSnipeTaskHook.Original.Invoke(scene, state);
}
public void Dispose()
{
_enqueueSnipeTaskHook.Dispose();
}
}

3
Questionable/QuestionablePlugin.cs
View File

@ -18,6 +18,7 @@ using Questionable.Controller.Steps.Common;
using Questionable.Controller.Steps.Gathering;
using Questionable.Controller.Steps.Interactions;
using Questionable.Controller.Steps.Leves;
using Questionable.Controller.Utils;
using Questionable.Data;
using Questionable.External;
using Questionable.Functions;
@ -108,6 +109,7 @@ public sealed class QuestionablePlugin : IDalamudPlugin
serviceCollection.AddSingleton<GameFunctions>();
serviceCollection.AddSingleton<ChatFunctions>();
serviceCollection.AddSingleton<QuestFunctions>();
serviceCollection.AddSingleton<AutoSnipeHandler>();
serviceCollection.AddSingleton<AetherCurrentData>();
serviceCollection.AddSingleton<AetheryteData>();
@ -240,6 +242,7 @@ public sealed class QuestionablePlugin : IDalamudPlugin
serviceProvider.GetRequiredService<LeveUiController>();
serviceProvider.GetRequiredService<QuestionableIpc>();
serviceProvider.GetRequiredService<DalamudInitializer>();
serviceProvider.GetRequiredService<AutoSnipeHandler>().Enable();
}
public void Dispose()

10
Questionable/Windows/ConfigWindow.cs
View File

@ -90,6 +90,16 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig
Save();
}
if (ImGui.CollapsingHeader("Cheats"))
{
bool automaticallyCompleteSnipeTasks = _configuration.General.AutomaticallyCompleteSnipeTasks;
if (ImGui.Checkbox("Automatically complete snipe tasks", ref automaticallyCompleteSnipeTasks))
{
_configuration.General.AutomaticallyCompleteSnipeTasks = automaticallyCompleteSnipeTasks;
Save();
}
}
ImGui.EndTabItem();
}

2
Questionable/Windows/QuestComponents/ActiveQuestComponent.cs
View File

@ -84,7 +84,7 @@ internal sealed partial class ActiveQuestComponent
if (!isMinimized)
{
bool colored = currentStep is
{ InteractionType: EInteractionType.Instruction or EInteractionType.WaitForManualProgress };
{ InteractionType: EInteractionType.Instruction or EInteractionType.WaitForManualProgress or EInteractionType.Snipe };
if (colored)
ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudOrange);
ImGui.TextUnformatted(currentStep?.Comment ??