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

Fix some minor bugs introduced into turn-based mode

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2020-12-03 21:17:50 -07:00
parent dfb274e85d
commit 8505b132bb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/main.js
View File

@ -321,7 +321,7 @@ class Player extends PrimaryView {
else { else {
if (this.turn_mode === 2) { if (this.turn_mode === 2) {
// Finish up the tic with dummy input // Finish up the tic with dummy input
this.level.advance_tic(null, null, 2); this.level.advance_tic({primary: null, secondary: null}, 2);
this.advance_by(1); this.advance_by(1);
} }
this.turn_mode = 0; this.turn_mode = 0;
@ -842,7 +842,7 @@ class Player extends PrimaryView {
this.level.aid = Math.max(1, this.level.aid); this.level.aid = Math.max(1, this.level.aid);
} }
let has_input = Object.values(player_actions).some(x => x); let has_input = input.has('wait') || Object.values(player_actions).some(x => x);
// Turn-based mode complicates this slightly; it aligns us to the middle of a tic // Turn-based mode complicates this slightly; it aligns us to the middle of a tic
if (this.turn_mode === 2) { if (this.turn_mode === 2) {
if (has_input) { if (has_input) {