From e3ef770c81a6988b1da10f58d51614f702472b82 Mon Sep 17 00:00:00 2001 From: danny Date: Sun, 14 Jun 2026 13:01:41 +0200 Subject: [PATCH] Compact layout, multi-vote, step reveal, imposter weights + resolve bug fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG FIX: resolve_round now reads liar_keys directly from DB via performResolveRound() helper, bypassing loadRoom()'s redaction (liarKeys=[] when roundOutcome is null) — fixes 0 points + no_liar bug. resolve logic extracted into performResolveRound() used by both manual resolve_round and auto-resolve in lock_vote. Migration V7: - gtl_rooms: reveal_index INT DEFAULT -1, imposter_weights VARCHAR(500) - gtl_players: vote_locked TINYINT, vote_request TINYINT API: - lock_vote: stores JSON votes array, locks player, auto-resolves when all locked - request_voting: democratic vote-start; opens voting when all players request - reveal_next: increments reveal_index one answer at a time - reveal/reveal_all: sets reveal_index=9999 (show all) - update_weights: saves imposter_weights JSON per room - resolveVotes(): handles votes[] array instead of single voteFor string - new_round: resets vote_locked, vote_request, reveal_index, active_emojis - assign_questions: resets vote state + reveal_index on each new question set Layout: - wrap max-width 640→960px for grid layout - Player view: 3-col grid (sidebar scores | gameplay | emoji reactions) - Host view: 2-col grid (sidebar players+tally+scores | main content) - Compact sb-row sidebar rows with avatar + name + score Voting: - Multi-select checkboxes (client-side) + "Stimme abschicken" lock button - Niemand exclusive: checking it clears other selections and vice versa - Once locked: checkboxes hidden, confirmation shown - Auto-resolve triggers when last player locks vote Reveal: - "Nächste aufdecken" reveals one answer at a time via reveal_index - "Alle aufdecken" reveals everything at once - Host sees which answers are still hidden vs revealed - Players only see answers up to current reveal_index Imposter weights: - JSON field in host UI e.g. {"3-5":1,"6-9":2,"10+":3} - randomImposters() reads weights to pick appropriate count - Saved per-room via update_weights API Co-Authored-By: Claude Sonnet 4.6 --- api.php | 392 +++++++++++++++++++------------- index.html | 638 +++++++++++++++++++++++++++++++++++----------------- migrate.php | 15 +- 3 files changed, 690 insertions(+), 355 deletions(-) diff --git a/api.php b/api.php index d620d5d..4b9602a 100644 --- a/api.php +++ b/api.php @@ -45,7 +45,8 @@ function loadRoom(PDO $pdo, string $code): ?array { $stmt = $pdo->prepare( 'SELECT code, revealed, liar_keys, normal_question, imposter_question, - round_num, voted_out_keys, round_outcome, voting_open, active_emojis + round_num, voted_out_keys, round_outcome, voting_open, active_emojis, + reveal_index, imposter_weights FROM gtl_rooms WHERE code = ?' ); $stmt->execute([$code]); @@ -56,8 +57,8 @@ function loadRoom(PDO $pdo, string $code): ?array $ps = $pdo->prepare( - 'SELECT p.pkey, p.name, p.user_id, p.question, p.answer, p.answered, p.score, p.vote_for, - u.avatar + 'SELECT p.pkey, p.name, p.user_id, p.question, p.answer, p.answered, p.score, + p.vote_for, p.vote_locked, p.vote_request, u.avatar FROM gtl_players p LEFT JOIN gtl_users u ON u.id = p.user_id WHERE p.room_code = ? ORDER BY p.id ASC' @@ -66,16 +67,28 @@ function loadRoom(PDO $pdo, string $code): ?array $players = []; foreach ($ps->fetchAll() as $row) { + // Parse vote_for: JSON array (new) or legacy single pkey string + $voteRaw = $row['vote_for'] ?? null; + if ($voteRaw !== null && str_starts_with(ltrim((string) $voteRaw), '[')) { + $parsedVotes = json_decode($voteRaw, true) ?: []; + } elseif ($voteRaw !== null && $voteRaw !== '') { + $parsedVotes = [$voteRaw]; + } else { + $parsedVotes = []; + } + $players[$row['pkey']] = [ - 'pkey' => $row['pkey'], - 'name' => $row['name'], - 'userId' => $row['user_id'] ? (int) $row['user_id'] : null, - 'avatar' => $row['avatar'] ?? null, - 'question' => $row['question'] ?? '', - 'answer' => $row['answer'] ?? '', - 'answered' => (bool) $row['answered'], - 'score' => (int) $row['score'], - 'voteFor' => $row['vote_for'] ?? '', + 'pkey' => $row['pkey'], + 'name' => $row['name'], + 'userId' => $row['user_id'] ? (int) $row['user_id'] : null, + 'avatar' => $row['avatar'] ?? null, + 'question' => $row['question'] ?? '', + 'answer' => $row['answer'] ?? '', + 'answered' => (bool) $row['answered'], + 'score' => (int) $row['score'], + 'votes' => $parsedVotes, + 'voteLocked' => (bool) ($row['vote_locked'] ?? false), + 'voteRequest' => (bool) ($row['vote_request'] ?? false), ]; } @@ -92,6 +105,8 @@ function loadRoom(PDO $pdo, string $code): ?array 'votedOutKeys' => $j($room['voted_out_keys']), 'roundOutcome' => $outcome, 'votingOpen' => (bool) ($room['voting_open'] ?? false), + 'revealIndex' => (int) ($room['reveal_index'] ?? -1), + 'imposterWeights' => $room['imposter_weights'] ?? null, 'activeEmojis' => array_values(array_filter( $j($room['active_emojis'] ?? '[]'), fn($e) => ($e['ts'] ?? 0) >= (time() - 4) @@ -120,11 +135,21 @@ function resolveVotes(array $players, array $liarKeys): array $tally[$p['pkey']] = 0; } foreach ($players as $p) { - $vf = $p['voteFor'] ?? ''; - if ($vf === '' || $vf === '__nobody__') { + $votes = $p['votes'] ?? []; + if (!is_array($votes)) $votes = []; + if (empty($votes)) { $tally['__nobody__']++; - } elseif (array_key_exists($vf, $tally)) { - $tally[$vf]++; + } else { + // __nobody__ is exclusive: if present, count only as nobody + if (in_array('__nobody__', $votes, true)) { + $tally['__nobody__']++; + } else { + foreach ($votes as $vf) { + if (array_key_exists($vf, $tally)) { + $tally[$vf]++; + } + } + } } } @@ -200,6 +225,118 @@ function archiveRound(PDO $pdo, array $state, int $now): void } } +/** + * Führt die Rundenauswertung durch. Liest liar_keys direkt aus der DB, + * damit die Redaktion in loadRoom() (liarKeys=[] solange roundOutcome=null) umgangen wird. + * Schreibt Ergebnis, Archiv, Punkte und Profil-Stats. + * + * @return array Neuer state nach Auswertung (loadRoom-Ergebnis). + */ +function performResolveRound(PDO $pdo, string $code, int $now): array +{ + $j = fn($v) => (!empty($v) && is_string($v)) ? (json_decode($v, true) ?: []) : []; + + // Liar-Keys direkt lesen — loadRoom() würde sie ohne roundOutcome verstecken + $lkStmt = $pdo->prepare('SELECT liar_keys FROM gtl_rooms WHERE code=?'); + $lkStmt->execute([$code]); + $lkRow = $lkStmt->fetch(); + $liarKeys = $j($lkRow['liar_keys'] ?? ''); + + $state = loadRoom($pdo, $code); + $players = $state['players']; + + $votedOut = resolveVotes(array_values($players), $liarKeys); + + if (empty($liarKeys)) { + $outcome = 'no_liar'; + } elseif (empty($votedOut)) { + $outcome = 'imposters_win'; + } elseif (empty(array_diff($liarKeys, $votedOut))) { + $outcome = 'innocents_win'; + } else { + $outcome = 'imposters_win'; + } + + $pdo->prepare( + 'UPDATE gtl_rooms SET voted_out_keys=?, round_outcome=?, revealed=1, reveal_index=9999, updated_at=? + WHERE code=?' + )->execute([json_encode($votedOut), $outcome, $now, $code]); + + // Verlauf speichern + $existing = $pdo->prepare('SELECT id FROM gtl_game_rounds WHERE room_code=? AND round_num=?'); + $existing->execute([$code, $state['roundNum']]); + $existingRow = $existing->fetch(); + + if ($existingRow) { + $roundId = (int) $existingRow['id']; + $pdo->prepare('UPDATE gtl_game_rounds SET outcome=? WHERE id=?') + ->execute([$outcome, $roundId]); + $updVo = $pdo->prepare('UPDATE gtl_round_players SET voted_out=? WHERE round_id=? AND pkey=?'); + foreach ($players as $p) { + $updVo->execute([in_array($p['pkey'], $votedOut, true) ? 1 : 0, $roundId, $p['pkey']]); + } + } else { + $pdo->prepare( + 'INSERT INTO gtl_game_rounds (room_code, round_num, played_at, outcome) VALUES (?,?,?,?)' + )->execute([$code, $state['roundNum'], $now, $outcome]); + $roundId = (int) $pdo->lastInsertId(); + + $ins = $pdo->prepare( + 'INSERT IGNORE INTO gtl_round_players + (round_id, user_id, player_name, pkey, was_imposter, voted_out, question, answer) + VALUES (?,?,?,?,?,?,?,?)' + ); + foreach ($players as $p) { + $ins->execute([ + $roundId, $p['userId'], $p['name'], $p['pkey'], + in_array($p['pkey'], $liarKeys, true) ? 1 : 0, + in_array($p['pkey'], $votedOut, true) ? 1 : 0, + $p['question'], $p['answer'], + ]); + } + } + + // Punkte + Profil-Stats + $updStats = $pdo->prepare( + 'UPDATE gtl_user_stats SET + games_played = games_played + 1, + games_won = games_won + ?, + games_lost = games_lost + ?, + times_imposter = times_imposter + ?, + imposter_wins = imposter_wins + ?, + imposter_losses = imposter_losses + ?, + innocent_wins = innocent_wins + ?, + innocent_losses = innocent_losses + ? + WHERE user_id = ?' + ); + $updScore = $pdo->prepare( + 'UPDATE gtl_players SET score=score+1, updated_at=? WHERE room_code=? AND pkey=?' + ); + + foreach ($players as $p) { + $wasImposter = in_array($p['pkey'], $liarKeys, true); + $wasVotedOut = in_array($p['pkey'], $votedOut, true); + $playerWon = $wasImposter ? !$wasVotedOut : ($outcome === 'innocents_win'); + + if ($playerWon) { + $updScore->execute([$now, $code, $p['pkey']]); + } + if (!$p['userId']) continue; + $updStats->execute([ + $playerWon ? 1 : 0, + $playerWon ? 0 : 1, + $wasImposter ? 1 : 0, + $wasImposter && $playerWon ? 1 : 0, + $wasImposter && !$playerWon ? 1 : 0, + !$wasImposter && $playerWon ? 1 : 0, + !$wasImposter && !$playerWon ? 1 : 0, + $p['userId'], + ]); + } + + return loadRoom($pdo, $code); +} + $cfg = require __DIR__ . '/config.php'; try { @@ -308,13 +445,17 @@ try { $pdo->prepare( 'UPDATE gtl_rooms SET normal_question=?, imposter_question=?, liar_keys=?, - voted_out_keys=NULL, round_outcome=NULL, updated_at=? + voted_out_keys=NULL, round_outcome=NULL, voting_open=0, + reveal_index=-1, updated_at=? WHERE code=?' )->execute([$normalQ, $imposterQ, json_encode($imposterKeys), $now, $code]); $ps = $pdo->prepare('SELECT pkey FROM gtl_players WHERE room_code=?'); $ps->execute([$code]); - $upd = $pdo->prepare('UPDATE gtl_players SET question=?, updated_at=? WHERE room_code=? AND pkey=?'); + $upd = $pdo->prepare( + 'UPDATE gtl_players SET question=?, vote_for=NULL, vote_locked=0, vote_request=0, updated_at=? + WHERE room_code=? AND pkey=?' + ); foreach (array_column($ps->fetchAll(), 'pkey') as $pk) { $q = in_array($pk, $imposterKeys, true) ? $imposterQ : $normalQ; $upd->execute([$q, $now, $code, $pk]); @@ -351,11 +492,26 @@ try { break; case 'reveal': + // Alle gleichzeitig aufdecken $body = input(); $code = slugCode((string) ($body['code'] ?? '')); - $pdo->prepare('UPDATE gtl_rooms SET revealed=1, updated_at=? WHERE code=?') + $pdo->prepare('UPDATE gtl_rooms SET revealed=1, reveal_index=9999, updated_at=? WHERE code=?') ->execute([$now, $code]); - respond(['ok' => true]); + respond(['ok' => true, 'state' => loadRoom($pdo, $code)]); + break; + + case 'reveal_next': + // Nächste Antwort einzeln aufdecken + $body = input(); + $code = slugCode((string) ($body['code'] ?? '')); + $riRow = $pdo->prepare('SELECT reveal_index FROM gtl_rooms WHERE code=?'); + $riRow->execute([$code]); + $riData = $riRow->fetch(); + if (!$riData) respond(['error' => 'Raum nicht gefunden.'], 404); + $newIdx = (int) $riData['reveal_index'] + 1; + $pdo->prepare('UPDATE gtl_rooms SET revealed=1, reveal_index=?, updated_at=? WHERE code=?') + ->execute([$newIdx, $now, $code]); + respond(['ok' => true, 'state' => loadRoom($pdo, $code)]); break; case 'open_voting': @@ -386,148 +542,80 @@ try { respond(['ok' => true]); break; - case 'vote': - $body = input(); - $code = slugCode((string) ($body['code'] ?? '')); - $pkey = (string) ($body['pkey'] ?? ''); - $voteFor = (string) ($body['voteFor'] ?? ''); + case 'request_voting': + // Demokratischer Voting-Antrag: sobald ALLE Spieler angefragt haben → auto-open + $body = input(); + $code = slugCode((string) ($body['code'] ?? '')); + $pkey = (string) ($body['pkey'] ?? ''); + $pdo->prepare('UPDATE gtl_players SET vote_request=1, updated_at=? WHERE room_code=? AND pkey=?') + ->execute([$now, $code, $pkey]); + $pdo->prepare('UPDATE gtl_rooms SET updated_at=? WHERE code=?')->execute([$now, $code]); + // Wenn alle Spieler request gesetzt haben → Voting öffnen + $pending = $pdo->prepare('SELECT COUNT(*) FROM gtl_players WHERE room_code=? AND vote_request=0'); + $pending->execute([$code]); + if ((int) $pending->fetchColumn() === 0) { + $pdo->prepare('UPDATE gtl_rooms SET voting_open=1, updated_at=? WHERE code=?') + ->execute([$now, $code]); + } + respond(['ok' => true, 'state' => loadRoom($pdo, $code)]); + break; - // Voting gesperrt prüfen - $vCheck = $pdo->prepare('SELECT voting_open FROM gtl_rooms WHERE code=?'); - $vCheck->execute([$code]); - $vRow = $vCheck->fetch(); - if (!$vRow || !$vRow['voting_open']) { + case 'lock_vote': + // Stimme final abschicken. Sperrt die Auswahl; wenn alle gesperrt → Auto-Auswertung. + $body = input(); + $code = slugCode((string) ($body['code'] ?? '')); + $pkey = (string) ($body['pkey'] ?? ''); + $votes = array_values(array_filter((array) ($body['votes'] ?? []), 'is_string')); + + $vLock = $pdo->prepare('SELECT voting_open FROM gtl_rooms WHERE code=?'); + $vLock->execute([$code]); + $vLockRow = $vLock->fetch(); + if (!$vLockRow || !$vLockRow['voting_open']) { respond(['error' => 'Das Voting ist noch nicht geöffnet.'], 403); } - - if ($voteFor !== '__nobody__' && $voteFor === $pkey) respond(['error' => 'Du kannst nicht für dich selbst stimmen.'], 400); - + // Niemand ist exklusiv; eigene pkey nicht erlaubt + if (in_array('__nobody__', $votes, true)) { + $votes = ['__nobody__']; + } else { + $votes = array_values(array_filter($votes, fn($v) => $v !== $pkey)); + } $pdo->prepare( - 'UPDATE gtl_players SET vote_for=?, updated_at=? WHERE room_code=? AND pkey=?' - )->execute([$voteFor !== '' ? $voteFor : null, $now, $code, $pkey]); + 'UPDATE gtl_players SET vote_for=?, vote_locked=1, updated_at=? WHERE room_code=? AND pkey=?' + )->execute([json_encode($votes), $now, $code, $pkey]); $pdo->prepare('UPDATE gtl_rooms SET updated_at=? WHERE code=?')->execute([$now, $code]); + + // Auto-Auswertung wenn alle Spieler abgestimmt haben + $unlocked = $pdo->prepare('SELECT COUNT(*) FROM gtl_players WHERE room_code=? AND vote_locked=0'); + $unlocked->execute([$code]); + if ((int) $unlocked->fetchColumn() === 0) { + $newState = performResolveRound($pdo, $code, $now); + respond(['ok' => true, 'autoResolved' => true, 'state' => $newState]); + } + respond(['ok' => true, 'state' => loadRoom($pdo, $code)]); + break; + + case 'update_weights': + $body = input(); + $code = slugCode((string) ($body['code'] ?? '')); + $weights = (string) ($body['weights'] ?? ''); + $decoded = json_decode($weights, true); + if (!is_array($decoded)) respond(['error' => 'Ungültiges JSON für Imposter-Gewichte.'], 400); + $pdo->prepare('UPDATE gtl_rooms SET imposter_weights=?, updated_at=? WHERE code=?') + ->execute([$weights, $now, $code]); respond(['ok' => true]); break; case 'resolve_round': + // Manueller Trigger durch Host — nutzt den gemeinsamen Helper $body = input(); $code = slugCode((string) ($body['code'] ?? '')); - $state = loadRoom($pdo, $code); - if ($state === null) respond(['error' => 'Raum nicht gefunden.'], 404); - if (!$state['revealed']) respond(['error' => 'Runde noch nicht aufgedeckt.'], 400); - - $players = $state['players']; - $liarKeys = $state['liarKeys']; - $votedOut = resolveVotes(array_values($players), $liarKeys); - - // Outcome-Logik: - // - Niemand hatte Max + kein Imposter gesetzt → innocents_win - // - Niemand hatte Max + Imposter exist. → imposters_win - // - Alle Imposters rausgewählt → innocents_win - // - Mind. 1 Imposter überlebt → imposters_win - if (empty($liarKeys)) { - // Kein Imposter gesetzt: bei voting war niemand der Böse - // Niemand gewinnt = Spiel war "clean" - $outcome = 'no_liar'; - } elseif (empty($votedOut)) { - // Niemand rausgewählt UND es gibt Imposters → Imposters gewinnen - $outcome = 'imposters_win'; - } elseif (empty(array_diff($liarKeys, $votedOut))) { - // Alle Imposters raus → Innocents gewinnen - $outcome = 'innocents_win'; - } else { - // Mind. 1 Imposter überlebt - $outcome = 'imposters_win'; + $check = loadRoom($pdo, $code); + if ($check === null) respond(['error' => 'Raum nicht gefunden.'], 404); + if (!$check['revealed'] && $check['revealIndex'] < 0) { + respond(['error' => 'Runde noch nicht aufgedeckt.'], 400); } - - $pdo->prepare( - 'UPDATE gtl_rooms SET voted_out_keys=?, round_outcome=?, updated_at=? WHERE code=?' - )->execute([json_encode($votedOut), $outcome, $now, $code]); - - // Verlauf speichern - $existing = $pdo->prepare('SELECT id FROM gtl_game_rounds WHERE room_code=? AND round_num=?'); - $existing->execute([$code, $state['roundNum']]); - $existingRow = $existing->fetch(); - - if ($existingRow) { - $roundId = (int) $existingRow['id']; - $pdo->prepare('UPDATE gtl_game_rounds SET outcome=? WHERE id=?') - ->execute([$outcome, $roundId]); - $pdo->prepare('UPDATE gtl_round_players SET voted_out=? WHERE round_id=? AND pkey=?'); - // Update voted_out for each player - $updVo = $pdo->prepare('UPDATE gtl_round_players SET voted_out=? WHERE round_id=? AND pkey=?'); - foreach ($players as $p) { - $updVo->execute([in_array($p['pkey'], $votedOut, true) ? 1 : 0, $roundId, $p['pkey']]); - } - } else { - $pdo->prepare('INSERT INTO gtl_game_rounds (room_code, round_num, played_at, outcome) VALUES (?,?,?,?)') - ->execute([$code, $state['roundNum'], $now, $outcome]); - $roundId = (int) $pdo->lastInsertId(); - - $ins = $pdo->prepare( - 'INSERT IGNORE INTO gtl_round_players - (round_id, user_id, player_name, pkey, was_imposter, voted_out, question, answer) - VALUES (?,?,?,?,?,?,?,?)' - ); - foreach ($players as $p) { - $ins->execute([ - $roundId, $p['userId'], $p['name'], $p['pkey'], - in_array($p['pkey'], $liarKeys, true) ? 1 : 0, - in_array($p['pkey'], $votedOut, true) ? 1 : 0, - $p['question'], $p['answer'], - ]); - } - } - - // Statistiken aktualisieren - $updStats = $pdo->prepare( - 'UPDATE gtl_user_stats SET - games_played = games_played + 1, - games_won = games_won + ?, - games_lost = games_lost + ?, - times_imposter = times_imposter + ?, - imposter_wins = imposter_wins + ?, - imposter_losses = imposter_losses + ?, - innocent_wins = innocent_wins + ?, - innocent_losses = innocent_losses + ? - WHERE user_id = ?' - ); - - $updScore = $pdo->prepare( - 'UPDATE gtl_players SET score=score+1, updated_at=? WHERE room_code=? AND pkey=?' - ); - - foreach ($players as $p) { - $wasImposter = in_array($p['pkey'], $liarKeys, true); - $wasVotedOut = in_array($p['pkey'], $votedOut, true); - - if ($wasImposter) { - $playerWon = !$wasVotedOut; - } else { - $playerWon = ($outcome === 'innocents_win'); - } - - // Automatische Punktevergabe - if ($playerWon) { - $updScore->execute([$now, $code, $p['pkey']]); - } - - // Profil-Statistiken (nur für eingeloggte User) - if (!$p['userId']) continue; - - $updStats->execute([ - $playerWon ? 1 : 0, - $playerWon ? 0 : 1, - $wasImposter ? 1 : 0, - $wasImposter && $playerWon ? 1 : 0, - $wasImposter && !$playerWon ? 1 : 0, - !$wasImposter && $playerWon ? 1 : 0, - !$wasImposter && !$playerWon ? 1 : 0, - $p['userId'], - ]); - } - - respond(['ok' => true, 'state' => loadRoom($pdo, $code)]); + $newState = performResolveRound($pdo, $code, $now); + respond(['ok' => true, 'state' => $newState]); break; case 'get_host_history': @@ -596,13 +684,15 @@ try { 'UPDATE gtl_rooms SET revealed=0, liar_keys=NULL, voted_out_keys=NULL, round_outcome=NULL, normal_question=NULL, imposter_question=NULL, voting_open=0, + reveal_index=-1, active_emojis=NULL, round_num=round_num+1, updated_at=? WHERE code=?' )->execute([$now, $code]); $pdo->prepare( 'UPDATE gtl_players - SET question=NULL, answer=NULL, answered=0, vote_for=NULL, updated_at=? + SET question=NULL, answer=NULL, answered=0, vote_for=NULL, + vote_locked=0, vote_request=0, updated_at=? WHERE room_code=?' )->execute([$now, $code]); diff --git a/index.html b/index.html index 0ab5a64..c8211f3 100644 --- a/index.html +++ b/index.html @@ -23,7 +23,7 @@ background:radial-gradient(1100px 600px at 50% -10%,rgba(62,204,92,.08),transparent 60%),var(--bg); color:var(--text);line-height:1.55;min-height:100vh; padding:20px 16px 48px;display:flex;justify-content:center;-webkit-font-smoothing:antialiased} - .wrap{width:100%;max-width:640px;animation:fade .5s ease} + .wrap{width:100%;max-width:960px;animation:fade .5s ease} @keyframes fade{from{opacity:0;transform:translateY(8px)}to{opacity:1;transform:none}} @keyframes pop{0%{transform:scale(.8);opacity:0}60%{transform:scale(1.12)}100%{transform:scale(1);opacity:1}} @keyframes pulse{0%,100%{opacity:1}50%{opacity:.4}} @@ -202,7 +202,95 @@ .outcome-banner.draw .title{color:var(--gold)} .outcome-banner .sub{font-size:13px;color:var(--muted)} + /* ── COMPACT GAME GRID LAYOUT ─────────────────────────── */ + .game-header{display:flex;align-items:center;gap:8px;flex-wrap:wrap;margin-bottom:12px} + .game-header .pill{white-space:nowrap} + .round-badge{background:var(--navy);color:#fff;border-radius:999px;padding:4px 12px; + font-size:12.5px;font-weight:700;letter-spacing:.3px} + + .game-grid{ + display:grid; + grid-template-columns:160px 1fr 96px; + gap:12px; + align-items:start; + width:100%; + } + .game-sidebar-left{grid-column:1;display:flex;flex-direction:column;gap:10px} + .game-main{grid-column:2;display:flex;flex-direction:column;gap:0} + .game-sidebar-right{grid-column:3;display:flex;flex-direction:column;gap:10px} + + .sidebar-card{background:linear-gradient(180deg,var(--panel),var(--bg2)); + border:1px solid var(--line);border-radius:var(--radius-sm);padding:12px} + .sidebar-title{font-size:11px;color:var(--muted);font-weight:700;text-transform:uppercase; + letter-spacing:.6px;margin-bottom:8px} + + /* Sidebar-Scoreboard: smaller rows */ + .sb-row{display:flex;align-items:center;gap:8px;padding:6px 0;border-bottom:1px solid rgba(42,53,80,.5)} + .sb-row:last-child{border-bottom:none} + .sb-row .sb-av{width:26px;height:26px;border-radius:8px;flex-shrink:0;font-size:10px; + display:flex;align-items:center;justify-content:center;font-weight:800;color:#0a2010} + .sb-row .sb-name{flex:1;font-size:12.5px;font-weight:600;overflow:hidden; + text-overflow:ellipsis;white-space:nowrap} + .sb-row .sb-score{font-size:16px;font-weight:800;color:var(--gold)} + + /* Emoji sidebar: vertical stacked buttons */ + .emoji-side-bar{display:flex;flex-direction:column;gap:6px} + .emoji-side-btn{background:var(--panel);border:1.5px solid var(--line);border-radius:10px; + font-size:22px;padding:8px 0;cursor:pointer;transition:transform .1s,border-color .15s; + line-height:1;width:100%;text-align:center} + .emoji-side-btn:hover{border-color:var(--accent);transform:scale(1.1)} + .emoji-side-btn:active{transform:scale(.9)} + + /* Multi-vote checkboxes */ + .vote-check-grid{display:flex;flex-direction:column;gap:8px;margin:8px 0} + .vote-check-item{display:flex;align-items:center;gap:10px;padding:10px 12px; + background:var(--bg);border:1.5px solid var(--line);border-radius:var(--radius-sm); + cursor:pointer;transition:border-color .15s,background .15s} + .vote-check-item:hover{border-color:var(--accent-deep)} + .vote-check-item.checked{border-color:var(--accent);background:rgba(62,204,92,.1)} + .vote-check-item.nobody{border-style:dashed} + .vote-check-item.nobody.checked{border-color:var(--red);background:rgba(232,93,92,.1)} + .vote-check-item input[type=checkbox]{accent-color:var(--accent);width:17px;height:17px;cursor:pointer;flex-shrink:0} + .vote-check-item .vc-name{flex:1;font-weight:600;font-size:14px} + .vote-lock-btn{margin-top:10px;background:linear-gradient(180deg,#5b9cf6,#3a6fd8);color:#fff} + .vote-lock-btn:disabled{opacity:.45} + .vote-locked-msg{text-align:center;font-size:13px;color:var(--muted);padding:8px;font-weight:600} + + /* Vote request pill */ + .vreq-bar{display:flex;align-items:center;gap:8px;flex-wrap:wrap;margin-top:8px} + .vreq-count{font-size:12px;color:var(--muted)} + + /* ── HOST GRID ─────────────────────────────────────────── */ + .host-grid{ + display:grid; + grid-template-columns:220px 1fr; + gap:12px; + align-items:start; + } + .host-sidebar{grid-column:1;display:flex;flex-direction:column;gap:10px} + .host-main{grid-column:2;display:flex;flex-direction:column;gap:0} + + /* Imposter weights field */ + .weights-row{display:flex;align-items:center;gap:8px;margin-top:10px} + .weights-row input{flex:1;margin-bottom:0;font-size:13px;padding:9px 11px} + .weights-row button{width:auto;padding:9px 12px;font-size:13px;box-shadow:none} + /* ── RESPONSIVE ── */ + @media(max-width:860px){ + .game-grid{grid-template-columns:140px 1fr 80px} + .host-grid{grid-template-columns:190px 1fr} + } + @media(max-width:640px){ + .game-grid{grid-template-columns:1fr} + .game-sidebar-left{grid-column:1;order:3} + .game-main{grid-column:1;order:1} + .game-sidebar-right{grid-column:1;order:2;flex-direction:row;justify-content:center} + .emoji-side-bar{flex-direction:row} + .emoji-side-btn{width:48px} + .host-grid{grid-template-columns:1fr} + .host-sidebar{grid-column:1} + .host-main{grid-column:1} + } @media(max-width:600px){ body{padding:12px 10px 48px} .card{padding:15px;border-radius:14px;margin-bottom:12px} @@ -210,7 +298,7 @@ nav{padding:10px 12px;gap:8px} .nav-links a{padding:5px 10px;font-size:12px} .nav-logo{font-size:15px} - .roomcode{font-size:clamp(26px,8vw,42px);letter-spacing:4px} + .roomcode{font-size:clamp(22px,7vw,36px);letter-spacing:3px;padding:12px} .ctrlrow{flex-wrap:wrap} .ctrlrow>button{min-width:calc(50% - 5px)} .prow{padding:10px 12px;gap:10px} @@ -223,6 +311,9 @@ .hist-prow{padding:7px 0} .imposter-list{gap:6px} button{padding:12px 14px;font-size:14px} + .sidebar-card{padding:10px} + .weights-row{flex-wrap:wrap} + .weights-row input{min-width:100%} } @media(max-width:400px){ .nav-links{gap:5px} @@ -296,149 +387,183 @@ @@ -596,27 +721,39 @@ const App = (() => { } // ── PLAYER render ───────────────────────────────────────── + let localVotes = new Set(); // client-side checkbox state (cleared on lock or new round) + function renderPlayer(state){ const me=state.players[pkey]||{}; const players=Object.values(state.players); - // Update own avatar in header + const ri=state.revealIndex??-1; // how many answers are revealed + const revealedPlayers=ri>=9999?players:players.slice(0,ri+1); + const anyRevealed=state.revealed||ri>=0; + + // Header + $('pRound').textContent=state.roundNum||1; + $('pScore').textContent=me.score||0; + $('pName').textContent=me.name||name; const avEl=$('pAvatar'); if(me.avatar){ - avEl.outerHTML=`${esc(me.name||name)}`; + avEl.outerHTML=`
${esc(me.name||name)}
`; } else { avEl.style.background=colorFor(me.name||name); avEl.textContent=initials(me.name||name); } - $('pScore').textContent=me.score||0; + $('pQuestion').textContent=me.question&&me.question.trim()?me.question:'Warten auf den Spielleiter…'; show('pAnswerArea',!me.answered); show('pSubmitted',!!me.answered); + // Sidebar scoreboard + $('pScoreboard').innerHTML=sidebarScoreboard(players,pkey); + const box=$('pAnswers'); const resolved=!!state.roundOutcome; - if(state.revealed){ - // Imposter/votedout only visible after round is resolved - box.innerHTML=players.map(p=>{ + + if(anyRevealed){ + box.innerHTML=revealedPlayers.map((p,i)=>{ const imp=resolved&&isImp(p.pkey,state); const vo=resolved&&isVotedOut(p.pkey,state); return `
@@ -626,22 +763,47 @@ const App = (() => {
${p.answer?esc(p.answer):'keine Antwort'}
`; - }).join('')||'

Keine Antworten.

'; + }).join('')+(revealedPlayers.length${players.length-revealedPlayers.length} weitere werden noch aufgedeckt…`:'')|| + '

Keine Antworten.

'; show('pVoteCard',true); - // Vote grid if(resolved){ $('pVoteGrid').innerHTML=''; } else if(!state.votingOpen){ - $('pVoteGrid').innerHTML=``; + // Democratic voting request + const myReq=me.voteRequest||false; + const reqCount=players.filter(p=>p.voteRequest).length; + $('pVoteGrid').innerHTML=myReq + ?`
✓ Voting beantragt (${reqCount}/${players.length})
` + :`
+ +
`; + } else if(me.voteLocked){ + const myVotedNames=(me.votes||[]).map(v=>v==='__nobody__'?'Niemand':(state.players[v]?.name||v)); + $('pVoteGrid').innerHTML=`
✓ Stimme abgeschickt: ${myVotedNames.join(', ')||'—'}
`; } else { + // Multi-vote checkboxes const others=players.filter(p=>p.pkey!==pkey); - $('pVoteGrid').innerHTML= - others.map(p=>``).join('')+ - ``; + $('pVoteGrid').innerHTML=` +
+ ${others.map(p=>` + `).join('')} + +
+ `; } $('pOutcomeBanner').innerHTML=outcomeHTML(state,pkey); @@ -651,14 +813,13 @@ const App = (() => { box.innerHTML=`
${waiting>0?waiting+' Spieler tippen noch…':'Alle fertig — warten auf Aufdeckung'}
`; } - $('pScoreboard').innerHTML=scoreboard(players); } - // ── HOST: Player-Liste ───────────────────────────────────── + // ── HOST: Player-Liste (Sidebar) ────────────────────────── function renderHostPlayers(players){ const wrap=$('hPlayers'); if(!players.length){ - if(wrap.dataset.empty!=='1'){wrap.innerHTML='

Noch keine Spieler.

';wrap.dataset.empty='1';} + if(wrap.dataset.empty!=='1'){wrap.innerHTML='

Noch keine Spieler.

';wrap.dataset.empty='1';} return; } wrap.dataset.empty='0'; @@ -668,16 +829,17 @@ const App = (() => { let row=wrap.querySelector(`[data-row="${p.pkey}"]`); if(!row){ row=document.createElement('div'); - row.className='abox'; row.dataset.row=p.pkey; - row.innerHTML=`
${avatar(p,'miniav')}${esc(p.name)} - -
`; + row.className='sb-row'; row.dataset.row=p.pkey; + row.innerHTML=`${avatar(p,'sb-av')} + + `; row.querySelector('[data-kick]').addEventListener('click',()=>removePlayer(p.pkey,p.name)); wrap.appendChild(row); } + row.querySelector('[data-name]').textContent=p.name; const badge=row.querySelector('[data-badge]'); const want=p.answered?'done':'wait'; - if(badge.dataset.state!==want){badge.dataset.state=want;badge.className='badge '+want;badge.textContent=p.answered?'geantwortet':'wartet';} + if(badge.dataset.state!==want){badge.dataset.state=want;badge.className='badge '+want;badge.textContent=p.answered?'✓':'…';} }); wrap.querySelectorAll('[data-row]').forEach(row=>{if(!seen.has(row.dataset.row))row.remove();}); } @@ -724,7 +886,22 @@ const App = (() => { function randomImposters(){ const players=lastState?Object.values(lastState.players):[]; if(!players.length){ err('Noch keine Spieler im Raum.'); return; } - const count=Math.floor(Math.random()*players.length)+1; + const n=players.length; + let count=1; + try{ + const weightsRaw=$('hWeights').value.trim()||lastState?.imposterWeights||'{"3-5":1,"6-9":2,"10+":3}'; + const weights=JSON.parse(weightsRaw); + for(const [range,c] of Object.entries(weights)){ + if(range.endsWith('+')){ + const min=parseInt(range); + if(n>=min) count=Number(c); + } else { + const [lo,hi]=range.split('-').map(Number); + if(n>=lo&&n<=hi){ count=Number(c); break; } + } + } + }catch(e){ /* ignore bad JSON, use default 1 */ } + count=Math.min(Math.max(1,count),Math.max(1,n-1)); selectedImposters=new Set([...players].sort(()=>Math.random()-.5).slice(0,count).map(p=>p.pkey)); renderImposterList(players); } @@ -750,93 +927,108 @@ const App = (() => { // ── HOST: Hauptrender ────────────────────────────────────── function renderHost(state){ const players=Object.values(state.players); - $('hRoundState').textContent=state.revealed?'aufgedeckt':'verdeckt'; + const ri=state.revealIndex??-1; + const anyRevealed=state.revealed||ri>=0; + $('hRound').textContent=state.roundNum||1; + $('hRoundState').textContent=anyRevealed?(ri>=9999?'aufgedeckt':`${ri+1}/${players.length} aufgedeckt`):'verdeckt'; renderHostPlayers(players); renderImposterList(players); + // Imposter weights field - populate once + if(state.imposterWeights && $('hWeights').value===''){ + $('hWeights').value=state.imposterWeights; + } + if(!questionsLoaded&&(state.normalQuestion||state.imposterQuestion)){ if($('hNormalQ').value===''&&state.normalQuestion) $('hNormalQ').value=state.normalQuestion; if($('hImposterQ').value===''&&state.imposterQuestion) $('hImposterQ').value=state.imposterQuestion; questionsLoaded=true; } - // Voting öffnen: show after reveal, voting not yet open, not yet resolved - show('hOpenVotingBtn', state.revealed && !state.votingOpen && !state.roundOutcome); - // Resolve button: only show after voting is open and not yet resolved - show('hResolveBtn', state.revealed && state.votingOpen && !state.roundOutcome); - - // Outcome - show('hOutcomeCard', !!state.roundOutcome); - if(state.roundOutcome) $('hOutcomeBanner').innerHTML=outcomeHTML(state,null); - - // Nur aktuelle Runde zeigen — mit Delete-Button const resolved=!!state.roundOutcome; - $('hAnswers').innerHTML=players.length?players.map(p=>{ + // Reveal buttons: only before reveal all + show('hRevealNextBtn', !resolved && !state.votingOpen); + show('hRevealAllBtn', !resolved && !state.votingOpen); + show('hOpenVotingBtn', anyRevealed && !state.votingOpen && !resolved); + show('hResolveBtn', anyRevealed && state.votingOpen && !resolved); + + show('hOutcomeCard', !!resolved); + if(resolved) $('hOutcomeBanner').innerHTML=outcomeHTML(state,null); + + // Answers — host always sees all, shows reveal status + $('hAnswers').innerHTML=players.length?players.map((p,i)=>{ const imp=resolved&&isImp(p.pkey,state); const vo=resolved&&isVotedOut(p.pkey,state); - return `
+ const revealed=ri>=9999||i<=ri; + return `
${avatar(p,'miniav')}${esc(p.name)} ${imp?'Imposter':''} ${vo?'Rausgewählt':''} - ${p.answered?``:''} + ${!revealed&&p.answered?'verdeckt':''} + ${revealed&&p.answered?``:''}
-
${p.answered?esc(p.answer):'noch keine Antwort'}
+
${revealed&&p.answered?esc(p.answer):p.answered?'noch verdeckt':'noch keine Antwort'}
`; }).join(''):'

