Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import Checks from "./Checks";
const options = {
theme: "realm-of-ra",
policies: CONFIG.POLICIES,
namespace: "mancala_fire",
slot: "mancala-fire",
namespace: "mancala_wind",
slot: "mancala-wind",
rpc: CONFIG.SLOT_RPC_URL,
chains: [
{ rpcUrl: "https://api.cartridge.gg/x/starknet/sepolia" },
Expand Down
42 changes: 21 additions & 21 deletions client/src/components/gameplay/game-board.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ const GameBoard: React.FC<GameBoardProps> = ({
const [selectedPit, setSelectedPit] = React.useState<number | null>(null);
const [simulatedSeeds, setSimulatedSeeds] = React.useState<any[]>([]);
const [isSimulating, setIsSimulating] = React.useState(false);
const involved = game_players?.mancalaFirePlayerModels.edges.some(
const involved = game_players?.mancalaWindPlayerModels.edges.some(
(item: any) =>
item?.node.address ===
(account.account?.address || game_node?.player_one),
);
const player_position = involved
? game_players?.mancalaFirePlayerModels.edges.findIndex(
? game_players?.mancalaWindPlayerModels.edges.findIndex(
(item: any) =>
item?.node.address ===
(account.account?.address || game_node?.player_one),
Expand Down Expand Up @@ -74,7 +74,7 @@ const GameBoard: React.FC<GameBoardProps> = ({
}, [startCapturePolling, startExtraTurnPolling]);

useEffect(() => {
const captures = captureData?.mancalaFireCaptureModels?.edges;
const captures = captureData?.mancalaWindCaptureModels?.edges;
if (captures && captures.length > 0 && game_node?.status !== "Finished") {
const latestCapture = captures[captures.length - 1]?.node;

Expand All @@ -97,7 +97,7 @@ const GameBoard: React.FC<GameBoardProps> = ({
}, [captureData, account.account?.address, game_node?.status, setMessage]);

useEffect(() => {
const extraTurns = extraTurnData?.mancalaFirePlayerExtraTurnModels?.edges;
const extraTurns = extraTurnData?.mancalaWindPlayerExtraTurnModels?.edges;
if (
extraTurns &&
extraTurns.length > 0 &&
Expand All @@ -124,11 +124,11 @@ const GameBoard: React.FC<GameBoardProps> = ({
}, [extraTurnData, account.account?.address, game_node?.status, setMessage]);

const seeds = React.useMemo(() => {
if (!data?.mancalaFireSeedModels?.edges) return [];
if (!data?.mancalaWindSeedModels?.edges) return [];
const uniqueSeeds = new Map();

// Sort edges by timestamp in descending order (newest first)
const sortedEdges = [...data.mancalaFireSeedModels.edges].sort((a, b) => {
const sortedEdges = [...data.mancalaWindSeedModels.edges].sort((a, b) => {
const timeA = new Date(a.node.entity.updatedAt).getTime();
const timeB = new Date(b.node.entity.updatedAt).getTime();
return timeB - timeA; // Descending order
Expand Down Expand Up @@ -169,10 +169,10 @@ const GameBoard: React.FC<GameBoardProps> = ({
}));

const player =
game_players?.mancalaFirePlayerModels.edges[player_position]?.node
game_players?.mancalaWindPlayerModels.edges[player_position]?.node
.address;
const opponent =
game_players?.mancalaFirePlayerModels.edges[opponent_position]?.node
game_players?.mancalaWindPlayerModels.edges[opponent_position]?.node
.address;

const simulatedMove = calculateMancalaMove(
Expand All @@ -194,7 +194,7 @@ const GameBoard: React.FC<GameBoardProps> = ({
]);

useEffect(() => {
if (data?.mancalaFireSeedModels?.edges) {
if (data?.mancalaWindSeedModels?.edges) {
setIsSimulating(false);
setSelectedPit(null);
}
Expand Down Expand Up @@ -246,14 +246,14 @@ const GameBoard: React.FC<GameBoardProps> = ({
? calculatePitAmount(
simulatedSeeds,
7,
game_players?.mancalaFirePlayerModels.edges[player_position]?.node
game_players?.mancalaWindPlayerModels.edges[player_position]?.node
.address,
)
: game_players?.mancalaFirePitModels.edges
: game_players?.mancalaWindPitModels.edges
.filter(
(item: any) =>
item?.node.player ===
game_players?.mancalaFirePlayerModels.edges[player_position]?.node
game_players?.mancalaWindPlayerModels.edges[player_position]?.node
.address,
)
.filter((item: any) => item?.node.pit_number === 7)[0]?.node
Expand All @@ -264,14 +264,14 @@ const GameBoard: React.FC<GameBoardProps> = ({
? calculatePitAmount(
simulatedSeeds,
7,
game_players?.mancalaFirePlayerModels.edges[opponent_position]?.node
game_players?.mancalaWindPlayerModels.edges[opponent_position]?.node
.address,
)
: game_players?.mancalaFirePitModels.edges
: game_players?.mancalaWindPitModels.edges
.filter(
(item: any) =>
item?.node.player ===
game_players?.mancalaFirePlayerModels.edges[opponent_position]
game_players?.mancalaWindPlayerModels.edges[opponent_position]
?.node.address,
)
.filter((item: any) => item?.node.pit_number === 7)[0]?.node
Expand Down Expand Up @@ -324,11 +324,11 @@ const GameBoard: React.FC<GameBoardProps> = ({
{/* Player 1 */}
<div className="h-[175px] w-full flex flex-row justify-center items-center ml-3.5">
<div className="flex flex-row justify-center flex-1 items-center w-[100px] space-x-5">
{game_players?.mancalaFirePitModels.edges
{game_players?.mancalaWindPitModels.edges
.filter(
(item: any) =>
item?.node.player ===
game_players?.mancalaFirePlayerModels.edges[
game_players?.mancalaWindPlayerModels.edges[
opponent_position
]?.node.address,
)
Expand All @@ -340,7 +340,7 @@ const GameBoard: React.FC<GameBoardProps> = ({
? calculatePitAmount(
simulatedSeeds,
pit.node.pit_number,
game_players?.mancalaFirePlayerModels.edges[
game_players?.mancalaWindPlayerModels.edges[
opponent_position
]?.node.address,
)
Expand All @@ -359,11 +359,11 @@ const GameBoard: React.FC<GameBoardProps> = ({
{/* Player 2 */}
<div className="h-[175px] w-full flex flex-row justify-between items-center">
<div className="flex flex-row justify-center flex-1 space-x-5">
{game_players?.mancalaFirePitModels.edges
{game_players?.mancalaWindPitModels.edges
.filter(
(item: any) =>
item?.node.player ===
game_players?.mancalaFirePlayerModels.edges[player_position]
game_players?.mancalaWindPlayerModels.edges[player_position]
?.node.address,
)
.filter((item: any) => item?.node.pit_number !== 7)
Expand All @@ -374,7 +374,7 @@ const GameBoard: React.FC<GameBoardProps> = ({
? calculatePitAmount(
simulatedSeeds,
pit.node.pit_number,
game_players?.mancalaFirePlayerModels.edges[
game_players?.mancalaWindPlayerModels.edges[
player_position
]?.node.address,
)
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/gameplay/game-message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export default function GameMessage({
normalizeAddress(account.account?.address);

const user_position =
game_players?.mancalaFirePlayerModels?.edges?.find(
game_players?.mancalaWindPlayerModels?.edges?.find(
(item: any) =>
item.node.address ===
normalizeAddress(game_node?.current_player),
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/gameplay/game-navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ export default function GameNavigation({
}, [game_node]);

const player_one_name = formatPlayerName(
player_names?.mancalaFireProfileModels.edges.find(
player_names?.mancalaWindProfileModels.edges.find(
(item: any) => item.node.address === game_node?.player_one,
)?.node.name,
game_node?.player_one,
);

const player_two_name = formatPlayerName(
player_names?.mancalaFireProfileModels.edges.find(
player_names?.mancalaWindProfileModels.edges.find(
(item: any) => item.node.address === game_node?.player_two,
)?.node.name,
game_node?.player_two,
Expand Down
10 changes: 5 additions & 5 deletions client/src/components/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export default function Header() {
const [playerName, setPlayerName] = useState("");

useEffect(() => {
const profile: any = playerData?.mancalaFireProfileModels?.edges.find(
const profile: any = playerData?.mancalaWindProfileModels?.edges.find(
(player: any) => player.node.address === account?.address,
);
if (!account || !profile) {
Expand All @@ -100,7 +100,7 @@ export default function Header() {
if (profile?.node?.name) {
setPlayerName(shortString.decodeShortString(profile?.node?.name));
}
}, [account, playerData?.mancalaFireProfileModels?.edges, playerData]);
}, [account, playerData?.mancalaWindProfileModels?.edges, playerData]);

const handleTrophyClick = useCallback(() => {
if (!connector?.controller) {
Expand Down Expand Up @@ -157,7 +157,7 @@ export default function Header() {
const [displayName, setDisplayName] = useState("");
const [initialDisplayName, setInitialDisplayName] = useState("");
const [initialImageUrl, setInitialImageUrl] = useState("");
const profile: any = playerData?.mancalaFireProfileModels?.edges.find(
const profile: any = playerData?.mancalaWindProfileModels?.edges.find(
(player: any) => player.node.address === account?.address,
);

Expand Down Expand Up @@ -243,7 +243,7 @@ export default function Header() {
setSaveStatus({ status: "saving", message: "Saving changes..." });

try {
const userExists = profiles.mancalaFireProfileModels.edges.some(
const userExists = profiles.mancalaWindProfileModels.edges.some(
(profile: any) => profile.node.address === account?.address,
);

Expand Down Expand Up @@ -298,7 +298,7 @@ export default function Header() {
useEffect(() => {
if (
account?.address &&
playerData?.mancalaFireProfileModels?.edges &&
playerData?.mancalaWindProfileModels?.edges &&
!profile
) {
setOpen(true);
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/message-area.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ export default function MessageArea({
setAction,
}: IMessageAreaProps) {
const active_players_addrs =
game_players?.mancalaFirePlayerModels?.edges?.map(
game_players?.mancalaWindPlayerModels?.edges?.map(
(item: any) => item?.node?.address,
) ?? [];
const opponent_position = active_players_addrs.indexOf(address) === 0 ? 1 : 0;
const opponent_requested_restart =
game_players?.mancalaFirePlayerModels?.edges?.filter(
game_players?.mancalaWindPlayerModels?.edges?.filter(
(item: any) => item?.node?.restart_requested === true,
)[opponent_position]?.node?.restart_requested;
const { account } = useAccount();
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/profile/user-section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default function UserSection({
const account = useAccount();

useEffect(() => {
const profile: any = playerData?.mancalaFireProfileModels?.edges.find(
const profile: any = playerData?.mancalaWindProfileModels?.edges.find(
(player: any) => player.node.address === account?.account?.address,
);
if (!account?.address || !profile) {
Expand Down Expand Up @@ -137,7 +137,7 @@ export default function UserSection({
setSaveStatus({ status: "saving", message: "Saving changes..." });

try {
const userExists = profiles.mancalaFireProfileModels.edges.some(
const userExists = profiles.mancalaWindProfileModels.edges.some(
(profile: any) => profile.node.address === account.account?.address,
);

Expand Down
2 changes: 1 addition & 1 deletion client/src/components/tutorial/tutorial-game-message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export default function TutorialGameMessage({
normalizeAddress(account.account?.address);
const findPlayerProfile = (address: string) => {
return (
profiles?.mancalaFireProfileModels?.edges?.find(
profiles?.mancalaWindProfileModels?.edges?.find(
(item: any) =>
normalizeAddress(item?.node.address) ===
normalizeAddress(address),
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/tutorial/tutorial-game-navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ export default function TutorialGameNavigation({
game_players?.player_two?.edges?.[0]?.node?.address,
);
const player_one_name = formatPlayerName(
player_names?.mancalaFireProfileModels.edges.find(
player_names?.mancalaWindProfileModels.edges.find(
(item: any) => item.node.address === game_node?.player_one,
)?.node.name,
game_node?.player_one,
);
const player_two_name = formatPlayerName(
player_names?.mancalaFireProfileModels.edges.find(
player_names?.mancalaWindProfileModels.edges.find(
(item: any) => item.node.address === game_node?.player_two,
)?.node.name,
game_node?.player_two,
Expand Down
4 changes: 2 additions & 2 deletions client/src/lib/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const PROFILE_ADDRESS = IS_MAINNET
const CONFIG = {
GRAPHQL_ENDPOINT: `${TORII_URL}/graphql`,
SLOT_RPC_URL: RPC_URL,
SLOT: "mancala-fire",
SLOT: "mancala-wind",
RPC_URL,
TORII_URL,
MASTER_ADDRESS: IS_MAINNET
Expand All @@ -26,7 +26,7 @@ const CONFIG = {
: import.meta.env.VITE_SEPOLIA_MASTER_PRIVATE_KEY,
MANCALA_ADDRESS,
PROFILE_ADDRESS,
NAMESPACE: "mancala_fire",
NAMESPACE: "mancala_wind",
CONTRACT_NAME: "Mancala",
POLICIES: [
{
Expand Down
Loading
Loading