muffin v7.5.12

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

View file

@ -91,13 +91,15 @@ internal sealed class JournalProgressWindow : ThemedWindow, IDisposable
_pluginInterface = pluginInterface;
_configuration = configuration;
_pages = new Action[9] { _questJournalComponent.DrawQuests, _dutyJournalComponent.DrawDuties, _attunementJournalComponent.DrawAttunement, _gatheringJournalComponent.DrawGatheringItems, _questRewardComponent.DrawItemRewards, _questMapComponent.DrawQuestMap, _questChainComponent.DrawQuestChain, _alliedSocietyJournalComponent.DrawAlliedSocietyQuests, _customDeliveryJournalComponent.DrawCustomDeliveries };
questJournalUtils.OpenJournal = delegate
{
base.IsOpen = true;
};
_questChainComponent.SelectTabAction = SelectTab;
_questChainComponent.QuestJournalUtils = questJournalUtils;
_questMapComponent.SelectTabAction = SelectTab;
_questMapComponent.QuestChainComponent = _questChainComponent;
_questMapComponent.QuestJournalUtils = questJournalUtils;
_attunementJournalComponent.SelectTabAction = SelectTab;
_attunementJournalComponent.QuestChainComponent = _questChainComponent;
_clientState.Login += _questJournalComponent.RefreshCounts;
_clientState.Logout += _dutyJournalComponent.ClearCounts;
_clientState.Login += _gatheringJournalComponent.RefreshCounts;

View file

@ -18,6 +18,7 @@ using Questionable.Data;
using Questionable.Functions;
using Questionable.Model;
using Questionable.Model.Questing;
using Questionable.Windows.JournalComponents;
using Questionable.Windows.QuestComponents;
namespace Questionable.Windows;
@ -56,6 +57,8 @@ internal sealed class QuestSelectionWindow : ThemedWindow
private readonly QuestTooltipComponent _questTooltipComponent;
private readonly QuestJournalUtils _questJournalUtils;
private List<IQuestInfo> _quests = new List<IQuestInfo>();
private List<IQuestInfo> _offeredQuests = new List<IQuestInfo>();
@ -64,7 +67,7 @@ internal sealed class QuestSelectionWindow : ThemedWindow
private string _searchText = string.Empty;
public QuestSelectionWindow(QuestData questData, IGameGui gameGui, IChatGui chatGui, QuestFunctions questFunctions, QuestController questController, FateController fateController, SeasonalDutyController seasonalDutyController, CustomDeliveryController customDeliveryController, AttunementController attunementController, QuestRegistry questRegistry, IDalamudPluginInterface pluginInterface, TerritoryData territoryData, IClientState clientState, UiUtils uiUtils, QuestTooltipComponent questTooltipComponent)
public QuestSelectionWindow(QuestData questData, IGameGui gameGui, IChatGui chatGui, QuestFunctions questFunctions, QuestController questController, FateController fateController, SeasonalDutyController seasonalDutyController, CustomDeliveryController customDeliveryController, AttunementController attunementController, QuestRegistry questRegistry, IDalamudPluginInterface pluginInterface, TerritoryData territoryData, IClientState clientState, UiUtils uiUtils, QuestTooltipComponent questTooltipComponent, QuestJournalUtils questJournalUtils)
: base("Quest Selection###QuestionableQuestSelection")
{
_questData = questData;
@ -82,6 +85,7 @@ internal sealed class QuestSelectionWindow : ThemedWindow
_clientState = clientState;
_uiUtils = uiUtils;
_questTooltipComponent = questTooltipComponent;
_questJournalUtils = questJournalUtils;
base.Size = new Vector2(500f, 200f);
base.SizeCondition = ImGuiCond.Once;
base.SizeConstraints = new WindowSizeConstraints
@ -214,6 +218,7 @@ internal sealed class QuestSelectionWindow : ThemedWindow
}
}
UiThemeUtils.RowLabel(item.Name, 0f);
_questJournalUtils.ShowContextMenu(item, quest, "QuestSelectionWindow");
}
if (!ImGui.TableNextColumn())
{
@ -266,16 +271,11 @@ internal sealed class QuestSelectionWindow : ThemedWindow
}
if (flag2)
{
_fateController.Stop("Quest selection start");
_seasonalDutyController.Stop("Quest selection start");
_customDeliveryController.Stop("Quest selection start");
_attunementController.Stop("Quest selection start");
_questController.SetNextQuest(quest);
if (!_questController.ManualPriorityQuests.Contains(quest))
{
_questController.ManualPriorityQuests.Insert(0, quest);
}
_questController.Start("QuestSelectionWindow");
_questJournalUtils.StartQuestAsNext(quest, "QuestSelectionWindow");
}
ImGui.SameLine();
bool num2 = UiThemeUtils.IconButton(FontAwesomeIcon.AngleDoubleRight, ImGui.GetFrameHeight());