tc: refactor score

1 files changed, 5 insertions, 7 deletions

diff --git a/test-client/visual.ts b/test-client/visual.ts
index cf8e6bf1..ece31b8b 100644
--- a/test-client/visual.ts
+++ b/test-client/visual.ts
@@ -16,7 +16,7 @@
 
 */
 import { tr } from "./locale.ts";
-import { ItemData, MessageData, PlayerData, TileData, camera, camera_scale, canvas, ctx, data, demands_completed, demands_failed, get_interact_target, global_message, interact_active_anim, interact_possible_anim, interact_target_anim, is_lobby, items_removed, keys_down, my_id, nametag_scale_anim, players, points, server_hints, tiles, time_remaining } from "./main.ts";
+import { ItemData, MessageData, PlayerData, TileData, camera, camera_scale, canvas, ctx, data, get_interact_target, global_message, interact_active_anim, interact_possible_anim, interact_target_anim, is_lobby, items_removed, keys_down, my_id, nametag_scale_anim, players, score, server_hints, tiles } from "./main.ts";
 import { PLAYER_SIZE } from "./movement.ts";
 import { draw_item_sprite, draw_tile_sprite, ItemName, TileName } from "./tiles.ts";
 import { V2, ceil_v2, floor_v2 } from "./util.ts";
@@ -39,7 +39,6 @@ export function draw_wait(text: string) {
     ctx.fillText(text, canvas.width / 2, canvas.height / 2)
 }
 
-
 export function draw_ingame() {
     ctx.fillStyle = "#111"
     ctx.fillRect(0, 0, canvas.width, canvas.height)
@@ -95,13 +94,12 @@ function draw_score() {
     ctx.textAlign = "left"
     ctx.textBaseline = "bottom"
     ctx.font = "20px sans-serif"
-    if (time_remaining != undefined)
-        ctx.fillText(`${tr("c.score.time_remaining")}: ${time_remaining?.toFixed(2)}`, 10, canvas.height - 90)
+    ctx.fillText(`${tr("c.score.time_remaining")}: ${score.time_remaining?.toFixed(2)}`, 10, canvas.height - 90)
     ctx.font = "30px sans-serif"
-    ctx.fillText(`${tr("c.score.points")}: ${points}`, 10, canvas.height - 60)
+    ctx.fillText(`${tr("c.score.points")}: ${score.points}`, 10, canvas.height - 60)
     ctx.font = "20px sans-serif"
-    ctx.fillText(`${tr("c.score.completed")}: ${demands_completed}`, 10, canvas.height - 30)
-    ctx.fillText(`${tr("c.score.failed")}: ${demands_failed}`, 10, canvas.height - 10)
+    ctx.fillText(`${tr("c.score.completed")}: ${score.demands_completed}`, 10, canvas.height - 30)
+    ctx.fillText(`${tr("c.score.failed")}: ${score.demands_failed}`, 10, canvas.height - 10)
 }
 
 function draw_debug() {