forked from aly/qstbak
muffin v7.4.1
This commit is contained in:
parent
a4175abacd
commit
7ae14cf8b8
24 changed files with 2673 additions and 722 deletions
|
|
@ -4,7 +4,6 @@ using System.Numerics;
|
|||
using System.Runtime.CompilerServices;
|
||||
using Dalamud.Bindings.ImGui;
|
||||
using Dalamud.Game.ClientState.Conditions;
|
||||
using Dalamud.Game.ClientState.Objects;
|
||||
using Dalamud.Game.ClientState.Objects.Enums;
|
||||
using Dalamud.Game.ClientState.Objects.Types;
|
||||
using Dalamud.Game.Text;
|
||||
|
|
|
|||
|
|
@ -37,6 +37,8 @@ internal sealed class EventInfoComponent
|
|||
|
||||
private readonly IDataManager _dataManager;
|
||||
|
||||
private readonly JournalData _journalData;
|
||||
|
||||
private List<IQuestInfo> _cachedActiveSeasonalQuests = new List<IQuestInfo>();
|
||||
|
||||
private DateTime _cachedAtUtc = DateTime.MinValue;
|
||||
|
|
@ -60,7 +62,7 @@ internal sealed class EventInfoComponent
|
|||
}
|
||||
}
|
||||
|
||||
public EventInfoComponent(QuestData questData, QuestRegistry questRegistry, QuestFunctions questFunctions, UiUtils uiUtils, QuestController questController, QuestTooltipComponent questTooltipComponent, Configuration configuration, IDataManager dataManager, ILogger<EventInfoComponent> logger)
|
||||
public EventInfoComponent(QuestData questData, QuestRegistry questRegistry, QuestFunctions questFunctions, UiUtils uiUtils, QuestController questController, QuestTooltipComponent questTooltipComponent, Configuration configuration, IDataManager dataManager, JournalData journalData, ILogger<EventInfoComponent> logger)
|
||||
{
|
||||
_questData = questData;
|
||||
_questRegistry = questRegistry;
|
||||
|
|
@ -70,6 +72,7 @@ internal sealed class EventInfoComponent
|
|||
_questTooltipComponent = questTooltipComponent;
|
||||
_configuration = configuration;
|
||||
_dataManager = dataManager;
|
||||
_journalData = journalData;
|
||||
_logger = logger ?? throw new ArgumentNullException("logger");
|
||||
}
|
||||
|
||||
|
|
@ -254,7 +257,7 @@ internal sealed class EventInfoComponent
|
|||
DateTime? dateTime = null;
|
||||
if (questInfo is QuestInfo questInfo2)
|
||||
{
|
||||
flag = questInfo2.IsSeasonalQuest || questInfo2.IsSeasonalEvent || questInfo2.SeasonalQuestExpiry is DateTime || (questInfo2.JournalGenre >= 234 && questInfo2.JournalGenre <= 247);
|
||||
flag = questInfo2.IsSeasonalQuest || questInfo2.IsSeasonalEvent || questInfo2.SeasonalQuestExpiry is DateTime || (questInfo2.JournalGenre.HasValue && _journalData.SeasonalEventGenreIds.Contains(questInfo2.JournalGenre.Value));
|
||||
dateTime = questInfo2.SeasonalQuestExpiry;
|
||||
}
|
||||
if (flag)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue