From 989f70460543de6184c4281552525a7a7e95f2a9 Mon Sep 17 00:00:00 2001
From: maver <kentucky@posteo.de>
Date: Sat, 3 Jun 2023 22:15:41 +0200
Subject: [PATCH] Improve strength of main and impersonation prompt

---
 public/scripts/PromptManager.js | 14 +++++++-------
 public/scripts/openai.js        |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/scripts/PromptManager.js b/public/scripts/PromptManager.js
index a38ff9112..a941e0aff 100644
--- a/public/scripts/PromptManager.js
+++ b/public/scripts/PromptManager.js
@@ -778,7 +778,7 @@ const openAiDefaultPrompts = {
         },
         {
             "identifier": "characterInfo",
-            "name": "Character",
+            "name": "Character Description",
             "system_prompt": true,
             "marker": true,
             "calculated_tokens": 0,
@@ -859,15 +859,11 @@ const openAiDefaultPromptList = [
         "enabled": true
     },
     {
-        "identifier": "nsfw",
+        "identifier": "enhanceDefinitions",
         "enabled": false
     },
     {
-        "identifier": "main",
-        "enabled": true
-    },
-    {
-        "identifier": "enhanceDefinitions",
+        "identifier": "nsfw",
         "enabled": false
     },
     {
@@ -890,6 +886,10 @@ const openAiDefaultPromptList = [
         "identifier": "chatHistory",
         "enabled": true
     },
+    {
+        "identifier": "main",
+        "enabled": true
+    },
     {
         "identifier": "jailbreak",
         "enabled": false
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index c9122477b..adf9d8d67 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -401,9 +401,6 @@ async function prepareOpenAIMessages({ systemPrompt, name2, storyString, worldIn
     // Handle bias settings
     if (bias && bias.trim().length) chatCompletion.add(biasMessage);
 
-    // Handle impersonation
-    if (type === "impersonate") chatCompletion.replace('main', substituteParams(oai_settings.impersonation_prompt));
-
     // Handle chat examples
     // ToDo: Update dialogueExamples prompt with only the token count that's actually sent.
     const exampleMessages = prepareExampleMessages(openai_msgs ,openai_msgs_example, power_user.pin_examples);
@@ -415,6 +412,9 @@ async function prepareOpenAIMessages({ systemPrompt, name2, storyString, worldIn
         chatCompletion.insertAfter('main', quietPromptMessage)
     }
 
+    // Handle impersonation
+    if (type === "impersonate") chatCompletion.replace('main', chatCompletion.makeSystemMessage(substituteParams(oai_settings.impersonation_prompt)));
+
     promptManager.updatePrompts(chatCompletion.getPromptsWithTokenCount());
 
     // Save settings with updated token calculation and return context