leif/lexys-labyrinth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clumsily add support for the player's swimming sprite

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2020-09-16 14:57:29 -06:00
parent e70e92b931
commit 1d809601ae
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/tileset.js
View File

@ -282,6 +282,12 @@ export const CC2_TILESET_LAYOUT = {
west: [8, 23], west: [8, 23],
east: [8, 22], east: [8, 22],
}, },
swimming: {
north: [[0, 24], [1, 24]],
east: [[2, 24], [3, 24]],
south: [[4, 24], [5, 24]],
west: [[6, 24], [7, 24]],
},
}, },
bogus_player_win: { bogus_player_win: {
overlay: [0, 23], overlay: [0, 23],
@ -582,7 +588,19 @@ export class Tileset {
// TODO this is getting really ad-hoc and clumsy lol, maybe // TODO this is getting really ad-hoc and clumsy lol, maybe
// have tiles expose a single 'state' prop or something // have tiles expose a single 'state' prop or something
if (coords.moving) { if (coords.moving) {
if (tile && tile.animation_speed) { if (! tile) {
coords = coords.standing;
}
else if (coords.swimming &&
// Count as swimming if we're in water, but NOT if we're midway through
// stepping into water from a non-water tile
// TODO umm, only if we have flippers?
tile.cell.some(t => t.type.name === 'water') &&
(! tile.previous_cell || tile.previous_cell.some(t => t.type.name === 'water')))
{
coords = coords.swimming;
}
else if (tile.animation_speed) {
coords = coords.moving; coords = coords.moving;
} }
else { else {
@ -592,6 +610,7 @@ export class Tileset {
coords = coords[(tile && tile.direction) ?? 'south']; coords = coords[(tile && tile.direction) ?? 'south'];
} }
} }
// Deal with animation
if (coords[0] instanceof Array) { if (coords[0] instanceof Array) {
if (tic !== null) { if (tic !== null) {
if (tile && tile.animation_speed) { if (tile && tile.animation_speed) {