Merge pull request #273 from chrahunt/add-new-powerups

Add new powerups

Author: chrahunt

src/js/modules/renderer.js

@@ -780,9 +780,13 @@ function drawFloorTiles(positions, showPreviews) {
       x = tile_spec.emptyCoordinates.x;
       y = tile_spec.emptyCoordinates.y;
     } else {
-      trackPreviewState(positions, floor_tile);
-      let coordinates = floor_tile.previewState.isEmpty ? tile_spec.emptyCoordinates
-                                                        : tile_spec.coordinates;
+      let coordinates = tile_spec.coordinates
+      if (tile_spec.blinking) {
+        trackPreviewState(positions, floor_tile);
+        if (floor_tile.previewState.isEmpty) {
+          coordinates = tile_spec.emptyCoordinates;
+        }
+      }
       x = coordinates.x;
       y = coordinates.y;
       context.globalAlpha = 0.5;

src/js/modules/tiles.js

@@ -52,6 +52,10 @@ exports.mapElements = {
   6.21: {tile: "emptypowerup", coordinates: {x: 13, y: 4}, tileSize: 40, drawTileFirst: false},
   6.31: {tile: "emptypowerup", coordinates: {x: 13, y: 4}, tileSize: 40, drawTileFirst: false},
   6.41: {tile: "emptypowerup", coordinates: {x: 13, y: 4}, tileSize: 40, drawTileFirst: false},
+  6.12: {tile: "emptypowerup", coordinates: {x: 13, y: 4}, tileSize: 40, drawTileFirst: false},
+  6.22: {tile: "emptypowerup", coordinates: {x: 13, y: 4}, tileSize: 40, drawTileFirst: false},
+  6.32: {tile: "emptypowerup", coordinates: {x: 13, y: 4}, tileSize: 40, drawTileFirst: false},
+  6.42: {tile: "emptypowerup", coordinates: {x: 13, y: 4}, tileSize: 40, drawTileFirst: false},
   7: {tile: "spike", coordinates: {x: 12, y: 0}, tileSize: 40, drawTileFirst: true},
   8: {tile: "button", coordinates: {x: 13, y: 6}, tileSize: 40, drawTileFirst: true},
   9: {tile: "gate", coordinates: {x: 12, y: 3}, tileSize: 40, drawTileFirst: false},
@@ -99,10 +103,14 @@ exports.floor_tiles = {
   6.2: {tile: "rollingbomb", coordinates: {x: 12, y: 5}, tileSize: 40, img: "tiles"},
   6.3: {tile: "tagpro", coordinates: {x: 12, y: 6}, tileSize: 40, img: "tiles"},
   6.4: {tile: "speed", coordinates: {x: 12, y: 7}, tileSize: 40, img: "tiles"},
-  6.11: {tile: "previewjukejuice", coordinates: {x: 12, y: 4}, tileSize: 40, img: "tiles", preview: true, emptyCoordinates: {x: 12, y: 8}},
-  6.21: {tile: "previewrollingbomb", coordinates: {x: 12, y: 5}, tileSize: 40, img: "tiles", preview: true, emptyCoordinates: {x: 12, y: 8}},
-  6.31: {tile: "previewtagpro", coordinates: {x: 12, y: 6}, tileSize: 40, img: "tiles", preview: true, emptyCoordinates: {x: 12, y: 8}},
-  6.41: {tile: "previewspeed", coordinates: {x: 12, y: 7}, tileSize: 40, img: "tiles", preview: true, emptyCoordinates: {x: 12, y: 8}},
+  6.11: {tile: "previewjukejuice", coordinates: {x: 12, y: 4}, tileSize: 40, img: "tiles", preview: true, blinking: true, emptyCoordinates: {x: 12, y: 8}},
+  6.21: {tile: "previewrollingbomb", coordinates: {x: 12, y: 5}, tileSize: 40, img: "tiles", preview: true, blinking: true, emptyCoordinates: {x: 12, y: 8}},
+  6.31: {tile: "previewtagpro", coordinates: {x: 12, y: 6}, tileSize: 40, img: "tiles", preview: true, blinking: true, emptyCoordinates: {x: 12, y: 8}},
+  6.41: {tile: "previewspeed", coordinates: {x: 12, y: 7}, tileSize: 40, img: "tiles", preview: true, blinking: true, emptyCoordinates: {x: 12, y: 8}},
+  6.12: {tile: "previewjukejuice2", coordinates: {x: 12, y: 4}, tileSize: 40, img: "tiles", preview: true, emptyCoordinates: {x: 12, y: 8}},
+  6.22: {tile: "previewrollingbomb2", coordinates: {x: 12, y: 5}, tileSize: 40, img: "tiles", preview: true, emptyCoordinates: {x: 12, y: 8}},
+  6.32: {tile: "previewtagpro2", coordinates: {x: 12, y: 6}, tileSize: 40, img: "tiles", preview: true, emptyCoordinates: {x: 12, y: 8}},
+  6.42: {tile: "previewspeed2", coordinates: {x: 12, y: 7}, tileSize: 40, img: "tiles", preview: true, emptyCoordinates: {x: 12, y: 8}},
   9: {tile: "gate", coordinates: {x: 12, y: 3}, tileSize: 40, img: "tiles"},
   9.1: {tile: "greengate", coordinates: {x: 13, y: 3}, tileSize: 40, img: "tiles"},
   9.2: {tile: "redgate", coordinates: {x: 14, y: 3}, tileSize: 40, img: "tiles"},