Wire into level data

excaliburjs · Nov 25, 2023 · 1f08365 · 1f08365
1 parent 978dcc2
commit 1f08365
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 18 deletions.
diff --git a/src/levels/level-base.ts b/src/levels/level-base.ts
@@ -15,6 +15,7 @@ import { Resources } from '../resources';
 
 export interface LevelData {
     name: string;
+    displayName: string;
     nextLevel: string;
     width: number;
     height: number;
@@ -100,6 +101,7 @@ export class LevelBase extends ex.Scene {
 
     override onDeactivate(): void {
         // TODO deactivate event handlers on types that have them!!
+        Resources.LevelMusic2.instances.forEach(i => i.stop());
         Resources.LevelMusic2.stop();
     }
 

diff --git a/src/levels/start-screen.ts b/src/levels/start-screen.ts
@@ -7,13 +7,7 @@ export class StartScreen extends ex.Scene {
     title!: ex.Actor;
     instructions!: ex.Actor;
     override onInitialize(engine: ex.Engine): void {
-        engine.input.pointers.primary.once('down', () => {
-            engine.goToScene('tutorial');
-        });
-        engine.input.keyboard.once('press', () => {
-            engine.goToScene('tutorial');
-        });
-
+        this.engine = engine;
         this.add(new Cloud(ex.vec(800, 0)));
         this.add(new Cloud(ex.vec(400, 300)));
         this.add(new Cloud(ex.vec(700, 700)));
@@ -67,6 +61,14 @@ export class StartScreen extends ex.Scene {
         Resources.TitleMusic.loop = true;
         Resources.TitleMusic.volume = .05;
         Resources.TitleMusic.play();
+
+        this.engine.input.pointers.primary.once('down', () => {
+            this.engine.goToScene('tutorial');
+        });
+        this.engine.input.keyboard.once('press', () => {
+            this.engine.goToScene('tutorial');
+        });
+
     }
     onDeactivate(): void {
         Resources.TitleMusic.stop();

diff --git a/src/levels/tutorial.ts b/src/levels/tutorial.ts
@@ -6,7 +6,8 @@ import { UnitMenu } from '../ui-components/unit-menu';
 import { HumanPlayer } from '../human-player';
 
 export const TutorialData: LevelData = {
-    name: 'Gentle Plains',
+    name: 'tutorial',
+    displayName: 'Gentle Plains',
     nextLevel: 'level',
     width: 6,
     height: 3,
@@ -42,11 +43,7 @@ export class Tutorial extends LevelBase {
             this.engine.add(this.focus);
         }
 
-        engine.input.keyboard.once('press', evt => {
-            if (evt.key === ex.Keys.Esc) {
-                this.engine.goToScene('level1');
-            }
-        })
+
     }
 
     async moveToUnit1() {
@@ -126,6 +123,12 @@ export class Tutorial extends LevelBase {
     }
 
     async onActivate() {
+        this.engine.input.keyboard.once('press', evt => {
+            if (evt.key === ex.Keys.Esc) {
+                this.engine.goToScene('level1');
+            }
+        })
+
         Resources.LevelMusic2.loop = true;
         Resources.LevelMusic2.volume = .05;
         Resources.LevelMusic2.play();

diff --git a/src/main.ts b/src/main.ts
@@ -23,7 +23,8 @@ game.addScene(tutorial.name, tutorial);
 
 
 const Level1Data: LevelData = {
-    name: 'Gentle Plains',
+    displayName: 'Gentle Plains',
+    name: 'level1',
     nextLevel: 'level2',
     width: 6,
     height: 3,
@@ -40,7 +41,8 @@ const level1 = new LevelBase(Level1Data, 'level1')
 game.addScene(level1.name, level1);
 
 export const Level2Data: LevelData = {
-    name: 'Gentle Plains 2',
+    displayName: 'Gentle Plains 2',
+    name: 'level2',
     nextLevel: 'start',
     width: 6,
     height: 6,

diff --git a/src/turn-manager.ts b/src/turn-manager.ts
@@ -177,16 +177,14 @@ export class TurnManager {
                 if (this.currentPlayer instanceof HumanPlayer) {
                     await this.showGameOver();
                     this.engine.input.pointers.once('down', () => {
-                        // TODO go to current level name
                         Resources.LevelMusic2.stop();
-                        this.engine.goToScene('level1');
+                        this.engine.goToScene(this.level.levelData.name);
                     });
                     return;
                 }
                 if (this.currentPlayer instanceof ComputerPlayer) {
                     await this.showVictory();
                     this.engine.input.pointers.once('down', () => {
-                        // TODO next level!
                         this.engine.goToScene(this.level.levelData.nextLevel);
                     });
                     return;

diff --git a/todo.md b/todo.md
@@ -6,6 +6,7 @@
 * [ ] Skip tutorial option
 * [ ] Show the name of the stage "Gentle Plains"
 * [ ] Show the players name when they should move
+* [ ] Range viz, support mobile
 * [x] Win condition
 * [x] Tutorial (what is the point of the game)
 * [x] Only show valid actions