update

client/src/layouts/utils.js

@@ -1,7 +1,7 @@
 import { LAYOUTS, getNextLayoutType } from "./config";
 
-// Map to store layout types for each page
-const pageLayoutMap = new Map();
+// Map to store layout types for each segment
+const segmentLayoutMap = new Map();
 
 // Function to group segments into layouts
 export function groupSegmentsIntoLayouts(segments) {
@@ -9,7 +9,7 @@ export function groupSegmentsIntoLayouts(segments) {
 
   const layouts = [];
 
-  segments.forEach((segment) => {
+  segments.forEach((segment, index) => {
     const imageCount = segment.images?.length || 0;
 
     // Si c'est le premier segment ou le dernier (mort/victoire), créer un layout COVER
@@ -18,8 +18,12 @@ export function groupSegmentsIntoLayouts(segments) {
       return;
     }
 
-    // Pour tous les autres segments, créer un layout adapté au nombre d'images
-    const layoutType = getNextLayoutType(layouts.length, imageCount);
+    // Pour tous les autres segments, utiliser le layout existant ou en créer un nouveau
+    let layoutType = segmentLayoutMap.get(segment.text);
+    if (!layoutType) {
+      layoutType = getNextLayoutType(layouts.length, imageCount);
+      segmentLayoutMap.set(segment.text, layoutType);
+    }
     layouts.push({ type: layoutType, segments: [segment] });
   });
 
@@ -40,18 +44,19 @@ export function getNextPanelDimensions(segments) {
     return LAYOUTS.COVER.panels[0];
   }
 
-  // Pour les segments du milieu, déterminer le layout en fonction du nombre d'images
+  // Pour les segments du milieu, utiliser le layout existant ou en créer un nouveau
   const lastSegment = nonChoiceSegments[nonChoiceSegments.length - 1];
   const imageCount = lastSegment.images?.length || 0;
-  const layoutType = getNextLayoutType(
-    nonChoiceSegments.length - 1,
-    imageCount
-  );
+  let layoutType = segmentLayoutMap.get(lastSegment.text);
+  if (!layoutType) {
+    layoutType = getNextLayoutType(nonChoiceSegments.length - 1, imageCount);
+    segmentLayoutMap.set(lastSegment.text, layoutType);
+  }
 
   return LAYOUTS[layoutType].panels[0];
 }
 
 // Function to reset layout map (call this when starting a new story)
 export function resetLayoutMap() {
-  pageLayoutMap.clear();
+  segmentLayoutMap.clear();
 }

client/src/pages/Game.jsx

@@ -149,13 +149,14 @@ export function Game() {
       }
     } catch (error) {
       console.error("Error in handleStoryAction:", error);
+      const errorMessage =
+        error.response?.data?.detail ||
+        error.message ||
+        "Le conteur d'histoires est temporairement indisponible. Veuillez réessayer dans quelques instants...";
+
       const errorSegment = {
-        text:
-          error.message ||
-          "Le conteur d'histoires est temporairement indisponible. Veuillez réessayer dans quelques instants...",
-        rawText:
-          error.message ||
-          "Le conteur d'histoires est temporairement indisponible. Veuillez réessayer dans quelques instants...",
+        text: errorMessage,
+        rawText: errorMessage,
         isChoice: false,
         isDeath: false,
         isVictory: false,
@@ -164,16 +165,18 @@ export function Game() {
             ? storySegments[storySegments.length - 1].radiationLevel
             : 0,
         images: [],
+        isLoading: false,
       };
 
       if (action === "restart") {
         setStorySegments([errorSegment]);
       } else {
-        setStorySegments((prev) => [...prev, errorSegment]);
+        // En cas d'erreur sur un choix, on garde le segment précédent
+        setStorySegments((prev) => [...prev.slice(0, -1), errorSegment]);
       }
 
       // Set retry choice
-      setCurrentChoices([{ id: 1, text: "Réessayer" }]);
+      setCurrentChoices([{ id: "retry", text: "Réessayer" }]);
 
       // Play error message
       await playNarration(errorSegment.rawText);

server/api/models.py

@@ -3,11 +3,11 @@ from typing import List, Optional
 
 class Choice(BaseModel):
     id: int
-    text: str = Field(description="The text of the choice with proper nouns in bold using ** markdown. No more than 6 words.")
+    text: str = Field(description="The text of the choice. No more than 6 words.")
 
 # New response models for story generation steps
 class StoryTextResponse(BaseModel):
-    story_text: str = Field(description="The story text with proper nouns in bold using ** markdown. No more than 15 words.")
+    story_text: str = Field(description="The story text. No more than 15 words.")
 
 class StoryPromptsResponse(BaseModel):
     image_prompts: List[str] = Field(description="List of 2 to 4 comic panel descriptions that illustrate the key moments of the scene. Use the word 'Sarah' only when referring to her.", min_items=1, max_items=4)
@@ -18,11 +18,11 @@ class StoryMetadataResponse(BaseModel):
     radiation_increase: int = Field(description="How much radiation this segment adds (0-3)", ge=0, le=3, default=1)
     is_last_step: bool = Field(description="Whether this is the last step (victory or death)", default=False)
     time: str = Field(description="Current in-game time in 24h format (HH:MM). Time passes realistically based on actions.")
-    location: str = Field(description="Current location, using bold for proper nouns (e.g., 'Inside **Vault 15**', 'Streets of **New Haven**').")
+    location: str = Field(description="Current location.")
 
 # Complete story response combining all parts
 class StoryResponse(BaseModel):
-    story_text: str = Field(description="The story text with proper nouns in bold using ** markdown. No more than 15 words.")
+    story_text: str = Field(description="The story text. No more than 15 words.")
     choices: List[Choice]
     radiation_level: int = Field(description="Current radiation level from 0 to 10")
     is_victory: bool = Field(description="Whether this segment ends in Sarah's victory", default=False)

server/core/game_logic.py

@@ -15,7 +15,7 @@ from core.story_generators import TextGenerator, ImagePromptsGenerator, Metadata
 # Game constants
 MAX_RADIATION = 10
 STARTING_TIME = "18:00"  # Game starts at sunset
-STARTING_LOCATION = "Outskirts of **New Haven**"
+STARTING_LOCATION = "Outskirts of New Haven"
 
 def enrich_prompt_with_sarah_description(prompt: str) -> str:
     """Add Sarah's visual description to prompts that mention her."""
@@ -56,14 +56,14 @@ class GameState:
 
 # Story output structure
 class StoryLLMResponse(BaseModel):
-    story_text: str = Field(description="The next segment of the story. No more than 12 words THIS IS MANDATORY. Use bold formatting (like **this**) ONLY for proper nouns (like **Sarah**, **hospital**) and important locations.")
+    story_text: str = Field(description="The next segment of the story. No more than 12 words THIS IS MANDATORY. Use bold formatting (like this) ONLY for proper nouns (like Sarah, hospital) and important locations.")
     choices: List[str] = Field(description="Exactly two possible choices for the player", min_items=2, max_items=2)
     is_victory: bool = Field(description="Whether this segment ends in Sarah's victory", default=False)
     radiation_increase: int = Field(description="How much radiation this segment adds (0-3)", ge=0, le=3, default=1)
     image_prompts: List[str] = Field(description="List of 1 to 4 comic panel descriptions that illustrate the key moments of the scene", min_items=1, max_items=4)
     is_last_step: bool = Field(description="Whether this is the last step (victory or death)", default=False)
     time: str = Field(description="Current in-game time in 24h format (HH:MM). Time passes realistically based on actions.", default=STARTING_TIME)
-    location: str = Field(description="Current location, using bold for proper nouns (e.g., 'Inside **Vault 15**', 'Streets of **New Haven**').", default=STARTING_LOCATION)
+    location: str = Field(description="Current location, using bold for proper nouns (e.g., 'Inside Vault 15', 'Streets of New Haven').", default=STARTING_LOCATION)
 
 # Story generator
 class StoryGenerator:

server/core/prompts/system.py

@@ -12,6 +12,7 @@ FORMATTING_RULES ( MANDATORY )
 - Never use TIME: 18:30 or other time-related information
 - Never use LOCATION: the city or other location-related information
 - Never use RADIATION: 10* or other radiation-related information
+- NEVER USE BOLD FOR ANYTHING 
 """
 
 STORY_RULES = """

server/core/prompts/text_prompts.py

@@ -19,12 +19,12 @@ Be consistent with the story's tone and previous context.
 
 You must return a JSON object with the following format:
 {{{{
-    "choices": ["Go to the **hospital**", "Get back to the **warehouse**"],
+    "choices": ["Go to the hospital", "Get back to the warehouse"],
     "is_victory": false,
     "radiation_increase": 1,
     "is_last_step": false,
     "time": "HH:MM",
-    "location": "Location name with **proper nouns** in bold"
+    "location": "Location name with proper nouns in bold"
 }}}}
 """