Skip to content

Commit f2ddd49

Browse files
authored
Merge pull request #272 from chrahunt/team-portals
Add temporary team portal tile definitions
2 parents 6b6990a + b36bdad commit f2ddd49

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

src/js/modules/tiles.js

+14-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,13 @@ exports.mapElements = {
7777
17: {tile: "redgoal", coordinates: {x: 14, y: 5}, tileSize: 40, drawTileFirst: false},
7878
18: {tile: "bluegoal", coordinates: {x: 15, y: 5}, tileSize: 40, drawTileFirst: false},
7979
22: {tile: "gravitywell", coordinates: {x: 13, y: 0}, tileSize: 40, drawTileFirst: true},
80-
23: {tile: "yellowtile", coordinates: {x: 13, y: 5}, tileSize: 40, drawTileFirst: false}
80+
23: {tile: "yellowtile", coordinates: {x: 13, y: 5}, tileSize: 40, drawTileFirst: false},
81+
24: {tile: "portalred", coordinates: {x: 13, y: 4}, tileSize: 40, drawTileFirst: false},
82+
24.1: {tile: "emptyportalred", coordinates: {x: 13, y: 4}, tileSize: 40, drawTileFirst: false},
83+
24.11: {tile: "emptyportalred", coordinates: {x: 13, y: 4}, tileSize: 40, drawTileFirst: false},
84+
25: {tile: "portalblue", coordinates: {x: 13, y: 4}, tileSize: 40, drawTileFirst: false},
85+
25.1: {tile: "emptyportalblue", coordinates: {x: 13, y: 4}, tileSize: 40, drawTileFirst: false},
86+
25.11: {tile: "emptyportalblue", coordinates: {x: 13, y: 4}, tileSize: 40, drawTileFirst: false}
8187
};
8288

8389
exports.floor_tiles = {
@@ -114,7 +120,13 @@ exports.floor_tiles = {
114120
15.1: {tile: "emptyspeedpadblue", coordinates: {x: 4, y: 0}, tileSize: 40, img: "speedpadblue"},
115121
15.11: {tile: "previewspeedpadblue", coordinates: {x: 0, y: 0}, tileSize: 40, img: "speedpadblue", preview: true, emptyCoordinates: {x: 4, y: 0}},
116122
16: {tile: "yellowflag", coordinates: {x: 13, y: 1}, tileSize: 40, img: "tiles"},
117-
16.1: {tile: "yellowflagtaken", coordinates: {x: 13, y: 2}, tileSize: 40, img: "tiles"}
123+
16.1: {tile: "yellowflagtaken", coordinates: {x: 13, y: 2}, tileSize: 40, img: "tiles"},
124+
24: {tile: "portalred", coordinates: {x: 0, y: 0}, tileSize: 40, img: "portal", animated: true},
125+
24.1: {tile: "emptyportalred", coordinates: {x: 4, y: 0}, tileSize: 40, img: "portal"},
126+
24.11: {tile: "previewportalred", coordinates: {x: 0, y: 0}, tileSize: 40, img: "portal", preview: true, emptyCoordinates: {x: 4, y: 0}},
127+
25: {tile: "portalblue", coordinates: {x: 0, y: 0}, tileSize: 40, img: "portal", animated: true},
128+
25.1: {tile: "emptyportalblue", coordinates: {x: 4, y: 0}, tileSize: 40, img: "portal"},
129+
25.11: {tile: "previewportalblue", coordinates: {x: 0, y: 0}, tileSize: 40, img: "portal", preview: true, emptyCoordinates: {x: 4, y: 0}}
118130
};
119131

120132
exports.tiles = {

src/js/recording.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function recordReplayData() {
5252
positions.tagproVersion = tagpro.version;
5353

5454
// Set up dynamic tiles.
55-
const dynamic_tile_ids = [3, 4, 5, 6, 9, 10, 13, 14, 15, 16, 19, 20, 21];
55+
const dynamic_tile_ids = [3, 4, 5, 6, 9, 10, 13, 14, 15, 16, 19, 20, 21, 24, 25];
5656
positions.map.forEach((row, x) => {
5757
row.forEach((tile, y) => {
5858
if (dynamic_tile_ids.includes(Math.floor(tile))) {

0 commit comments

Comments
 (0)