#916 Rework to fix major regression (some quests not starting)

- secure Mythos phase state machine rather than mess with event validity
NPBruce · Oct 15, 2018 · 9f8f4f1 · 9f8f4f1
1 parent 2e53b5a
commit 9f8f4f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/unity/Assets/Scripts/Quest/EventManager.cs b/unity/Assets/Scripts/Quest/EventManager.cs
@@ -694,8 +694,7 @@ public bool ButtonsPresent()
         virtual public bool Disabled()
         {
             // check if condition is valid, and if there is something to do in this event (see #916)
-            return (!game.quest.vars.Test(qEvent.conditions)
-                    || (!qEvent.display && qEvent.operations.Count == 0 && qEvent.nextEvent.Count == 0));
+            return (!game.quest.vars.Test(qEvent.conditions));
         }
     }
 

diff --git a/unity/Assets/Scripts/Quest/RoundControllerMoM.cs b/unity/Assets/Scripts/Quest/RoundControllerMoM.cs
@@ -140,7 +140,8 @@ public override bool CheckNewRound()
                     game.stageUI.Update();
                     return false;
                 }
-                else
+                // this is a recursive call, so we don't want to bring back monsters, if we have reached the end of activations
+                else if (game.quest.phase != Quest.MoMPhase.horror)
                 {
                     // going through monster activation: switch to phase monsters
                     game.quest.phase = Quest.MoMPhase.monsters;