Merge branch 'main' of https://github.com/sjefvanleeuwen/shooter

Author: sjefvanleeuwen

js/game.js

@@ -151,7 +151,7 @@ class Game {
     }
 
     gameOver() {
-        // Switch to intro screen with game over flag
+        // Create new intro screen with game over state
         this.screens.intro = new IntroScreen(this.ctx, {
             virtualWidth: this.virtualWidth,
             virtualHeight: this.virtualHeight,
@@ -160,7 +160,7 @@ class Game {
             finalScore: this.gameState.score,
             highScore: this.gameState.highScore
         });
-        this.currentScreen = 'intro';
+        this.switchScreen('intro');
     }
 
     reset() {
@@ -170,26 +170,29 @@ class Game {
     }
 
     switchScreen(screenName) {
-        // Start music when transitioning from startup to intro
-        if (this.currentScreen === 'startup' && screenName === 'intro') {
-            this.musicPlayer.start().then(() => {
-                this.musicPlayer.fadeIn(3);
-            });
+        // Cleanup current screen
+        if (this.screens[this.currentScreen]?.cleanup) {
+            this.screens[this.currentScreen].cleanup();
         }
 
-        // Fade out music when going to game over
-        if (screenName === 'intro' && this.screens[this.currentScreen]?.isGameOver) {
-            this.musicPlayer.fadeOut(2);
+        // Special handling for game screen
+        if (screenName === 'game') {
+            // Always create a new game screen instance
+            this.screens.game = new GameScreen(this.ctx, {
+                virtualWidth: this.virtualWidth,
+                virtualHeight: this.virtualHeight,
+                bgScroller: this.bgScroller,
+                gameState: this.gameState
+            });
         }
 
-        // Cleanup current screen if it exists
-        if (this.screens[this.currentScreen]?.cleanup) {
-            this.screens[this.currentScreen].cleanup();
+        // Handle music transitions
+        if (this.currentScreen === 'startup' && screenName === 'intro') {
+            this.musicPlayer.start().then(() => {
+                this.musicPlayer.fadeIn(3);
+            });
         }
 
-        if (screenName === 'game' && !this.screens.game) {
-            this.initGameScreen();
-        }
         this.currentScreen = screenName;
         this.inputManager.setCurrentScreen(screenName);
     }

js/managers/GameStateManager.js

@@ -43,6 +43,7 @@ class GameStateManager {
         this.playerHit = false;
         this.playerInvulnerable = false;
         this.invulnerabilityTimer = 0;
+        // Don't reset highScore as it should persist
     }
 
     getInvulnerabilityAlpha() {

js/screens/IntroScreen.js

@@ -113,7 +113,10 @@ class IntroScreen {
 
     handleInput(key) {
         if (key === ' ' && this.pressSpaceVisible) {
-            return 'game'; // Signal to switch to game screen
+            // Always reset game state when starting a new game
+            window.game.gameState.reset();
+            this.cleanup();
+            return 'game';
         }
         return null;
     }