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

Consider turn-based mode to be aid; switch back to realtime correctly

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2020-11-03 10:32:25 -07:00
parent e7e02281a2
commit 84840d2b02
2 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
js/main.js
View File

@ -306,24 +306,25 @@ class Player extends PrimaryView {
this.music_audio_el.pause(); this.music_audio_el.pause();
} }
}); });
// 0: normal realtime mode // 0: normal realtime mode
// 1: turn-based mode, and the next tic starts at the beginning // 1: turn-based mode, and the next tic starts at the beginning
// 2: turn-based mode, and we're in mid-tic waiting for input // 2: turn-based mode, and we're in mid-tic waiting for input
this.turn_based = 0; this.turn_mode = 0;
this.turn_based_checkbox = this.root.querySelector('.controls .control-turn-based'); this.turn_based_checkbox = this.root.querySelector('.controls .control-turn-based');
this.turn_based_checkbox.checked = false; this.turn_based_checkbox.checked = false;
this.turn_based_checkbox.addEventListener('change', ev => { this.turn_based_checkbox.addEventListener('change', ev => {
if (this.turn_based_checkbox.checked) { if (this.turn_based_checkbox.checked) {
// If we're leaving real-time mode then we're between tics // If we're leaving real-time mode then we're between tics
this.turn_based = 1; this.turn_mode = 1;
} }
else { else {
if (this.turn_based === 2) { if (this.turn_mode === 2) {
// Finish up the tic // Finish up the tic with dummy input
this.level.advance_tic(null, null, 2);
this.advance_by(1); this.advance_by(1);
} }
this.turn_based = 0; this.turn_mode = 0;
} }
}); });
@ -674,7 +675,7 @@ class Player extends PrimaryView {
_clear_state() { _clear_state() {
this.set_state('waiting'); this.set_state('waiting');
this.turn_based = this.turn_based_checkbox.checked ? 1 : 0; this.turn_mode = this.turn_based_checkbox.checked ? 1 : 0;
this.tic_offset = 0; this.tic_offset = 0;
this.last_advance = 0; this.last_advance = 0;
this.demo_faucet = null; this.demo_faucet = null;
@ -731,7 +732,7 @@ class Player extends PrimaryView {
return input; return input;
} }
} }
advance_by(tics) { advance_by(tics) {
for (let i = 0; i < tics; i++) { for (let i = 0; i < tics; i++) {
let input = this.get_input(); let input = this.get_input();
@ -794,33 +795,42 @@ class Player extends PrimaryView {
this.previous_input = input; this.previous_input = input;
this.sfx_player.advance_tic(); this.sfx_player.advance_tic();
var primary_dir = this.primary_action ? ACTION_DIRECTIONS[this.primary_action] : null; let primary_dir = this.primary_action ? ACTION_DIRECTIONS[this.primary_action] : null;
var secondary_dir = this.secondary_action ? ACTION_DIRECTIONS[this.secondary_action] : null; let secondary_dir = this.secondary_action ? ACTION_DIRECTIONS[this.secondary_action] : null;
let has_input = primary_dir !== null || input.has('wait'); // Turn-based mode is considered assistance, but only if the game actually attempts to
// Turn-based mode complicates this slightly // progress while it's enabled
// TODO advance_by(1) no longer advances by 1 tic necessarily... if (this.turn_mode > 0) {
if (this.turn_based === 2) { this.level.aid = Math.max(1, this.level.aid);
if (has_input) {
this.level.advance_tic(primary_dir, secondary_dir, 2);
// TODO what if we just do the next tic part now? but then we can never realign to a tic boundary.
this.turn_based = 1;
}
} }
else {
// Start from a tic boundary let has_input = primary_dir !== null || input.has('wait');
this.level.advance_tic(primary_dir, secondary_dir, 1); // Turn-based mode complicates this slightly; it aligns us to the middle of a tic
if (this.turn_based > 0 && this.level.can_accept_input() && ! has_input) { if (this.turn_mode === 2) {
// If we're in turn-based mode and could provide input here, but don't have any, if (has_input) {
// then wait until we do // Finish the current tic, then continue as usual. This means the end of the
this.turn_based = 2; // tic doesn't count against the number of tics to advance -- because it already
// did, the first time we tried it
this.level.advance_tic(primary_dir, secondary_dir, 2);
this.turn_mode = 1;
} }
else { else {
this.level.advance_tic(primary_dir, secondary_dir, 2); continue;
} }
} }
// We should now be at the start of a tic
this.level.advance_tic(primary_dir, secondary_dir, 1);
if (this.turn_mode > 0 && this.level.can_accept_input() && ! has_input) {
// If we're in turn-based mode and could provide input here, but don't have any,
// then wait until we do
this.turn_mode = 2;
}
else {
this.level.advance_tic(primary_dir, secondary_dir, 2);
}
if (this.level.state !== 'playing') { if (this.level.state !== 'playing') {
// We either won or lost! // We either won or lost!
this.set_state('stopped'); this.set_state('stopped');
@ -837,9 +847,9 @@ class Player extends PrimaryView {
this._advance_handle = null; this._advance_handle = null;
return; return;
} }
this.last_advance = performance.now(); this.last_advance = performance.now();
if (this.state === 'playing') { if (this.state === 'playing') {
this.advance_by(1); this.advance_by(1);
} }
@ -858,8 +868,6 @@ class Player extends PrimaryView {
} }
} }
// XXX tic_offset = 0 was here, what does that change
let dt = 1000 / TICS_PER_SECOND; let dt = 1000 / TICS_PER_SECOND;
if (this.state === 'rewinding') { if (this.state === 'rewinding') {
// Rewind faster than normal time // Rewind faster than normal time
@ -871,8 +879,8 @@ class Player extends PrimaryView {
undo() { undo() {
this.level.undo(); this.level.undo();
// Undo always returns to the start of a tic // Undo always returns to the start of a tic
if (this.turn_based === 2) { if (this.turn_mode === 2) {
this.turn_based = 1; this.turn_mode = 1;
} }
} }
@ -883,7 +891,7 @@ class Player extends PrimaryView {
// TODO this is not gonna be right while pausing lol // TODO this is not gonna be right while pausing lol
// TODO i'm not sure it'll be right when rewinding either // TODO i'm not sure it'll be right when rewinding either
// TODO or if the game's speed changes. wow! // TODO or if the game's speed changes. wow!
if (this.turn_based === 2) { if (this.turn_mode === 2) {
// We're frozen in mid-tic, so the clock hasn't advanced yet, but everything has already // We're frozen in mid-tic, so the clock hasn't advanced yet, but everything has already
// finished moving; pretend we're already on the next tic // finished moving; pretend we're already on the next tic
this.tic_offset = 1; this.tic_offset = 1;
@ -1097,7 +1105,7 @@ class Player extends PrimaryView {
overlay_top = random_choice([ overlay_top = random_choice([
"you did it!", "nice going!", "great job!", "good work!", "you did it!", "nice going!", "great job!", "good work!",
"onwards!", "tubular!", "yeehaw!", "hot damn!", "onwards!", "tubular!", "yeehaw!", "hot damn!",
"alphanumeric!", "nice dynamic typing!", "alphanumeric!", "nice dynamic typing!",
]); ]);
} }
if (this.using_touch) { if (this.using_touch) {

2
js/renderer-canvas.js
View File

@ -60,7 +60,7 @@ export class CanvasRenderer {
sx * tw, sy * th, w * tw, h * th, sx * tw, sy * th, w * tw, h * th,
dx * tw, dy * th, w * tw, h * th); dx * tw, dy * th, w * tw, h * th);
} }
draw(tic_offset = 0) { draw(tic_offset = 0) {
if (! this.level) { if (! this.level) {
console.warn("CanvasRenderer.draw: No level to render"); console.warn("CanvasRenderer.draw: No level to render");