Refactoring

.devcontainer/devcontainer.json

@@ -7,7 +7,15 @@
       "extensions": [
         "esbenp.prettier-vscode",
         "kavod-io.vscode-jest-test-adapter"
-      ]
+      ],
+      "settings": {
+        "window.menuBarVisibility": "classic",
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+        "editor.formatOnSave": true,
+        "editor.formatOnType": true,
+        "editor.formatOnPaste": true,
+        "typescript.surveys.enabled": false      
+      }
     }
   }
 }

.github/workflows/build.yml

@@ -37,6 +37,7 @@ jobs:
 
       - name: Test
         run: |
+          npx prettier --check src
           npm run jest
 
       - name: Build documentation

readme.md

@@ -1,8 +1,10 @@
 # Alan & Ada kids programming
 
-Play the [game](https://wimyedema.github.io/alan-and-ada/) and
+Play the [game](https://wimyedema.github.io/alan-and-ada/), read the [docs](https://wimyedema.github.io/alan-and-ada/docs/) and
 start [editing](https://vscode.dev/github/WimYedema/alan-and-ada)!
 
+
+
 ## Running locally
 
 - Using [nodejs](https://nodejs.org/en/) and [npm](https://www.npmjs.com/)

src/actors/docs.ts

@@ -1 +1 @@
-export { Player, PlayerState} from "./player";
+export { Player, PlayerState } from "./player";

src/core/cutScene.ts

@@ -15,7 +15,7 @@ export interface iSceneNode {
   thisScene: string;
 
   /**
-   * The name of the next scene, the scene the player will go to after passing 
+   * The name of the next scene, the scene the player will go to after passing
    * the exit gate.
    */
   nextScene: string;

src/core/docs.ts

@@ -2,6 +2,12 @@ export { loader } from "./resources";
 export { Stats, stats } from "./stats";
 export { iSceneNode } from "./cutScene";
 export { iArtifact } from "./iartifact";
-export { iLocation, iBox, iFloor} from "./location";
-export { Actor, ActorState, ActorWithState, SceneActor, GameActor} from "./actor";
+export { iLocation, iBox, iFloor } from "./location";
+export {
+  Actor,
+  ActorState,
+  ActorWithState,
+  SceneActor,
+  GameActor,
+} from "./actor";
 export { LevelLayout } from "./levelLayout";

src/core/levelLayout.ts

@@ -13,7 +13,7 @@ import { Floor, Wall } from "../actors/ground";
  *
  * The sub-classes only need to implement {@link layoutLevel} to create the actors
  * and artifacts of the level.
- * 
+ *
  * @noInheritDoc
  */
 export abstract class LevelLayout extends ex.Scene implements iSceneNode {
@@ -43,10 +43,10 @@ export abstract class LevelLayout extends ex.Scene implements iSceneNode {
   }
   /**
    * @experimental
-   * 
-   * Initialize the camera for this level. Defaults to an elastic focus on the 
+   *
+   * Initialize the camera for this level. Defaults to an elastic focus on the
    * player.
-   * 
+   *
    * @param player The player actor
    */
   initCamera(player: ex.Actor) {
@@ -105,20 +105,20 @@ export abstract class LevelLayout extends ex.Scene implements iSceneNode {
             0,
             0,
             this.levelSize.x * tileSize,
-            this.levelSize.y * tileSize
-          )
+            this.levelSize.y * tileSize,
+          ),
         );
         engine.add(new Floor({ x: -1, y: -1, right: this.levelSize.x + 2 }));
         engine.add(
           new Floor({
             x: -1,
             y: this.levelSize.y,
             right: this.levelSize.x + 2,
-          })
+          }),
         );
         engine.add(new Wall({ x: -1, y: 0, down: this.levelSize.y }));
         engine.add(
-          new Wall({ x: this.levelSize.x, y: 0, down: this.levelSize.y })
+          new Wall({ x: this.levelSize.x, y: 0, down: this.levelSize.y }),
         );
       }
     }

src/main.ts

@@ -53,7 +53,7 @@ addNode(new Level3());
 addNode(new Finish());
 addNode(new GameOver());
 
-const st = JSON.parse(window.localStorage.getItem("stats")||"{}");
+const st = JSON.parse(window.localStorage.getItem("stats") || "{}");
 stats.load(st);
 engine.goToScene(stats.currentNode);
 let showDebug = false;
@@ -64,15 +64,15 @@ engine.on("preupdate", () => {
     showDebug = !showDebug;
     engine.showDebug(showDebug);
   } else if (showDebug) {
-    if(engine.input.keyboard.wasPressed(ex.Input.Keys.KeyN)) {
+    if (engine.input.keyboard.wasPressed(ex.Input.Keys.KeyN)) {
       stats.nextScene = true;
-    } else if(engine.input.keyboard.wasPressed(ex.Input.Keys.KeyR)) {
+    } else if (engine.input.keyboard.wasPressed(ex.Input.Keys.KeyR)) {
       stats.currentNode = "playerSelect";
       engine.goToScene(nodes[stats.currentNode].thisScene);
       window.localStorage.setItem("stats", JSON.stringify(stats));
     }
   }
-    
+
   if (stats.nextScene) {
     console.log("switching from ", stats.currentNode);
     stats.currentNode = nodes[stats.currentNode].nextScene;
@@ -89,21 +89,20 @@ engine.on("gameover", () => {
   console.log("Game over reset");
   stats.reset();
 });
-// Detect hidden and visible outside of excalibur: it blocks events when the
-// engine is stopped so we cannot detect when to resume.
-document.addEventListener("visibilitychange", () => {
-  if (document.visibilityState === "hidden") {
-    console.log("Window hidden");
-    engine.stop();
-  } else if (document.visibilityState === "visible") {
-    console.log("Window visible");
-    engine.start();
-  }
-});
-
 // Start the engine
 engine.start(loader).then(() => {
   console.log("game start");
+  // Detect hidden and visible outside of excalibur: it blocks events when the
+  // engine is stopped so we cannot detect when to resume.
+  document.addEventListener("visibilitychange", () => {
+    if (document.visibilityState === "hidden") {
+      console.log("Window hidden");
+      engine.stop();
+    } else if (document.visibilityState === "visible") {
+      console.log("Window visible");
+      engine.start();
+    }
+  });
 });
 
 // For test hook

src/scenes/docs.ts

@@ -2,11 +2,7 @@ export { Example } from "./example";
 export { GameOver } from "./gameover";
 export { PlayerSelect } from "./playerSelect";
 export { Level1 } from "./level1";
-export {
-  BeforeLevel1,
-  BeforeLevel2,
-  BeforeLevel3,
-} from "./beforeScenes";
+export { BeforeLevel1, BeforeLevel2, BeforeLevel3 } from "./beforeScenes";
 export { Level2 } from "./level2";
 export { Finish } from "./finish";
 export { Level3 } from "./level3";