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

master #3

Open
cacahuetes wants to merge 920 commits from liza/Questionable:master into cacahuetes-ShB-Healer
pull from: liza/Questionable:master
merge into: cacahuetes:cacahuetes-ShB-Healer
Conversation 0 Commits 920 Files Changed 1978 +4 -6
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cd16cf93a3 - Show all commits

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

@ -517,8 +517,8 @@ internal sealed class InteractionUiController : IDisposable
_logger.LogTrace("Prompt: '{Prompt}'", actualPrompt);
var director = UIState.Instance()->DirectorTodo.Director;
if (director != null && director->EventHandlerInfo != null &&
director->EventHandlerInfo->EventId.ContentId == EventHandlerType.GatheringLeveDirector &&
if (director != null &&
director->Info.EventId.ContentId == EventHandlerType.GatheringLeveDirector &&
director->Sequence == 254)
{
// 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;
var director = UIState.Instance()->DirectorTodo.Director;
if (director != null && director->EventHandlerInfo != null &&
director->EventHandlerInfo->EventId.ContentId == EventHandlerType.GatheringLeveDirector)
if (director != null && director->Info.EventId.ContentId == EventHandlerType.GatheringLeveDirector)
{
if (director->Sequence == 254)
return;

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

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