From 677d7295844e3d59ccef980054a4dffbd2c842f9 Mon Sep 17 00:00:00 2001
From: Dennis Schoepf <dennis@schoepf.co>
Date: Fri, 6 Aug 2021 17:52:33 +0200
Subject: [PATCH] Implement three subprojects till completion

---
 src/scenes/DetailScene.ts   | 12 +++++++-----
 src/scenes/OverviewScene.ts |  9 +--------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/scenes/DetailScene.ts b/src/scenes/DetailScene.ts
index be69987..b347fda 100644
--- a/src/scenes/DetailScene.ts
+++ b/src/scenes/DetailScene.ts
@@ -72,12 +72,14 @@ export class DetailScene {
 
     if (
       this.revealableObjects.every((revObj) => revObj.wasInteractedWith) &&
-      !(store.getState().companionState === CompanionState.ACTIVE)
+      !(store.getState().companionState === CompanionState.ACTIVE) &&
+      !store.getState().infoMessageShown
     ) {
-      store.setState((state) => ({
-        finishedSubProjects: [...state.finishedSubProjects, state.currentSubproject],
-      }));
-
+      if (!store.getState().finishedSubProjects.includes(store.getState().currentSubproject)) {
+        store.setState((state) => ({
+          finishedSubProjects: [...state.finishedSubProjects, state.currentSubproject],
+        }));
+      }
       store.getState().addUserMessage({
         text: "Yaay! You've found all of the important parts of this part of the repository. You will be returned to the subproject overview now. Pick the next subproject you want to take a look at there.",
         inputWanted: false,
diff --git a/src/scenes/OverviewScene.ts b/src/scenes/OverviewScene.ts
index dc822f0..ed57536 100644
--- a/src/scenes/OverviewScene.ts
+++ b/src/scenes/OverviewScene.ts
@@ -55,14 +55,7 @@ export class OverviewScene {
   }
 
   private drawLocations() {
-    if (
-      store.getState().finishedSubProjects.every((fsp) => {
-        const edge = this.edges.filter((edge) => edge.name === fsp)[0];
-        return edge.finished;
-      }) &&
-      !store.getState().finishedGame &&
-      store.getState().finishedSubProjects.length > 0
-    ) {
+    if (store.getState().finishedSubProjects.length === 3 && !store.getState().finishedGame) {
       store.setState({ finishedGame: true });
 
       setTimeout(() => {