feat(multi): add game mode selection and surrender button for all_finish mode
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
// Route handler pour les actions sur une room specifique
|
// Route handler pour les actions sur une room specifique
|
||||||
// PATCH /api/rooms/[code] - actions: join, heartbeat, start, navigate, leave, nextRound
|
// PATCH /api/rooms/[code] - actions: join, heartbeat, start, navigate, surrender, nextRound, resetGame
|
||||||
|
|
||||||
import { NextRequest } from "next/server";
|
import { NextRequest } from "next/server";
|
||||||
import type { Room, Player } from "../route";
|
import type { Room, Player } from "../route";
|
||||||
@@ -12,6 +12,7 @@ function dbToRoom(row: {
|
|||||||
round: number;
|
round: number;
|
||||||
totalRounds: number;
|
totalRounds: number;
|
||||||
maxPlayers: number;
|
maxPlayers: number;
|
||||||
|
gameMode: string;
|
||||||
startArticle: string;
|
startArticle: string;
|
||||||
targetArticle: string;
|
targetArticle: string;
|
||||||
roundWinner: string | null;
|
roundWinner: string | null;
|
||||||
@@ -26,6 +27,7 @@ function dbToRoom(row: {
|
|||||||
round: row.round,
|
round: row.round,
|
||||||
totalRounds: row.totalRounds,
|
totalRounds: row.totalRounds,
|
||||||
maxPlayers: row.maxPlayers,
|
maxPlayers: row.maxPlayers,
|
||||||
|
gameMode: (row.gameMode ?? "race") as Room["gameMode"],
|
||||||
startArticle: row.startArticle,
|
startArticle: row.startArticle,
|
||||||
targetArticle: row.targetArticle,
|
targetArticle: row.targetArticle,
|
||||||
roundWinner: row.roundWinner,
|
roundWinner: row.roundWinner,
|
||||||
@@ -47,6 +49,33 @@ function prunePlayers(players: Player[]): Player[] {
|
|||||||
return players.filter((p) => now - p.lastSeen < PLAYER_TIMEOUT_MS);
|
return players.filter((p) => now - p.lastSeen < PLAYER_TIMEOUT_MS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// En mode all_finish : calcule les points selon le rang d'arrivée
|
||||||
|
// 1er = 10pts, 2ème = 7pts, 3ème = 5pts, reste = 3pts, forfait = 0pts
|
||||||
|
const RANK_POINTS = [10, 7, 5, 3];
|
||||||
|
function getRankPoints(rank: number): number {
|
||||||
|
return RANK_POINTS[rank] ?? RANK_POINTS[RANK_POINTS.length - 1];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Vérifie si la manche doit se terminer en mode all_finish
|
||||||
|
function checkAllFinished(room: Room): boolean {
|
||||||
|
if (room.gameMode !== "all_finish") return false;
|
||||||
|
return room.players.every((p) => p.hasWon || p.hasSurrendered);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Attribue les points en mode all_finish selon l'ordre d'arrivée
|
||||||
|
function assignAllFinishPoints(room: Room) {
|
||||||
|
const winners = room.players.filter((p) => p.hasWon);
|
||||||
|
// On leur attribue les points selon leur rang (ordre d'arrivée = ordre dans le tableau, déjà fixé au moment où ils ont gagné)
|
||||||
|
winners.forEach((p, i) => {
|
||||||
|
p.score += getRankPoints(i);
|
||||||
|
});
|
||||||
|
// roundWinner = premier arrivé
|
||||||
|
if (winners.length > 0) {
|
||||||
|
room.roundWinner = winners[0].id;
|
||||||
|
}
|
||||||
|
room.phase = "results";
|
||||||
|
}
|
||||||
|
|
||||||
// PATCH /api/rooms/[code]
|
// PATCH /api/rooms/[code]
|
||||||
export async function PATCH(
|
export async function PATCH(
|
||||||
request: NextRequest,
|
request: NextRequest,
|
||||||
@@ -105,6 +134,7 @@ export async function PATCH(
|
|||||||
score: 0,
|
score: 0,
|
||||||
currentArticle: "",
|
currentArticle: "",
|
||||||
hasWon: false,
|
hasWon: false,
|
||||||
|
hasSurrendered: false,
|
||||||
isHost: false,
|
isHost: false,
|
||||||
lastSeen: Date.now(),
|
lastSeen: Date.now(),
|
||||||
};
|
};
|
||||||
@@ -161,6 +191,7 @@ export async function PATCH(
|
|||||||
for (const p of room.players) {
|
for (const p of room.players) {
|
||||||
p.currentArticle = startArticle;
|
p.currentArticle = startArticle;
|
||||||
p.hasWon = false;
|
p.hasWon = false;
|
||||||
|
p.hasSurrendered = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
await saveRoom(room);
|
await saveRoom(room);
|
||||||
@@ -202,17 +233,61 @@ export async function PATCH(
|
|||||||
|
|
||||||
if (
|
if (
|
||||||
!player.hasWon &&
|
!player.hasWon &&
|
||||||
|
!player.hasSurrendered &&
|
||||||
normalize(player.currentArticle) === normalize(room.targetArticle)
|
normalize(player.currentArticle) === normalize(room.targetArticle)
|
||||||
) {
|
) {
|
||||||
player.hasWon = true;
|
player.hasWon = true;
|
||||||
|
|
||||||
const alreadyWon = room.players.some(
|
if (room.gameMode === "race") {
|
||||||
(p) => p.hasWon && p.id !== player.id,
|
// Mode course : 1er arrivé gagne la manche immédiatement
|
||||||
);
|
const alreadyWon = room.players.some(
|
||||||
if (!alreadyWon) {
|
(p) => p.hasWon && p.id !== player.id,
|
||||||
player.score += 10;
|
);
|
||||||
room.roundWinner = player.id;
|
if (!alreadyWon) {
|
||||||
|
player.score += 10;
|
||||||
|
room.roundWinner = player.id;
|
||||||
|
room.phase = "results";
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Mode all_finish : on attend que tout le monde finisse ou abandonne
|
||||||
|
if (checkAllFinished(room)) {
|
||||||
|
assignAllFinishPoints(room);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await saveRoom(room);
|
||||||
|
return Response.json({ room });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Forfait
|
||||||
|
case "surrender": {
|
||||||
|
if (room.phase !== "playing") {
|
||||||
|
return Response.json({ room });
|
||||||
|
}
|
||||||
|
const player = room.players.find((p) => p.id === playerId);
|
||||||
|
if (!player) {
|
||||||
|
return Response.json({ error: "Joueur inconnu" }, { status: 404 });
|
||||||
|
}
|
||||||
|
if (player.hasWon || player.hasSurrendered) {
|
||||||
|
return Response.json({ room });
|
||||||
|
}
|
||||||
|
|
||||||
|
player.hasSurrendered = true;
|
||||||
|
player.lastSeen = Date.now();
|
||||||
|
|
||||||
|
if (room.gameMode === "race") {
|
||||||
|
// En mode course, forfait ne termine pas la manche — on attend qu'un vrai gagnant arrive
|
||||||
|
// Sauf si tous ont abandonné
|
||||||
|
const anyoneStillPlaying = room.players.some((p) => !p.hasWon && !p.hasSurrendered);
|
||||||
|
if (!anyoneStillPlaying) {
|
||||||
room.phase = "results";
|
room.phase = "results";
|
||||||
|
// Pas de roundWinner si tout le monde a abandonné
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Mode all_finish : si tout le monde a fini ou abandonné, on termine
|
||||||
|
if (checkAllFinished(room)) {
|
||||||
|
assignAllFinishPoints(room);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -235,6 +310,7 @@ export async function PATCH(
|
|||||||
room.roundStart = null;
|
room.roundStart = null;
|
||||||
for (const p of room.players) {
|
for (const p of room.players) {
|
||||||
p.hasWon = false;
|
p.hasWon = false;
|
||||||
|
p.hasSurrendered = false;
|
||||||
p.currentArticle = "";
|
p.currentArticle = "";
|
||||||
}
|
}
|
||||||
await saveRoom(room);
|
await saveRoom(room);
|
||||||
@@ -258,6 +334,7 @@ export async function PATCH(
|
|||||||
for (const p of room.players) {
|
for (const p of room.players) {
|
||||||
p.score = 0;
|
p.score = 0;
|
||||||
p.hasWon = false;
|
p.hasWon = false;
|
||||||
|
p.hasSurrendered = false;
|
||||||
p.currentArticle = "";
|
p.currentArticle = "";
|
||||||
}
|
}
|
||||||
await saveRoom(room);
|
await saveRoom(room);
|
||||||
@@ -278,6 +355,7 @@ async function saveRoom(room: Room) {
|
|||||||
round: room.round,
|
round: room.round,
|
||||||
totalRounds: room.totalRounds,
|
totalRounds: room.totalRounds,
|
||||||
maxPlayers: room.maxPlayers,
|
maxPlayers: room.maxPlayers,
|
||||||
|
gameMode: room.gameMode,
|
||||||
startArticle: room.startArticle,
|
startArticle: room.startArticle,
|
||||||
targetArticle: room.targetArticle,
|
targetArticle: room.targetArticle,
|
||||||
roundWinner: room.roundWinner,
|
roundWinner: room.roundWinner,
|
||||||
|
|||||||
+10
-1
@@ -12,6 +12,7 @@ export type Player = {
|
|||||||
score: number;
|
score: number;
|
||||||
currentArticle: string;
|
currentArticle: string;
|
||||||
hasWon: boolean;
|
hasWon: boolean;
|
||||||
|
hasSurrendered: boolean;
|
||||||
isHost: boolean;
|
isHost: boolean;
|
||||||
lastSeen: number; // timestamp ms
|
lastSeen: number; // timestamp ms
|
||||||
};
|
};
|
||||||
@@ -23,6 +24,7 @@ export type Room = {
|
|||||||
round: number;
|
round: number;
|
||||||
totalRounds: number;
|
totalRounds: number;
|
||||||
maxPlayers: number;
|
maxPlayers: number;
|
||||||
|
gameMode: "race" | "all_finish"; // race = 1er gagne, all_finish = tout le monde joue
|
||||||
startArticle: string;
|
startArticle: string;
|
||||||
targetArticle: string;
|
targetArticle: string;
|
||||||
roundWinner: string | null;
|
roundWinner: string | null;
|
||||||
@@ -53,6 +55,7 @@ function dbToRoom(row: {
|
|||||||
round: number;
|
round: number;
|
||||||
totalRounds: number;
|
totalRounds: number;
|
||||||
maxPlayers: number;
|
maxPlayers: number;
|
||||||
|
gameMode: string;
|
||||||
startArticle: string;
|
startArticle: string;
|
||||||
targetArticle: string;
|
targetArticle: string;
|
||||||
roundWinner: string | null;
|
roundWinner: string | null;
|
||||||
@@ -67,6 +70,7 @@ function dbToRoom(row: {
|
|||||||
round: row.round,
|
round: row.round,
|
||||||
totalRounds: row.totalRounds,
|
totalRounds: row.totalRounds,
|
||||||
maxPlayers: row.maxPlayers,
|
maxPlayers: row.maxPlayers,
|
||||||
|
gameMode: (row.gameMode ?? "race") as Room["gameMode"],
|
||||||
startArticle: row.startArticle,
|
startArticle: row.startArticle,
|
||||||
targetArticle: row.targetArticle,
|
targetArticle: row.targetArticle,
|
||||||
roundWinner: row.roundWinner,
|
roundWinner: row.roundWinner,
|
||||||
@@ -87,10 +91,11 @@ async function pruneOldRooms() {
|
|||||||
// Response: { room: Room, playerId: string }
|
// Response: { room: Room, playerId: string }
|
||||||
export async function POST(request: NextRequest) {
|
export async function POST(request: NextRequest) {
|
||||||
const body = await request.json();
|
const body = await request.json();
|
||||||
const { playerName, maxPlayers, totalRounds } = body as {
|
const { playerName, maxPlayers, totalRounds, gameMode } = body as {
|
||||||
playerName: string;
|
playerName: string;
|
||||||
maxPlayers?: number;
|
maxPlayers?: number;
|
||||||
totalRounds?: number;
|
totalRounds?: number;
|
||||||
|
gameMode?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
if (
|
if (
|
||||||
@@ -125,6 +130,8 @@ export async function POST(request: NextRequest) {
|
|||||||
const playerId = generatePlayerId();
|
const playerId = generatePlayerId();
|
||||||
const now = BigInt(Date.now());
|
const now = BigInt(Date.now());
|
||||||
|
|
||||||
|
const clampedMode: Room["gameMode"] = gameMode === "all_finish" ? "all_finish" : "race";
|
||||||
|
|
||||||
const players: Player[] = [
|
const players: Player[] = [
|
||||||
{
|
{
|
||||||
id: playerId,
|
id: playerId,
|
||||||
@@ -132,6 +139,7 @@ export async function POST(request: NextRequest) {
|
|||||||
score: 0,
|
score: 0,
|
||||||
currentArticle: "",
|
currentArticle: "",
|
||||||
hasWon: false,
|
hasWon: false,
|
||||||
|
hasSurrendered: false,
|
||||||
isHost: true,
|
isHost: true,
|
||||||
lastSeen: Date.now(),
|
lastSeen: Date.now(),
|
||||||
},
|
},
|
||||||
@@ -145,6 +153,7 @@ export async function POST(request: NextRequest) {
|
|||||||
round: 0,
|
round: 0,
|
||||||
totalRounds: clampedRounds,
|
totalRounds: clampedRounds,
|
||||||
maxPlayers: clampedMax,
|
maxPlayers: clampedMax,
|
||||||
|
gameMode: clampedMode,
|
||||||
startArticle: "",
|
startArticle: "",
|
||||||
targetArticle: "",
|
targetArticle: "",
|
||||||
roundWinner: null,
|
roundWinner: null,
|
||||||
|
|||||||
@@ -20,15 +20,17 @@ type GameScreenProps = {
|
|||||||
onRetry: () => void;
|
onRetry: () => void;
|
||||||
onNextRound: () => void;
|
onNextRound: () => void;
|
||||||
onResetGame: () => void;
|
onResetGame: () => void;
|
||||||
|
onSurrender: () => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
export function GameScreen({
|
export function GameScreen({
|
||||||
room, playerId, html, title, loading, loadError, history, clicks, elapsed,
|
room, playerId, html, title, loading, loadError, history, clicks, elapsed,
|
||||||
countdown, onNavigate, onRetry, onNextRound, onResetGame,
|
countdown, onNavigate, onRetry, onNextRound, onResetGame, onSurrender,
|
||||||
}: GameScreenProps) {
|
}: GameScreenProps) {
|
||||||
const breadcrumbEndRef = useRef<HTMLDivElement>(null);
|
const breadcrumbEndRef = useRef<HTMLDivElement>(null);
|
||||||
const myPlayer = room.players.find((p) => p.id === playerId);
|
const myPlayer = room.players.find((p) => p.id === playerId);
|
||||||
const isHost = myPlayer?.isHost ?? false;
|
const isHost = myPlayer?.isHost ?? false;
|
||||||
|
const myFinished = myPlayer?.hasWon || myPlayer?.hasSurrendered;
|
||||||
const sortedPlayers = [...room.players].sort((a, b) => b.score - a.score);
|
const sortedPlayers = [...room.players].sort((a, b) => b.score - a.score);
|
||||||
const winner = room.roundWinner ? room.players.find((p) => p.id === room.roundWinner) : null;
|
const winner = room.roundWinner ? room.players.find((p) => p.id === room.roundWinner) : null;
|
||||||
|
|
||||||
@@ -65,7 +67,8 @@ export function GameScreen({
|
|||||||
<li key={p.id} className={`flex items-center gap-2 bg-[#1a1a1a] rounded-xl px-3.5 py-2.5 min-h-11 border ${p.id === playerId ? "border-[#7c3aed]" : "border-[#2e2e2e]"}`}>
|
<li key={p.id} className={`flex items-center gap-2 bg-[#1a1a1a] rounded-xl px-3.5 py-2.5 min-h-11 border ${p.id === playerId ? "border-[#7c3aed]" : "border-[#2e2e2e]"}`}>
|
||||||
<span className="text-xs sm:text-sm font-bold text-[#888] min-w-6 sm:min-w-7">#{i + 1}</span>
|
<span className="text-xs sm:text-sm font-bold text-[#888] min-w-6 sm:min-w-7">#{i + 1}</span>
|
||||||
<span className="flex-1 font-semibold text-sm truncate">{p.name}</span>
|
<span className="flex-1 font-semibold text-sm truncate">{p.name}</span>
|
||||||
{p.hasWon && <span className="text-[10px] font-bold px-2 py-0.5 rounded-full bg-green-900/40 text-green-300 uppercase tracking-wide shrink-0">Gagnant</span>}
|
{p.hasWon && <span className="text-[10px] font-bold px-2 py-0.5 rounded-full bg-green-900/40 text-green-300 uppercase tracking-wide shrink-0">✓ Trouvé</span>}
|
||||||
|
{p.hasSurrendered && <span className="text-[10px] font-bold px-2 py-0.5 rounded-full bg-[#242424] text-[#888] uppercase tracking-wide shrink-0">Forfait</span>}
|
||||||
<span className="font-bold text-[#7c3aed] text-sm shrink-0">{p.score} pts</span>
|
<span className="font-bold text-[#7c3aed] text-sm shrink-0">{p.score} pts</span>
|
||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
@@ -117,10 +120,26 @@ export function GameScreen({
|
|||||||
</div>
|
</div>
|
||||||
<Breadcrumbs history={history} endRef={breadcrumbEndRef} />
|
<Breadcrumbs history={history} endRef={breadcrumbEndRef} />
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center gap-2 sm:gap-3 shrink-0 text-[10px] sm:text-xs font-bold text-[#888] tabular-nums">
|
<div className="flex items-center gap-2 sm:gap-3 shrink-0">
|
||||||
<span>{elapsed}</span>
|
<div className="flex items-center gap-2 sm:gap-3 text-[10px] sm:text-xs font-bold text-[#888] tabular-nums">
|
||||||
<span>{clicks} clics</span>
|
<span>{elapsed}</span>
|
||||||
<span className="hidden sm:inline">{myPlayer?.score ?? 0} pts</span>
|
<span>{clicks} clics</span>
|
||||||
|
<span className="hidden sm:inline">{myPlayer?.score ?? 0} pts</span>
|
||||||
|
</div>
|
||||||
|
{!myFinished && (
|
||||||
|
<button
|
||||||
|
onClick={onSurrender}
|
||||||
|
className="min-h-8 px-2 rounded-lg text-xs font-semibold bg-red-950/40 border border-red-900 text-red-400 hover:bg-red-900/40 cursor-pointer shrink-0"
|
||||||
|
>
|
||||||
|
Forfait
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
{myFinished && myPlayer?.hasWon && (
|
||||||
|
<span className="text-xs font-bold text-green-400 shrink-0">✓ Trouvé !</span>
|
||||||
|
)}
|
||||||
|
{myFinished && myPlayer?.hasSurrendered && (
|
||||||
|
<span className="text-xs font-bold text-[#888] shrink-0">Forfait</span>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -156,7 +175,8 @@ export function GameScreen({
|
|||||||
<li key={p.id} className="flex flex-col gap-0.5">
|
<li key={p.id} className="flex flex-col gap-0.5">
|
||||||
<span className={`text-xs font-semibold truncate ${p.id === playerId ? "text-[#7c3aed]" : "text-[#f0f0f0]"}`}>{p.name}</span>
|
<span className={`text-xs font-semibold truncate ${p.id === playerId ? "text-[#7c3aed]" : "text-[#f0f0f0]"}`}>{p.name}</span>
|
||||||
<span className="text-xs text-[#888]">{p.score} pts</span>
|
<span className="text-xs text-[#888]">{p.score} pts</span>
|
||||||
{p.hasWon && <span className="text-[10px] text-green-400 font-bold">Gagné !</span>}
|
{p.hasWon && <span className="text-[10px] text-green-400 font-bold">✓ Trouvé</span>}
|
||||||
|
{p.hasSurrendered && <span className="text-[10px] text-[#888] font-bold">Forfait</span>}
|
||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ type LobbyScreenProps = {
|
|||||||
setMaxPlayers: (v: number) => void;
|
setMaxPlayers: (v: number) => void;
|
||||||
totalRounds: number;
|
totalRounds: number;
|
||||||
setTotalRounds: (v: number) => void;
|
setTotalRounds: (v: number) => void;
|
||||||
|
gameMode: Room["gameMode"];
|
||||||
|
setGameMode: (v: Room["gameMode"]) => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
export function LobbyScreen({
|
export function LobbyScreen({
|
||||||
@@ -32,6 +34,8 @@ export function LobbyScreen({
|
|||||||
setMaxPlayers,
|
setMaxPlayers,
|
||||||
totalRounds,
|
totalRounds,
|
||||||
setTotalRounds,
|
setTotalRounds,
|
||||||
|
gameMode,
|
||||||
|
setGameMode,
|
||||||
}: LobbyScreenProps) {
|
}: LobbyScreenProps) {
|
||||||
const isHost = room.players.find((p) => p.id === playerId)?.isHost ?? false;
|
const isHost = room.players.find((p) => p.id === playerId)?.isHost ?? false;
|
||||||
const [copied, setCopied] = useState(false);
|
const [copied, setCopied] = useState(false);
|
||||||
@@ -141,6 +145,17 @@ export function LobbyScreen({
|
|||||||
<h3 className="text-[10px] sm:text-xs font-bold text-[#888] uppercase tracking-wider">
|
<h3 className="text-[10px] sm:text-xs font-bold text-[#888] uppercase tracking-wider">
|
||||||
Paramètres
|
Paramètres
|
||||||
</h3>
|
</h3>
|
||||||
|
<div className="flex flex-col gap-1.5">
|
||||||
|
<span className="text-xs text-[#888]">Mode de jeu</span>
|
||||||
|
<select
|
||||||
|
value={gameMode}
|
||||||
|
onChange={(e) => setGameMode(e.target.value as Room["gameMode"])}
|
||||||
|
className="w-full min-h-11 px-2 bg-[#0f0f0f] border border-[#2e2e2e] rounded-xl text-sm text-[#f0f0f0] outline-none focus:border-[#7c3aed] cursor-pointer transition-colors"
|
||||||
|
>
|
||||||
|
<option value="race">🏁 Course — le premier arrivé gagne</option>
|
||||||
|
<option value="all_finish">⏱ Normal — tout le monde joue jusqu'au bout</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
<div className="flex gap-3">
|
<div className="flex gap-3">
|
||||||
<div className="flex-1 flex flex-col gap-1.5">
|
<div className="flex-1 flex flex-col gap-1.5">
|
||||||
<span className="text-xs text-[#888]">Joueurs max</span>
|
<span className="text-xs text-[#888]">Joueurs max</span>
|
||||||
|
|||||||
@@ -32,6 +32,8 @@ type Props = {
|
|||||||
setMaxPlayers: Dispatch<SetStateAction<number>>;
|
setMaxPlayers: Dispatch<SetStateAction<number>>;
|
||||||
totalRounds: number;
|
totalRounds: number;
|
||||||
setTotalRounds: Dispatch<SetStateAction<number>>;
|
setTotalRounds: Dispatch<SetStateAction<number>>;
|
||||||
|
gameMode: "race" | "all_finish";
|
||||||
|
setGameMode: Dispatch<SetStateAction<"race" | "all_finish">>;
|
||||||
error: string | null;
|
error: string | null;
|
||||||
setError: Dispatch<SetStateAction<string | null>>;
|
setError: Dispatch<SetStateAction<string | null>>;
|
||||||
loading: boolean;
|
loading: boolean;
|
||||||
@@ -44,6 +46,7 @@ export function ScreenRouter({
|
|||||||
playerName, setPlayerName, joinCode, setJoinCode,
|
playerName, setPlayerName, joinCode, setJoinCode,
|
||||||
maxPlayers, setMaxPlayers,
|
maxPlayers, setMaxPlayers,
|
||||||
totalRounds, setTotalRounds,
|
totalRounds, setTotalRounds,
|
||||||
|
gameMode, setGameMode,
|
||||||
error, setError, loading, showAuth, setShowAuth,
|
error, setError, loading, showAuth, setShowAuth,
|
||||||
}: Props) {
|
}: Props) {
|
||||||
if (screen === "profile") return (
|
if (screen === "profile") return (
|
||||||
@@ -108,6 +111,7 @@ export function ScreenRouter({
|
|||||||
onReset={handlers.handleResetGame}
|
onReset={handlers.handleResetGame}
|
||||||
maxPlayers={maxPlayers} setMaxPlayers={setMaxPlayers}
|
maxPlayers={maxPlayers} setMaxPlayers={setMaxPlayers}
|
||||||
totalRounds={totalRounds} setTotalRounds={setTotalRounds}
|
totalRounds={totalRounds} setTotalRounds={setTotalRounds}
|
||||||
|
gameMode={gameMode} setGameMode={setGameMode}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -123,6 +127,7 @@ export function ScreenRouter({
|
|||||||
onRetry={multi.retryLoad}
|
onRetry={multi.retryLoad}
|
||||||
onNextRound={handlers.handleNextRound}
|
onNextRound={handlers.handleNextRound}
|
||||||
onResetGame={handlers.handleResetGame}
|
onResetGame={handlers.handleResetGame}
|
||||||
|
onSurrender={handlers.handleSurrender}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
+3
-1
@@ -14,6 +14,7 @@ export default function WikiRush() {
|
|||||||
const [joinCode, setJoinCode] = useState("");
|
const [joinCode, setJoinCode] = useState("");
|
||||||
const [maxPlayers, setMaxPlayers] = useState(16);
|
const [maxPlayers, setMaxPlayers] = useState(16);
|
||||||
const [totalRounds, setTotalRounds] = useState(3);
|
const [totalRounds, setTotalRounds] = useState(3);
|
||||||
|
const [gameMode, setGameMode] = useState<"race" | "all_finish">("race");
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
const [showAuth, setShowAuth] = useState(false);
|
const [showAuth, setShowAuth] = useState(false);
|
||||||
@@ -22,7 +23,7 @@ export default function WikiRush() {
|
|||||||
const multi = useMultiGame();
|
const multi = useMultiGame();
|
||||||
|
|
||||||
const { session } = useGameEffects({ solo, multi, screen, setScreen, setPlayerName });
|
const { session } = useGameEffects({ solo, multi, screen, setScreen, setPlayerName });
|
||||||
const handlers = useGameHandlers({ solo, multi, playerName, joinCode, maxPlayers, totalRounds, setScreen, setError, setLoading });
|
const handlers = useGameHandlers({ solo, multi, playerName, joinCode, maxPlayers, totalRounds, gameMode, setScreen, setError, setLoading });
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ScreenRouter
|
<ScreenRouter
|
||||||
@@ -32,6 +33,7 @@ export default function WikiRush() {
|
|||||||
joinCode={joinCode} setJoinCode={setJoinCode}
|
joinCode={joinCode} setJoinCode={setJoinCode}
|
||||||
maxPlayers={maxPlayers} setMaxPlayers={setMaxPlayers}
|
maxPlayers={maxPlayers} setMaxPlayers={setMaxPlayers}
|
||||||
totalRounds={totalRounds} setTotalRounds={setTotalRounds}
|
totalRounds={totalRounds} setTotalRounds={setTotalRounds}
|
||||||
|
gameMode={gameMode} setGameMode={setGameMode}
|
||||||
error={error} setError={setError} loading={loading}
|
error={error} setError={setError} loading={loading}
|
||||||
showAuth={showAuth} setShowAuth={setShowAuth}
|
showAuth={showAuth} setShowAuth={setShowAuth}
|
||||||
/>
|
/>
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -862,6 +862,7 @@ export const RoomScalarFieldEnum = {
|
|||||||
round: 'round',
|
round: 'round',
|
||||||
totalRounds: 'totalRounds',
|
totalRounds: 'totalRounds',
|
||||||
maxPlayers: 'maxPlayers',
|
maxPlayers: 'maxPlayers',
|
||||||
|
gameMode: 'gameMode',
|
||||||
startArticle: 'startArticle',
|
startArticle: 'startArticle',
|
||||||
targetArticle: 'targetArticle',
|
targetArticle: 'targetArticle',
|
||||||
roundWinner: 'roundWinner',
|
roundWinner: 'roundWinner',
|
||||||
|
|||||||
@@ -119,6 +119,7 @@ export const RoomScalarFieldEnum = {
|
|||||||
round: 'round',
|
round: 'round',
|
||||||
totalRounds: 'totalRounds',
|
totalRounds: 'totalRounds',
|
||||||
maxPlayers: 'maxPlayers',
|
maxPlayers: 'maxPlayers',
|
||||||
|
gameMode: 'gameMode',
|
||||||
startArticle: 'startArticle',
|
startArticle: 'startArticle',
|
||||||
targetArticle: 'targetArticle',
|
targetArticle: 'targetArticle',
|
||||||
roundWinner: 'roundWinner',
|
roundWinner: 'roundWinner',
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ export type RoomMinAggregateOutputType = {
|
|||||||
round: number | null
|
round: number | null
|
||||||
totalRounds: number | null
|
totalRounds: number | null
|
||||||
maxPlayers: number | null
|
maxPlayers: number | null
|
||||||
|
gameMode: string | null
|
||||||
startArticle: string | null
|
startArticle: string | null
|
||||||
targetArticle: string | null
|
targetArticle: string | null
|
||||||
roundWinner: string | null
|
roundWinner: string | null
|
||||||
@@ -65,6 +66,7 @@ export type RoomMaxAggregateOutputType = {
|
|||||||
round: number | null
|
round: number | null
|
||||||
totalRounds: number | null
|
totalRounds: number | null
|
||||||
maxPlayers: number | null
|
maxPlayers: number | null
|
||||||
|
gameMode: string | null
|
||||||
startArticle: string | null
|
startArticle: string | null
|
||||||
targetArticle: string | null
|
targetArticle: string | null
|
||||||
roundWinner: string | null
|
roundWinner: string | null
|
||||||
@@ -81,6 +83,7 @@ export type RoomCountAggregateOutputType = {
|
|||||||
round: number
|
round: number
|
||||||
totalRounds: number
|
totalRounds: number
|
||||||
maxPlayers: number
|
maxPlayers: number
|
||||||
|
gameMode: number
|
||||||
startArticle: number
|
startArticle: number
|
||||||
targetArticle: number
|
targetArticle: number
|
||||||
roundWinner: number
|
roundWinner: number
|
||||||
@@ -116,6 +119,7 @@ export type RoomMinAggregateInputType = {
|
|||||||
round?: true
|
round?: true
|
||||||
totalRounds?: true
|
totalRounds?: true
|
||||||
maxPlayers?: true
|
maxPlayers?: true
|
||||||
|
gameMode?: true
|
||||||
startArticle?: true
|
startArticle?: true
|
||||||
targetArticle?: true
|
targetArticle?: true
|
||||||
roundWinner?: true
|
roundWinner?: true
|
||||||
@@ -131,6 +135,7 @@ export type RoomMaxAggregateInputType = {
|
|||||||
round?: true
|
round?: true
|
||||||
totalRounds?: true
|
totalRounds?: true
|
||||||
maxPlayers?: true
|
maxPlayers?: true
|
||||||
|
gameMode?: true
|
||||||
startArticle?: true
|
startArticle?: true
|
||||||
targetArticle?: true
|
targetArticle?: true
|
||||||
roundWinner?: true
|
roundWinner?: true
|
||||||
@@ -147,6 +152,7 @@ export type RoomCountAggregateInputType = {
|
|||||||
round?: true
|
round?: true
|
||||||
totalRounds?: true
|
totalRounds?: true
|
||||||
maxPlayers?: true
|
maxPlayers?: true
|
||||||
|
gameMode?: true
|
||||||
startArticle?: true
|
startArticle?: true
|
||||||
targetArticle?: true
|
targetArticle?: true
|
||||||
roundWinner?: true
|
roundWinner?: true
|
||||||
@@ -250,6 +256,7 @@ export type RoomGroupByOutputType = {
|
|||||||
round: number
|
round: number
|
||||||
totalRounds: number
|
totalRounds: number
|
||||||
maxPlayers: number
|
maxPlayers: number
|
||||||
|
gameMode: string
|
||||||
startArticle: string
|
startArticle: string
|
||||||
targetArticle: string
|
targetArticle: string
|
||||||
roundWinner: string | null
|
roundWinner: string | null
|
||||||
@@ -289,6 +296,7 @@ export type RoomWhereInput = {
|
|||||||
round?: Prisma.IntFilter<"Room"> | number
|
round?: Prisma.IntFilter<"Room"> | number
|
||||||
totalRounds?: Prisma.IntFilter<"Room"> | number
|
totalRounds?: Prisma.IntFilter<"Room"> | number
|
||||||
maxPlayers?: Prisma.IntFilter<"Room"> | number
|
maxPlayers?: Prisma.IntFilter<"Room"> | number
|
||||||
|
gameMode?: Prisma.StringFilter<"Room"> | string
|
||||||
startArticle?: Prisma.StringFilter<"Room"> | string
|
startArticle?: Prisma.StringFilter<"Room"> | string
|
||||||
targetArticle?: Prisma.StringFilter<"Room"> | string
|
targetArticle?: Prisma.StringFilter<"Room"> | string
|
||||||
roundWinner?: Prisma.StringNullableFilter<"Room"> | string | null
|
roundWinner?: Prisma.StringNullableFilter<"Room"> | string | null
|
||||||
@@ -305,6 +313,7 @@ export type RoomOrderByWithRelationInput = {
|
|||||||
round?: Prisma.SortOrder
|
round?: Prisma.SortOrder
|
||||||
totalRounds?: Prisma.SortOrder
|
totalRounds?: Prisma.SortOrder
|
||||||
maxPlayers?: Prisma.SortOrder
|
maxPlayers?: Prisma.SortOrder
|
||||||
|
gameMode?: Prisma.SortOrder
|
||||||
startArticle?: Prisma.SortOrder
|
startArticle?: Prisma.SortOrder
|
||||||
targetArticle?: Prisma.SortOrder
|
targetArticle?: Prisma.SortOrder
|
||||||
roundWinner?: Prisma.SortOrderInput | Prisma.SortOrder
|
roundWinner?: Prisma.SortOrderInput | Prisma.SortOrder
|
||||||
@@ -324,6 +333,7 @@ export type RoomWhereUniqueInput = Prisma.AtLeast<{
|
|||||||
round?: Prisma.IntFilter<"Room"> | number
|
round?: Prisma.IntFilter<"Room"> | number
|
||||||
totalRounds?: Prisma.IntFilter<"Room"> | number
|
totalRounds?: Prisma.IntFilter<"Room"> | number
|
||||||
maxPlayers?: Prisma.IntFilter<"Room"> | number
|
maxPlayers?: Prisma.IntFilter<"Room"> | number
|
||||||
|
gameMode?: Prisma.StringFilter<"Room"> | string
|
||||||
startArticle?: Prisma.StringFilter<"Room"> | string
|
startArticle?: Prisma.StringFilter<"Room"> | string
|
||||||
targetArticle?: Prisma.StringFilter<"Room"> | string
|
targetArticle?: Prisma.StringFilter<"Room"> | string
|
||||||
roundWinner?: Prisma.StringNullableFilter<"Room"> | string | null
|
roundWinner?: Prisma.StringNullableFilter<"Room"> | string | null
|
||||||
@@ -340,6 +350,7 @@ export type RoomOrderByWithAggregationInput = {
|
|||||||
round?: Prisma.SortOrder
|
round?: Prisma.SortOrder
|
||||||
totalRounds?: Prisma.SortOrder
|
totalRounds?: Prisma.SortOrder
|
||||||
maxPlayers?: Prisma.SortOrder
|
maxPlayers?: Prisma.SortOrder
|
||||||
|
gameMode?: Prisma.SortOrder
|
||||||
startArticle?: Prisma.SortOrder
|
startArticle?: Prisma.SortOrder
|
||||||
targetArticle?: Prisma.SortOrder
|
targetArticle?: Prisma.SortOrder
|
||||||
roundWinner?: Prisma.SortOrderInput | Prisma.SortOrder
|
roundWinner?: Prisma.SortOrderInput | Prisma.SortOrder
|
||||||
@@ -364,6 +375,7 @@ export type RoomScalarWhereWithAggregatesInput = {
|
|||||||
round?: Prisma.IntWithAggregatesFilter<"Room"> | number
|
round?: Prisma.IntWithAggregatesFilter<"Room"> | number
|
||||||
totalRounds?: Prisma.IntWithAggregatesFilter<"Room"> | number
|
totalRounds?: Prisma.IntWithAggregatesFilter<"Room"> | number
|
||||||
maxPlayers?: Prisma.IntWithAggregatesFilter<"Room"> | number
|
maxPlayers?: Prisma.IntWithAggregatesFilter<"Room"> | number
|
||||||
|
gameMode?: Prisma.StringWithAggregatesFilter<"Room"> | string
|
||||||
startArticle?: Prisma.StringWithAggregatesFilter<"Room"> | string
|
startArticle?: Prisma.StringWithAggregatesFilter<"Room"> | string
|
||||||
targetArticle?: Prisma.StringWithAggregatesFilter<"Room"> | string
|
targetArticle?: Prisma.StringWithAggregatesFilter<"Room"> | string
|
||||||
roundWinner?: Prisma.StringNullableWithAggregatesFilter<"Room"> | string | null
|
roundWinner?: Prisma.StringNullableWithAggregatesFilter<"Room"> | string | null
|
||||||
@@ -380,6 +392,7 @@ export type RoomCreateInput = {
|
|||||||
round?: number
|
round?: number
|
||||||
totalRounds?: number
|
totalRounds?: number
|
||||||
maxPlayers?: number
|
maxPlayers?: number
|
||||||
|
gameMode?: string
|
||||||
startArticle?: string
|
startArticle?: string
|
||||||
targetArticle?: string
|
targetArticle?: string
|
||||||
roundWinner?: string | null
|
roundWinner?: string | null
|
||||||
@@ -396,6 +409,7 @@ export type RoomUncheckedCreateInput = {
|
|||||||
round?: number
|
round?: number
|
||||||
totalRounds?: number
|
totalRounds?: number
|
||||||
maxPlayers?: number
|
maxPlayers?: number
|
||||||
|
gameMode?: string
|
||||||
startArticle?: string
|
startArticle?: string
|
||||||
targetArticle?: string
|
targetArticle?: string
|
||||||
roundWinner?: string | null
|
roundWinner?: string | null
|
||||||
@@ -412,6 +426,7 @@ export type RoomUpdateInput = {
|
|||||||
round?: Prisma.IntFieldUpdateOperationsInput | number
|
round?: Prisma.IntFieldUpdateOperationsInput | number
|
||||||
totalRounds?: Prisma.IntFieldUpdateOperationsInput | number
|
totalRounds?: Prisma.IntFieldUpdateOperationsInput | number
|
||||||
maxPlayers?: Prisma.IntFieldUpdateOperationsInput | number
|
maxPlayers?: Prisma.IntFieldUpdateOperationsInput | number
|
||||||
|
gameMode?: Prisma.StringFieldUpdateOperationsInput | string
|
||||||
startArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
startArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
||||||
targetArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
targetArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
||||||
roundWinner?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
roundWinner?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||||
@@ -428,6 +443,7 @@ export type RoomUncheckedUpdateInput = {
|
|||||||
round?: Prisma.IntFieldUpdateOperationsInput | number
|
round?: Prisma.IntFieldUpdateOperationsInput | number
|
||||||
totalRounds?: Prisma.IntFieldUpdateOperationsInput | number
|
totalRounds?: Prisma.IntFieldUpdateOperationsInput | number
|
||||||
maxPlayers?: Prisma.IntFieldUpdateOperationsInput | number
|
maxPlayers?: Prisma.IntFieldUpdateOperationsInput | number
|
||||||
|
gameMode?: Prisma.StringFieldUpdateOperationsInput | string
|
||||||
startArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
startArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
||||||
targetArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
targetArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
||||||
roundWinner?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
roundWinner?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||||
@@ -444,6 +460,7 @@ export type RoomCreateManyInput = {
|
|||||||
round?: number
|
round?: number
|
||||||
totalRounds?: number
|
totalRounds?: number
|
||||||
maxPlayers?: number
|
maxPlayers?: number
|
||||||
|
gameMode?: string
|
||||||
startArticle?: string
|
startArticle?: string
|
||||||
targetArticle?: string
|
targetArticle?: string
|
||||||
roundWinner?: string | null
|
roundWinner?: string | null
|
||||||
@@ -460,6 +477,7 @@ export type RoomUpdateManyMutationInput = {
|
|||||||
round?: Prisma.IntFieldUpdateOperationsInput | number
|
round?: Prisma.IntFieldUpdateOperationsInput | number
|
||||||
totalRounds?: Prisma.IntFieldUpdateOperationsInput | number
|
totalRounds?: Prisma.IntFieldUpdateOperationsInput | number
|
||||||
maxPlayers?: Prisma.IntFieldUpdateOperationsInput | number
|
maxPlayers?: Prisma.IntFieldUpdateOperationsInput | number
|
||||||
|
gameMode?: Prisma.StringFieldUpdateOperationsInput | string
|
||||||
startArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
startArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
||||||
targetArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
targetArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
||||||
roundWinner?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
roundWinner?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||||
@@ -476,6 +494,7 @@ export type RoomUncheckedUpdateManyInput = {
|
|||||||
round?: Prisma.IntFieldUpdateOperationsInput | number
|
round?: Prisma.IntFieldUpdateOperationsInput | number
|
||||||
totalRounds?: Prisma.IntFieldUpdateOperationsInput | number
|
totalRounds?: Prisma.IntFieldUpdateOperationsInput | number
|
||||||
maxPlayers?: Prisma.IntFieldUpdateOperationsInput | number
|
maxPlayers?: Prisma.IntFieldUpdateOperationsInput | number
|
||||||
|
gameMode?: Prisma.StringFieldUpdateOperationsInput | string
|
||||||
startArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
startArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
||||||
targetArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
targetArticle?: Prisma.StringFieldUpdateOperationsInput | string
|
||||||
roundWinner?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
roundWinner?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
|
||||||
@@ -492,6 +511,7 @@ export type RoomCountOrderByAggregateInput = {
|
|||||||
round?: Prisma.SortOrder
|
round?: Prisma.SortOrder
|
||||||
totalRounds?: Prisma.SortOrder
|
totalRounds?: Prisma.SortOrder
|
||||||
maxPlayers?: Prisma.SortOrder
|
maxPlayers?: Prisma.SortOrder
|
||||||
|
gameMode?: Prisma.SortOrder
|
||||||
startArticle?: Prisma.SortOrder
|
startArticle?: Prisma.SortOrder
|
||||||
targetArticle?: Prisma.SortOrder
|
targetArticle?: Prisma.SortOrder
|
||||||
roundWinner?: Prisma.SortOrder
|
roundWinner?: Prisma.SortOrder
|
||||||
@@ -516,6 +536,7 @@ export type RoomMaxOrderByAggregateInput = {
|
|||||||
round?: Prisma.SortOrder
|
round?: Prisma.SortOrder
|
||||||
totalRounds?: Prisma.SortOrder
|
totalRounds?: Prisma.SortOrder
|
||||||
maxPlayers?: Prisma.SortOrder
|
maxPlayers?: Prisma.SortOrder
|
||||||
|
gameMode?: Prisma.SortOrder
|
||||||
startArticle?: Prisma.SortOrder
|
startArticle?: Prisma.SortOrder
|
||||||
targetArticle?: Prisma.SortOrder
|
targetArticle?: Prisma.SortOrder
|
||||||
roundWinner?: Prisma.SortOrder
|
roundWinner?: Prisma.SortOrder
|
||||||
@@ -531,6 +552,7 @@ export type RoomMinOrderByAggregateInput = {
|
|||||||
round?: Prisma.SortOrder
|
round?: Prisma.SortOrder
|
||||||
totalRounds?: Prisma.SortOrder
|
totalRounds?: Prisma.SortOrder
|
||||||
maxPlayers?: Prisma.SortOrder
|
maxPlayers?: Prisma.SortOrder
|
||||||
|
gameMode?: Prisma.SortOrder
|
||||||
startArticle?: Prisma.SortOrder
|
startArticle?: Prisma.SortOrder
|
||||||
targetArticle?: Prisma.SortOrder
|
targetArticle?: Prisma.SortOrder
|
||||||
roundWinner?: Prisma.SortOrder
|
roundWinner?: Prisma.SortOrder
|
||||||
@@ -578,6 +600,7 @@ export type RoomSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = r
|
|||||||
round?: boolean
|
round?: boolean
|
||||||
totalRounds?: boolean
|
totalRounds?: boolean
|
||||||
maxPlayers?: boolean
|
maxPlayers?: boolean
|
||||||
|
gameMode?: boolean
|
||||||
startArticle?: boolean
|
startArticle?: boolean
|
||||||
targetArticle?: boolean
|
targetArticle?: boolean
|
||||||
roundWinner?: boolean
|
roundWinner?: boolean
|
||||||
@@ -594,6 +617,7 @@ export type RoomSelectCreateManyAndReturn<ExtArgs extends runtime.Types.Extensio
|
|||||||
round?: boolean
|
round?: boolean
|
||||||
totalRounds?: boolean
|
totalRounds?: boolean
|
||||||
maxPlayers?: boolean
|
maxPlayers?: boolean
|
||||||
|
gameMode?: boolean
|
||||||
startArticle?: boolean
|
startArticle?: boolean
|
||||||
targetArticle?: boolean
|
targetArticle?: boolean
|
||||||
roundWinner?: boolean
|
roundWinner?: boolean
|
||||||
@@ -610,6 +634,7 @@ export type RoomSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensio
|
|||||||
round?: boolean
|
round?: boolean
|
||||||
totalRounds?: boolean
|
totalRounds?: boolean
|
||||||
maxPlayers?: boolean
|
maxPlayers?: boolean
|
||||||
|
gameMode?: boolean
|
||||||
startArticle?: boolean
|
startArticle?: boolean
|
||||||
targetArticle?: boolean
|
targetArticle?: boolean
|
||||||
roundWinner?: boolean
|
roundWinner?: boolean
|
||||||
@@ -626,6 +651,7 @@ export type RoomSelectScalar = {
|
|||||||
round?: boolean
|
round?: boolean
|
||||||
totalRounds?: boolean
|
totalRounds?: boolean
|
||||||
maxPlayers?: boolean
|
maxPlayers?: boolean
|
||||||
|
gameMode?: boolean
|
||||||
startArticle?: boolean
|
startArticle?: boolean
|
||||||
targetArticle?: boolean
|
targetArticle?: boolean
|
||||||
roundWinner?: boolean
|
roundWinner?: boolean
|
||||||
@@ -635,7 +661,7 @@ export type RoomSelectScalar = {
|
|||||||
updatedAt?: boolean
|
updatedAt?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export type RoomOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"code" | "players" | "phase" | "round" | "totalRounds" | "maxPlayers" | "startArticle" | "targetArticle" | "roundWinner" | "countdownStart" | "roundStart" | "createdAt" | "updatedAt", ExtArgs["result"]["room"]>
|
export type RoomOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"code" | "players" | "phase" | "round" | "totalRounds" | "maxPlayers" | "gameMode" | "startArticle" | "targetArticle" | "roundWinner" | "countdownStart" | "roundStart" | "createdAt" | "updatedAt", ExtArgs["result"]["room"]>
|
||||||
|
|
||||||
export type $RoomPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
|
export type $RoomPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
|
||||||
name: "Room"
|
name: "Room"
|
||||||
@@ -647,6 +673,7 @@ export type $RoomPayload<ExtArgs extends runtime.Types.Extensions.InternalArgs =
|
|||||||
round: number
|
round: number
|
||||||
totalRounds: number
|
totalRounds: number
|
||||||
maxPlayers: number
|
maxPlayers: number
|
||||||
|
gameMode: string
|
||||||
startArticle: string
|
startArticle: string
|
||||||
targetArticle: string
|
targetArticle: string
|
||||||
roundWinner: string | null
|
roundWinner: string | null
|
||||||
@@ -1083,6 +1110,7 @@ export interface RoomFieldRefs {
|
|||||||
readonly round: Prisma.FieldRef<"Room", 'Int'>
|
readonly round: Prisma.FieldRef<"Room", 'Int'>
|
||||||
readonly totalRounds: Prisma.FieldRef<"Room", 'Int'>
|
readonly totalRounds: Prisma.FieldRef<"Room", 'Int'>
|
||||||
readonly maxPlayers: Prisma.FieldRef<"Room", 'Int'>
|
readonly maxPlayers: Prisma.FieldRef<"Room", 'Int'>
|
||||||
|
readonly gameMode: Prisma.FieldRef<"Room", 'String'>
|
||||||
readonly startArticle: Prisma.FieldRef<"Room", 'String'>
|
readonly startArticle: Prisma.FieldRef<"Room", 'String'>
|
||||||
readonly targetArticle: Prisma.FieldRef<"Room", 'String'>
|
readonly targetArticle: Prisma.FieldRef<"Room", 'String'>
|
||||||
readonly roundWinner: Prisma.FieldRef<"Room", 'String'>
|
readonly roundWinner: Prisma.FieldRef<"Room", 'String'>
|
||||||
|
|||||||
@@ -13,18 +13,19 @@ type Handlers = {
|
|||||||
joinCode: string;
|
joinCode: string;
|
||||||
maxPlayers: number;
|
maxPlayers: number;
|
||||||
totalRounds: number;
|
totalRounds: number;
|
||||||
|
gameMode: "race" | "all_finish";
|
||||||
setScreen: Dispatch<SetStateAction<Screen>>;
|
setScreen: Dispatch<SetStateAction<Screen>>;
|
||||||
setError: Dispatch<SetStateAction<string | null>>;
|
setError: Dispatch<SetStateAction<string | null>>;
|
||||||
setLoading: Dispatch<SetStateAction<boolean>>;
|
setLoading: Dispatch<SetStateAction<boolean>>;
|
||||||
};
|
};
|
||||||
|
|
||||||
export function useGameHandlers({
|
export function useGameHandlers({
|
||||||
solo, multi, playerName, joinCode, maxPlayers, totalRounds, setScreen, setError, setLoading,
|
solo, multi, playerName, joinCode, maxPlayers, totalRounds, gameMode, setScreen, setError, setLoading,
|
||||||
}: Handlers) {
|
}: Handlers) {
|
||||||
async function handleCreateRoom() {
|
async function handleCreateRoom() {
|
||||||
if (!playerName.trim()) { setError("Entre ton pseudo !"); return; }
|
if (!playerName.trim()) { setError("Entre ton pseudo !"); return; }
|
||||||
setLoading(true); setError(null);
|
setLoading(true); setError(null);
|
||||||
const { error: err } = await multi.createRoom(playerName.trim(), maxPlayers, totalRounds);
|
const { error: err } = await multi.createRoom(playerName.trim(), maxPlayers, totalRounds, gameMode);
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
if (err) { setError(err); return; }
|
if (err) { setError(err); return; }
|
||||||
setScreen("lobby");
|
setScreen("lobby");
|
||||||
@@ -67,6 +68,10 @@ export function useGameHandlers({
|
|||||||
setScreen("solo");
|
setScreen("solo");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function handleSurrender() {
|
||||||
|
await multi.surrender();
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
handleCreateRoom,
|
handleCreateRoom,
|
||||||
handleJoinRoom,
|
handleJoinRoom,
|
||||||
@@ -75,5 +80,6 @@ export function useGameHandlers({
|
|||||||
handleResetGame,
|
handleResetGame,
|
||||||
handleLeave,
|
handleLeave,
|
||||||
handleSolo,
|
handleSolo,
|
||||||
|
handleSurrender,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
+13
-3
@@ -152,11 +152,11 @@ export function useMultiGame() {
|
|||||||
|
|
||||||
// Room actions
|
// Room actions
|
||||||
|
|
||||||
async function createRoom(playerName: string, maxPlayers = 16, totalRounds = 3): Promise<{ error?: string }> {
|
async function createRoom(playerName: string, maxPlayers = 16, totalRounds = 3, gameMode: "race" | "all_finish" = "race"): Promise<{ error?: string }> {
|
||||||
const res = await fetch("/api/rooms", {
|
const res = await fetch("/api/rooms", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: { "Content-Type": "application/json" },
|
headers: { "Content-Type": "application/json" },
|
||||||
body: JSON.stringify({ playerName, maxPlayers, totalRounds }),
|
body: JSON.stringify({ playerName, maxPlayers, totalRounds, gameMode }),
|
||||||
});
|
});
|
||||||
const data = await res.json() as { room?: Room; playerId?: string; error?: string };
|
const data = await res.json() as { room?: Room; playerId?: string; error?: string };
|
||||||
if (!res.ok) return { error: data.error ?? "Erreur" };
|
if (!res.ok) return { error: data.error ?? "Erreur" };
|
||||||
@@ -195,6 +195,16 @@ export function useMultiGame() {
|
|||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function surrender() {
|
||||||
|
if (!room || !playerId) return;
|
||||||
|
const res = await fetch(`/api/rooms/${room.code}`, {
|
||||||
|
method: "PATCH",
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
body: JSON.stringify({ action: "surrender", playerId }),
|
||||||
|
});
|
||||||
|
if (res.ok) setRoom((await res.json() as { room: Room }).room);
|
||||||
|
}
|
||||||
|
|
||||||
async function nextRound() {
|
async function nextRound() {
|
||||||
if (!room || !playerId) return;
|
if (!room || !playerId) return;
|
||||||
const res = await fetch(`/api/rooms/${room.code}`, {
|
const res = await fetch(`/api/rooms/${room.code}`, {
|
||||||
@@ -247,7 +257,7 @@ export function useMultiGame() {
|
|||||||
return {
|
return {
|
||||||
room, playerId, html, title, loading, loadError,
|
room, playerId, html, title, loading, loadError,
|
||||||
history, clicks: clicksDisplay, elapsed: timer.elapsed, countdown,
|
history, clicks: clicksDisplay, elapsed: timer.elapsed, countdown,
|
||||||
createRoom, joinRoom, startGame, nextRound, resetGame, leave, navigate, restore,
|
createRoom, joinRoom, startGame, nextRound, resetGame, leave, navigate, surrender, restore,
|
||||||
retryLoad: () => title && loadArticle(title),
|
retryLoad: () => title && loadArticle(title),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ model Room {
|
|||||||
round Int @default(0)
|
round Int @default(0)
|
||||||
totalRounds Int @default(3)
|
totalRounds Int @default(3)
|
||||||
maxPlayers Int @default(16)
|
maxPlayers Int @default(16)
|
||||||
|
gameMode String @default("race")
|
||||||
startArticle String @default("")
|
startArticle String @default("")
|
||||||
targetArticle String @default("")
|
targetArticle String @default("")
|
||||||
roundWinner String?
|
roundWinner String?
|
||||||
|
|||||||
Reference in New Issue
Block a user