erdelf/qstbak
1
0
Fork 0
forked from aly/qstbak
Code Pull requests Activity

muffin v7.5.12

Browse source
This commit is contained in:
alydev 2026-08-19 13:19:57 +10:00
parent 3102923ce2
commit 911ed68baa
65 changed files with 2356 additions and 1539 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Questionable/Questionable.Controller/CustomDeliveryController.cs
View file

@ -786,18 +786,18 @@ internal sealed class CustomDeliveryController : MiniTaskController<CustomDelive
if (!_npcPositions.TryGetValue(npcIndex, out (ushort, Vector3) value))
{
_logger.LogWarning("No position found for delivery NPC index {NpcIndex}, skipping navigation", npcIndex);
_taskQueue.Enqueue(new Questionable.Controller.Steps.Common.Mount.UnmountTask());
return;
}
uint valueOrDefault = _npcDataIds.GetValueOrDefault(npcIndex);
_routeEnqueuer.SetDestination(value.Item1, value.Item2);
if (_clientState.TerritoryType != value.Item1 && !_routeEnqueuer.TryEnqueueToTerritory(_taskQueue, value.Item1, value.Item2))
{
_logger.LogWarning("Could not route to delivery NPC territory {TerritoryId}; falling back to normal routing", value.Item1);
EnqueueNavigateTo(value.Item1, value.Item2);
}
else
{
_taskQueue.Enqueue(new DeliveryNpcApproachTask(value.Item1, value.Item2, valueOrDefault));
}
_taskQueue.Enqueue(new Questionable.Controller.Steps.Common.Mount.UnmountTask());
_taskQueue.Enqueue(new DeliveryNpcApproachTask(value.Item1, value.Item2, valueOrDefault));
}
private void EnqueueNavigateTo(ushort territoryId, Vector3 position)
@ -808,12 +808,11 @@ internal sealed class CustomDeliveryController : MiniTaskController<CustomDelive
private void EnqueueTurnInSequence(DeliveryPlan plan)
{
EnqueueNavigateToNpc(plan.NpcIndex);
_taskQueue.Enqueue(new Questionable.Controller.Steps.Common.Mount.UnmountTask());
if (!_npcDataIds.ContainsKey(plan.NpcIndex))
{
_logger.LogWarning("No DataId for delivery NPC index {NpcIndex}, turn-in may fail", plan.NpcIndex);
}
_taskQueue.Enqueue(new SatisfactionSupplyTurnInTask(plan.NpcIndex, plan.Slot, plan.DeliveryCount, _npcDataIds.GetValueOrDefault(plan.NpcIndex)));
_taskQueue.Enqueue(new SatisfactionSupplyTurnInTask(plan.NpcIndex, plan.Slot, plan.DeliveryCount, _npcDataIds.GetValueOrDefault(plan.NpcIndex), plan.ItemId, plan.Collectability));
_taskQueue.Enqueue(new WaitAtEnd.WaitDelay());
}