Make safe-storage work (fix #179)

src/core/grid.ts

@@ -1,6 +1,6 @@
 import { DEBUG } from "../util/debug";
 import { Point, Rect } from "../util/types";
-import { boundRect } from "../util/util";
+import { boundRect, mapval } from "../util/util";
 import { vtrans } from "../util/vutil";
 import { AbstractLetter, stringOfLetter } from "./letters";
 import { MainTile, TileNoId } from './state-types';
@@ -231,3 +231,7 @@ export function gridKeys<T>(x: UbGrid<T>): Point[] {
 export function unionGrids<T>(x: UbGrid<T>, y: UbGrid<T>): UbGrid<T> {
   return { elems: { ...x.elems, ...y.elems } };
 }
+
+export function mapGrid<T, U>(x: UbGrid<T>, f: (x: T) => U): UbGrid<U> {
+  return { elems: mapval(x.elems, f) };
+}

src/core/state-helpers.ts

@@ -15,7 +15,7 @@ import { PauseData, WORD_BONUS_INTERVAL_MS, now_in_game } from "./clock";
 import { DrawForce, getLetterSample } from "./distribution";
 import { updateFogOfWar } from "./fog-of-war";
 import { freshPanic } from "./fresh-panic";
-import { checkConnected, checkGridWords, gridKeys, mkGridOfMainTiles } from "./grid";
+import { checkConnected, checkGridWords, gridKeys, mapGrid, mkGridOfMainTiles, unionGrids } from "./grid";
 import { mkOverlayFrom, overlayAny, overlayPoints, setOverlay } from "./layer";
 import { AbstractLetter } from "./letters";
 import { addRandomMob } from "./mob-helpers";
@@ -156,7 +156,9 @@ export function checkValid(state: CoreState): CoreState {
   const oldConnectedSet = state.connectedSet;
 
   const { validWords, invalidWords } = checkGridWords(grid, word => getAssets().dictionary[word] || DEBUG.allWords);
-  const { allConnected, connectedSet } = checkConnected(grid);
+  const { allConnected, connectedSet: realConnectedSet } = checkConnected(grid);
+  const connectedSet = unionGrids(realConnectedSet, mapGrid(mkGridOfMainTiles(safeTiles), _ => true));
+
   let allValid = false;
   if (invalidWords.length == 0 && allConnected && get_hand_tiles(state).length == 0) {
     state = resolveValid(state, new Set(validWords.map(x => x.word)));