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

Improve interactions between turn-based mode and tic navigation

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2021-01-01 13:10:48 -07:00
parent adac6774a4
commit 83793603d3
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/main.js
View File

@ -447,23 +447,22 @@ class Player extends PrimaryView {
} }
// Per-tic navigation; only useful if the game isn't running // Per-tic navigation; only useful if the game isn't running
// FIXME these are funky in turn-based mode still. don't update the debug panel timer,
// and don't show us at the end of the tic
if (ev.key === ',') { if (ev.key === ',') {
if (this.state === 'stopped' || this.state === 'paused' || this.turn_mode > 0) { if (this.state === 'stopped' || this.state === 'paused' || this.turn_mode > 0) {
this.undo();
this._redraw();
this.set_state('paused'); this.set_state('paused');
this.undo();
this.update_ui();
this._redraw();
} }
return; return;
} }
if (ev.key === '.') { if (ev.key === '.') {
if (this.state === 'waiting' || this.state === 'paused' || this.turn_mode > 0) { if (this.state === 'waiting' || this.state === 'paused' || this.turn_mode > 0) {
this.advance_by(1, true);
this._redraw();
if (this.state === 'waiting' || this.turn_mode === 1) { if (this.state === 'waiting' || this.turn_mode === 1) {
this.set_state('paused'); this.set_state('paused');
} }
this.advance_by(1, true);
this._redraw();
} }
return; return;
} }
@ -1265,7 +1264,18 @@ class Player extends PrimaryView {
// Actually redraw. Used to force drawing outside of normal play, in which case we don't // Actually redraw. Used to force drawing outside of normal play, in which case we don't
// interpolate (because we're probably paused) // interpolate (because we're probably paused)
_redraw(tic_offset = 0) { _redraw(tic_offset = null) {
if (tic_offset === null) {
// Default to drawing the "end" state of the tic when we're paused; it matches
// turn-based mode's "waiting" behavior, and it makes tic-by-tic navigation make a lot
// more sense visually
if (this.state === 'paused') {
tic_offset = 0.999;
}
else {
tic_offset = 0;
}
}
this.renderer.draw(tic_offset); this.renderer.draw(tic_offset);
} }
@ -1344,7 +1354,12 @@ class Player extends PrimaryView {
if (this.debug.enabled) { if (this.debug.enabled) {
let t = this.level.tic_counter; let t = this.level.tic_counter;
this.debug.time_tics_el.textContent = `${t}`; if (this.turn_mode === 2) {
this.debug.time_tics_el.textContent = `${t}½`;
}
else {
this.debug.time_tics_el.textContent = `${t}`;
}
this.debug.time_moves_el.textContent = `${Math.floor(t/4)}`; this.debug.time_moves_el.textContent = `${Math.floor(t/4)}`;
this.debug.time_secs_el.textContent = (t / 20).toFixed(2); this.debug.time_secs_el.textContent = (t / 20).toFixed(2);

3
js/tileset.js
View File

@ -929,6 +929,9 @@ export class Tileset {
// out of sync if the player hesitates, but no one will notice that, and this // out of sync if the player hesitates, but no one will notice that, and this
// approach minimizes storing extra state. // approach minimizes storing extra state.
let i = ((tile.movement_speed - tile.movement_cooldown) + tic % 1 * 3) / tile.movement_speed; let i = ((tile.movement_speed - tile.movement_cooldown) + tic % 1 * 3) / tile.movement_speed;
// FIXME hack for cc2 mode, the only place we can see a cooldown of 0 which
// makes i be 1
i = Math.min(0.999, i);
// But do NOT do this for explosions or splashes, which have a fixed duration // But do NOT do this for explosions or splashes, which have a fixed duration
// and only play once // and only play once
if (this.animation_slowdown > 1 && ! tile.type.ttl) { if (this.animation_slowdown > 1 && ! tile.type.ttl) {