JerryWester/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests Activity

Fix some EventHandler related code if in firmament

Browse Source
This commit is contained in:
Liza 2024-09-20 21:46:10 +02:00
parent f7d56663d2
commit cd16cf93a3
Signed by: liza
GPG Key ID: 7199F8D727D55F67
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Questionable/Controller/GameUi/InteractionUiController.cs
View File

@ -517,8 +517,8 @@ internal sealed class InteractionUiController : IDisposable
_logger.LogTrace("Prompt: '{Prompt}'", actualPrompt); _logger.LogTrace("Prompt: '{Prompt}'", actualPrompt);
var director = UIState.Instance()->DirectorTodo.Director; var director = UIState.Instance()->DirectorTodo.Director;
if (director != null && director->EventHandlerInfo != null && if (director != null &&
director->EventHandlerInfo->EventId.ContentId == EventHandlerType.GatheringLeveDirector && director->Info.EventId.ContentId == EventHandlerType.GatheringLeveDirector &&
director->Sequence == 254) director->Sequence == 254)
{ {
// just close the dialogue for 'do you want to return to next settlement', should prolly be different for // just close the dialogue for 'do you want to return to next settlement', should prolly be different for

3
Questionable/Controller/GatheringController.cs
View File

@ -135,8 +135,7 @@ internal sealed unsafe class GatheringController : MiniTaskController<GatheringC
return; return;
var director = UIState.Instance()->DirectorTodo.Director; var director = UIState.Instance()->DirectorTodo.Director;
if (director != null && director->EventHandlerInfo != null && if (director != null && director->Info.EventId.ContentId == EventHandlerType.GatheringLeveDirector)
director->EventHandlerInfo->EventId.ContentId == EventHandlerType.GatheringLeveDirector)
{ {
if (director->Sequence == 254) if (director->Sequence == 254)
return; return;

3
Questionable/Controller/Steps/Leves/InitiateLeve.cs
View File

@ -44,8 +44,7 @@ internal static class InitiateLeve
{ {
var director = UIState.Instance()->DirectorTodo.Director; var director = UIState.Instance()->DirectorTodo.Director;
if (director != null && if (director != null &&
director->EventHandlerInfo != null && director->Info.EventId.ContentId == EventHandlerType.GatheringLeveDirector &&
director->EventHandlerInfo->EventId.ContentId == EventHandlerType.GatheringLeveDirector &&
director->ContentId == Task.ElementId.Value) director->ContentId == Task.ElementId.Value)
return ETaskResult.SkipRemainingTasksForStep; return ETaskResult.SkipRemainingTasksForStep;