Asteroids high-score code or the game-over flow, & the Select Players screen may be showing current run best while the initials table shows stored leaderboard

Author: ToolboxAid

games/Asteroids/game/AsteroidsGameScene.js

@@ -558,6 +558,10 @@ export default class AsteroidsGameScene extends Scene {
       if (engine.canvas) {
         engine.canvas.style.cursor = 'default';
       }
+      // Ensure qualifying game-over scores always enter initials flow before continue/auto-exit paths.
+      if (!this.initialsEntry.active) {
+        this.tryBeginInitialsEntry();
+      }
       if (enterPressed && !this.lastEnterPressed && this.isGameOverScreenVisible()) {
         this.initialsEntry.cancel();
         this.returnToIntroAttract();
@@ -684,6 +688,8 @@ export default class AsteroidsGameScene extends Scene {
   }
 
   render(renderer) {
+    const leaderboardTopScore = this.highScoreService.getTopScore(this.highScoreRows);
+    const liveHudHighScore = Math.max(this.session.highScore, leaderboardTopScore);
     renderer.drawRect(0, 0, this.world.bounds.width, this.world.bounds.height, '#020617');
     this.world.starfield.forEach((star) => {
       renderer.drawRect(star.x, star.y, star.size, star.size, '#94a3b8');
@@ -698,7 +704,7 @@ export default class AsteroidsGameScene extends Scene {
       renderer.drawText('SCORE 1', SCORE_ONE_X, 34, { color: '#ffffff', font: `18px ${HUD_FONT}`, textAlign: 'center' });
       renderer.drawText(`${this.session.players[0]?.score || 0}`.padStart(4, '0'), SCORE_ONE_X, 62, { color: scoreOneColor, font: `24px ${HUD_FONT}`, textAlign: 'center' });
       renderer.drawText('HIGH SCORE', HIGH_SCORE_X, 34, { color: '#ffffff', font: `18px ${HUD_FONT}`, textAlign: 'center' });
-      renderer.drawText(`${this.session.highScore}`.padStart(4, '0'), HIGH_SCORE_X, 62, { color: '#ffffff', font: `24px ${HUD_FONT}`, textAlign: 'center' });
+      renderer.drawText(`${liveHudHighScore}`.padStart(4, '0'), HIGH_SCORE_X, 62, { color: '#ffffff', font: `24px ${HUD_FONT}`, textAlign: 'center' });
       renderer.drawText('SCORE 2', SCORE_TWO_X, 34, { color: '#ffffff', font: `18px ${HUD_FONT}`, textAlign: 'center' });
       renderer.drawText(`${this.session.players[1]?.score || 0}`.padStart(4, '0'), SCORE_TWO_X, 62, { color: scoreTwoColor, font: `24px ${HUD_FONT}`, textAlign: 'center' });
 
@@ -762,7 +768,7 @@ export default class AsteroidsGameScene extends Scene {
           font: `56px ${HUD_FONT}`,
           textAlign: 'center',
         });
-        renderer.drawText(`HIGH SCORE ${String(this.session.highScore).padStart(4, '0')}`, 480, 286, {
+        renderer.drawText(`HIGH SCORE ${String(leaderboardTopScore).padStart(4, '0')}`, 480, 286, {
           color: '#ffffff',
           font: `20px ${HUD_FONT}`,
           textAlign: 'center',

tests/games/AsteroidsPresentation.test.mjs

@@ -85,8 +85,81 @@ function testAsteroidsAttractMenuFlow() {
   assert.equal(scene.attractController.active, false);
 }
 
+function testAsteroidsGameOverQualifyingScoreInitialsFlow() {
+  const scene = new AsteroidsGameScene();
+  const storage = createStorage();
+  scene.highScoreService = new AsteroidsHighScoreService({ storage, tableSize: 5 });
+  scene.highScoreRows = [
+    { initials: 'ACE', score: 1800 },
+    { initials: 'VTR', score: 1400 },
+    { initials: 'ION', score: 1000 },
+    { initials: 'CPU', score: 700 },
+    { initials: 'BOT', score: 500 },
+  ];
+  scene.session.players = [
+    { id: 1, score: 1900, lives: 0, nextExtraLifeScore: 10000, worldState: null },
+  ];
+  scene.session.activePlayerIndex = 0;
+  scene.session.mode = 'game-over';
+  scene.initialsEntry.cancel();
+
+  const engine = {
+    input: createInput(),
+    canvas: { style: {} },
+  };
+
+  scene.update(0.016, engine);
+  assert.equal(scene.initialsEntry.active, true);
+  assert.equal(scene.initialsEntry.score, 1900);
+  assert.equal(scene.isGameOverScreenVisible(), false);
+
+  engine.input = createInput({ pressed: ['Enter'] });
+  scene.update(0.016, engine);
+
+  assert.equal(scene.initialsEntry.active, false);
+  assert.equal(scene.session.mode, 'menu');
+  assert.equal(scene.highScoreRows.length, 5);
+  assert.equal(scene.highScoreRows[0].initials, 'AAA');
+  assert.equal(scene.highScoreRows[0].score, 1900);
+  for (let index = 1; index < scene.highScoreRows.length; index += 1) {
+    assert.equal(scene.highScoreRows[index - 1].score >= scene.highScoreRows[index].score, true);
+  }
+}
+
+function testAsteroidsMenuHighScoreUsesLeaderboardTop() {
+  const scene = new AsteroidsGameScene();
+  scene.highScoreRows = [
+    { initials: 'ACE', score: 1800 },
+    { initials: 'VTR', score: 1400 },
+    { initials: 'ION', score: 1000 },
+    { initials: 'CPU', score: 700 },
+    { initials: 'BOT', score: 500 },
+  ];
+  scene.session.highScore = 2500;
+  scene.session.mode = 'menu';
+  scene.attractController.active = false;
+
+  const textCalls = [];
+  const renderer = {
+    drawRect() {},
+    strokeRect() {},
+    drawPolygon() {},
+    drawLine() {},
+    drawCircle() {},
+    drawText(text, ...rest) {
+      textCalls.push([text, ...rest]);
+    },
+  };
+
+  scene.render(renderer);
+  assert.equal(textCalls.some(([text]) => text === 'HIGH SCORE 1800'), true);
+  assert.equal(textCalls.some(([text]) => text === 'HIGH SCORE 2500'), false);
+}
+
 export function run() {
   testAsteroidsHighScoreService();
   testAsteroidsInitialsEntry();
   testAsteroidsAttractMenuFlow();
+  testAsteroidsGameOverQualifyingScoreInitialsFlow();
+  testAsteroidsMenuHighScoreUsesLeaderboardTop();
 }