Save random seed for layer generation (#95)

Save and restore is still buggy with respect to bonuses, not sure why.
Also tile id generation is outside of state, therefore does not work
with save and restore.

src/core/bonus.ts

@@ -138,9 +138,10 @@ export type BonusLayerId = string;
 const _cachedBonusLayer: Record<BonusLayerId, Layer<Bonus>> = {};
 
 const DETERMINISTIC_SEED = 46;
-export function getBonusLayer(name: string): Layer<Bonus> {
+export function getBonusLayer(seed: number = DETERMINISTIC_SEED): Layer<Bonus> {
+  const name = `game-${seed}`;
   if (_cachedBonusLayer[name] == undefined) {
-    _cachedBonusLayer[name] = mkBonusLayer(name == 'game' ? Date.now() : DETERMINISTIC_SEED);
+    _cachedBonusLayer[name] = mkBonusLayer(seed);
   }
   return _cachedBonusLayer[name];
 }

src/core/reduce.ts

@@ -87,7 +87,7 @@ function resolveMouseupInner(state: GameState): GameState {
           });
 
           const tgts = moves.map(x => x.p_in_world_int);
-          if (isCollision(remainingTiles, moves, state.coreState.bonusOverlay, getBonusLayer(state.coreState.bonusLayerName))) {
+          if (isCollision(remainingTiles, moves, state.coreState.bonusOverlay, getBonusLayer(state.coreState.bonusLayerSeed))) {
             return state;
           }
 
@@ -374,7 +374,7 @@ export function reduce(scState: SceneState, action: Action): effectful.Result<Sc
     case 'resize': return { state: scState, effects: [] }; // XXX maybe stash viewdata this in state somewhere?
     case 'newGame':
       return {
-        state: mkGameSceneState(Date.now(), action.creative ?? false), effects: [],
+        state: mkGameSceneState(Date.now(), action.creative ?? false, Date.now()), effects: [],
       };
     case 'setSceneState':
       return { state: action.state, effects: [] };

src/core/state-helpers.ts

@@ -199,7 +199,7 @@ export function unpauseState(state: CoreState, pause: PauseData): CoreState {
 }
 
 export function bonusOfStatePoint(cs: CoreState, p: Point): Bonus {
-  return getOverlayLayer(cs.bonusOverlay, getBonusLayer(cs.bonusLayerName), p);
+  return getOverlayLayer(cs.bonusOverlay, getBonusLayer(cs.bonusLayerSeed), p);
 }
 
 export function tileFall(state: CoreState, ms: MouseState): Point {

src/core/state.ts

@@ -89,7 +89,7 @@ export type CoreState = {
   connectedSet: Grid<boolean>,
   energies: Energies,
   canvas_from_world: SE2,
-  seed: number,
+  seed: number, // changes during game play, determines which letters are drawn
   bonusOverlay: Overlay<Bonus>,
   selected?: SelectionState,
   scoring: ScoreState,
@@ -103,7 +103,7 @@ export type CoreState = {
     consonants: number,
     copies: number,
   }
-  bonusLayerName: string,
+  bonusLayerSeed: number,  // immutable during game play
 };
 
 export type GameState = {
@@ -115,16 +115,16 @@ export function mkSceneState(): SceneState {
   return { t: 'menu' };
 }
 
-export function mkGameSceneState(seed: number, creative: boolean): SceneState {
+export function mkGameSceneState(seed: number, creative: boolean, bonusLayerSeed: number): SceneState {
   return {
     t: 'game',
-    gameState: mkGameState(seed, creative), revision: 0
+    gameState: mkGameState(seed, creative, bonusLayerSeed), revision: 0
   };
 }
 
 const DEFAULT_SCALE = 48;
 
-export function mkGameState(seed: number, creative: boolean): GameState {
+export function mkGameState(seed: number, creative: boolean, bonusLayerSeed: number): GameState {
   return {
     coreState: {
       animations: [],
@@ -153,7 +153,7 @@ export function mkGameState(seed: number, creative: boolean): GameState {
         consonants: 0,
         copies: 0,
       },
-      bonusLayerName: 'game',
+      bonusLayerSeed,
     },
     mouseState: { t: 'up', p_in_canvas: { x: 0, y: 0 } },
   };

src/ui/instructions.tsx

@@ -117,7 +117,6 @@ function render(ci: CanvasInfo, props: CanvasProps) {
 function exampleState(): GameState {
   const state: GameState = {
     coreState: {
-      bonusLayerName: 'instructions',
       animations: [],
       currentTool: 'pointer',
       invalidWords: [],
@@ -155,6 +154,7 @@ function exampleState(): GameState {
         byClass: [0, 0,],
       },
       seed: 1533311107,
+      bonusLayerSeed: 46,
       canvas_from_world: {
         scale: {
           x: 39.6694214876033,

tests/test-state-helpers.ts

@@ -8,7 +8,7 @@ import { produce } from "../src/util/produce";
 const SEED = 12345678;
 
 function twoTileState(): GameState {
-  let state = mkGameState(SEED, false);
+  let state = mkGameState(SEED, false, SEED);
   state = produce(state, s => addWorldTile(s.coreState, { letter: 'A', p_in_world_int: { x: 0, y: 0 }, id: '1' }));
   state = produce(state, s => addWorldTile(s.coreState, { letter: 'B', p_in_world_int: { x: 1, y: 0 }, id: '2' }));
   return state;
@@ -45,7 +45,7 @@ describe('addWorldTile', () => {
   });
 
   test('should generate ids correctly', () => {
-    let state = mkGameState(SEED, false);
+    let state = mkGameState(SEED, false, SEED);
     state = produce(state, s => addWorldTile(s.coreState, { letter: 'A', p_in_world_int: { x: 0, y: 0 } }));
     state = produce(state, s => addWorldTile(s.coreState, { letter: 'B', p_in_world_int: { x: 1, y: 0 } }));
     expect(Object.keys(state.coreState.tile_entities).length).toBe(2);
@@ -86,7 +86,7 @@ describe('moveTile', () => {
 
 describe('removeTile', () => {
   test('should work correctly', () => {
-    const state = withCoreState(mkGameState(SEED, false), cs => checkValid(addWorldTiles(cs, debugTiles())));
+    const state = withCoreState(mkGameState(SEED, false, SEED), cs => checkValid(addWorldTiles(cs, debugTiles())));
     const state2 = removeTile(state.coreState, Object.keys(state.coreState.tile_entities)[0]);
     expect(Object.keys(state2.tile_entities).length).toBe(Object.keys(state.coreState.tile_entities).length - 1);
   });