update guesser

packages/website/src/components/GuessBackground/index.tsx

@@ -1,7 +1,6 @@
 import { Box } from "@radix-ui/themes";
 import { useEffect } from "react";
-import { awaitableModelDefinitions } from "../../core/awaitables/modelDefinitions";
-import { awaitableProvisionDefinitions } from "../../core/awaitables/provisionDefinitions";
+import { api } from "../../core/blitzkit/api";
 import { tankToDuelMember } from "../../core/blitzkit/tankToDuelMember";
 import { Var } from "../../core/radix/var";
 import { Duel } from "../../stores/duel";
@@ -10,8 +9,8 @@ import { Tankopedia } from "../../stores/tankopedia";
 import "./index.css";
 
 const [modelDefinitions, provisionDefinitions] = await Promise.all([
-  awaitableModelDefinitions,
-  awaitableProvisionDefinitions,
+  api.modelDefinitions(),
+  api.provisionDefinitions(),
 ]);
 
 export function GuessBackground() {
@@ -42,7 +41,7 @@ export function GuessBackground() {
               ? "accent-2"
               : guessState === GuessState.Correct
                 ? "jade-3"
-                : "tomato-3"
+                : "tomato-3",
           ),
         }}
       >

packages/website/src/components/Guesser.tsx

@@ -1,5 +1,4 @@
 import {
-  asset,
   SEARCH_KEYS,
   TankDefinition,
   TIER_ROMAN_NUMERALS,
@@ -29,8 +28,8 @@ import {
 import fuzzysort from "fuzzysort";
 import { debounce, times } from "lodash-es";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { awaitableTankDefinitions } from "../core/awaitables/tankDefinitions";
 import { awaitableTankNames } from "../core/awaitables/tankNames";
+import { api } from "../core/blitzkit/api";
 import { useLocale } from "../hooks/useLocale";
 import { Guess, GuessState } from "../stores/guess";
 import { classIcons } from "./ClassIcon";
@@ -40,7 +39,7 @@ const { go } = fuzzysort;
 
 const [tankNames, tankDefinitions] = await Promise.all([
   awaitableTankNames,
-  awaitableTankDefinitions,
+  api.tankDefinitions(),
 ]);
 
 const ids = Object.keys(tankDefinitions.tanks);
@@ -150,7 +149,7 @@ export function Guesser() {
                       prefix={
                         <img
                           style={{ width: "1em", height: "1em" }}
-                          src={asset(`flags/circle/${result.nation}.webp`)}
+                          src={`/api/flags/circle/${result.nation}.webp`}
                         />
                       }
                       discriminator={
@@ -322,7 +321,8 @@ export function Guesser() {
                   ? GuessState.Correct
                   : GuessState.Incorrect;
                 draft.totalGuesses++;
-                draft.correctGuesses += correct && draft.tiers.length === 10 ? 1 : 0;
+                draft.correctGuesses +=
+                  correct && draft.tiers.length === 10 ? 1 : 0;
                 draft.streak = correct ? draft.streak + 1 : 0;
               });
             } else {

packages/website/src/pages/[...chunk_default]/[...locale]/guess/_index.tsx

@@ -1,25 +1,24 @@
 import { Box, Flex, Heading } from "@radix-ui/themes";
 import { Suspense, useEffect } from "react";
-import { GuessBackground } from "../../../components/GuessBackground";
-import { Guesser } from "../../../components/Guesser";
-import { GuessRenderer } from "../../../components/GuessRenderer";
-import { GuessRendererLoader } from "../../../components/GuessRendererLoader";
-import { PageWrapper } from "../../../components/PageWrapper";
-import { awaitableModelDefinitions } from "../../../core/awaitables/modelDefinitions";
-import { awaitableTankDefinitions } from "../../../core/awaitables/tankDefinitions";
+import { GuessBackground } from "../../../../components/GuessBackground";
+import { Guesser } from "../../../../components/Guesser";
+import { GuessRenderer } from "../../../../components/GuessRenderer";
+import { GuessRendererLoader } from "../../../../components/GuessRendererLoader";
+import { PageWrapper } from "../../../../components/PageWrapper";
+import { api } from "../../../../core/blitzkit/api";
 import {
   type LocaleAcceptorProps,
   LocaleProvider,
   useLocale,
-} from "../../../hooks/useLocale";
-import { Duel } from "../../../stores/duel";
-import { Guess, GuessState } from "../../../stores/guess";
-import { Tankopedia } from "../../../stores/tankopedia";
-import type { MaybeSkeletonComponentProps } from "../../../types/maybeSkeletonComponentProps";
+} from "../../../../hooks/useLocale";
+import { Duel } from "../../../../stores/duel";
+import { Guess, GuessState } from "../../../../stores/guess";
+import { Tankopedia } from "../../../../stores/tankopedia";
+import type { MaybeSkeletonComponentProps } from "../../../../types/maybeSkeletonComponentProps";
 
 const [tankDefinitions, modelDefinitions] = await Promise.all([
-  awaitableTankDefinitions,
-  awaitableModelDefinitions,
+  api.tankDefinitions(),
+  api.modelDefinitions(),
 ]);
 
 const ids = Object.keys(tankDefinitions.tanks);

packages/website/src/pages/[...chunk_default]/[...locale]/guess/index.astro

@@ -1,7 +1,7 @@
 ---
-import ToolOpenGraph from "../../../components/ToolOpenGraph.astro";
-import { tools } from "../../../constants/tools";
-import BaseLayout from "../../../layouts/BaseLayout.astro";
+import ToolOpenGraph from "../../../../components/ToolOpenGraph.astro";
+import { tools } from "../../../../constants/tools";
+import BaseLayout from "../../../../layouts/BaseLayout.astro";
 import { Page } from "./_index";
 
 export { getStaticPaths } from "../index.astro";