fix: game logic and ai comments

ai_service.py → backend/ai_service.py

@@ -5,7 +5,7 @@ Only active when USE_OPENAI environment variable is set to true.
 
 from typing import Optional
 from openai import OpenAI
-from config import settings
+from backend.config import settings
 import asyncio
 
 

backend/game_engine.py

@@ -214,7 +214,7 @@ class GameEngine:
         ai_comment: Optional[str] = None
     ):
         """Add a turn record to the game history."""
-        from models import Turn
+        from backend.models import Turn
 
         player = next((p for p in game.players if p.id == player_id), None)
         if not player:
@@ -250,13 +250,14 @@ class GameEngine:
 
     @staticmethod
     def roll_dice() -> int:
-        """Roll two dice and return the sum (2-12)."""
-        return random.randint(1, 6) + random.randint(1, 6)
+        """Roll a single die (1-6)."""
+        return random.randint(1, 6)
 
     @staticmethod
     def move_player(game: Game, player_id: str, dice_roll: int) -> Tuple[bool, str, int]:
         """
-        Move a player on the board based on dice roll.
+        Move a player to a room based on dice roll.
+        Dice value maps directly to room index (1→room 0, 2→room 1, etc.)
         Returns (success, message, new_room_index).
         """
         player = next((p for p in game.players if p.id == player_id), None)
@@ -267,14 +268,14 @@ class GameEngine:
         if num_rooms == 0:
             return False, "Pas de pièces disponibles", -1
 
-        # Calculate new position (circular movement)
-        new_room_index = (player.current_room_index + dice_roll) % num_rooms
-        old_room = game.rooms[player.current_room_index]
+        # Map dice roll to room (1-6 maps to rooms, if more rooms, use modulo)
+        new_room_index = (dice_roll - 1) % num_rooms
+        old_room = game.rooms[player.current_room_index] if player.current_room_index < num_rooms else "???"
         new_room = game.rooms[new_room_index]
 
         player.current_room_index = new_room_index
 
-        message = f"🎲 Dés: {dice_roll} | {old_room} → {new_room}"
+        message = f"🎲 Dé: {dice_roll} → {new_room}"
         return True, message, new_room_index
 
     @staticmethod

backend/main.py

@@ -69,7 +69,7 @@ async def quick_create_game(req: QuickCreateRequest):
             rooms=config["rooms"],
             custom_weapons=config["weapons"],
             custom_suspects=config["suspects"],
-            use_ai=False,
+            use_ai=True,  # Enable AI by default
             board_layout=board_layout
         )
 
@@ -128,9 +128,24 @@ async def start_game(game_id: str):
         raise HTTPException(status_code=400, detail="Cannot start game (need min 3 players)")
 
     game = game_manager.get_game(game_id.upper())
+
+    # Generate AI scenario if enabled
+    if game and game.use_ai and not game.scenario:
+        try:
+            from backend.ai_service import ai_service
+            game.scenario = await ai_service.generate_scenario(
+                game.rooms,
+                [c.name for c in game.characters],
+                game.narrative_tone
+            )
+            game_manager.save_games()
+        except Exception as e:
+            print(f"AI scenario generation failed: {e}")
+
     return {
         "status": "started",
-        "first_player": game.get_current_player().name if game else None
+        "first_player": game.get_current_player().name if game else None,
+        "scenario": game.scenario if game else None
     }
 
 
@@ -155,6 +170,7 @@ async def get_game_state(game_id: str, player_id: str):
         "game_name": game.name,
         "status": game.status.value,
         "scenario": game.scenario,
+        "use_ai": game.use_ai,
         "rooms": game.rooms,
         "suspects": [c.name for c in game.characters],
         "weapons": [w.name for w in game.weapons],
@@ -183,7 +199,7 @@ async def get_game_state(game_id: str, player_id: str):
                 "details": t.details,
                 "ai_comment": t.ai_comment
             }
-            for t in game.turns[-5:]
+            for t in game.turns[-10:]  # Show more history
         ],
         "winner": game.winner
     }
