aly/qstbak
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

muffin v7.4.1

Browse source
This commit is contained in:
alydev 2025-12-20 04:56:36 +10:00
parent a4175abacd
commit 7ae14cf8b8
24 changed files with 2673 additions and 722 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Questionable/Questionable.Controller/CombatController.cs
View file

@ -4,7 +4,6 @@ using System.Linq;
using System.Numerics;
using System.Runtime.InteropServices;
using Dalamud.Game.ClientState.Conditions;
using Dalamud.Game.ClientState.Objects;
using Dalamud.Game.ClientState.Objects.Enums;
using Dalamud.Game.ClientState.Objects.Types;
using Dalamud.Plugin.Services;

1
Questionable/Questionable.Controller/CommandHandler.cs
View file

@ -1,5 +1,4 @@
using System;
using Dalamud.Game.ClientState.Objects;
using Dalamud.Game.Command;
using Dalamud.Plugin.Services;
using Questionable.Functions;

17
Questionable/Questionable.Controller/MovementController.cs
View file

@ -13,6 +13,7 @@ using Dalamud.Game.ClientState.Objects.SubKinds;
using Dalamud.Game.ClientState.Objects.Types;
using Dalamud.Plugin.Ipc.Exceptions;
using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Enums;
using FFXIVClientStructs.FFXIV.Client.Game;
using FFXIVClientStructs.FFXIV.Client.Game.Control;
using Microsoft.Extensions.Logging;
@ -689,14 +690,14 @@ internal sealed class MovementController : IDisposable
bool flag2;
switch (GameMain.Instance()->CurrentTerritoryIntendedUseId)
{
case 0:
case 7:
case 13:
case 14:
case 15:
case 19:
case 23:
case 29:
case TerritoryIntendedUse.Town:
case TerritoryIntendedUse.BeforeTrialDung:
case TerritoryIntendedUse.HousingOutdoor:
case TerritoryIntendedUse.HousingIndoor:
case TerritoryIntendedUse.SoloOverworldInstances:
case TerritoryIntendedUse.ChocoboSquareOld:
case TerritoryIntendedUse.GoldSaucer:
case TerritoryIntendedUse.SoloDuty:
flag2 = true;
break;
default:

7
Questionable/Questionable.Controller/QuestController.cs
View file

@ -99,6 +99,8 @@ internal sealed class QuestController : MiniTaskController<QuestController>
private readonly QuestRegistry _questRegistry;
private readonly JournalData _journalData;
private readonly IKeyState _keyState;
private readonly IChatGui _chatGui;
@ -234,7 +236,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>
public event AutomationTypeChangedEventHandler? AutomationTypeChanged;
public QuestController(IClientState clientState, IObjectTable objectTable, GameFunctions gameFunctions, QuestFunctions questFunctions, MovementController movementController, CombatController combatController, GatheringController gatheringController, ILogger<QuestController> logger, QuestRegistry questRegistry, IKeyState keyState, IChatGui chatGui, ICondition condition, IToastGui toastGui, Configuration configuration, TaskCreator taskCreator, IServiceProvider serviceProvider, InterruptHandler interruptHandler, IDataManager dataManager, SinglePlayerDutyConfigComponent singlePlayerDutyConfigComponent)
public QuestController(IClientState clientState, IObjectTable objectTable, GameFunctions gameFunctions, QuestFunctions questFunctions, MovementController movementController, CombatController combatController, GatheringController gatheringController, ILogger<QuestController> logger, QuestRegistry questRegistry, JournalData journalData, IKeyState keyState, IChatGui chatGui, ICondition condition, IToastGui toastGui, Configuration configuration, TaskCreator taskCreator, IServiceProvider serviceProvider, InterruptHandler interruptHandler, IDataManager dataManager, SinglePlayerDutyConfigComponent singlePlayerDutyConfigComponent)
: base(chatGui, condition, serviceProvider, interruptHandler, dataManager, logger)
{
_clientState = clientState;
@ -245,6 +247,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>
_combatController = combatController;
_gatheringController = gatheringController;
_questRegistry = questRegistry;
_journalData = journalData;
_keyState = keyState;
_chatGui = chatGui;
_condition = condition;
@ -1231,7 +1234,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>
_logger.LogDebug("Excluding allied society quest {QuestId} from bulk add", quest.Id);
return false;
}
if (quest.Info is QuestInfo { MoogleDeliveryLevel: >0 })
if (quest.Info is QuestInfo questInfo && _journalData.MoogleDeliveryGenreId.HasValue && questInfo.JournalGenre == _journalData.MoogleDeliveryGenreId.Value)
{
_logger.LogDebug("Excluding moogle delivery quest {QuestId} from bulk add", quest.Id);
return false;