diff --git a/public/script.js b/public/script.js index 2a06a29bd..d8b77de81 100644 --- a/public/script.js +++ b/public/script.js @@ -1458,21 +1458,8 @@ async function Generate(type, automatic_trigger, force_name2) { storyString += appendToStoryString(charPersonality, power_user.disable_personality_formatting ? '' : 'Personality: '); storyString += appendToStoryString(Scenario, power_user.disable_scenario_formatting ? '' : 'Scenario: '); } else { - if (charDescription !== undefined) { - if (charPersonality.length > 0 && !power_user.disable_personality_formatting) { - charPersonality = name2 + "'s personality: " + charPersonality; - } - } - storyString += appendToStoryString(charDescription, ''); - - if (storyString.endsWith('\n')) { - storyString = storyString.slice(0, -1); - } - - if (count_view_mes < topAnchorDepth) { - storyString += '\n' + appendToStoryString(charPersonality, ''); - } + storyString += appendToStoryString(charPersonality, power_user.disable_personality_formatting ? '' : name2 + "'s personality: "); } if (power_user.custom_chat_separator && power_user.custom_chat_separator.length) { @@ -1484,9 +1471,6 @@ async function Generate(type, automatic_trigger, force_name2) { if (power_user.pin_examples && main_api !== 'openai') { for (let example of mesExamplesArray) { if (!is_pygmalion) { - if (!storyString.endsWith('\n')) { - storyString += '\n'; - } const replaceString = power_user.disable_examples_formatting ? '' : `This is how ${name2} should talk`; example = example.replace(//i, replaceString); } @@ -1645,9 +1629,6 @@ async function Generate(type, automatic_trigger, force_name2) { } } if (!is_pygmalion && Scenario && Scenario.length > 0) { - if (!storyString.endsWith('\n')) { - storyString += '\n'; - } storyString += !power_user.disable_scenario_formatting ? `Circumstances and context of the dialogue: ${Scenario}\n` : `${Scenario}\n`; } console.log('calling runGenerate');