fix: last and next checking

This commit is contained in:
TrèsAbhi committed 2025-09-01 22:55:31 -05:00
1 parent f56c31fb48
commit 8b527f2333
6 files changed
+40 -27

No files matched your search

@@ -5,7 +5,7 @@ import { awaitableProvisionDefinitions } from "../../core/awaitables/provisionDe
import { tankToDuelMember } from "../../core/blitzkit/tankToDuelMember";
import { Var } from "../../core/radix/var";
import { Duel } from "../../stores/duel";
import { Guess } from "../../stores/guessEphemeral";
import { Guess, GuessState } from "../../stores/guessEphemeral";
import { TankopediaEphemeral } from "../../stores/tankopediaEphemeral";
import "./index.css";
@@ -39,9 +39,9 @@ export function GuessBackground() {
style={{
transitionDuration: "2s",
backgroundColor: Var(
guessState === null
guessState === GuessState.NotGuessed
? "accent-2"
: guessState
: guessState === GuessState.Correct
? "jade-3"
: "tomato-3"
),
@@ -1,4 +1,4 @@
import { Guess } from "../stores/guessEphemeral";
import { Guess, GuessState } from "../stores/guessEphemeral";
import { SmartCanvas } from "./SmartCanvas";
import { Controls } from "./Tankopedia/HeroSection/components/TankSandbox/components/Control";
import { Lighting } from "./Tankopedia/HeroSection/components/TankSandbox/components/Lighting";
@@ -9,7 +9,7 @@ const CONTRAST = 2 ** 2;
export function GuessRenderer() {
const guessState = Guess.use((state) => state.guessState);
const isRevealed = guessState !== null;
const isRevealed = guessState !== GuessState.NotGuessed;
return (
<SmartCanvas
+15 -8
View File
@@ -24,7 +24,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
import { awaitableTankDefinitions } from "../core/awaitables/tankDefinitions";
import { awaitableTankNames } from "../core/awaitables/tankNames";
import { useLocale } from "../hooks/useLocale";
import { Guess } from "../stores/guessEphemeral";
import { Guess, GuessState } from "../stores/guessEphemeral";
import { classIcons } from "./ClassIcon";
import { SearchResults } from "./SearchResults";
@@ -78,7 +78,7 @@ export function Guesser() {
);
useEffect(() => {
if (guessState !== null) setSelected(null);
if (guessState !== GuessState.NotGuessed) setSelected(null);
}, [guessState]);
return (
@@ -148,7 +148,7 @@ export function Guesser() {
<Flex gap="3">
<TextField.Root
disabled={guessState !== null}
disabled={guessState !== GuessState.NotGuessed}
ref={input}
onChange={requestSearch}
style={{ flex: 1 }}
@@ -163,13 +163,19 @@ export function Guesser() {
<Button
size="3"
color={guessState === null && selected === null ? "red" : undefined}
color={
guessState === GuessState.NotGuessed && selected === null
? "red"
: undefined
}
onClick={() => {
if (guessState === null) {
if (guessState === GuessState.NotGuessed) {
const correct = selected !== null && selected.id === tank.id;
Guess.mutate((draft) => {
draft.guessState = correct;
draft.guessState = correct
? GuessState.Correct
: GuessState.Incorrect;
draft.totalGuesses++;
draft.correctGuesses += correct ? 1 : 0;
});
@@ -181,13 +187,14 @@ export function Guesser() {
if (!input.current) return;
draft.tank = tank;
draft.guessState = null;
draft.guessState = GuessState.NotGuessed;
input.current.value = "";
});
}
}}
>
{guessState === null ? (
{guessState === GuessState.NotGuessed ? (
<>
{
strings.website.tools.guess.search[