-
+
- - |
+
- - |
+
- - |
+
+
|
- |
@@ -676,22 +679,20 @@ MP.socket.on("mp_room_user_finished", (data) => {
$(`.tribeResult table .player[socketId=${data.socketId}] .acc`).text(
data.result.acc + "%"
);
- $(`.tribeResult table .player[socketId=${data.socketId}] .progress`).remove();
- $(`.tribeResult table .player[socketId=${data.socketId}] .raw`).remove();
- $(`.tribeResult table .player[socketId=${data.socketId}] .con`).remove();
- $(`.tribeResult table .player[socketId=${data.socketId}] .char`).remove();
- $(`.tribeResult table .player[socketId=${data.socketId}] .acc`).after(`
-
- |
- |
- `);
+ // $(`.tribeResult table .player[socketId=${data.socketId}] .progress`).remove();
+ // $(`.tribeResult table .player[socketId=${data.socketId}] .raw`).remove();
+ // $(`.tribeResult table .player[socketId=${data.socketId}] .con`).remove();
+ // $(`.tribeResult table .player[socketId=${data.socketId}] .char`).remove();
+ // $(`.tribeResult table .player[socketId=${data.socketId}] .acc`).after(`
+ // |
+ // |
+ // |
+ // `);
$(`.tribeResult table .player[socketId=${data.socketId}] .raw`).text(
data.result.raw
);
- let val = "";
- if (!data.result.invalid && !data.result.failed && !data.result.outOfTime) {
- val = data.result.char;
- } else if (data.result.afk) {
+ let val = "-";
+ if (data.result.afk) {
val = "afk";
} else if (data.result.invalid) {
val = "invalid";
@@ -700,12 +701,20 @@ MP.socket.on("mp_room_user_finished", (data) => {
} else if (data.result.outOfTime) {
val = "out of time";
}
- $(`.tribeResult table .player[socketId=${data.socketId}] .char`).text(val);
+ $(`.tribeResult table .player[socketId=${data.socketId}] .other`).text(val);
+ $(`.tribeResult table .player[socketId=${data.socketId}] .char`).text(
+ data.result.char
+ );
$(`.tribeResult table .player[socketId=${data.socketId}] .con`).text(
data.result.con + "%"
);
- if (config.mode !== "time") {
+ if (data.result.failed || data.result.invalid) {
+ $(`.tribePlayers .player[socketId=${data.socketId}]`).addClass("failed");
+ $(`.tribeResult .player[socketId=${data.socketId}]`).addClass("failed");
+ }
+
+ if (config.mode !== "time" && !data.result.failed) {
$(`.tribePlayers .player[socketId=${data.socketId}] .bar`)
.stop(true, false)
.animate(
@@ -729,6 +738,9 @@ MP.socket.on("mp_room_user_finished", (data) => {
MP.socket.on("mp_room_winner", (data) => {
let pos = 1;
+ if (data.official) {
+ hideResultCountdown();
+ }
data.sorted.forEach((sid) => {
$(`.tribeResult table [socketId=${sid.sid}] .pos .num`).text(
`${pos}${Misc.getNumberSuffix(pos)}`
diff --git a/src/sass/style.scss b/src/sass/style.scss
index 473bb87c1..9fefb390a 100644
--- a/src/sass/style.scss
+++ b/src/sass/style.scss
@@ -1584,22 +1584,32 @@ key {
tr td:first-child {
text-align: left;
}
+
tbody tr {
color: var(--text-color);
&.me {
color: var(--main-color);
}
+ .progressAndGraph {
+ width: 25%;
+ }
+ .acc,
+ .con,
+ .other {
+ opacity: 0.5;
+ }
.crown {
width: 1px;
}
.pos {
- width: 1px;
+ width: 5.6rem;
.num {
margin-right: 0.5rem;
}
.points {
opacity: 0.5;
font-size: 0.6rem;
+ vertical-align: super;
}
}
}
@@ -2284,6 +2294,9 @@ key {
.player.me .progress .barBg .bar {
background: var(--main-color);
}
+ .player.failed {
+ opacity: 0.25;
+ }
}
.tribePlayers {
diff --git a/static/index.html b/static/index.html
index b84f9083c..751bcb8a5 100644
--- a/static/index.html
+++ b/static/index.html
@@ -1254,11 +1254,22 @@
|
- wpm |
- acc |
- raw |
- consistency |
- characters |
+
+ wpm
+
+ acc
+ |
+
+ raw
+
+ consistency
+ |
+
+ characters
+
+ other
+ |
+ |
pos |
|
|