liza/Questionable
liza/Questionable
2
1
Fork 27
Code Pull Requests 1 Releases 100 Activity

Merge pull request 'ipc: fix GetActiveEvents and add StartSingleQuest' (#134) from croizat/Questionable:fixy into master

Browse Source 
Reviewed-on: #134
This commit is contained in:
Liza 2025-02-07 23:22:39 +00:00
commit 2abf567e9f
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Questionable/External/QuestionableIpc.cs vendored
View File

@ -15,11 +15,13 @@ internal sealed class QuestionableIpc : IDisposable
private const string IpcGetCurrentQuestId = "Questionable.GetCurrentQuestId"; private const string IpcGetCurrentQuestId = "Questionable.GetCurrentQuestId";
private const string IpcGetCurrentlyActiveEventQuests = "Questionable.GetCurrentlyActiveEventQuests"; private const string IpcGetCurrentlyActiveEventQuests = "Questionable.GetCurrentlyActiveEventQuests";
private const string IpcStartQuest = "Questionable.StartQuest"; private const string IpcStartQuest = "Questionable.StartQuest";
private const string IpcStartSingleQuest = "Questionable.StartSingleQuest";
private readonly ICallGateProvider<bool> _isRunning; private readonly ICallGateProvider<bool> _isRunning;
private readonly ICallGateProvider<string?> _getCurrentQuestId; private readonly ICallGateProvider<string?> _getCurrentQuestId;
private readonly ICallGateProvider<List<string>> _getCurrentlyActiveEventQuests; private readonly ICallGateProvider<List<string>> _getCurrentlyActiveEventQuests;
private readonly ICallGateProvider<string, bool> _startQuest; private readonly ICallGateProvider<string, bool> _startQuest;
private readonly ICallGateProvider<string, bool> _startSingleQuest;
public QuestionableIpc( public QuestionableIpc(
QuestController questController, QuestController questController,
@ -39,15 +41,21 @@ internal sealed class QuestionableIpc : IDisposable
eventInfoComponent.GetCurrentlyActiveEventQuests().Select(q => q.ToString()).ToList()); eventInfoComponent.GetCurrentlyActiveEventQuests().Select(q => q.ToString()).ToList());
_startQuest = pluginInterface.GetIpcProvider<string, bool>(IpcStartQuest); _startQuest = pluginInterface.GetIpcProvider<string, bool>(IpcStartQuest);
_startQuest.RegisterFunc((string questId) => StartQuest(questController, questRegistry, questId)); _startQuest.RegisterFunc((string questId) => StartQuest(questController, questRegistry, questId, false));
_startSingleQuest = pluginInterface.GetIpcProvider<string, bool>(IpcStartSingleQuest);
_startSingleQuest.RegisterFunc((string questId) => StartQuest(questController, questRegistry, questId, true));
} }
private static bool StartQuest(QuestController qc, QuestRegistry qr, string questId) private static bool StartQuest(QuestController qc, QuestRegistry qr, string questId, bool single)
{ {
if (ElementId.TryFromString(questId, out var elementId) && elementId != null && qr.TryGetQuest(elementId, out var quest)) if (ElementId.TryFromString(questId, out var elementId) && elementId != null && qr.TryGetQuest(elementId, out var quest))
{ {
qc.SetNextQuest(quest); qc.SetNextQuest(quest);
qc.Start("IPCQuestSelection"); if (single)
qc.StartSingleQuest("IPCQuestSelection");
else
qc.Start("IPCQuestSelection");
return true; return true;
} }
return false; return false;

2
Questionable/Windows/QuestComponents/EventInfoComponent.cs
View File

@ -139,7 +139,7 @@ internal sealed class EventInfoComponent
public IEnumerable<QuestId> GetCurrentlyActiveEventQuests() public IEnumerable<QuestId> GetCurrentlyActiveEventQuests()
{ {
return _eventQuests return _eventQuests
.Where(x => x.EndsAtUtc <= DateTime.UtcNow) .Where(x => x.EndsAtUtc >= DateTime.UtcNow)
.SelectMany(x => x.QuestIds); .SelectMany(x => x.QuestIds);
} }