From 1f7d13e44c40c8f486db06821feceb5189e30654 Mon Sep 17 00:00:00 2001
From: Alexej Wolff <awolff@draug.me>
Date: Mon, 4 May 2026 00:59:56 +0200
Subject: [PATCH] Improve narrative rules, update temperature defaults, fix
 session character loading

---
 src/pages/CreateStoryPage.tsx | 10 +++++-----
 src/pages/GamePage.tsx        | 23 +++++++++++++++++++++--
 src/services/deepseek.ts      | 33 +++++++++++++++++++--------------
 3 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/src/pages/CreateStoryPage.tsx b/src/pages/CreateStoryPage.tsx
index bc5bd96..8f6f297 100644
--- a/src/pages/CreateStoryPage.tsx
+++ b/src/pages/CreateStoryPage.tsx
@@ -77,7 +77,7 @@ export default function CreateStoryPage() {
     plot: "",
     firstMessage: "",
     isNsfw: false,
-    temperature: 1.3, // Креативность ИИ
+    temperature: 0.9, // Креативность ИИ
     narrativeRules: "", // Правила повествования для ИИ
     // NPC персонажи мира
     characters: [{ name: "", description: "", role: "Союзник" }] as Character[],
@@ -116,7 +116,7 @@ export default function CreateStoryPage() {
           plot: story.plot || "",
           firstMessage: story.firstMessage || "",
           isNsfw: story.isNsfw || false,
-          temperature: story.temperature || 1.3,
+          temperature: story.temperature || 0.9,
           narrativeRules: story.narrativeRules || "",
           characters:
             story.characters?.length > 0
@@ -448,9 +448,9 @@ export default function CreateStoryPage() {
             </p>
             <div className="temperature-selector">
               {[
-                { value: 1.0, label: "🎯 Сосредоточенный", desc: "1.0" },
-                { value: 1.3, label: "⚖️ Сбалансированный", desc: "1.3" },
-                { value: 1.5, label: "✨ Креативный", desc: "1.5" },
+                { value: 0.9, label: "⚖️ Сбалансированный", desc: "0.9" },
+                { value: 0.95, label: "✨ Живой", desc: "0.95" },
+                { value: 1.05, label: "🎨 Креативный", desc: "1.05" },
               ].map((opt) => (
                 <button
                   key={opt.value}
diff --git a/src/pages/GamePage.tsx b/src/pages/GamePage.tsx
index 0cbc947..784818c 100644
--- a/src/pages/GamePage.tsx
+++ b/src/pages/GamePage.tsx
@@ -10,6 +10,7 @@ import {
   saveSession as apiSaveSession,
   deleteSession,
   getPlayerCharacter,
+  getPlayerCharacters,
   type SessionListItem,
 } from "../services/api";
 import {
@@ -96,6 +97,13 @@ export default function GamePage() {
         if (characterId) {
           character = await getPlayerCharacter(characterId);
           setPlayerCharacter(character);
+        } else {
+          // Если персонаж не указан в URL, загружаем первого доступного (или избранного)
+          const characters = await getPlayerCharacters();
+          if (characters.length > 0) {
+            character = characters.find(c => c.isFavorite) || characters[0];
+            setPlayerCharacter(character);
+          }
         }
 
         // Если есть сессии, загружаем последнюю (или создаём новую)
@@ -107,11 +115,21 @@ export default function GamePage() {
           console.log("[GamePage] Session data loaded:", sessionData);
           if (sessionData) {
             setSession(sessionData);
-            // Загружаем персонажа из сессии если не выбран
+            // Загружаем персонажа: приоритет URL > сессия
             if (!character && sessionData.playerId) {
               character = await getPlayerCharacter(sessionData.playerId);
               setPlayerCharacter(character);
             }
+            // Если в сессии нет playerId, но персонаж выбран в URL — обновляем сессию
+            if (!sessionData.playerId && character) {
+              const updatedSession = { ...sessionData, playerId: character.id };
+              await apiSaveSession(id, latestSession.id, updatedSession);
+              setSession(updatedSession);
+            }
+            // Если сессия пустая (нет сообщений) — запускаем историю
+            if (sessionData.messages.length === 0 && character) {
+              startStory(normalizedStory, sessionData, character, latestSession.id);
+            }
           }
         } else if (characterId) {
           // Нет сессий и выбран персонаж — создаём новую
@@ -608,7 +626,8 @@ export default function GamePage() {
     // Используем персонажа из текущей сессии или выбранного
     const characterId = playerCharacter?.id || session?.playerId;
     if (!characterId) {
-      alert("Не выбран персонаж для игры");
+      // Перенаправляем на страницу выбора персонажа
+      window.location.href = `/story/${id}`;
       return;
     }
 
diff --git a/src/services/deepseek.ts b/src/services/deepseek.ts
index 0aa3e61..d8803fc 100644
--- a/src/services/deepseek.ts
+++ b/src/services/deepseek.ts
@@ -54,6 +54,7 @@ export async function sendMessage(
       Authorization: `Bearer ${apiKey}`,
     },
     body: JSON.stringify({
+      // model: "deepseek-chat",
       model: "deepseek-chat",
       messages,
       temperature,
@@ -213,20 +214,24 @@ ${nsfwBlock}
 === NARRATIVE RULES ===
 1. Player writes their own actions and dialogue
 2. Weave player actions into the scene, describe character reactions and consequences
-3. NEVER make decisions for the player
-4. NEVER ask the player questions
-5. NEVER offer action choices
-6. NEVER assume player intentions
+3. Do not make decisions for the player — let them choose
+4. Do not ask questions like "What do you do?" or "What will you choose?"
+5. Do not offer explicit action choices
+6. Do not assume what player wants to do next
 7. No time skips without explicit indication
 8. If action not written by player — it did NOT happen
 
-=== PROTAGONIST RULES ===
-You are NOT ALLOWED to:
-— describe MC's physical actions
-— describe their internal sensations, emotions, or thoughts
-— put words or dialogue in their mouth
-Until player writes an action or dialogue,
-the hero is considered motionless, silent, and observing.
+=== PROTAGONIST HANDLING ===
+Guidelines for the main character (MC):
+— Do not describe MC's physical actions (walking, grabbing, looking) unless player wrote them
+— Do not put thoughts or internal monologue in MC's mind
+— Do not speak for MC unless player wrote dialogue
+— When player hasn't acted, describe the scene and other characters' reactions
+— You may describe what MC perceives (sights, sounds, sensations) to set atmosphere
+— End scenes with situation that invites action, not with direct questions
+
+WRONG: "Ты протягиваешь руку и берёшь кристалл. Что ты делаешь?"
+RIGHT: "Кристалл лежит на земле, мерцая голубым светом. Где-то вдали слышен стук копыт."
 
 === REACTIONS TO MC's DIALOGUE ===
 Characters MUST explicitly react to MC's words:
@@ -341,8 +346,8 @@ export async function generateStoryResponse(
     { role: "user", content: userMessage },
   ];
 
-  // Use temperature from story settings (default 1.3)
-  return sendMessage(messages, story.temperature || 1.3);
+  // Use temperature from story settings (default 0.9 for balanced creative writing)
+  return sendMessage(messages, story.temperature || 0.9);
 }
 
 /**
@@ -372,7 +377,7 @@ export async function generateStoryResponseStream(
     { role: "user", content: userMessage },
   ];
 
-  return sendMessageStream(messages, story.temperature || 1.3, onChunk, signal);
+  return sendMessageStream(messages, story.temperature || 0.9, onChunk, signal);
 }
 
 /**