chore: refac

sivicstudio · Jan 1, 2025 · 9d0e35d · 9d0e35d
1 parent 9f01c5a
commit 9d0e35d
Show file tree

Hide file tree

Showing 9 changed files with 468 additions and 287 deletions.
diff --git a/client/src/components/ControlWindows/GameAccount.tsx b/client/src/components/ControlWindows/GameAccount.tsx
@@ -1,4 +1,4 @@
-import { QueryBuilder } from "@dojoengine/sdk";
+import { QueryBuilder, SDK } from "@dojoengine/sdk";
 import { useAccount, useConnect } from "@starknet-react/core";
 import { getEntityIdFromKeys } from "@dojoengine/utils";
 import BigNumber from "bignumber.js";
@@ -11,7 +11,7 @@ import "../../styles/GameAccount.scss";
 import useModel from "../../dojo/hooks/useModel";
 import { getUsernameFromAddress } from "../../utils/helpers";
 
-const ConnectWallet = ({ sdk }) => {
+const ConnectWallet = ({ sdk }: { sdk: SDK<SchemaType> }) => {
   const {
     account,
     setup: { client },
@@ -106,7 +106,7 @@ const ConnectWallet = ({ sdk }) => {
   );
 };
 
-const GameAccount = ({ sdk }) => {
+const GameAccount = ({ sdk }: { sdk: SDK<SchemaType> }) => {
   const { address } = useAccount();
   const [pagesStack, setPagesStack] = useState<string[]>(["MAIN_PAGE"]);
 

diff --git a/client/src/components/Menu.tsx b/client/src/components/Menu.tsx
@@ -6,7 +6,7 @@ import DiceTwo from "../svg/DiceTwo";
 import DiceThree from "../svg/DiceThree";
 import DiceFour from "../svg/DiceFour";
 import { useDojo } from "../dojo/hooks/useDojo";
-import * as models from "../dojo/typescript/models.gen.ts";
+import * as models from "../dojo/typescript/models.gen";
 
 const Menu = () => {
   const { options } = useContext(GameContext);
@@ -26,13 +26,10 @@ const Menu = () => {
   }
 
   async function start() {
-    await client.GameActions.create(
+    await client.GameActions.createNewGame(
       account.account,
-      models.GameMode.MultiPlayer,
-      "ibs",
-      0,
-      0,
-      0,
+      models.GameMode.SinglePlayer,
+      models.PlayerColor.Green,
       2
     );
   }

diff --git a/client/src/dojo/typescript/contracts.gen.ts b/client/src/dojo/typescript/contracts.gen.ts
@@ -4,14 +4,14 @@ import * as models from "./models.gen";
 
 export function setupWorld(provider: DojoProvider) {
 
-	const GameActions_create = async (snAccount: Account | AccountInterface, gameMode: models.GameMode, playerGreen: BigNumberish, playerYellow: BigNumberish, playerBlue: BigNumberish, playerRed: BigNumberish, numberOfPlayers: BigNumberish) => {
+	const GameActions_createNewGame = async (snAccount: Account | AccountInterface, gameMode: models.GameMode, playerColor: models.PlayerColor, numberOfPlayers: BigNumberish) => {
 		try {
 			return await provider.execute(
 				snAccount,
 				{
 					contractName: "GameActions",
-					entrypoint: "create",
-					calldata: [gameMode, playerGreen, playerYellow, playerBlue, playerRed, numberOfPlayers],
+					entrypoint: "create_new_game",
+					calldata: [gameMode, playerColor, numberOfPlayers],
 				},
 				"starkludo",
 			);
@@ -20,14 +20,14 @@ export function setupWorld(provider: DojoProvider) {
 		}
 	};
 
-	const GameActions_start = async (snAccount: Account | AccountInterface) => {
+	const GameActions_startGame = async (snAccount: Account | AccountInterface, gameId: BigNumberish) => {
 		try {
 			return await provider.execute(
 				snAccount,
 				{
 					contractName: "GameActions",
-					entrypoint: "start",
-					calldata: [],
+					entrypoint: "start_game",
+					calldata: [gameId],
 				},
 				"starkludo",
 			);
@@ -128,6 +128,22 @@ export function setupWorld(provider: DojoProvider) {
 		}
 	};
 
+	const GameActions_createBotPlayer = async (snAccount: Account | AccountInterface, botColor: models.PlayerColor) => {
+		try {
+			return await provider.execute(
+				snAccount,
+				{
+					contractName: "GameActions",
+					entrypoint: "create_bot_player",
+					calldata: [botColor],
+				},
+				"starkludo",
+			);
+		} catch (error) {
+			console.error(error);
+		}
+	};
+
 	const GameActions_getUsernameFromAddress = async (address: string) => {
 		try {
 			return await provider.call("starkludo", {
@@ -154,14 +170,15 @@ export function setupWorld(provider: DojoProvider) {
 
 	return {
 		GameActions: {
-			create: GameActions_create,
-			start: GameActions_start,
+			createNewGame: GameActions_createNewGame,
+			startGame: GameActions_startGame,
 			join: GameActions_join,
 			move: GameActions_move,
 			roll: GameActions_roll,
 			getCurrentGameId: GameActions_getCurrentGameId,
 			createNewGameId: GameActions_createNewGameId,
 			createNewPlayer: GameActions_createNewPlayer,
+			createBotPlayer: GameActions_createBotPlayer,
 			getUsernameFromAddress: GameActions_getUsernameFromAddress,
 			getAddressFromUsername: GameActions_getAddressFromUsername,
 		},