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

Fix detecting presses of action keys, again

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2020-12-16 01:39:17 -07:00
parent af7d2c741b
commit 6587cbf7f0
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/game.js
View File

@ -318,7 +318,8 @@ export class Level {
this.cells = []; this.cells = [];
this.player = null; this.player = null;
this.p1_previous_still_input = 0; this.p1_input = 0;
this.p1_released = 0xff;
this.actors = []; this.actors = [];
this.chips_remaining = this.stored_level.chips_required; this.chips_remaining = this.stored_level.chips_required;
this.bonus_points = 0; this.bonus_points = 0;
@ -556,6 +557,8 @@ export class Level {
]) { ]) {
this.pending_undo.level_props[key] = this[key]; this.pending_undo.level_props[key] = this[key];
} }
this.p1_input = p1_input;
this.p1_released |= ~p1_input; // Action keys released since we last checked them
// Used for various tic-local effects; don't need to be undoable // Used for various tic-local effects; don't need to be undoable
// TODO maybe this should be undone anyway so rewind looks better? // TODO maybe this should be undone anyway so rewind looks better?
@ -631,7 +634,7 @@ export class Level {
continue; continue;
if (actor.just_stepped_on_teleporter) { if (actor.just_stepped_on_teleporter) {
this.attempt_teleport(actor, actor === this.player ? p1_input : null); this.attempt_teleport(actor);
} }
} }
@ -639,7 +642,7 @@ export class Level {
this.update_wiring(); this.update_wiring();
} }
finish_tic(p1_input) { finish_tic() {
// After cooldowns but before the decision phase, remember the player's /current/ direction, // After cooldowns but before the decision phase, remember the player's /current/ direction,
// which may be affected by sliding. This will affect the behavior of doppelgangers earlier // which may be affected by sliding. This will affect the behavior of doppelgangers earlier
// in the actor order than the player. // in the actor order than the player.
@ -665,7 +668,7 @@ export class Level {
continue; continue;
if (actor === this.player) { if (actor === this.player) {
this.make_player_decision(actor, p1_input); this.make_player_decision(actor, this.p1_input);
} }
else { else {
this.make_actor_decision(actor); this.make_actor_decision(actor);
@ -694,7 +697,7 @@ export class Level {
// have four bowling balls and hold Q, you'll throw the first, wait a second or so, then // have four bowling balls and hold Q, you'll throw the first, wait a second or so, then
// release the rest rapid-fire. absurd // release the rest rapid-fire. absurd
if (actor === this.player) { if (actor === this.player) {
let new_input = p1_input & ~this.p1_previous_still_input; let new_input = this.p1_input & this.p1_released;
if (new_input & INPUT_BITS.cycle) { if (new_input & INPUT_BITS.cycle) {
this.cycle_inventory(this.player); this.cycle_inventory(this.player);
} }
@ -706,7 +709,7 @@ export class Level {
// checking this.player // checking this.player
swap_player1 = true; swap_player1 = true;
} }
this.p1_previous_still_input = p1_input; this.p1_released = ~this.p1_input;
} }
if (! actor.decision) if (! actor.decision)
@ -1309,7 +1312,7 @@ export class Level {
// Note that it's possible to bump a direction multiple times during this process, // Note that it's possible to bump a direction multiple times during this process,
// and also possible to perform a three-way block slap: the direction she leaves, // and also possible to perform a three-way block slap: the direction she leaves,
// the other direction she was holding, and the original exit direction we found. // the other direction she was holding, and the original exit direction we found.
let [dir1, dir2] = this._extract_player_directions(input); let [dir1, dir2] = this._extract_player_directions(this.p1_input);
let open1 = false, open2 = false; let open1 = false, open2 = false;
if (dir1) { if (dir1) {
open1 = this.check_movement(actor, dest.cell, dir1, push_mode); open1 = this.check_movement(actor, dest.cell, dir1, push_mode);