Move killed blocks out of state object

Author: janza

lib/game.js

@@ -1,14 +1,18 @@
-module.exports = () => {
+
+
+module.exports = (getBallLevel) => {
+  getBallLevel = getBallLevel || (level => Math.floor(Math.random() * level))
+
   const thresholds = [0, 0, 5, 30, 90, 150, 230, 280, 350, 450]
+  var blocksKilled = 0
   var updateCallback = () => {}
   var dotsId = 0
   var state = {
     dots: [],
     score: 0,
     highScore: 0,
     floatingDots: [newDot(4, 1), newDot(5, 0)],
-    level: 2,
-    blocksKilled: 0
+    level: 2
   }
 
   const colors = [
@@ -25,7 +29,7 @@ module.exports = () => {
   ]
 
   function setState (newState) {
-    Object.assign(state, newState)
+    state = Object.assign({}, state, newState)
     updateCallback(newState)
   }
 
@@ -39,7 +43,7 @@ module.exports = () => {
       y,
       key: dotsId++,
       type:
-        level !== undefined ? level : Math.floor(Math.random() * state.level)
+        level !== undefined ? level : getBallLevel(state.level)
     }
   }
 
@@ -133,7 +137,7 @@ module.exports = () => {
             keep[d.x][d.y] = false
             updateScore(state.score + (newColoredDot.type + 1) * 5)
           })
-          state.blocksKilled++
+          blocksKilled++
         }
       }
     }
@@ -154,7 +158,6 @@ module.exports = () => {
       return
     }
     setState({
-      ...state,
       floatingDots: state.floatingDots.map(d => {
         return {
           ...d,
@@ -195,7 +198,7 @@ module.exports = () => {
   function cleanupBoard (oldRun, newRun) {
     oldRun = newRun
     newRun = cleanupDots(oldRun)
-    const level = thresholds.findIndex(l => l > state.blocksKilled)
+    const level = thresholds.findIndex(l => l > blocksKilled)
     setState({
       ...state,
       level: level < 0 ? colors.length - 1 : level,

pages/index.js

@@ -48,7 +48,7 @@ export default class Page extends React.Component {
           }}
         >
           <GameBoard
-            width={500}
+            width={600}
             colors={this.game.colors()}
             score={this.game.score()}
             highScore={this.game.highScore()}