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

Show best score on the level overlay; touch up scorecard and mobile CSS a bit

Browse Source
This commit is contained in:
Eevee (Evelyn Woods) 2024-04-11 23:49:18 -06:00
parent a3b283b51e
commit 01dd4eb1a8
2 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/main.js
View File

@ -2020,12 +2020,24 @@ class Player extends PrimaryView {
this.overlay_message_el.textContent = ''; this.overlay_message_el.textContent = '';
if (this.state === 'waiting') { if (this.state === 'waiting') {
let stored_level = this.level.stored_level; let stored_level = this.level.stored_level;
let best_score = "";
let savefile = this.conductor.current_pack_savefile;
let scorecard = savefile.scorecards[stored_level.number - 1];
if (scorecard) {
best_score = `best score: ${scorecard.score.toLocaleString()}`;
if (scorecard.aid === 0) {
best_score += "★";
}
}
overlay.append( overlay.append(
mk('h1', this.conductor.stored_game.title), mk('h1', this.conductor.stored_game.title),
mk('h2', `#${stored_level.number} ${stored_level.title}`), mk('h2', `#${stored_level.number} ${stored_level.title}`),
mk('h3', stored_level.author ? `by ${stored_level.author}` : "\u200b"), mk('h3', stored_level.author ? `by ${stored_level.author}` : "\u200b"),
this.mobile_pause_menu, this.mobile_pause_menu,
mk('p.-controls-hint', "WASD/↑←↓→ to move · space to start without moving"), mk('div.-best-score', best_score),
mk('p.-controls-hint', "WASD/↑←↓→ to move · space to idle"),
); );
} }
else if (this.state === 'paused') { else if (this.state === 'paused') {
@ -3749,7 +3761,7 @@ class LevelBrowserOverlay extends DialogOverlay {
if (scorecard) { if (scorecard) {
score = scorecard.score.toLocaleString(); score = scorecard.score.toLocaleString();
if (scorecard.aid === 0) { if (scorecard.aid === 0) {
aid = '★'; aid = "★";
} }
// 0 means untimed level // 0 means untimed level

34
style.css
View File

@ -1268,17 +1268,9 @@ ol.packtest-summary > li {
padding: 0.25em 0.5em; padding: 0.25em 0.5em;
line-height: 1.33; line-height: 1.33;
} }
/* Hackily remove the <br>s in "turn based mode" */
#player-controls .radio-faux-button-set br {
display: none;
}
#player-actions { #player-actions {
justify-content: end; justify-content: end;
} }
#player-actions button svg {
display: inline-block;
margin: 0.125em;
}
#player button .keyhint { #player button .keyhint {
top: -2em; top: -2em;
left: 0; left: 0;
@ -1313,6 +1305,10 @@ ol.packtest-summary > li {
/* Hide key hints; there's nowhere to put them and they take up surprisingly a lot of space */ /* Hide key hints; there's nowhere to put them and they take up surprisingly a lot of space */
display: none; display: none;
} }
#player-controls .radio-faux-button-set span {
/* "step mode" is real big */
font-size: 0.75em;
}
} }
@media (orientation: landscape) and (max-height: 600px) { @media (orientation: landscape) and (max-height: 600px) {
/* On a small landscape screen, remove the music row (it matters!) */ /* On a small landscape screen, remove the music row (it matters!) */
@ -1384,10 +1380,11 @@ ol.packtest-summary > li {
position: relative; position: relative;
display: grid; display: grid;
grid: grid:
"pack" calc(1.25em * 1.25 * 1) "pack" calc(1em * 1.25 * 1)
"level" calc(1.333em * 1.25 * 2) "level" calc(1.333em * 1.25 * 2)
"author" calc(1em * 1.25 * 1) "author" calc(1em * 1.25 * 1)
"space" 1fr "space" 1fr
"score" 1.5em
"controls" 1.5em "controls" 1.5em
; ;
align-items: center; align-items: center;
@ -1417,11 +1414,11 @@ body.--debug .player-overlay-message {
.player-overlay-message h1 { .player-overlay-message h1 {
/* Pack title, doesn't need to be too big */ /* Pack title, doesn't need to be too big */
grid-area: pack; grid-area: pack;
font-size: 1em; font-size: 0.833em;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
color: hsl(220, 25%, 60%); color: hsl(220, 25%, 75%);
} }
.player-overlay-message > h2 { .player-overlay-message > h2 {
grid-area: level; grid-area: level;
@ -1439,8 +1436,12 @@ body.--debug .player-overlay-message {
text-overflow: ellipsis; text-overflow: ellipsis;
color: hsl(220, 10%, 90%); color: hsl(220, 10%, 90%);
} }
.player-overlay-message > .-best-score {
grid-area: score;
align-self: flex-end;
}
.player-overlay-message > .scoreboard { .player-overlay-message > .scoreboard {
grid-row: author / space; grid-row: author / score;
} }
.player-overlay-message .-controls-hint { .player-overlay-message .-controls-hint {
grid-area: controls; grid-area: controls;
@ -1573,6 +1574,9 @@ body.--debug .player-overlay-message {
margin: auto 5%; margin: auto 5%;
font-weight: normal; font-weight: normal;
text-align: center; text-align: center;
/* this is a lot of stuff crammed into a small space, so prefer having more space between rows
* and less space between labels+values (which makes them more clearly related anyway) */
line-height: 1.1;
} }
.scoreboard .-subscore { .scoreboard .-subscore {
grid-column: span 2; grid-column: span 2;
@ -1607,11 +1611,11 @@ body.--debug .player-overlay-message {
color: hsl(45, 50%, 75%); color: hsl(45, 50%, 75%);
} }
.scoreboard h4 { .scoreboard h4 {
font-size: 0.833em; font-size: 0.75em;
color: hsl(220, 10%, 80%); color: hsl(220, 10%, 60%);
} }
.scoreboard .-total-score h4 { .scoreboard .-total-score h4 {
color: hsl(30, 50%, 60%); color: hsl(30, 100%, 60%);
} }
.scoreboard p { .scoreboard p {
margin: 0; margin: 0;