fix: game over dialog show

Knivelty · Oct 11, 2024 · 3f9e3f6 · 3f9e3f6
1 parent bb04939
commit 3f9e3f6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/packages/client/src/ui/features/debug/StatePanel.tsx b/packages/client/src/ui/features/debug/StatePanel.tsx
@@ -2,9 +2,15 @@ import { useComponentValue, useEntityQuery } from "@dojoengine/react";
 import { useState } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 import { useDojo } from "../../hooks/useDojo";
-import { getComponentValue, HasValue, NotValue } from "@dojoengine/recs";
+import {
+    getComponentValue,
+    getEntitiesWithValue,
+    HasValue,
+    NotValue,
+} from "@dojoengine/recs";
 import { getPlayerBoardPieceEntity } from "../../lib/utils";
 import { zeroEntity } from "../../../utils";
+import { getEntityIdFromKeys } from "@dojoengine/utils";
 
 export function StatesPanel() {
     const {
@@ -15,6 +21,7 @@ export function StatesPanel() {
             PlayerInvPiece,
             Player,
             GameStatus,
+            MatchResult,
         },
         account: {
             account: { address },
@@ -25,6 +32,11 @@ export function StatesPanel() {
 
     const s = useComponentValue(GameStatus, zeroEntity);
 
+    const matchResult = useComponentValue(
+        MatchResult,
+        getEntityIdFromKeys([BigInt(s?.currentMatch || 0)])
+    );
+
     useHotkeys("p", () => {
         setStatesShow(!statesShow);
     });
@@ -150,6 +162,11 @@ export function StatesPanel() {
 
             <div>CurrentMatch {s?.currentMatch}</div>
             <div>CurrentRound {s?.currentRound}</div>
+            <div>Played {s?.played.toString()}</div>
+            <div>Player Value in match {playerValue?.inMatch}</div>
+            <div>
+                MatchResult score {matchResult?.score} {matchResult?.index}{" "}
+            </div>
         </div>
     );
 }
diff --git a/packages/client/src/ui/hooks/useControlGameEnd.ts b/packages/client/src/ui/hooks/useControlGameEnd.ts
@@ -22,11 +22,7 @@ export function useGameEnd() {
     const end = useMemo(() => {
         let e = false;
 
-        if (
-            !playerValue?.inMatch &&
-            result?.index == playerValue?.inMatch &&
-            s?.played === true
-        ) {
+        if (result?.index === playerValue?.inMatch && s?.played === true) {
             e = true;
         }
         return e;