Noch keine Antworten.

'; - show('hVoteCard',state.revealed&&players.length>0); - if(state.revealed&&players.length){ + // Voting tally in sidebar — use votes array + show('hVoteCard', anyRevealed && players.length>0); + if(anyRevealed && players.length){ const tally={'__nobody__':0}; - players.forEach(p=>tally[p.pkey]=0); + players.forEach(p=>{ tally[p.pkey]=0; }); players.forEach(p=>{ - const vf=p.voteFor; - if(!vf||vf==='__nobody__') tally['__nobody__']++; - else if(tally[vf]!==undefined) tally[vf]++; + const votes=p.votes||[]; + if(!votes.length){ tally['__nobody__']++; } + else if(votes.includes('__nobody__')){ tally['__nobody__']++; } + else{ votes.forEach(v=>{ if(tally[v]!==undefined) tally[v]++; }); } }); - const voters=players.filter(p=>p.voteFor).length; + const locked=players.filter(p=>p.voteLocked).length; $('hVoteTally').innerHTML= - `

${voters}/${players.length} haben getippt

`+ + `

${locked}/${players.length} abgestimmt

`+ players.map(p=>{ const imp=isImp(p.pkey,state); const vo=isVotedOut(p.pkey,state); - return `
- ${avatar(p)} - ${esc(p.name)}${imp?' Imposter':''} - ${tally[p.pkey]||0} Stimmen + return `
+ ${avatar(p,'sb-av')} + ${esc(p.name)}${imp?' 🎭':''} + ${tally[p.pkey]||0}🗳
`; }).join('')+ - `
- 🤷 - Niemand - ${tally['__nobody__']||0} Stimmen + `
+ 🤷 + Niemand + ${tally['__nobody__']||0}🗳
`; } - // History nachladen wenn Runde gewechselt hat if(state.roundNum !== lastRoundNum){ lastRoundNum = state.roundNum; loadHostHistory(state.code); } + // Sidebar scoreboard with manual +/- buttons const sorted=[...players].sort((a,b)=>(b.score||0)-(a.score||0)); $('hScoreboard').innerHTML=sorted.length?sorted.map((p,i)=>` -
- ${avatar(p)} - ${esc(p.name)} - ${p.score||0} -
- - +
+ ${avatar(p,'sb-av')} + ${esc(p.name)} + ${p.score||0} +
+ +
-
`).join(''):'

Noch keine Spieler.

'; +
`).join(''):'

