feat(endgame): elimination-based game over + overlay; fix LLM chat_format and i18n draw

ai_analysis.py

@@ -42,16 +42,28 @@ def _llama_worker(result_queue, model_path, prompt, messages, max_tokens, temper
         result_queue.put({'status': 'error', 'message': f"llama-cpp import failed: {exc}"})
         return
     
-    try:
-        llama = Llama(
-            model_path=model_path,
-            n_ctx=2048,
-            n_threads=2,
-            verbose=False,
-            chat_format='qwen'
-        )
-    except Exception as exc:
-        result_queue.put({'status': 'error', 'message': f"Failed to load model: {exc}"})
+    # Try loading the model with best-suited chat template for Qwen2.5
+    n_threads = max(1, min(4, os.cpu_count() or 2))
+    last_exc = None
+    llama = None
+    for chat_fmt in ('qwen2', 'qwen', None):
+        try:
+            kwargs: Dict[str, Any] = dict(
+                model_path=model_path,
+                n_ctx=4096,
+                n_threads=n_threads,
+                verbose=False,
+            )
+            if chat_fmt is not None:
+                kwargs['chat_format'] = chat_fmt  # type: ignore[index]
+            llama = Llama(**kwargs)  # type: ignore[arg-type]
+            break
+        except Exception as exc:
+            last_exc = exc
+            llama = None
+            continue
+    if llama is None:
+        result_queue.put({'status': 'error', 'message': f"Failed to load model: {last_exc}"})
         return
     
     try:
@@ -120,7 +132,7 @@ def _llama_worker(result_queue, model_path, prompt, messages, max_tokens, temper
                     prompt or '',
                     max_tokens=max_tokens,
                     temperature=temperature,
-                    stop=["\n", "Human:", "Assistant:"]
+                    stop=["</s>", "<|endoftext|>"]
                 )
             except Exception:
                 raw_resp = None

app.py

@@ -761,6 +761,52 @@ class ConnectionManager:
                         free_pos = self.find_free_position_nearby(spawn_pos, new_unit.id)
                         new_unit.position = free_pos
                     building.production_progress = 0
+
+        # Endgame checks: elimination-first (after all destructions this tick)
+        if not self.game_state.game_over:
+            p_units = sum(1 for u in self.game_state.units.values() if u.player_id == 0)
+            e_units = sum(1 for u in self.game_state.units.values() if u.player_id == 1)
+            p_buildings = sum(1 for b in self.game_state.buildings.values() if b.player_id == 0)
+            e_buildings = sum(1 for b in self.game_state.buildings.values() if b.player_id == 1)
+
+            player_language = self.game_state.players[0].language if 0 in self.game_state.players else "en"
+
+            if p_units == 0 and p_buildings == 0 and (e_units > 0 or e_buildings > 0):
+                # Player eliminated
+                self.game_state.game_over = True
+                self.game_state.winner = "enemy"
+                winner_name = LOCALIZATION.translate(player_language, "game.winner.enemy")
+                message = LOCALIZATION.translate(player_language, "game.win.banner", winner=winner_name)
+                asyncio.create_task(self.broadcast({
+                    "type": "game_over",
+                    "winner": "enemy",
+                    "message": message
+                }))
+            elif e_units == 0 and e_buildings == 0 and (p_units > 0 or p_buildings > 0):
+                # Enemy eliminated
+                self.game_state.game_over = True
+                self.game_state.winner = "player"
+                winner_name = LOCALIZATION.translate(player_language, "game.winner.player")
+                message = LOCALIZATION.translate(player_language, "game.win.banner", winner=winner_name)
+                asyncio.create_task(self.broadcast({
+                    "type": "game_over",
+                    "winner": "player",
+                    "message": message
+                }))
+            elif p_units == 0 and p_buildings == 0 and e_units == 0 and e_buildings == 0:
+                # Total annihilation -> draw
+                self.game_state.game_over = True
+                self.game_state.winner = "draw"
+                # Localized draw banner if available
+                try:
+                    draw_msg = LOCALIZATION.translate(player_language, "game.draw.banner")
+                except Exception:
+                    draw_msg = "Draw!"
+                asyncio.create_task(self.broadcast({
+                    "type": "game_over",
+                    "winner": "draw",
+                    "message": draw_msg
+                }))
     
     def find_nearest_enemy(self, unit: Unit) -> Optional[Unit]:
         """RED ALERT: Find nearest enemy unit"""

localization.py

@@ -83,6 +83,7 @@ TRANSLATIONS: Dict[str, Dict[str, str]] = {
         "menu.actions.stop.tooltip": "Stop selected units",
         "menu.actions.attack_move": "Attack Move",
         "menu.actions.attack_move.tooltip": "Attack enemies while moving (hotkey: A)",
+    "menu.actions.restart": "Restart",
         "menu.control_groups.title": "🎮 Control Groups",
         "menu.stats.title": "📈 Game Stats",
         "menu.stats.player_units": "Player Units:",
@@ -132,6 +133,7 @@ TRANSLATIONS: Dict[str, Dict[str, str]] = {
     "hud.model.download.retry": "Retrying download…",
     "hud.model.download.done": "Model ready",
     "hud.model.download.error": "Model download failed",
+    "game.draw.banner": "Draw!",
     },
     "fr": {
         "game.window.title": "RTS Minimaliste",
@@ -201,6 +203,7 @@ TRANSLATIONS: Dict[str, Dict[str, str]] = {
         "menu.actions.stop.tooltip": "Arrêter les unités sélectionnées",
         "menu.actions.attack_move": "Attaque en mouvement",
         "menu.actions.attack_move.tooltip": "Attaquer les ennemis en se déplaçant (raccourci : A)",
+    "menu.actions.restart": "Recommencer",
         "menu.control_groups.title": "🎮 Groupes de contrôle",
         "menu.stats.title": "📈 Statistiques",
         "menu.stats.player_units": "Unités joueur :",
@@ -241,6 +244,7 @@ TRANSLATIONS: Dict[str, Dict[str, str]] = {
     "menu.sound.disable": "Désactiver le son",
     "notification.sound.enabled": "Son activé",
     "notification.sound.disabled": "Son désactivé",
+    "game.draw.banner": "Match nul !",
         "menu.camera.zoom_in": "Zoom avant",
         "menu.camera.zoom_out": "Zoom arrière",
         "menu.camera.reset": "Réinitialiser la vue",
@@ -319,6 +323,7 @@ TRANSLATIONS: Dict[str, Dict[str, str]] = {
         "menu.actions.stop.tooltip": "停止選取的單位",
         "menu.actions.attack_move": "攻擊移動",
         "menu.actions.attack_move.tooltip": "移動時攻擊敵人（快捷鍵：A）",
+    "menu.actions.restart": "重新開始",
         "menu.control_groups.title": "🎮 控制組",
         "menu.stats.title": "📈 遊戲統計",
         "menu.stats.player_units": "玩家單位：",
@@ -368,6 +373,7 @@ TRANSLATIONS: Dict[str, Dict[str, str]] = {
     "hud.model.download.retry": "重試下載…",
     "hud.model.download.done": "模型已就緒",
     "hud.model.download.error": "模型下載失敗",
+    "game.draw.banner": "平手！",
     },
 }
 

static/game.js

@@ -204,10 +204,38 @@ class GameClient {
             case 'notification':
                 this.showNotification(data.message, data.level || 'info');
                 break;
+            case 'game_over':
+                this.onGameOver(data);
+                break;
             default:
                 console.log('Unknown message type:', data.type);
         }
     }
+
+    onGameOver(payload) {
+        // Show overlay with localized message
+        const overlay = document.getElementById('game-over-overlay');
+        const msgEl = document.getElementById('game-over-message');
+        const btn = document.getElementById('game-over-restart');
+        if (overlay && msgEl && btn) {
+            // Prefer server-provided message; fallback by winner
+            let message = payload.message || '';
+            if (!message) {
+                const key = payload.winner === 'player' ? 'game.winner.player' : payload.winner === 'enemy' ? 'game.winner.enemy' : 'game.draw.banner';
+                if (payload.winner === 'draw') {
+                    message = this.translate('game.draw.banner');
+                } else {
+                    const winnerName = this.translate(key);
+                    message = this.translate('game.win.banner', { winner: winnerName });
+                }
+            }
+            msgEl.textContent = message;
+            // Localize button
+            btn.textContent = this.translate('menu.actions.restart') || 'Restart';
+            btn.onclick = () => window.location.reload();
+            overlay.classList.remove('hidden');
+        }
+    }
     
     sendCommand(command) {
         if (this.ws && this.ws.readyState === WebSocket.OPEN) {

static/index.html

@@ -235,6 +235,16 @@
                 <p>Connecting to server...</p>
             </div>
         </div>
+
+        <!-- Game Over Overlay -->
+        <div id="game-over-overlay" class="hidden">
+            <div class="game-over-content">
+                <h2 id="game-over-message">Game Over</h2>
+                <div class="game-over-actions">
+                    <button id="game-over-restart">Restart</button>
+                </div>
+            </div>
+        </div>
     </div>
 
     <script src="/static/sounds.js"></script>

static/styles.css

@@ -6,6 +6,38 @@
     margin: 6px 0 8px;
     font-size: 12px;
 }
+
+/* Game Over Overlay */
+#game-over-overlay {
+    position: fixed;
+    inset: 0;
+    background: rgba(0,0,0,0.75);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 9999;
+}
+#game-over-overlay.hidden { display: none; }
+.game-over-content {
+    background: #111;
+    color: #fff;
+    padding: 24px 28px;
+    border-radius: 8px;
+    box-shadow: 0 8px 24px rgba(0,0,0,0.4);
+    min-width: 320px;
+    text-align: center;
+}
+.game-over-content h2 { margin: 0 0 12px; font-size: 20px; }
+.game-over-actions { display: flex; gap: 12px; justify-content: center; }
+.game-over-actions button {
+    background: #2d7ef7;
+    color: #fff;
+    border: none;
+    border-radius: 6px;
+    padding: 8px 12px;
+    cursor: pointer;
+}
+.game-over-actions button:hover { background: #226ad1; }
 #production-source .label { opacity: 0.8; }
 #production-source-name { font-weight: 700; }
 #production-source-clear {