Bit more refactoring

Author: janza

lib/game.js

@@ -143,7 +143,7 @@ const game = (getBallLevel, sleepFunction, gameBoard) => {
     const newDots = pending.mergeWithPending(state.dots)
     setState({ dots: newDots })
     pending = null
-    sleepFunction(() => cleanupBoard([], newDots))
+    sleepFunction(() => cleanupBoard(newDots))
   }
 
   function board (dots) {
@@ -201,8 +201,7 @@ const game = (getBallLevel, sleepFunction, gameBoard) => {
         map[d.x][d.y <= 0 ? 0 : d.y - 1]
       ]
         .filter(n => n && n.type === d.type)
-        .reduce((l, d) => l.concat(checkTile(d)), [])
-        .concat([d])
+        .reduce((l, d) => l.concat(checkTile(d)), [d])
     }
 
     let freshDots = []
@@ -243,20 +242,19 @@ const game = (getBallLevel, sleepFunction, gameBoard) => {
     window.localStorage['score'] = highScore
   }
 
-  function cleanupBoard (oldRun, newRun) {
-    oldRun = newRun
-    newRun = cleanupDots(oldRun)
-    const level = levelUpAt.findIndex(l => l > blocksKilled)
+  function outsidePlayingArea (ball) {
+    return ball.y < 0
+  }
+
+  function cleanupBoard (oldRun) {
+    const newRun = cleanupDots(oldRun)
     setState({
-      level: level < 0 ? colors.length - 1 : level,
+      level: levelUpAt.findIndex(l => l > blocksKilled),
       dots: newRun
     })
     if (oldRun.length === newRun.length) {
-      if (newRun.some(d => d.y < 0)) {
-        return setState({
-          gameover: true,
-          dots: []
-        })
+      if (newRun.some(outsidePlayingArea)) {
+        return setState({ gameover: true })
       }
       pending = pendingBalls(
         getBallLevel(state.level),
@@ -266,11 +264,11 @@ const game = (getBallLevel, sleepFunction, gameBoard) => {
     }
 
     sleepFunction(() => {
-      newRun = settleDots(newRun)
-      setState({
-        dots: newRun
+      const ballsInPlace = settleDots(newRun)
+      setState({ dots: ballsInPlace })
+      sleepFunction(() => {
+        cleanupBoard(ballsInPlace)
       })
-      sleepFunction(() => cleanupBoard(oldRun, newRun))
     })
   }