—

'; } - function scoreboard(players){ + // Compact sidebar scoreboard for player view + function sidebarScoreboard(players, myPkey){ const sorted=[...players].sort((a,b)=>(b.score||0)-(a.score||0)); - if(!sorted.length) return '

Noch keine Spieler.

'; - return sorted.map((p,i)=>`
- ${avatar(p)}${esc(p.name)} - ${p.score||0}
`).join(''); + if(!sorted.length) return '

—

'; + return sorted.map((p,i)=>`
+ ${avatar(p,'sb-av')} + ${esc(p.name)} + ${p.score||0} +
`).join(''); } // ── Actions ──────────────────────────────────────────────── @@ -898,10 +1090,37 @@ const App = (() => { try{ await api('submit_answer',{code:room,pkey,answer:a}); refresh(); } catch(e){ err(e.message); } } - async function vote(pk){ - try{ await api('vote',{code:room,pkey,voteFor:pk}); refresh(); } + + // Multi-vote checkbox toggle (client-side only) + function toggleVoteCheck(cb){ + const v=cb.value; + const item=cb.closest('.vote-check-item'); + if(v==='__nobody__'){ + if(cb.checked){ localVotes=new Set(['__nobody__']); } + else{ localVotes.delete('__nobody__'); } + } else { + localVotes.delete('__nobody__'); + if(cb.checked){ localVotes.add(v); } + else{ localVotes.delete(v); } + } + // Re-render vote grid without full refresh + if(lastState) renderPlayer(lastState); + } + + async function lockVote(){ + if(localVotes.size===0){ err('Bitte mindestens eine Auswahl treffen.'); return; } + try{ + const d=await api('lock_vote',{code:room,pkey,votes:[...localVotes]}); + localVotes=new Set(); + render(d.state); + }catch(e){ err(e.message); } + } + + async function requestVoting(){ + try{ const d=await api('request_voting',{code:room,pkey}); render(d.state); } catch(e){ err(e.message); } } + async function removePlayer(pk,nm){ if(!confirm('Spieler "'+nm+'" wirklich entfernen?')) return; selectedImposters.delete(pk); @@ -913,11 +1132,22 @@ const App = (() => { catch(e){ err(e.message); } } async function reveal(){ - try{ await api('reveal',{code:room}); refresh(); } + try{ const d=await api('reveal',{code:room}); render(d.state); } + catch(e){ err(e.message); } + } + async function revealNext(){ + try{ const d=await api('reveal_next',{code:room}); render(d.state); } catch(e){ err(e.message); } } async function openVoting(){ - try{ await api('open_voting',{code:room}); refresh(); } + try{ const d=await api('open_voting',{code:room}); render(d.state); } + catch(e){ err(e.message); } + } + async function saveWeights(){ + const w=$('hWeights').value.trim(); + if(!w){ err('Gewichte darf nicht leer sein.'); return; } + try{ JSON.parse(w); }catch(e){ err('Ungültiges JSON.'); return; } + try{ await api('update_weights',{code:room,weights:w}); } catch(e){ err(e.message); } } async function resolveRound(){ @@ -932,7 +1162,7 @@ const App = (() => { try{ await api('new_round',{code:room}); selectedImposters=new Set(); questionsLoaded=false; lastJSON=''; - lastRoundNum=-1; // History-Reload erzwingen + lastRoundNum=-1; localVotes=new Set(); $('hNormalQ').value=''; $('hImposterQ').value=''; refresh(); }catch(e){ err(e.message); } @@ -989,9 +1219,11 @@ const App = (() => { initAuth().then(()=>tryRestoreSession()); return { - hostOpen, playerJoin, submitAnswer, vote, removePlayer, score, reveal, openVoting, resolveRound, - newRound, resetScores, deleteRoom, leave, logout, assignQuestions, deleteAnswer, - toggleImposter, randomImposters, clearImposters, sendEmoji + hostOpen, playerJoin, submitAnswer, removePlayer, score, + reveal, revealNext, openVoting, resolveRound, newRound, resetScores, deleteRoom, + leave, logout, assignQuestions, deleteAnswer, saveWeights, + toggleImposter, randomImposters, clearImposters, sendEmoji, + toggleVoteCheck, lockVote, requestVoting }; })(); diff --git a/migrate.php b/migrate.php index f8838e0..cd47fcc 100644 --- a/migrate.php +++ b/migrate.php @@ -6,7 +6,7 @@ */ declare(strict_types=1); -const LATEST_MIGRATION = 6; +const LATEST_MIGRATION = 7; function runMigrations(PDO $pdo, string $dbname): void { @@ -150,6 +150,19 @@ function runMigrations(PDO $pdo, string $dbname): void 'TEXT NULL DEFAULT NULL AFTER voting_open'); markMigration($pdo, 6); } + + // ── V7: Schrittweises Aufdecken, Imposter-Gewichte, Vote-Lock, Vote-Request ── + if ($current < 7) { + addColumnIfMissing($pdo, $dbname, 'gtl_rooms', 'reveal_index', + 'INT NOT NULL DEFAULT -1 AFTER active_emojis'); + addColumnIfMissing($pdo, $dbname, 'gtl_rooms', 'imposter_weights', + 'VARCHAR(500) NULL DEFAULT NULL AFTER reveal_index'); + addColumnIfMissing($pdo, $dbname, 'gtl_players', 'vote_locked', + 'TINYINT(1) NOT NULL DEFAULT 0'); + addColumnIfMissing($pdo, $dbname, 'gtl_players', 'vote_request', + 'TINYINT(1) NOT NULL DEFAULT 0'); + markMigration($pdo, 7); + } } // ── Hilfsfunktionen ──────────────────────────────────────────