Updated issue #152 - Fixed rendering of dead snakes to use same code …

…as normal snakes with alpha on body and head/tail images.

Improved line rendering at edges.
Restored .eslintrc file to original.

.eslintrc

@@ -16,7 +16,6 @@
       "props": false
     }],
     "no-console": ["off"],
-    "no-mixed-operators": ["off"],
     "react/jsx-indent": ["off"]
   }
 }

app/constants/Images.js

@@ -21,18 +21,9 @@ import snake000000Tail from '../design/images/snakes/000000/000000_TAIL.png';
 import snakeFF4848Tail from '../design/images/snakes/FF4848/FF4848_TAIL.png';
 import snake9AF48ETail from '../design/images/snakes/9AF48E/9AF48E_TAIL.png';
 import snake9BF3F0Tail from '../design/images/snakes/9BF3F0/9BF3F0_TAIL.png';
-// 50% alpha
-import deadSnakeTail50 from '../design/images/snakes/999999/grey-dead-tail-50.svg';
-import deadSnakeHead50 from '../design/images/snakes/999999/grey-dead-head-50.svg';
-import deadSnakeBody50 from '../design/images/snakes/999999/grey-dead-body-50.svg';
-// 70% alpha
-import deadSnakeTail70 from '../design/images/snakes/999999/grey-dead-tail-70.svg';
-import deadSnakeHead70 from '../design/images/snakes/999999/grey-dead-head-70.svg';
-import deadSnakeBody70 from '../design/images/snakes/999999/grey-dead-body-70.svg';
 // 100% alpha
 import deadSnakeTail100 from '../design/images/snakes/999999/grey-dead-tail-100.svg';
 import deadSnakeHead100 from '../design/images/snakes/999999/grey-dead-head-100.svg';
-import deadSnakeBody100 from '../design/images/snakes/999999/grey-dead-body-100.svg';
 
 const starImg = star;
 
@@ -60,9 +51,9 @@ function _getSnakeHead(color) {
       return snake9AF48E;
     case '#9BF3F0' :
       return snake9BF3F0;
-    case '#dead' : {
+    case '#dead' :
+    case '#999999' :
       return deadSnakeHead100;
-    }
     default:
       return snake000000;
   }
@@ -92,44 +83,17 @@ function _getSnakeTail(color) {
       return snake9AF48ETail;
     case '#9BF3F0' :
       return snake9BF3F0Tail;
-    default:
-      return snake000000Tail;
-  }
-}
-
-function _getDeadImage(part, alpha) {
-  switch (part) {
-    case 'head':
-      if (alpha === 70) {
-        return deadSnakeHead70;
-      } else if (alpha === 50) {
-        return deadSnakeHead50;
-      }
-      return deadSnakeHead100;
-    case 'tail':
-      if (alpha === 70) {
-        return deadSnakeTail70;
-      } else if (alpha === 50) {
-        return deadSnakeTail50;
-      }
+    case '#999999' :
       return deadSnakeTail100;
     default:
-      if (alpha === 70) {
-        return deadSnakeBody70;
-      } else if (alpha === 50) {
-        return deadSnakeBody50;
-      }
-      return deadSnakeBody100;
+      return snake000000Tail;
   }
 }
 
 export default {
   getStarImage(position) {
     return { src: starImg, key: 'star_' + position };
   },
-  getDeadImage(part, alpha) {
-    return { src: _getDeadImage(part, alpha), key: undefined };
-  },
   getSnakeHead(color) {
     return { src: _getSnakeHead(color), key: 'head_' + color };
   },

app/game/components/GameBoard.jsx

@@ -10,15 +10,13 @@ import GameControl from './sidebar/GameControl';
 
 function getGameState() {
   const state = Store.getActiveGameState();
-  const deadSnakes = Store.getDeadSnakes();
-  return { state, deadSnakes };
+  return { state };
 }
 
 const propTypes = {
-  deadSnakes: React.PropTypes.array.isRequired,// eslint-disable-line
   state: React.PropTypes.object.isRequired, // eslint-disable-line
   params: React.PropTypes.object.isRequired,
-  routes: React.PropTypes.object.isRequired,
+  routes: React.PropTypes.array.isRequired,
 };
 
 class GameBoard extends React.Component {
@@ -103,11 +101,11 @@ class GameBoard extends React.Component {
   }
 
   renderDeadSnakes(mapEvent, tileSize, state) {
-    const allDeadSnakes = this.props.deadSnakes.filter(snake =>
+    const allDeadSnakes = state.deadSnakes.filter(snake =>
       (mapEvent.worldTick > snake.worldTick && snake.worldTick + snake.ttl >= mapEvent.worldTick)
     );
 
-    const collisions = this.props.deadSnakes.filter(snake =>
+    const collisions = state.deadSnakes.filter(snake =>
       mapEvent.worldTick === (snake.worldTick + 1)
     );
 
@@ -164,8 +162,8 @@ class GameBoard extends React.Component {
           <div className="gameboard">
             <canvas
               id="canvas"
-              width={size.width + 1}
-              height={size.height + 1}
+              width={size.width + 0}
+              height={size.height + 0}
               ref={(c) => {
                 this.canvas = c;
               }}

app/util/Colors.js

@@ -34,8 +34,8 @@ export default {
   getBoardColor(i) {
     return boardColors[i];
   },
-
   getSnakeColor(i) {
     return snakeColors[i];
   },
+  DEAD_SNAKE: '#999999',
 };