From 2c4206f66c99f16ce761c1987cee3720c1ee7a12 Mon Sep 17 00:00:00 2001 From: Jakub Majewski Date: Sun, 15 Nov 2020 17:20:14 +0100 Subject: [PATCH] Added 2 more mythos events, removed Mythos trigger from D2E (#1392) Fixes #1110 Fixes #1111 --- unity/Assets/Scripts/Quest/RoundControllerMoM.cs | 2 ++ unity/Assets/Scripts/QuestEditor/EditorComponentEvent.cs | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/unity/Assets/Scripts/Quest/RoundControllerMoM.cs b/unity/Assets/Scripts/Quest/RoundControllerMoM.cs index e63cb5e73..5beb2732f 100644 --- a/unity/Assets/Scripts/Quest/RoundControllerMoM.cs +++ b/unity/Assets/Scripts/Quest/RoundControllerMoM.cs @@ -22,7 +22,9 @@ override public void HeroActivated() game.stageUI.Update(); game.monsterCanvas.UpdateList(); + game.quest.eManager.EventTriggerType("BeforeMonsterActivation", false); game.quest.eManager.EventTriggerType("Mythos", false); + game.quest.eManager.EventTriggerType("EndInvestigatorTurn", false); // This will cause the next phase if nothing was added game.quest.eManager.TriggerEvent(); diff --git a/unity/Assets/Scripts/QuestEditor/EditorComponentEvent.cs b/unity/Assets/Scripts/QuestEditor/EditorComponentEvent.cs index 56038ff9a..7ed77c873 100644 --- a/unity/Assets/Scripts/QuestEditor/EditorComponentEvent.cs +++ b/unity/Assets/Scripts/QuestEditor/EditorComponentEvent.cs @@ -627,9 +627,15 @@ public void SetTrigger() select.AddItem("Eliminated", traits); } - select.AddItem("Mythos", traits); select.AddItem("EndRound", traits); select.AddItem("StartRound", traits); + + if (game.gameType is MoMGameType) + { + select.AddItem("Mythos", traits); + select.AddItem("EndInvestigatorTurn", traits); + select.AddItem("BeforeMonsterActivation", traits); + } traits = new Dictionary>(); traits.Add(CommonStringKeys.TYPE.Translate(), new string[] { CommonStringKeys.MONSTER.Translate() });