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

master #2

Merged
cacahuetes merged 79 commits from liza/Questionable:master into master 2024-08-25 10:51:08 +00:00
Conversation 0 Commits 79 Files Changed 202 +37 -10
6 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6ea9f282f3 - Show all commits

2
QuestPathGenerator/RoslynElements/QuestStepExtensions.cs
View File

@ -44,6 +44,8 @@ internal static class QuestStepExtensions
Assignment(nameof(QuestStep.DelaySecondsAtStart), step.DelaySecondsAtStart,
emptyStep.DelaySecondsAtStart)
.AsSyntaxNodeOrToken(),
Assignment(nameof(QuestStep.PickUpItemId), step.PickUpItemId, emptyStep.PickUpItemId)
.AsSyntaxNodeOrToken(),
Assignment(nameof(QuestStep.Disabled), step.Disabled, emptyStep.Disabled)
.AsSyntaxNodeOrToken(),
Assignment(nameof(QuestStep.DisableNavmesh), step.DisableNavmesh,

3
QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/402_Thanks a Million.json
View File

@ -29,7 +29,8 @@
},
"TerritoryId": 134,
"InteractionType": "Interact",
"Comment": "Technically triggers combat, but can be ignored"
"Comment": "Technically triggers combat, but can be ignored",
"PickUpItemId": 2000342
}
]
},

1
QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/465_Washed Up.json
View File

@ -59,6 +59,7 @@
"StopDistance": 5,
"TerritoryId": 134,
"InteractionType": "Interact",
"DelaySecondsAtStart": 3,
"DialogueChoices": [
{
"Type": "List",

5
QuestPaths/quest-v1.json
View File

@ -440,6 +440,11 @@
}
},
"then": {
"properties": {
"PickUpItemId": {
"type": "number"
}
},
"required": [
"DataId"
]

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

@ -27,6 +27,7 @@ public sealed class QuestStep
public float? NpcWaitDistance { get; set; }
public ushort? TargetTerritoryId { get; set; }
public float? DelaySecondsAtStart { get; set; }
public uint? PickUpItemId { get; set; }
public bool Disabled { get; set; }
public bool DisableNavmesh { get; set; }

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

@ -4,6 +4,7 @@ using Dalamud.Game.ClientState.Conditions;
using Dalamud.Game.ClientState.Objects.Enums;
using Dalamud.Game.ClientState.Objects.Types;
using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Game;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Questionable.Controller.Steps.Shared;
@ -15,7 +16,8 @@ namespace Questionable.Controller.Steps.Interactions;
internal static class Interact
{
internal sealed class Factory(GameFunctions gameFunctions, ICondition condition, ILoggerFactory loggerFactory) : ITaskFactory
internal sealed class Factory(GameFunctions gameFunctions, ICondition condition, ILoggerFactory loggerFactory)
: ITaskFactory
{
public IEnumerable<ITask> CreateAllTasks(Quest quest, QuestSequence sequence, QuestStep step)
{
@ -39,13 +41,14 @@ internal static class Interact
yield return new WaitAtEnd.WaitDelay();
yield return Interact(step.DataId.Value, quest, step.InteractionType,
step.TargetTerritoryId != null || quest.Id is SatisfactionSupplyNpcId);
step.TargetTerritoryId != null || quest.Id is SatisfactionSupplyNpcId, step.PickUpItemId);
}
internal ITask Interact(uint dataId, Quest? quest, EInteractionType interactionType, bool skipMarkerCheck = false)
internal ITask Interact(uint dataId, Quest? quest, EInteractionType interactionType,
bool skipMarkerCheck = false, uint? pickUpItemId = null)
{
return new DoInteract(dataId, quest, interactionType, skipMarkerCheck, gameFunctions, condition,
loggerFactory.CreateLogger<DoInteract>());
return new DoInteract(dataId, quest, interactionType, skipMarkerCheck, pickUpItemId, gameFunctions,
condition, loggerFactory.CreateLogger<DoInteract>());
}
}
@ -54,6 +57,7 @@ internal static class Interact
Quest? quest,
EInteractionType interactionType,
bool skipMarkerCheck,
uint? pickUpItemId,
GameFunctions gameFunctions,
ICondition condition,
ILogger<DoInteract> logger)
@ -64,6 +68,7 @@ internal static class Interact
private DateTime _continueAt = DateTime.MinValue;
public Quest? Quest => quest;
public EInteractionType InteractionType
{
get => interactionType;
@ -119,11 +124,23 @@ internal static class Interact
_needsUnmount = false;
}
if (_interactionState == EInteractionState.InteractionConfirmed)
return ETaskResult.TaskComplete;
if (pickUpItemId != null)
{
unsafe
{
InventoryManager* inventoryManager = InventoryManager.Instance();
if (inventoryManager->GetInventoryItemCount(pickUpItemId.Value) > 0)
return ETaskResult.TaskComplete;
}
}
else
{
if (_interactionState == EInteractionState.InteractionConfirmed)
return ETaskResult.TaskComplete;
if (interactionType == EInteractionType.InternalGather && condition[ConditionFlag.Gathering])
return ETaskResult.TaskComplete;
if (interactionType == EInteractionType.InternalGather && condition[ConditionFlag.Gathering])
return ETaskResult.TaskComplete;
}
IGameObject? gameObject = gameFunctions.FindObjectByDataId(dataId);
if (gameObject == null || !gameObject.IsTargetable || !HasAnyMarker(gameObject))