diff --git a/js/main.js b/js/main.js index 0ae7a20..514ec1c 100644 --- a/js/main.js +++ b/js/main.js @@ -1879,34 +1879,37 @@ class Conductor { async function main() { + let local = !! location.host.match(/localhost/); let query = new URLSearchParams(location.search); // Pick a tileset - // These alternative ones only exist locally for me at the moment, since - // they're part of the commercial games! + // These alternative ones only work locally for me for testing purposes, since they're part of + // the commercial games! let tilesheet = new Image(); let tilesize; let tilelayout; - if (query.get('tileset') === 'ms') { + if (local && query.get('tileset') === 'ms') { tilesheet.src = 'tileset-ms.png'; tilesize = 32; tilelayout = CC2_TILESET_LAYOUT; } - else if (query.get('tileset') === 'steam') { + else if (local && query.get('tileset') === 'steam') { tilesheet.src = 'tileset-steam.png'; tilesize = 32; tilelayout = CC2_TILESET_LAYOUT; } - else if (query.get('tileset') === 'lexy') { - tilesheet.src = 'tileset-lexy.png'; - tilesize = 32; - tilelayout = LL_TILESET_LAYOUT; - } - else { + else if (query.get('tileset') === 'tworld') { tilesheet.src = 'tileset-tworld.png'; tilesize = 48; tilelayout = TILE_WORLD_TILESET_LAYOUT; } + else { + // Default to Lexy's Labyrinth tileset + tilesheet.src = 'tileset-lexy.png'; + tilesize = 32; + tilelayout = LL_TILESET_LAYOUT; + } + // TODO would be fabulous to not wait on this before creating conductor await tilesheet.decode(); let tileset = new Tileset(tilesheet, tilelayout, tilesize, tilesize); diff --git a/tileset-lexy.png b/tileset-lexy.png new file mode 100644 index 0000000..e7c2495 Binary files /dev/null and b/tileset-lexy.png differ diff --git a/tileset-src/tileset-lexy-blob.aseprite b/tileset-src/tileset-lexy-blob.aseprite new file mode 100644 index 0000000..3367076 Binary files /dev/null and b/tileset-src/tileset-lexy-blob.aseprite differ diff --git a/tileset-src/tileset-lexy-bug.aseprite b/tileset-src/tileset-lexy-bug.aseprite new file mode 100644 index 0000000..72204c1 Binary files /dev/null and b/tileset-src/tileset-lexy-bug.aseprite differ diff --git a/tileset-src/tileset-lexy-exit.aseprite b/tileset-src/tileset-lexy-exit.aseprite new file mode 100644 index 0000000..211c7a8 Binary files /dev/null and b/tileset-src/tileset-lexy-exit.aseprite differ diff --git a/tileset-src/tileset-lexy-explosion.aseprite b/tileset-src/tileset-lexy-explosion.aseprite new file mode 100644 index 0000000..876b7c0 Binary files /dev/null and b/tileset-src/tileset-lexy-explosion.aseprite differ diff --git a/tileset-src/tileset-lexy-fire.aseprite b/tileset-src/tileset-lexy-fire.aseprite new file mode 100644 index 0000000..3679a7b Binary files /dev/null and b/tileset-src/tileset-lexy-fire.aseprite differ diff --git a/tileset-src/tileset-lexy-fireball.aseprite b/tileset-src/tileset-lexy-fireball.aseprite new file mode 100644 index 0000000..d26c597 Binary files /dev/null and b/tileset-src/tileset-lexy-fireball.aseprite differ diff --git a/tileset-src/tileset-lexy-flame-jet.aseprite b/tileset-src/tileset-lexy-flame-jet.aseprite new file mode 100644 index 0000000..4bf0e39 Binary files /dev/null and b/tileset-src/tileset-lexy-flame-jet.aseprite differ diff --git a/tileset-src/tileset-lexy-forceall.aseprite b/tileset-src/tileset-lexy-forceall.aseprite new file mode 100644 index 0000000..ddf6e3f Binary files /dev/null and b/tileset-src/tileset-lexy-forceall.aseprite differ diff --git a/tileset-src/tileset-lexy-lexy.aseprite b/tileset-src/tileset-lexy-lexy.aseprite new file mode 100644 index 0000000..5692488 Binary files /dev/null and b/tileset-src/tileset-lexy-lexy.aseprite differ diff --git a/tileset-src/tileset-lexy-lilypad.aseprite b/tileset-src/tileset-lexy-lilypad.aseprite new file mode 100644 index 0000000..41026d2 Binary files /dev/null and b/tileset-src/tileset-lexy-lilypad.aseprite differ diff --git a/tileset-src/tileset-lexy-paramecium.aseprite b/tileset-src/tileset-lexy-paramecium.aseprite new file mode 100644 index 0000000..1e7df09 Binary files /dev/null and b/tileset-src/tileset-lexy-paramecium.aseprite differ diff --git a/tileset-src/tileset-lexy-slime.aseprite b/tileset-src/tileset-lexy-slime.aseprite new file mode 100644 index 0000000..3f2fcff Binary files /dev/null and b/tileset-src/tileset-lexy-slime.aseprite differ diff --git a/tileset-src/tileset-lexy-splash.aseprite b/tileset-src/tileset-lexy-splash.aseprite new file mode 100644 index 0000000..6cc9471 Binary files /dev/null and b/tileset-src/tileset-lexy-splash.aseprite differ diff --git a/tileset-src/tileset-lexy-teeth.aseprite b/tileset-src/tileset-lexy-teeth.aseprite new file mode 100644 index 0000000..9261f0c Binary files /dev/null and b/tileset-src/tileset-lexy-teeth.aseprite differ diff --git a/tileset-src/tileset-lexy-walker.aseprite b/tileset-src/tileset-lexy-walker.aseprite new file mode 100644 index 0000000..0512eae Binary files /dev/null and b/tileset-src/tileset-lexy-walker.aseprite differ diff --git a/tileset-src/tileset-lexy-water.aseprite b/tileset-src/tileset-lexy-water.aseprite new file mode 100644 index 0000000..8a3c32f Binary files /dev/null and b/tileset-src/tileset-lexy-water.aseprite differ diff --git a/tileset-src/tileset-lexy.aseprite b/tileset-src/tileset-lexy.aseprite new file mode 100644 index 0000000..7e798e6 Binary files /dev/null and b/tileset-src/tileset-lexy.aseprite differ