Merge pull request #77 from sam-mfb/bugfix

Bugfix

Author: sam-mfb

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changes
 
+## 1.3.1 - 2025.11.01
+
+**BREAKING CHANGE - Game Engine Version 2**
+
+Fix bug with number of starting lives - games now correctly start with 3 lives (SHIPSTART + 1) instead of 2. This is a breaking change for validation: recordings made with version 1 will fail validation as they have incorrect initial state.
+
 ## 1.3.0 - 2025.10.26
 
 Game recording, validation, and replay

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "continuum",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "type": "module",
   "description": "Recreation of the 68000 Mac game Continuum for the web",
   "scripts": {

package.json

@@ -75,19 +75,14 @@ const main = async (): Promise<void> => {
   }
 
   // Create headless store (no UI, sound, or persistence)
-  const store = createHeadlessStore(
-    services,
-    recording.initialState.lives,
-    recording.startLevel
-  )
+  const store = createHeadlessStore(services, recording.startLevel)
 
   // Create headless engine (uses frame counter instead of real fizz service)
   const engine = createHeadlessGameEngine(
     store,
     galaxyService,
     randomService,
-    recording.galaxyId,
-    recording.initialState.lives
+    recording.galaxyId
   )
 
   const validator = createRecordingValidator(engine, store, recordingService)

scripts/validate-recording.ts

@@ -12,7 +12,7 @@ import { statusSlice } from '@core/status'
 import { clearAllShots } from '@core/shots'
 import { resetSparksAlive, clearShards } from '@core/explosions'
 import { SCRWTH, TOPMARG, BOTMARG } from '@core/screen'
-import { clearLevelComplete } from './gameSlice'
+import { clearLevelComplete, resetKillShipNextFrame } from './gameSlice'
 import { setMessage } from '@/core/status'
 import { FUELFRAMES } from '@core/figs'
 
@@ -59,8 +59,9 @@ export const loadLevel =
     // Update the current level in status state to match what we're loading
     dispatch(statusSlice.actions.setLevel(levelNum))
 
-    // Reset level complete flag and status message for the new level
+    // Reset level complete flag, kill ship flag, and status message for the new level
     dispatch(clearLevelComplete())
+    dispatch(resetKillShipNextFrame())
     dispatch(setMessage(null))
 
     // Get the planet data for this level from the service

src/core/game/levelThunks.ts

@@ -4,6 +4,7 @@ export const SKILLBRADIUS = 30 // Radius for bunker death blast when ship dies (
 export const SCOREBUNK = 50 // Points for destroying bunker
 export const FUELSTART = 10000 // Starting amount of fuel (GW.h:136)
 export const SHIPSTART = 2 // Number of spare ships to start with (GW.h:135)
+export const TOTAL_INITIAL_LIVES = SHIPSTART + 1 // Total lives including current ship
 
 // Shield-related constants from GW.h
 export const FUELBURN = 16 // Fuel consumed per frame while thrusting (GW.h:138)

src/core/ship/constants.ts

@@ -1,13 +1,6 @@
 import { createSlice, type PayloadAction } from '@reduxjs/toolkit'
 import type { ShipState } from './types'
-import {
-  SHIP,
-  DEAD_TIME,
-  FUELSTART,
-  FUELGAIN,
-  FUELBURN,
-  SHIPSTART
-} from './constants'
+import { SHIP, DEAD_TIME, FUELSTART, FUELGAIN, FUELBURN } from './constants'
 import type { ControlMatrix } from '../controls'
 
 // Note: TOTAL_INITIAL_LIVES will be set via preloadedState when creating the store
@@ -362,8 +355,8 @@ export const shipSlice = createSlice({
     /**
      * Reset lives for new game
      */
-    resetLives: state => {
-      state.lives = SHIPSTART
+    resetLives: (state, action: PayloadAction<number>) => {
+      state.lives = action.payload
     },
 
     /**

src/core/ship/shipSlice.ts

@@ -6,6 +6,7 @@ import type { GalaxyService } from '@core/galaxy'
 import type { RandomService } from '@/core/shared'
 import { updateGameState } from '@core/game'
 import { FIZZ_DURATION } from '@core/transition'
+import { TOTAL_INITIAL_LIVES } from '@core/ship'
 
 type HeadlessGameEngine = {
   step: (frameCount: number, controls: ControlMatrix) => void
@@ -16,8 +17,7 @@ const createHeadlessGameEngine = (
   store: HeadlessStore,
   galaxyService: GalaxyService,
   randomService: RandomService,
-  galaxyId: string,
-  initialLives: number
+  galaxyId: string
 ): HeadlessGameEngine => {
   // Track fizz state to simulate correct duration in headless mode
   let fizzFramesElapsed = 0
@@ -48,7 +48,7 @@ const createHeadlessGameEngine = (
       capturedFinalState = finalState
     },
     getGalaxyId: (): string => galaxyId,
-    getInitialLives: (): number => initialLives,
+    getInitialLives: (): number => TOTAL_INITIAL_LIVES,
     getCollisionMode: (): 'original' | 'modern' => 'modern' // Headless validation uses modern collision
   }
 

src/core/validation/HeadlessGameEngine.ts

@@ -1,6 +1,6 @@
 import { combineSlices, configureStore } from '@reduxjs/toolkit'
 import { gameSlice } from '@core/game'
-import { shipSlice } from '@core/ship'
+import { shipSlice, TOTAL_INITIAL_LIVES } from '@core/ship'
 import { shotsSlice } from '@core/shots'
 import { planetSlice } from '@core/planet'
 import { screenSlice } from '@core/screen'
@@ -40,31 +40,15 @@ const headlessReducer = combineSlices(
 
 const createHeadlessStore = (
   services: HeadlessServices,
-  initialLives: number,
   startLevel: number
 ): ReturnType<typeof configureStore<GameRootState>> => {
-  const preloadedState = {
-    ship: {
-      ...shipSlice.getInitialState(),
-      lives: initialLives
-    },
-    status: {
-      ...statusSlice.getInitialState(),
-      currentlevel: startLevel
-    },
-    game: {
-      ...gameSlice.getInitialState(),
-      cheatUsed: startLevel > 1 // Mark cheat used if starting beyond level 1
-    }
-  }
-
   // Create the sync thunk middleware instance
   const syncThunkMiddleware = createSyncThunkMiddleware<
     GameRootState,
     HeadlessServices
   >()
 
-  return configureStore({
+  const store = configureStore({
     reducer: headlessReducer,
     middleware: getDefaultMiddleware =>
       getDefaultMiddleware({
@@ -74,9 +58,23 @@ const createHeadlessStore = (
         // Disable serialization checks for headless validation
         // (randomService functions are passed in actions but that's okay for validation)
         serializableCheck: false
-      }).prepend(syncThunkMiddleware(services)),
-    preloadedState
+      }).prepend(syncThunkMiddleware(services))
   })
+
+  // Initialize state using the same actions as replay and game
+  // (ReplaySelectionScreen.tsx:132-136 and App.tsx:186-189)
+  // This ensures validator state matches game/replay state exactly
+  store.dispatch(shipSlice.actions.resetShip())
+  store.dispatch(shipSlice.actions.resetFuel())
+  store.dispatch(statusSlice.actions.initStatus(startLevel))
+  store.dispatch(shipSlice.actions.resetLives(TOTAL_INITIAL_LIVES))
+
+  // Mark cheat used if starting beyond level 1
+  if (startLevel > 1) {
+    store.dispatch(gameSlice.actions.markCheatUsed())
+  }
+
+  return store
 }
 
 export type HeadlessStore = ReturnType<typeof createHeadlessStore>

src/core/validation/createHeadlessStore.ts

@@ -18,7 +18,7 @@ import {
 } from './appSlice'
 import { isTouchDevice } from './mobile/deviceDetection'
 import { setHighScore } from '@/core/highscore'
-import { shipSlice } from '@/core/ship'
+import { shipSlice, TOTAL_INITIAL_LIVES } from '@/core/ship'
 import { statusSlice } from '@/core/status'
 import { markCheatUsed } from '@core/game'
 import { clearExplosions } from '@/core/explosions'
@@ -182,7 +182,7 @@ export const App: React.FC<AppProps> = ({
             onStartGame={(level: number) => {
               // Reset ship and sound to clean state
               dispatch(shipSlice.actions.resetShip())
-              dispatch(shipSlice.actions.resetLives())
+              dispatch(shipSlice.actions.resetLives(TOTAL_INITIAL_LIVES))
               dispatch(shipSlice.actions.resetFuel())
 
               // Reset score and status for new game