@@ -204,6 +220,11 @@ async def roll_dice(game_id: str, req: DiceRollRequest):
     if not GameEngine.can_player_act(game, req.player_id):
         raise HTTPException(status_code=400, detail="Not your turn")
 
+    # Check if player already rolled
+    player = next((p for p in game.players if p.id == req.player_id), None)
+    if player and player.has_rolled:
+        raise HTTPException(status_code=400, detail="Vous avez déjà lancé les dés ce tour")
+
     # Roll dice
     dice = GameEngine.roll_dice()
 
@@ -213,8 +234,32 @@ async def roll_dice(game_id: str, req: DiceRollRequest):
     if not success:
         raise HTTPException(status_code=400, detail=msg)
 
-    # Record turn
-    GameEngine.add_turn_record(game, req.player_id, "move", msg)
+    # Get player name
+    player = next((p for p in game.players if p.id == req.player_id), None)
+    player_name = player.name if player else "Inconnu"
+
+    # Generate AI comment if enabled
+    ai_comment = None
+    if game.use_ai:
+        try:
+            from backend.ai_service import ai_service
+            # Simple comment about movement
+            prompts = [
+                f"{player_name} se dirige vers {game.rooms[new_pos]}... Intéressant choix.",
+                f"Ah, {game.rooms[new_pos]}. {player_name} pense y trouver quelque chose ?",
+                f"{player_name} va fouiner dans {game.rooms[new_pos]}. Bonne chance avec ça."
+            ]
+            import random
+            ai_comment = random.choice(prompts)
+        except Exception as e:
+            print(f"AI comment generation failed: {e}")
+
+    # Mark player as having rolled
+    if player:
+        player.has_rolled = True
+
+    # Record turn with AI comment
+    GameEngine.add_turn_record(game, req.player_id, "move", msg, ai_comment=ai_comment)
     game_manager.save_games()
 
     return {
@@ -261,7 +306,7 @@ async def make_suggestion(game_id: str, req: SuggestionRequest):
     ai_comment = None
     if game.use_ai:
         try:
-            from ai_service import ai_service
+            from backend.ai_service import ai_service
             import asyncio
             ai_comment = await ai_service.generate_suggestion_comment(
                 player_name,
@@ -278,7 +323,10 @@ async def make_suggestion(game_id: str, req: SuggestionRequest):
         "suggestion": f"{req.suspect} + {req.weapon} + {req.room}",
         "was_disproven": can_disprove,
         "disprover": disprover if can_disprove else None,
-        "card_shown": card.name if card else None
+        "card_shown": {
+            "name": card.name,
+            "type": card.card_type.value
+        } if card else None
     }
 
     # Record turn with AI comment
@@ -327,7 +375,7 @@ async def make_accusation(game_id: str, req: AccusationRequest):
     ai_comment = None
     if game.use_ai:
         try:
-            from ai_service import ai_service
+            from backend.ai_service import ai_service
             ai_comment = await ai_service.generate_accusation_comment(
                 player_name,
                 req.suspect,

backend/models.py

@@ -39,6 +39,7 @@ class Player(BaseModel):
     cards: List[Card] = Field(default_factory=list)
     is_active: bool = True
     current_room_index: int = 0  # Position on the board
+    has_rolled: bool = False  # Track if player rolled dice this turn
 
 
 class GameStatus(str, Enum):
@@ -155,6 +156,10 @@ class Game(BaseModel):
         if not self.players:
             return
 
+        # Reset has_rolled for current player
+        if self.current_player_index < len(self.players):
+            self.players[self.current_player_index].has_rolled = False
+
         # Skip eliminated players
         attempts = 0
         while attempts < len(self.players):

backend/requirements.txt

@@ -2,3 +2,4 @@ fastapi==0.104.1
 uvicorn[standard]==0.24.0
 pydantic==2.5.0
 python-multipart==0.0.6
+openai==1.3.0

frontend/src/pages/Game.jsx

@@ -15,6 +15,7 @@ function Game() {
   const [selectedSuspect, setSelectedSuspect] = useState('')
   const [selectedWeapon, setSelectedWeapon] = useState('')
   const [selectedRoom, setSelectedRoom] = useState('')
+  const [revealedCard, setRevealedCard] = useState(null)
 
   useEffect(() => {
     loadGameState()
@@ -63,7 +64,19 @@ function Game() {
     }
     setActionLoading(true)
     try {
-      await makeSuggestion(gameId, playerId, selectedSuspect, selectedWeapon, selectedRoom)
+      const result = await makeSuggestion(gameId, playerId, selectedSuspect, selectedWeapon, selectedRoom)
+
+      // Show revealed card if any
+      if (result.data.card_shown) {
+        setRevealedCard({
+          ...result.data.card_shown,
+          disprover: result.data.disprover
+        })
+        setTimeout(() => setRevealedCard(null), 5000) // Hide after 5 seconds
+      } else {
+        alert('Personne ne peut réfuter votre suggestion !')
+      }
+
       await loadGameState()
       setSelectedSuspect('')
       setSelectedWeapon('')
@@ -117,8 +130,9 @@ function Game() {
   }
 
   const me = gameState.players.find(p => p.is_me)
-  const isMyTurn = gameState.current_turn?.is_my_turn
+  const isMyTurn = gameState.current_turn?.is_my_turn && me?.is_active
   const canStart = gameState.status === 'waiting' && gameState.players.length >= 3
+  const isEliminated = me && !me.is_active
 
   return (
     <div className="min-h-screen bg-haunted-gradient p-4 relative overflow-hidden">
@@ -155,6 +169,14 @@ function Game() {
           )}
         </div>
 
+        {/* Scenario */}
+        {gameState.scenario && gameState.status === 'in_progress' && (
+          <div className="bg-black/60 backdrop-blur-md p-6 rounded-lg border-2 border-haunted-purple/30">
+            <h2 className="text-xl font-bold text-haunted-purple mb-3 animate-flicker">📜 Le Mystère</h2>
+            <p className="text-haunted-fog italic">{gameState.scenario}</p>
+          </div>
+        )}
+
         <div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
           {/* Game Board */}
           <div className="lg:col-span-2">
@@ -198,14 +220,39 @@ function Game() {
           />
         )}
 
+        {/* Revealed Card Modal */}
+        {revealedCard && (
+          <div className="fixed inset-0 bg-black/70 backdrop-blur-sm flex items-center justify-center z-50 animate-fade-in">
+            <div className="bg-black/90 border-4 border-haunted-blood p-8 rounded-lg shadow-2xl max-w-md">
+              <h3 className="text-2xl font-bold text-haunted-blood mb-4 animate-flicker">🃏 Carte Révélée</h3>
+              <p className="text-haunted-fog mb-2">
+                <span className="font-semibold">{revealedCard.disprover}</span> vous montre :
+              </p>
+              <div className="bg-haunted-blood/20 border-2 border-haunted-blood p-4 rounded-lg">
+                <p className="text-2xl font-bold text-haunted-fog text-center">
+                  {revealedCard.type === 'character' && '👤 '}
+                  {revealedCard.type === 'weapon' && '🔪 '}
+                  {revealedCard.type === 'room' && '🏚️ '}
+                  {revealedCard.name}
+                </p>
+              </div>
+              <p className="text-haunted-fog/60 text-sm mt-4 text-center italic">
+                Cette carte disparaîtra dans quelques secondes...
+              </p>
+            </div>
+          </div>
+        )}
+
         {/* Actions */}
         {gameState.status === 'in_progress' && (
           <div className="bg-black/60 backdrop-blur-md p-6 rounded-lg border-2 border-haunted-blood/30">
             <h2 className="text-2xl font-bold text-haunted-blood mb-4 animate-flicker">
-              {isMyTurn ? '⚡ À vous de jouer !' : '⏳ ' + gameState.current_turn?.player_name + ' enquête...'}
+              {isEliminated ? '💀 Vous êtes éliminé - Vous pouvez toujours observer' :
+               isMyTurn ? '⚡ À vous de jouer !' :
+               '⏳ ' + gameState.current_turn?.player_name + ' enquête...'}
             </h2>
 
-            {isMyTurn && (
+            {isMyTurn && !isEliminated && (
               <div className="space-y-4">
                 <div className="flex gap-4 mb-4">
                   <button