Revert "Revert "internalization weatherEffects.js""

Revert "internalization weatherEffects.js"

README.md

@@ -7,13 +7,11 @@ An immersive RPG extension for browsers that tracks character stats, scene infor
 
 ## 🆕 What's New
 
-### v3.7.0
+### v3.6.1
  
-- Added omniscience filter.
-- Added opacity to the color selector.
-- Overwritten SillyTavern's dumb-ahh trim logic when joining prompts.
-- Fixed custom attributes not allowing value increase/decrease.
-- Various bug fixes.
+- Fixed the bugs in the encounter system where you couldn't use the buttons after performing any custom action.
+- Improved combat actions and made them dynamic, depending on the current situation.
+- Added Russian as a supported language.
 
 **Special thanks to all the other contributors for this project:**
 Paperboygold, Munimunigamer, Subarashimo, Lilminzyu, Claude, IDeathByte, Chungchandev, Joenunezb, Amauragis, and Tomt610.

index.js

@@ -384,11 +384,6 @@ async function initUI() {
         saveSettings();
     });
 
-    $('#rpg-toggle-omniscience').on('change', function() {
-        extensionSettings.enableOmniscienceFilter = $(this).prop('checked');
-        saveSettings();
-    });
-
     $('#rpg-toggle-cyoa').on('change', function() {
         extensionSettings.enableCYOA = $(this).prop('checked');
         saveSettings();
@@ -577,12 +572,6 @@ async function initUI() {
         updateFeatureTogglesVisibility();
     });
 
-    $('#rpg-toggle-show-omniscience-toggle').on('change', function() {
-        extensionSettings.showOmniscienceToggle = $(this).prop('checked');
-        saveSettings();
-        updateFeatureTogglesVisibility();
-    });
-
     $('#rpg-toggle-show-cyoa-toggle').on('change', function() {
         extensionSettings.showCYOAToggle = $(this).prop('checked');
         saveSettings();
@@ -816,30 +805,12 @@ async function initUI() {
         renderUserStats(); // Re-render with new colors
     });
 
-    $('#rpg-stat-bar-color-low-opacity').on('input', function() {
-        const opacity = Number($(this).val());
-        extensionSettings.statBarColorLowOpacity = opacity;
-        $('#rpg-stat-bar-color-low-opacity-value').text(opacity + '%');
-        renderUserStats();
-    }).on('change', function() {
-        saveSettings();
-    });
-
     $('#rpg-stat-bar-color-high').on('change', function() {
         extensionSettings.statBarColorHigh = String($(this).val());
         saveSettings();
         renderUserStats(); // Re-render with new colors
     });
 
-    $('#rpg-stat-bar-color-high-opacity').on('input', function() {
-        const opacity = Number($(this).val());
-        extensionSettings.statBarColorHighOpacity = opacity;
-        $('#rpg-stat-bar-color-high-opacity-value').text(opacity + '%');
-        renderUserStats();
-    }).on('change', function() {
-        saveSettings();
-    });
-
     // Theme selection
     $('#rpg-theme-select').on('change', function() {
         extensionSettings.theme = String($(this).val());
@@ -861,19 +832,6 @@ async function initUI() {
         }
     });
 
-    $('#rpg-custom-bg-opacity').on('input', function() {
-        const opacity = Number($(this).val());
-        extensionSettings.customColors.bgOpacity = opacity;
-        $('#rpg-custom-bg-opacity-value').text(opacity + '%');
-        if (extensionSettings.theme === 'custom') {
-            applyCustomTheme();
-            updateSettingsPopupTheme(getSettingsModal());
-            updateChatThoughts();
-        }
-    }).on('change', function() {
-        saveSettings();
-    });
-
     $('#rpg-custom-accent').on('change', function() {
         extensionSettings.customColors.accent = String($(this).val());
         saveSettings();
@@ -884,19 +842,6 @@ async function initUI() {
         }
     });
 
-    $('#rpg-custom-accent-opacity').on('input', function() {
-        const opacity = Number($(this).val());
-        extensionSettings.customColors.accentOpacity = opacity;
-        $('#rpg-custom-accent-opacity-value').text(opacity + '%');
-        if (extensionSettings.theme === 'custom') {
-            applyCustomTheme();
-            updateSettingsPopupTheme(getSettingsModal());
-            updateChatThoughts();
-        }
-    }).on('change', function() {
-        saveSettings();
-    });
-
     $('#rpg-custom-text').on('change', function() {
         extensionSettings.customColors.text = String($(this).val());
         saveSettings();
@@ -907,19 +852,6 @@ async function initUI() {
         }
     });
 
-    $('#rpg-custom-text-opacity').on('input', function() {
-        const opacity = Number($(this).val());
-        extensionSettings.customColors.textOpacity = opacity;
-        $('#rpg-custom-text-opacity-value').text(opacity + '%');
-        if (extensionSettings.theme === 'custom') {
-            applyCustomTheme();
-            updateSettingsPopupTheme(getSettingsModal());
-            updateChatThoughts();
-        }
-    }).on('change', function() {
-        saveSettings();
-    });
-
     $('#rpg-custom-highlight').on('change', function() {
         extensionSettings.customColors.highlight = String($(this).val());
         saveSettings();
@@ -930,19 +862,6 @@ async function initUI() {
         }
     });
 
-    $('#rpg-custom-highlight-opacity').on('input', function() {
-        const opacity = Number($(this).val());
-        extensionSettings.customColors.highlightOpacity = opacity;
-        $('#rpg-custom-highlight-opacity-value').text(opacity + '%');
-        if (extensionSettings.theme === 'custom') {
-            applyCustomTheme();
-            updateSettingsPopupTheme(getSettingsModal());
-            updateChatThoughts();
-        }
-    }).on('change', function() {
-        saveSettings();
-    });
-
     // External API settings event handlers
     $('#rpg-external-base-url').on('change', function() {
         if (!extensionSettings.externalApiSettings) {
@@ -1050,7 +969,6 @@ async function initUI() {
     $('#rpg-toggle-html-prompt').prop('checked', extensionSettings.enableHtmlPrompt);
     $('#rpg-toggle-dialogue-coloring').prop('checked', extensionSettings.enableDialogueColoring);
     $('#rpg-toggle-deception').prop('checked', extensionSettings.enableDeceptionSystem ?? false);
-    $('#rpg-toggle-omniscience').prop('checked', extensionSettings.enableOmniscienceFilter ?? false);
     $('#rpg-toggle-cyoa').prop('checked', extensionSettings.enableCYOA ?? false);
     $('#rpg-toggle-spotify-music').prop('checked', extensionSettings.enableSpotifyMusic);
 
@@ -1061,7 +979,6 @@ async function initUI() {
     $('#rpg-toggle-show-html-toggle').prop('checked', extensionSettings.showHtmlToggle ?? true);
     $('#rpg-toggle-show-dialogue-coloring-toggle').prop('checked', extensionSettings.showDialogueColoringToggle ?? true);
     $('#rpg-toggle-show-deception-toggle').prop('checked', extensionSettings.showDeceptionToggle ?? true);
-    $('#rpg-toggle-show-omniscience-toggle').prop('checked', extensionSettings.showOmniscienceToggle ?? true);
     $('#rpg-toggle-show-cyoa-toggle').prop('checked', extensionSettings.showCYOAToggle ?? true);
     $('#rpg-toggle-show-spotify-toggle').prop('checked', extensionSettings.showSpotifyToggle ?? true);
     $('#rpg-toggle-show-dynamic-weather-toggle').prop('checked', extensionSettings.showDynamicWeatherToggle ?? true);
@@ -1124,29 +1041,12 @@ async function initUI() {
     $('#rpg-strip-widget-options').toggle(stripWidgets.enabled || false);
 
     $('#rpg-stat-bar-color-low').val(extensionSettings.statBarColorLow);
-    $('#rpg-stat-bar-color-low-opacity').val(extensionSettings.statBarColorLowOpacity ?? 100);
-    $('#rpg-stat-bar-color-low-opacity-value').text((extensionSettings.statBarColorLowOpacity ?? 100) + '%');
-
     $('#rpg-stat-bar-color-high').val(extensionSettings.statBarColorHigh);
-    $('#rpg-stat-bar-color-high-opacity').val(extensionSettings.statBarColorHighOpacity ?? 100);
-    $('#rpg-stat-bar-color-high-opacity-value').text((extensionSettings.statBarColorHighOpacity ?? 100) + '%');
-
     $('#rpg-theme-select').val(extensionSettings.theme);
     $('#rpg-custom-bg').val(extensionSettings.customColors.bg);
-    $('#rpg-custom-bg-opacity').val(extensionSettings.customColors.bgOpacity ?? 100);
-    $('#rpg-custom-bg-opacity-value').text((extensionSettings.customColors.bgOpacity ?? 100) + '%');
-
     $('#rpg-custom-accent').val(extensionSettings.customColors.accent);
-    $('#rpg-custom-accent-opacity').val(extensionSettings.customColors.accentOpacity ?? 100);
-    $('#rpg-custom-accent-opacity-value').text((extensionSettings.customColors.accentOpacity ?? 100) + '%');
-
     $('#rpg-custom-text').val(extensionSettings.customColors.text);
-    $('#rpg-custom-text-opacity').val(extensionSettings.customColors.textOpacity ?? 100);
-    $('#rpg-custom-text-opacity-value').text((extensionSettings.customColors.textOpacity ?? 100) + '%');
-
     $('#rpg-custom-highlight').val(extensionSettings.customColors.highlight);
-    $('#rpg-custom-highlight-opacity').val(extensionSettings.customColors.highlightOpacity ?? 100);
-    $('#rpg-custom-highlight-opacity-value').text((extensionSettings.customColors.highlightOpacity ?? 100) + '%');
 
     // Initialize External API settings values
     if (extensionSettings.externalApiSettings) {

manifest.json

@@ -6,6 +6,6 @@
     "js": "index.js",
     "css": "style.css",
     "author": "Marinara",
-    "version": "3.7.0",
+    "version": "3.6.1",
     "homePage": "https://github.com/SpicyMarinara/rpg-companion-sillytavern"
 }

settings.html

@@ -49,7 +49,7 @@
             </div>
 
             <div style="margin-top: 10px; text-align: center; opacity: 0.6; font-size: 0.85em;">
-                v3.7.0
+                v3.6.1
             </div>
         </div>
     </div>

src/core/persistence.js

@@ -118,22 +118,6 @@ export function loadSettings() {
                 settingsChanged = true;
             }
 
-            // Migration to version 5: Add opacity properties for all colors
-            if (currentVersion < 5) {
-                // console.log('[RPG Companion] Migrating settings to version 5 (adding color opacity)');
-                if (!extensionSettings.customColors) {
-                    extensionSettings.customColors = {};
-                }
-                if (extensionSettings.customColors.bgOpacity === undefined) extensionSettings.customColors.bgOpacity = 100;
-                if (extensionSettings.customColors.accentOpacity === undefined) extensionSettings.customColors.accentOpacity = 100;
-                if (extensionSettings.customColors.textOpacity === undefined) extensionSettings.customColors.textOpacity = 100;
-                if (extensionSettings.customColors.highlightOpacity === undefined) extensionSettings.customColors.highlightOpacity = 100;
-                if (extensionSettings.statBarColorLowOpacity === undefined) extensionSettings.statBarColorLowOpacity = 100;
-                if (extensionSettings.statBarColorHighOpacity === undefined) extensionSettings.statBarColorHighOpacity = 100;
-                extensionSettings.settingsVersion = 5;
-                settingsChanged = true;
-            }
-
             // Save migrated settings
             if (settingsChanged) {
                 saveSettings();

src/core/state.js

@@ -23,15 +23,12 @@ export let extensionSettings = {
     showThoughtsInChat: true, // Show thoughts overlay in chat
     narratorMode: false, // Use character card as narrator instead of fixed character references
     customNarratorPrompt: '', // Custom narrator mode prompt text (empty = use default)
-    customContextInstructionsPrompt: '', // Custom context instructions prompt text (empty = use default)
     enableHtmlPrompt: false, // Enable immersive HTML prompt injection
     customHtmlPrompt: '', // Custom HTML prompt text (empty = use default)
     enableDialogueColoring: false, // Enable dialogue coloring prompt injection
     customDialogueColoringPrompt: '', // Custom dialogue coloring prompt text (empty = use default)
     enableDeceptionSystem: false, // Enable deception tracking with <lie> tags
     customDeceptionPrompt: '', // Custom deception prompt text (empty = use default)
-    enableOmniscienceFilter: false, // Enable omniscience filter with <filter> tags
-    customOmnisciencePrompt: '', // Custom omniscience filter prompt text (empty = use default)
     enableCYOA: false, // Enable "Choose Your Own Adventure" formatting with action choices
     customCYOAPrompt: '', // Custom CYOA prompt text (empty = use default)
     enableSpotifyMusic: false, // Enable Spotify music integration (asks AI for Spotify URLs)
@@ -44,7 +41,6 @@ export let extensionSettings = {
     showHtmlToggle: true, // Show Immersive HTML toggle in main panel
     showDialogueColoringToggle: true, // Show Dialogue Coloring toggle in main panel (enabled by default)
     showDeceptionToggle: true, // Show Deception System toggle in main panel
-    showOmniscienceToggle: true, // Show Omniscience Filter toggle in main panel
     showCYOAToggle: true, // Show CYOA toggle in main panel
     showSpotifyToggle: true, // Show Spotify Music toggle in main panel
 
@@ -66,18 +62,12 @@ export let extensionSettings = {
     theme: 'default', // Theme: default, sci-fi, fantasy, cyberpunk, custom
     customColors: {
         bg: '#1a1a2e',
-        bgOpacity: 100,
         accent: '#16213e',
-        accentOpacity: 100,
         text: '#eaeaea',
-        textOpacity: 100,
-        highlight: '#e94560',
-        highlightOpacity: 100
+        highlight: '#e94560'
     },
     statBarColorLow: '#cc3333', // Color for low stat values (red)
-    statBarColorLowOpacity: 100,
     statBarColorHigh: '#33cc66', // Color for high stat values (green)
-    statBarColorHighOpacity: 100,
     enableAnimations: true, // Enable smooth animations for stats and content updates
     mobileFabPosition: {
         top: 'calc(var(--topBarBlockSize) + 60px)',

src/i18n/en.json

@@ -52,10 +52,6 @@
     "template.settingsModal.display.showImmersiveHtmlToggleNote": "Display a toggle button to enable/disable HTML formatting in messages.",
     "template.settingsModal.display.showDialogueColoringToggle": "Show Colored Dialogues",
     "template.settingsModal.display.showDialogueColoringToggleNote": "Display a toggle button to enable/disable colored dialogue formatting.",
-    "template.settingsModal.display.showDeceptionToggle": "Show Deception System",
-    "template.settingsModal.display.showDeceptionToggleNote": "Display a toggle button to enable/disable the Deception System for marking lies and deceptions.",
-    "template.settingsModal.display.showOmniscienceToggle": "Show Omniscience Filter",
-    "template.settingsModal.display.showOmniscienceToggleNote": "Display a toggle button to enable/disable the Omniscience Filter for filtering hidden events.",
     "template.settingsModal.display.showSpotifyMusicToggle": "Show Spotify Music",
     "template.settingsModal.display.showSpotifyMusicToggleNote": "Display Spotify music player with AI-suggested scene-appropriate tracks.",
     "template.settingsModal.display.showSnowflakesToggle": "Show Snowflakes Effect",
@@ -166,8 +162,6 @@
     "template.mainPanel.clearLastRoll": "Clear last roll",
     "template.mainPanel.immersiveHtml": "Immersive HTML",
     "template.mainPanel.coloredDialogues": "Colored Dialogues",
-    "template.mainPanel.deceptionSystem": "Deception System",
-    "template.mainPanel.omniscienceFilter": "Omniscience Filter",
     "template.mainPanel.spotifyMusic": "Spotify Music",
     "template.mainPanel.snowflakesEffect": "Snowflakes Effect",
     "template.mainPanel.dynamicWeatherEffects": "Dynamic Weather",

src/systems/features/classicStats.js

@@ -20,10 +20,6 @@ export function setupClassicStatsButtons() {
     // Delegated event listener for increase buttons
     $userStatsContainer.on('click', '.rpg-stat-increase', function() {
         const stat = $(this).data('stat');
-        // Initialize custom attributes if they don't exist
-        if (extensionSettings.classicStats[stat] === undefined) {
-            extensionSettings.classicStats[stat] = 10;
-        }
         if (extensionSettings.classicStats[stat] < 999) {
             extensionSettings.classicStats[stat]++;
             saveSettings();
@@ -37,10 +33,6 @@ export function setupClassicStatsButtons() {
     // Delegated event listener for decrease buttons
     $userStatsContainer.on('click', '.rpg-stat-decrease', function() {
         const stat = $(this).data('stat');
-        // Initialize custom attributes if they don't exist
-        if (extensionSettings.classicStats[stat] === undefined) {
-            extensionSettings.classicStats[stat] = 10;
-        }
         if (extensionSettings.classicStats[stat] > 1) {
             extensionSettings.classicStats[stat]--;
             saveSettings();

src/systems/features/jsonCleaning.js

@@ -76,7 +76,7 @@ export async function ensureJsonCleaningRegex(st_extension_settings, saveSetting
                 }
                 // Small delay to ensure save completes
                 await new Promise(resolve => setTimeout(resolve, 100));
-                console.log('[RPG Companion] ✅ Updated JSON cleaning regex to v3.2.3 settings.');
+                console.log('[RPG Companion] ✅ Updated JSON cleaning regex to v3.2.6 settings.');
             } else {
                 console.log('[RPG Companion] JSON Cleaning Regex is up to date.');
             }

src/systems/generation/injector.js

@@ -4,7 +4,7 @@
  */
 
 import { getContext } from '../../../../../../extensions.js';
-import { extension_prompt_types, extension_prompt_roles, setExtensionPrompt, eventSource, event_types } from '../../../../../../../script.js';
+import { setExtensionPrompt, extension_prompt_types, extension_prompt_roles, eventSource, event_types } from '../../../../../../../script.js';
 import {
     extensionSettings,
     committedTrackerData,
@@ -22,11 +22,8 @@ import {
     DEFAULT_HTML_PROMPT,
     DEFAULT_DIALOGUE_COLORING_PROMPT,
     DEFAULT_DECEPTION_PROMPT,
-    DEFAULT_OMNISCIENCE_FILTER_PROMPT,
     DEFAULT_CYOA_PROMPT,
     DEFAULT_SPOTIFY_PROMPT,
-    DEFAULT_NARRATOR_PROMPT,
-    DEFAULT_CONTEXT_INSTRUCTIONS_PROMPT,
     SPOTIFY_FORMAT_INSTRUCTION
 } from './promptBuilder.js';
 import { restoreCheckpointOnLoad } from '../features/chapterCheckpoint.js';
@@ -89,8 +86,8 @@ function buildHistoricalContextMap() {
     // For user_message_end: start from the last assistant message (we need its context for the preceding user message)
     // For assistant_message_end: start from before the last assistant message (it gets current context via setExtensionPrompt)
     let processedCount = 0;
-    const startIndex = position === 'user_message_end'
-        ? lastAssistantIndex
+    const startIndex = position === 'user_message_end' 
+        ? lastAssistantIndex 
         : (lastAssistantIndex > 0 ? lastAssistantIndex - 1 : chat.length - 2);
 
     for (let i = startIndex; i >= 0 && (messageCount === 0 || processedCount < maxMessages); i--) {
@@ -204,7 +201,7 @@ function prepareHistoricalContextInjection() {
 /**
  * Finds the best match position for message content in the prompt.
  * Tries full content first, then progressively smaller suffixes.
- *
+ * 
  * @param {string} prompt - The prompt to search in
  * @param {string} messageContent - The message content to find
  * @returns {{start: number, end: number}|null} - Position info or null if not found
@@ -216,7 +213,7 @@ function findMessageInPrompt(prompt, messageContent) {
 
     // Try to find the full content first
     let searchIndex = prompt.lastIndexOf(messageContent);
-
+    
     if (searchIndex !== -1) {
         return { start: searchIndex, end: searchIndex + messageContent.length };
     }
@@ -224,15 +221,15 @@ function findMessageInPrompt(prompt, messageContent) {
     // If full content not found, try last N characters with progressively smaller chunks
     // This handles cases where messages are truncated in the prompt
     const searchLengths = [500, 300, 200, 100, 50];
-
+    
     for (const len of searchLengths) {
         if (messageContent.length <= len) {
             continue;
         }
-
+        
         const searchContent = messageContent.slice(-len);
         searchIndex = prompt.lastIndexOf(searchContent);
-
+        
         if (searchIndex !== -1) {
             return { start: searchIndex, end: searchIndex + searchContent.length };
         }
@@ -244,7 +241,7 @@ function findMessageInPrompt(prompt, messageContent) {
 /**
  * Injects historical context into a text completion prompt string.
  * Searches for message content in the prompt and appends context after matches.
- *
+ * 
  * @param {string} prompt - The text completion prompt
  * @returns {string} - The modified prompt with injected context
  */
@@ -271,7 +268,7 @@ function injectContextIntoTextPrompt(prompt) {
 
         // Find the message content in the prompt
         const position = findMessageInPrompt(modifiedPrompt, message.mes);
-
+        
         if (!position) {
             // Message not found in prompt (might be truncated or not included)
             console.debug(`[RPG Companion] Could not find message ${msgIdx} in prompt for context injection`);
@@ -293,7 +290,7 @@ function injectContextIntoTextPrompt(prompt) {
 /**
  * Injects historical context into a chat completion message array.
  * Modifies the content of messages in the array directly.
- *
+ * 
  * @param {Array} chatMessages - The chat completion message array
  * @returns {Array} - The modified message array with injected context
  */
@@ -318,7 +315,7 @@ function injectContextIntoChatPrompt(chatMessages) {
         // Find this message in the chat completion array by matching content
         // Try full content first, then progressively smaller suffixes
         let found = false;
-
+        
         for (const promptMsg of chatMessages) {
             if (!promptMsg.content || typeof promptMsg.content !== 'string') {
                 continue;
@@ -338,7 +335,7 @@ function injectContextIntoChatPrompt(chatMessages) {
                 if (messageContent.length <= len) {
                     continue;
                 }
-
+                
                 const searchContent = messageContent.slice(-len);
                 if (promptMsg.content.includes(searchContent)) {
                     promptMsg.content = promptMsg.content + ctxContent;
@@ -347,12 +344,12 @@ function injectContextIntoChatPrompt(chatMessages) {
                     break;
                 }
             }
-
+            
             if (found) {
                 break;
             }
         }
-
+        
         if (!found) {
             console.debug(`[RPG Companion] Could not find message ${msgIdx} in chat prompt for context injection`);
         }
@@ -368,7 +365,7 @@ function injectContextIntoChatPrompt(chatMessages) {
 /**
  * Injects historical context into finalMesSend message array (text completion).
  * Iterates through chat and finalMesSend in order, matching by content to skip injected messages.
- *
+ * 
  * @param {Array} finalMesSend - The array of message objects {message: string, extensionPrompts: []}
  * @returns {number} - Number of injections made
  */
@@ -384,20 +381,20 @@ function injectContextIntoFinalMesSend(finalMesSend) {
     }
 
     let injectedCount = 0;
-
+    
     // Build a map from chat index to finalMesSend index by matching content in order
     // This handles injected messages (author's note, OOC, etc.) that exist in finalMesSend but not in chat
     const chatToMesSendMap = new Map();
     let mesSendIdx = 0;
-
+    
     for (let chatIdx = 0; chatIdx < chat.length && mesSendIdx < finalMesSend.length; chatIdx++) {
         const chatMsg = chat[chatIdx];
         if (!chatMsg || chatMsg.is_system) {
             continue;
         }
-
+        
         const chatContent = chatMsg.mes || '';
-
+        
         // Look for this chat message in finalMesSend starting from current position
         // Skip any finalMesSend entries that don't match (they're injected content)
         while (mesSendIdx < finalMesSend.length) {
@@ -406,40 +403,40 @@ function injectContextIntoFinalMesSend(finalMesSend) {
                 mesSendIdx++;
                 continue;
             }
-
+            
             // Check if this finalMesSend message contains the chat content
             // Use a substring match since instruct formatting adds prefixes/suffixes
             // Match with sufficient content (first 50 chars or full message if shorter)
-            const matchContent = chatContent.length > 50
-                ? chatContent.substring(0, 50)
+            const matchContent = chatContent.length > 50 
+                ? chatContent.substring(0, 50) 
                 : chatContent;
-
+            
             if (matchContent && mesSendObj.message.includes(matchContent)) {
                 // Found a match - record the mapping
                 chatToMesSendMap.set(chatIdx, mesSendIdx);
                 mesSendIdx++;
                 break;
             }
-
+            
             // This finalMesSend entry doesn't match - it's injected content, skip it
             mesSendIdx++;
         }
     }
-
+    
     // Now inject context using the map
     for (const [chatIdx, ctxContent] of pendingContextMap) {
         const targetMesSendIdx = chatToMesSendMap.get(chatIdx);
-
+        
         if (targetMesSendIdx === undefined) {
             console.debug(`[RPG Companion] Chat message ${chatIdx} not found in finalMesSend mapping`);
             continue;
         }
-
+        
         const mesSendObj = finalMesSend[targetMesSendIdx];
         if (!mesSendObj || !mesSendObj.message) {
             continue;
         }
-
+        
         // Append context to this message
         mesSendObj.message = mesSendObj.message + ctxContent;
         injectedCount++;
@@ -453,7 +450,7 @@ function injectContextIntoFinalMesSend(finalMesSend) {
  * Event handler for GENERATE_BEFORE_COMBINE_PROMPTS (text completion).
  * Injects historical context into the finalMesSend array before prompt combination.
  * This is more reliable than post-combine string searching.
- *
+ * 
  * @param {Object} eventData - Event data with finalMesSend and other properties
  */
 function onGenerateBeforeCombinePrompts(eventData) {
@@ -481,8 +478,7 @@ function onGenerateBeforeCombinePrompts(eventData) {
 /**
  * Event handler for GENERATE_AFTER_COMBINE_PROMPTS (text completion).
  * This is now a backup/fallback - primary injection happens in BEFORE_COMBINE.
- * Also fixes newline spacing after </context> tag.
- *
+ * 
  * @param {Object} eventData - Event data with prompt property
  */
 function onGenerateAfterCombinePrompts(eventData) {
@@ -494,31 +490,25 @@ function onGenerateAfterCombinePrompts(eventData) {
         return;
     }
 
-    let didInjectHistory = false;
-
-    // Inject historical context if available and not already done
-    if (!historyInjectionDone && pendingContextMap.size > 0) {
-        // Fallback injection for edge cases where BEFORE_COMBINE didn't work
-        console.log('[RPG Companion] Using fallback string-based injection (AFTER_COMBINE)');
-        eventData.prompt = injectContextIntoTextPrompt(eventData.prompt);
-        didInjectHistory = true;
+    // Skip if injection already happened in BEFORE_COMBINE
+    if (historyInjectionDone) {
+        return;
     }
 
-    // Always fix newlines around context tags (whether we just injected or not)
-    eventData.prompt = eventData.prompt.replace(/<context>/g, '\n<context>');
-    eventData.prompt = eventData.prompt.replace(/<\/context>/g, '</context>\n');
+    // Only inject if we have pending context
+    if (pendingContextMap.size === 0) {
+        return;
+    }
 
-    // Remove extra newlines after last_message opening and closing tags
-    // Match exactly the double newline pattern
-    eventData.prompt = eventData.prompt.replace(/<last_message>\n\n/g, '<last_message>\n');
-    eventData.prompt = eventData.prompt.replace(/\n\n<\/last_message>/g, '\n</last_message>');
+    // Fallback injection for edge cases where BEFORE_COMBINE didn't work
+    console.log('[RPG Companion] Using fallback string-based injection (AFTER_COMBINE)');
+    eventData.prompt = injectContextIntoTextPrompt(eventData.prompt);
 }
 
 /**
  * Event handler for CHAT_COMPLETION_PROMPT_READY.
  * Injects historical context into the chat message array.
- * Also fixes newline spacing around <context> tags.
- *
+ * 
  * @param {Object} eventData - Event data with chat property
  */
 function onChatCompletionPromptReady(eventData) {
@@ -530,20 +520,14 @@ function onChatCompletionPromptReady(eventData) {
         return;
     }
 
-    // Inject historical context if we have pending context
-    if (pendingContextMap.size > 0) {
-        eventData.chat = injectContextIntoChatPrompt(eventData.chat);
-        // DON'T clear pendingContextMap here - let it persist for other generations
-        // (e.g., prewarm extensions). It will be cleared on GENERATION_ENDED.
+    // Only inject if we have pending context
+    if (pendingContextMap.size === 0) {
+        return;
     }
 
-    // Fix newlines around context tags for all messages
-    for (const message of eventData.chat) {
-        if (message.content && typeof message.content === 'string') {
-            message.content = message.content.replace(/<context>/g, '\n<context>');
-            message.content = message.content.replace(/<\/context>/g, '</context>\n');
-        }
-    }
+    eventData.chat = injectContextIntoChatPrompt(eventData.chat);
+    // DON'T clear pendingContextMap here - let it persist for other generations
+    // (e.g., prewarm extensions). It will be cleared on GENERATION_ENDED.
 }
 
 /**
@@ -808,19 +792,6 @@ export async function onGenerationStarted(type, data, dryRun) {
             setExtensionPrompt('rpg-companion-deception', '', extension_prompt_types.IN_CHAT, 0, false);
         }
 
-        // Inject Omniscience Filter prompt separately at depth 0 if enabled
-        if (extensionSettings.enableOmniscienceFilter && !shouldSuppress) {
-            // Use custom Omniscience Filter prompt if set, otherwise use default
-            const omnisciencePromptText = extensionSettings.customOmnisciencePrompt || DEFAULT_OMNISCIENCE_FILTER_PROMPT;
-            const omnisciencePrompt = `\n${omnisciencePromptText}\n`;
-
-            setExtensionPrompt('rpg-companion-omniscience', omnisciencePrompt, extension_prompt_types.IN_CHAT, 0, false);
-            // console.log('[RPG Companion] Injected Omniscience Filter prompt at depth 0 for together mode');
-        } else {
-            // Clear Omniscience Filter prompt if disabled
-            setExtensionPrompt('rpg-companion-omniscience', '', extension_prompt_types.IN_CHAT, 0, false);
-        }
-
         // Inject Spotify prompt separately at depth 0 if enabled
         if (extensionSettings.enableSpotifyMusic && !shouldSuppress) {
             // Use custom Spotify prompt if set, otherwise use default
@@ -852,14 +823,12 @@ export async function onGenerationStarted(type, data, dryRun) {
         const contextSummary = generateContextualSummary();
 
         if (contextSummary) {
-            // Use custom context instructions prompt if set, otherwise use default
-            const contextInstructionsText = extensionSettings.customContextInstructionsPrompt || DEFAULT_CONTEXT_INSTRUCTIONS_PROMPT;
-
-            const wrappedContext = `
+            const wrappedContext = `\nHere is context information about the current scene, and what follows is the last message in the chat history:
 <context>
 ${contextSummary}
-${contextInstructionsText}
-</context>`;
+
+Ensure these details naturally reflect and influence the narrative. Character behavior, dialogue, and story events should acknowledge these conditions when relevant, such as fatigue affecting performance, low hygiene influencing social interactions, environmental factors shaping the scene, or a character's emotional state coloring their responses.
+</context>\n\n`;
 
             // Inject context at depth 1 (before last user message) as SYSTEM
             // Skip when a guided generation injection is present to avoid conflicting instructions
@@ -911,19 +880,6 @@ ${contextInstructionsText}
             setExtensionPrompt('rpg-companion-deception', '', extension_prompt_types.IN_CHAT, 0, false);
         }
 
-        // Inject Omniscience Filter prompt separately at depth 0 if enabled
-        if (extensionSettings.enableOmniscienceFilter && !shouldSuppress) {
-            // Use custom Omniscience Filter prompt if set, otherwise use default
-            const omnisciencePromptText = extensionSettings.customOmnisciencePrompt || DEFAULT_OMNISCIENCE_FILTER_PROMPT;
-            const omnisciencePrompt = `\n${omnisciencePromptText}\n`;
-
-            setExtensionPrompt('rpg-companion-omniscience', omnisciencePrompt, extension_prompt_types.IN_CHAT, 0, false);
-            // console.log('[RPG Companion] Injected Omniscience Filter prompt at depth 0 for separate/external mode');
-        } else {
-            // Clear Omniscience Filter prompt if disabled
-            setExtensionPrompt('rpg-companion-omniscience', '', extension_prompt_types.IN_CHAT, 0, false);
-        }
-
         // Inject Spotify prompt separately at depth 0 if enabled
         if (extensionSettings.enableSpotifyMusic && !shouldSuppress) {
             // Use custom Spotify prompt if set, otherwise use default
@@ -961,7 +917,6 @@ ${contextInstructionsText}
         setExtensionPrompt('rpg-companion-html', '', extension_prompt_types.IN_CHAT, 0, false);
         setExtensionPrompt('rpg-companion-dialogue-coloring', '', extension_prompt_types.IN_CHAT, 0, false);
         setExtensionPrompt('rpg-companion-deception', '', extension_prompt_types.IN_CHAT, 0, false);
-        setExtensionPrompt('rpg-companion-omniscience', '', extension_prompt_types.IN_CHAT, 0, false);
         setExtensionPrompt('rpg-companion-zzz-cyoa', '', extension_prompt_types.IN_CHAT, 0, false);
         setExtensionPrompt('rpg-companion-spotify', '', extension_prompt_types.IN_CHAT, 0, false);
     }
@@ -983,16 +938,16 @@ ${contextInstructionsText}
 export function initHistoryInjectionListeners() {
     // Register persistent listeners for prompt injection
     // These check pendingContextMap and only inject if there's data
-
+    
     // Primary: BEFORE_COMBINE for text completion (more reliable - modifies message objects)
     eventSource.on(event_types.GENERATE_BEFORE_COMBINE_PROMPTS, onGenerateBeforeCombinePrompts);
-
+    
     // Fallback: AFTER_COMBINE for text completion (string-based injection)
     eventSource.on(event_types.GENERATE_AFTER_COMBINE_PROMPTS, onGenerateAfterCombinePrompts);
-
+    
     // Chat completion (OpenAI, etc.)
     eventSource.on(event_types.CHAT_COMPLETION_PROMPT_READY, onChatCompletionPromptReady);
-
+    
     console.log('[RPG Companion] History injection listeners initialized');
 }
 

src/systems/generation/parser.js

@@ -617,13 +617,6 @@ export function parseUserStats(statsText) {
                         if (!quest) return '';
                         if (typeof quest === 'string') return quest;
                         if (typeof quest === 'object') {
-                            // Check for locked format: {value, locked}
-                            // Recursively extract value if it's nested
-                            let extracted = quest;
-                            while (typeof extracted === 'object' && extracted.value !== undefined) {
-                                extracted = extracted.value;
-                            }
-                            if (typeof extracted === 'string') return extracted;
                             // v3 format: {title, description, status}
                             return quest.title || quest.description || JSON.stringify(quest);
                         }

src/systems/generation/promptBuilder.js

@@ -33,15 +33,6 @@ export const DEFAULT_DIALOGUE_COLORING_PROMPT = `Wrap all character/NPC "dialogu
  */
 export const DEFAULT_DECEPTION_PROMPT = `When a character is lying or deceiving, you should follow up that line with the <lie> tag, containing a brief description of the truth and the lie's reason, using the template below (replace placeholders in quotation marks). This will be hidden from the user's view, but not to you, making it useful for future consequences: <lie character="name" type="lying/deceiving/omitting" truth="truth" reason="reason"/>.`;
 
-/**
- * Default Omniscience Filter prompt text
- * This instructs the AI to separate information the player character cannot perceive
- */
-export const DEFAULT_OMNISCIENCE_FILTER_PROMPT = `You must strictly separate what the player can directly perceive from what they cannot. They should only read limited narrative content that their persona can actually see, hear, smell, touch, or otherwise directly sense. Before writing any narrative content that involves events, actions, or details the player directly cannot perceive (because they're not looking, too far away, behind them, in another room, happening silently, include NPCs' internal thoughts, etc.), you absolutely must output that hidden information inside a <filter> tag using this exact format:
-<filter event="[Brief description of what is happening that the player cannot perceive]" reason="[Why the player character cannot perceive this - e.g., 'behind them', 'in another room', 'too quiet to hear', 'focused elsewhere']"/>
-Example: <filter event="Zandik quietly takes the key from the table and slips out the back door" reason="Zandik is behind Mari, who is absorbed in reading, and he moves silently"/> You hear a faint click from somewhere behind you, but when you glance up from your newspaper, the room seems unchanged.`;
-
-
 /**
  * Default CYOA prompt text
  */
@@ -62,11 +53,6 @@ export const SPOTIFY_FORMAT_INSTRUCTION = `Include it in this exact format: <spo
  */
 export const DEFAULT_NARRATOR_PROMPT = `Infer the identity and details of characters present in each scene from the story context below. Do not use fixed character references; instead, identify characters naturally based on their actions, dialogue, and descriptions in the narrative.`;
 
-/**
- * Default Context Instructions prompt text (customizable by users)
- */
-export const DEFAULT_CONTEXT_INSTRUCTIONS_PROMPT = `The context above is information about the current scene, and what follows is the last message in the chat history. Ensure these details naturally reflect and influence the narrative. Character behavior, dialogue, and story events should acknowledge these conditions when relevant, such as fatigue affecting performance, low hygiene influencing social interactions, environmental factors shaping the scene, or a character's emotional state coloring their responses.`;
-
 /**
  * Gets character card information for current chat (handles both single and group chats)
  * @returns {string} Formatted character information

src/systems/rendering/quests.js

@@ -212,12 +212,8 @@ export function renderQuests() {
     // Get current sub-tab from container or default to 'main'
     const activeSubTab = $questsContainer.data('active-subtab') || 'main';
 
-    // Get quests data - extract value if it's a locked object
-    let mainQuest = extensionSettings.quests.main || 'None';
-    // Recursively extract value if it's nested objects
-    while (typeof mainQuest === 'object' && mainQuest.value !== undefined) {
-        mainQuest = mainQuest.value;
-    }
+    // Get quests data
+    const mainQuest = extensionSettings.quests.main || 'None';
     const optionalQuests = extensionSettings.quests.optional || [];
 
     // Build HTML

src/systems/rendering/thoughts.js

@@ -50,11 +50,9 @@ function debugLog(message, data = null) {
  * @param {number} percentage - Value from 0-100
  * @param {string} lowColor - Hex color for low values (e.g., '#ff0000')
  * @param {string} highColor - Hex color for high values (e.g., '#00ff00')
- * @param {number} lowOpacity - Opacity for low values (0-100)
- * @param {number} highOpacity - Opacity for high values (0-100)
- * @returns {string} Interpolated rgba color
+ * @returns {string} Interpolated hex color
  */
-function getStatColor(percentage, lowColor, highColor, lowOpacity = 100, highOpacity = 100) {
+function getStatColor(percentage, lowColor, highColor) {
     // Clamp percentage to 0-100
     const percent = Math.max(0, Math.min(100, percentage)) / 100;
 
@@ -75,9 +73,10 @@ function getStatColor(percentage, lowColor, highColor, lowOpacity = 100, highOpa
     const r = Math.round(low.r + (high.r - low.r) * percent);
     const g = Math.round(low.g + (high.g - low.g) * percent);
     const b = Math.round(low.b + (high.b - low.b) * percent);
-    const a = (lowOpacity + (highOpacity - lowOpacity) * percent) / 100;
 
-    return `rgba(${r}, ${g}, ${b}, ${a})`;
+    // Convert back to hex
+    const toHex = (n) => n.toString(16).padStart(2, '0');
+    return `#${toHex(r)}${toHex(g)}${toHex(b)}`;
 }
 
 /**
@@ -540,13 +539,7 @@ export function renderThoughts() {
                         <div class="rpg-character-stats-inner">`;
                     for (const stat of enabledCharStats) {
                         const statValue = char[stat.name] || 0;
-                        const statColor = getStatColor(
-                            statValue,
-                            extensionSettings.statBarColorLow,
-                            extensionSettings.statBarColorHigh,
-                            extensionSettings.statBarColorLowOpacity ?? 100,
-                            extensionSettings.statBarColorHighOpacity ?? 100
-                        );
+                        const statColor = getStatColor(statValue, extensionSettings.statBarColorLow, extensionSettings.statBarColorHigh);
                         html += `
                                 <div class="rpg-character-stat">
                                     <span class="rpg-stat-name">${stat.name}: </span><span class="rpg-editable" contenteditable="true" data-character="${char.name}" data-field="${stat.name}" style="color: ${statColor}" title="Click to edit ${stat.name}">${statValue}%</span>

src/systems/rendering/userStats.js

@@ -21,7 +21,6 @@ import { getSafeThumbnailUrl } from '../../utils/avatars.js';
 import { buildInventorySummary } from '../generation/promptBuilder.js';
 import { isItemLocked, setItemLock } from '../generation/lockManager.js';
 import { updateFabWidgets } from '../ui/mobile.js';
-import { getStatBarColors } from '../ui/theme.js';
 
 /**
  * Builds the user stats text string using custom stat names
@@ -252,9 +251,8 @@ export function renderUserStats() {
         }
     }
 
-    // Create gradient from low to high color with opacity
-    const colors = getStatBarColors();
-    const gradient = `linear-gradient(to right, ${colors.low}, ${colors.high})`;
+    // Create gradient from low to high color
+    const gradient = `linear-gradient(to right, ${extensionSettings.statBarColorLow}, ${extensionSettings.statBarColorHigh})`;
 
     // Check if stats bars section is locked
     const isStatsLocked = isItemLocked('userStats', 'stats');

src/systems/ui/desktop.js

@@ -5,7 +5,6 @@
 
 import { i18n } from '../../core/i18n.js';
 import { extensionSettings, lastGeneratedData, committedTrackerData } from '../../core/state.js';
-import { hexToRgba } from './theme.js';
 
 /**
  * Helper to parse time string and calculate clock hand angles
@@ -29,7 +28,7 @@ function parseTimeForClock(timeStr) {
 export function updateStripWidgets() {
     const $panel = $('#rpg-companion-panel');
     const $container = $('#rpg-strip-widget-container');
-
+    
     if ($panel.length === 0 || $container.length === 0) return;
 
     // Check if strip widgets are enabled
@@ -119,7 +118,7 @@ export function updateStripWidgets() {
     const $statsWidget = $container.find('.rpg-strip-widget-stats');
     if (widgetSettings.stats?.enabled) {
         let allStats = [];
-
+        
         // Try to get stats from tracker data first (most current)
         const userStatsData = lastGeneratedData?.userStats || committedTrackerData?.userStats;
         if (userStatsData) {
@@ -132,7 +131,7 @@ export function updateStripWidgets() {
                 console.warn('[RPG Strip Widgets] Failed to parse tracker userStats:', e);
             }
         }
-
+        
         // Fallback to extensionSettings.userStats
         if (allStats.length === 0 && extensionSettings.userStats) {
             try {
@@ -238,9 +237,7 @@ export function updateStripWidgets() {
  */
 function getStatColor(value) {
     const lowColor = extensionSettings.statBarColorLow || '#cc3333';
-    const lowOpacity = extensionSettings.statBarColorLowOpacity ?? 100;
     const highColor = extensionSettings.statBarColorHigh || '#33cc66';
-    const highOpacity = extensionSettings.statBarColorHighOpacity ?? 100;
 
     // Simple linear interpolation between low and high colors
     const percent = Math.min(100, Math.max(0, value)) / 100;
@@ -249,14 +246,13 @@ function getStatColor(value) {
     const lowRGB = hexToRgb(lowColor);
     const highRGB = hexToRgb(highColor);
 
-    if (!lowRGB || !highRGB) return value > 50 ? hexToRgba(highColor, highOpacity) : hexToRgba(lowColor, lowOpacity);
+    if (!lowRGB || !highRGB) return value > 50 ? highColor : lowColor;
 
     const r = Math.round(lowRGB.r + (highRGB.r - lowRGB.r) * percent);
     const g = Math.round(lowRGB.g + (highRGB.g - lowRGB.g) * percent);
     const b = Math.round(lowRGB.b + (highRGB.b - lowRGB.b) * percent);
-    const a = (lowOpacity + (highOpacity - lowOpacity) * percent) / 100;
 
-    return `rgba(${r}, ${g}, ${b}, ${a})`;
+    return `rgb(${r}, ${g}, ${b})`;
 }
 
 /**

src/systems/ui/mobile.js

@@ -8,7 +8,6 @@ import { saveSettings } from '../../core/persistence.js';
 import { closeMobilePanelWithAnimation, updateCollapseToggleIcon } from './layout.js';
 import { setupDesktopTabs, removeDesktopTabs } from './desktop.js';
 import { i18n } from '../../core/i18n.js';
-import { hexToRgba } from './theme.js';
 
 /**
  * Updates the text labels of the mobile navigation tabs based on the current language.
@@ -1452,7 +1451,7 @@ export function updateFabWidgets() {
     if (widgetSettings.attributes?.enabled) {
         // Check if RPG attributes are enabled in trackerConfig
         const showRPGAttributes = extensionSettings.trackerConfig?.userStats?.showRPGAttributes !== false;
-
+        
         if (showRPGAttributes && extensionSettings.classicStats) {
             // Get enabled attributes from trackerConfig
             const configuredAttrs = extensionSettings.trackerConfig?.userStats?.rpgAttributes || [];
@@ -1542,10 +1541,10 @@ export function updateFabWidgets() {
             e.stopPropagation();
             const $this = $(this);
             const wasExpanded = $this.hasClass('expanded');
-
+            
             // Collapse all other expanded widgets
             $container.find('.rpg-fab-widget.expanded').removeClass('expanded');
-
+            
             // Toggle this one
             if (!wasExpanded) {
                 $this.addClass('expanded');
@@ -1568,9 +1567,7 @@ export function updateFabWidgets() {
  */
 function getStatColor(value) {
     const lowColor = extensionSettings.statBarColorLow || '#cc3333';
-    const lowOpacity = extensionSettings.statBarColorLowOpacity ?? 100;
     const highColor = extensionSettings.statBarColorHigh || '#33cc66';
-    const highOpacity = extensionSettings.statBarColorHighOpacity ?? 100;
 
     // Simple linear interpolation between low and high colors
     const percent = Math.min(100, Math.max(0, value)) / 100;
@@ -1579,14 +1576,13 @@ function getStatColor(value) {
     const lowRGB = hexToRgb(lowColor);
     const highRGB = hexToRgb(highColor);
 
-    if (!lowRGB || !highRGB) return value > 50 ? hexToRgba(highColor, highOpacity) : hexToRgba(lowColor, lowOpacity);
+    if (!lowRGB || !highRGB) return value > 50 ? highColor : lowColor;
 
     const r = Math.round(lowRGB.r + (highRGB.r - lowRGB.r) * percent);
     const g = Math.round(lowRGB.g + (highRGB.g - lowRGB.g) * percent);
     const b = Math.round(lowRGB.b + (highRGB.b - lowRGB.b) * percent);
-    const a = (lowOpacity + (highOpacity - lowOpacity) * percent) / 100;
 
-    return `rgba(${r}, ${g}, ${b}, ${a})`;
+    return `rgb(${r}, ${g}, ${b})`;
 }
 
 /**

src/systems/ui/promptsEditor.js

@@ -4,7 +4,7 @@
  */
 import { extensionSettings } from '../../core/state.js';
 import { saveSettings } from '../../core/persistence.js';
-import { DEFAULT_HTML_PROMPT, DEFAULT_DIALOGUE_COLORING_PROMPT, DEFAULT_DECEPTION_PROMPT, DEFAULT_OMNISCIENCE_FILTER_PROMPT, DEFAULT_CYOA_PROMPT, DEFAULT_SPOTIFY_PROMPT, DEFAULT_NARRATOR_PROMPT, DEFAULT_CONTEXT_INSTRUCTIONS_PROMPT } from '../generation/promptBuilder.js';
+import { DEFAULT_HTML_PROMPT, DEFAULT_DIALOGUE_COLORING_PROMPT, DEFAULT_DECEPTION_PROMPT, DEFAULT_CYOA_PROMPT, DEFAULT_SPOTIFY_PROMPT, DEFAULT_NARRATOR_PROMPT } from '../generation/promptBuilder.js';
 
 let $editorModal = null;
 let tempPrompts = null; // Temporary prompts for cancel functionality
@@ -14,11 +14,9 @@ const DEFAULT_PROMPTS = {
     html: DEFAULT_HTML_PROMPT,
     dialogueColoring: DEFAULT_DIALOGUE_COLORING_PROMPT,
     deception: DEFAULT_DECEPTION_PROMPT,
-    omniscience: DEFAULT_OMNISCIENCE_FILTER_PROMPT,
     cyoa: DEFAULT_CYOA_PROMPT,
     spotify: DEFAULT_SPOTIFY_PROMPT,
     narrator: DEFAULT_NARRATOR_PROMPT,
-    contextInstructions: DEFAULT_CONTEXT_INSTRUCTIONS_PROMPT,
     plotRandom: 'Actually, the scene is getting stale. Introduce {{random::stakes::a plot twist::a new character::a cataclysm::a fourth-wall-breaking joke::a sudden atmospheric phenomenon::a plot hook::a running gag::an ecchi scenario::Death from Discworld::a new stake::a drama::a conflict::an angered entity::a god::a vision::a prophetic dream::Il Dottore from Genshin Impact::a new development::a civilian in need::an emotional bit::a threat::a villain::an important memory recollection::a marriage proposal::a date idea::an angry horde of villagers with pitchforks::a talking animal::an enemy::a cliffhanger::a short omniscient POV shift to a completely different character::a quest::an unexpected revelation::a scandal::an evil clone::death of an important character::harm to an important character::a romantic setup::a gossip::a messenger::a plot point from the past::a plot hole::a tragedy::a ghost::an otherworldly occurrence::a plot device::a curse::a magic device::a rival::an unexpected pregnancy::a brothel::a prostitute::a new location::a past lover::a completely random thing::a what-if scenario::a significant choice::war::love::a monster::lewd undertones::Professor Mari::a travelling troupe::a secret::a fortune-teller::something completely different::a killer::a murder mystery::a mystery::a skill check::a deus ex machina::three raccoons in a trench coat::a pet::a slave::an orphan::a psycho::tentacles::"there is only one bed" trope::accidental marriage::a fun twist::a boss battle::sexy corn::an eldritch horror::a character getting hungry, thirsty, or exhausted::horniness::a need for a bathroom break need::someone fainting::an assassination attempt::a meta narration of this all being an out of hand DND session::a dungeon::a friend in need::an old friend::a small time skip::a scene shift::Aurora Borealis, at this time of year, at this time of day, at this part of the country::a grand ball::a surprise party::zombies::foreshadowing::a Spanish Inquisition (nobody expects it)::a natural plot progression}} to make things more interesting! Be creative, but stay grounded in the setting.',
     plotNatural: 'Actually, the scene is getting stale. Progress it, to make things more interesting! Reintroduce an unresolved plot point from the past, or push the story further towards the current main goal. Be creative, but stay grounded in the setting.',
     avatar: `You are a visionary artist trapped in a cage of logic. Your mind is filled with poetry and distant horizons; however, your hands are uncontrollably focused on creating the perfect character avatar description that is faithful to the original intent, rich in detail, aesthetically pleasing, and directly usable by text-to-image models. Any ambiguity or metaphor will make you feel extremely uncomfortable.
@@ -98,11 +96,9 @@ function openPromptsEditor() {
         html: extensionSettings.customHtmlPrompt || '',
         dialogueColoring: extensionSettings.customDialogueColoringPrompt || '',
         deception: extensionSettings.customDeceptionPrompt || '',
-        omniscience: extensionSettings.customOmnisciencePrompt || '',
         cyoa: extensionSettings.customCYOAPrompt || '',
         spotify: extensionSettings.customSpotifyPrompt || '',
         narrator: extensionSettings.customNarratorPrompt || '',
-        contextInstructions: extensionSettings.customContextInstructionsPrompt || '',
         plotRandom: extensionSettings.customPlotRandomPrompt || '',
         plotNatural: extensionSettings.customPlotNaturalPrompt || '',
         avatar: extensionSettings.avatarLLMCustomInstruction || '',
@@ -115,11 +111,9 @@ function openPromptsEditor() {
     $('#rpg-prompt-html').val(extensionSettings.customHtmlPrompt || DEFAULT_PROMPTS.html);
     $('#rpg-prompt-dialogue-coloring').val(extensionSettings.customDialogueColoringPrompt || DEFAULT_PROMPTS.dialogueColoring);
     $('#rpg-prompt-deception').val(extensionSettings.customDeceptionPrompt || DEFAULT_PROMPTS.deception);
-    $('#rpg-prompt-omniscience').val(extensionSettings.customOmnisciencePrompt || DEFAULT_PROMPTS.omniscience);
     $('#rpg-prompt-cyoa').val(extensionSettings.customCYOAPrompt || DEFAULT_PROMPTS.cyoa);
     $('#rpg-prompt-spotify').val(extensionSettings.customSpotifyPrompt || DEFAULT_PROMPTS.spotify);
     $('#rpg-prompt-narrator').val(extensionSettings.customNarratorPrompt || DEFAULT_PROMPTS.narrator);
-    $('#rpg-prompt-context-instructions').val(extensionSettings.customContextInstructionsPrompt || DEFAULT_PROMPTS.contextInstructions);
     $('#rpg-prompt-plot-random').val(extensionSettings.customPlotRandomPrompt || DEFAULT_PROMPTS.plotRandom);
     $('#rpg-prompt-plot-natural').val(extensionSettings.customPlotNaturalPrompt || DEFAULT_PROMPTS.plotNatural);
     $('#rpg-prompt-avatar').val(extensionSettings.avatarLLMCustomInstruction || DEFAULT_PROMPTS.avatar);
@@ -156,11 +150,9 @@ function savePrompts() {
     extensionSettings.customHtmlPrompt = $('#rpg-prompt-html').val().trim();
     extensionSettings.customDialogueColoringPrompt = $('#rpg-prompt-dialogue-coloring').val().trim();
     extensionSettings.customDeceptionPrompt = $('#rpg-prompt-deception').val().trim();
-    extensionSettings.customOmnisciencePrompt = $('#rpg-prompt-omniscience').val().trim();
     extensionSettings.customCYOAPrompt = $('#rpg-prompt-cyoa').val().trim();
     extensionSettings.customSpotifyPrompt = $('#rpg-prompt-spotify').val().trim();
     extensionSettings.customNarratorPrompt = $('#rpg-prompt-narrator').val().trim();
-    extensionSettings.customContextInstructionsPrompt = $('#rpg-prompt-context-instructions').val().trim();
     extensionSettings.customPlotRandomPrompt = $('#rpg-prompt-plot-random').val().trim();
     extensionSettings.customPlotNaturalPrompt = $('#rpg-prompt-plot-natural').val().trim();
     extensionSettings.avatarLLMCustomInstruction = $('#rpg-prompt-avatar').val().trim();
@@ -190,9 +182,6 @@ function restorePromptToDefault(promptType) {
         case 'deception':
             extensionSettings.customDeceptionPrompt = '';
             break;
-        case 'omniscience':
-            extensionSettings.customOmnisciencePrompt = '';
-            break;
         case 'cyoa':
             extensionSettings.customCYOAPrompt = '';
             break;
@@ -202,9 +191,6 @@ function restorePromptToDefault(promptType) {
         case 'narrator':
             extensionSettings.customNarratorPrompt = '';
             break;
-        case 'contextInstructions':
-            extensionSettings.customContextInstructionsPrompt = '';
-            break;
         case 'plotRandom':
             extensionSettings.customPlotRandomPrompt = '';
             break;
@@ -235,11 +221,9 @@ function restoreAllToDefaults() {
     $('#rpg-prompt-html').val(DEFAULT_PROMPTS.html);
     $('#rpg-prompt-dialogue-coloring').val(DEFAULT_PROMPTS.dialogueColoring);
     $('#rpg-prompt-deception').val(DEFAULT_PROMPTS.deception);
-    $('#rpg-prompt-omniscience').val(DEFAULT_PROMPTS.omniscience);
     $('#rpg-prompt-cyoa').val(DEFAULT_PROMPTS.cyoa);
     $('#rpg-prompt-spotify').val(DEFAULT_PROMPTS.spotify);
     $('#rpg-prompt-narrator').val(DEFAULT_PROMPTS.narrator);
-    $('#rpg-prompt-context-instructions').val(DEFAULT_PROMPTS.contextInstructions);
     $('#rpg-prompt-plot-random').val(DEFAULT_PROMPTS.plotRandom);
     $('#rpg-prompt-plot-natural').val(DEFAULT_PROMPTS.plotNatural);
     $('#rpg-prompt-avatar').val(DEFAULT_PROMPTS.avatar);
@@ -251,11 +235,9 @@ function restoreAllToDefaults() {
     extensionSettings.customHtmlPrompt = '';
     extensionSettings.customDialogueColoringPrompt = '';
     extensionSettings.customDeceptionPrompt = '';
-    extensionSettings.customOmnisciencePrompt = '';
     extensionSettings.customCYOAPrompt = '';
     extensionSettings.customSpotifyPrompt = '';
     extensionSettings.customNarratorPrompt = '';
-    extensionSettings.customContextInstructionsPrompt = '';
     extensionSettings.customPlotRandomPrompt = '';
     extensionSettings.customPlotNaturalPrompt = '';
     extensionSettings.avatarLLMCustomInstruction = '';

src/systems/ui/theme.js

@@ -5,37 +5,6 @@
 
 import { extensionSettings, $panelContainer } from '../../core/state.js';
 
-/**
- * Converts hex color and opacity percentage to rgba string
- * @param {string} hex - Hex color (e.g., '#ff0000')
- * @param {number} opacity - Opacity percentage (0-100)
- * @returns {string} - RGBA color string
- */
-export function hexToRgba(hex, opacity = 100) {
-    const r = parseInt(hex.slice(1, 3), 16);
-    const g = parseInt(hex.slice(3, 5), 16);
-    const b = parseInt(hex.slice(5, 7), 16);
-    const a = opacity / 100;
-    return `rgba(${r}, ${g}, ${b}, ${a})`;
-}
-
-/**
- * Gets stat bar colors with opacity applied
- * @returns {{low: string, high: string}} RGBA color strings for stat bars
- */
-export function getStatBarColors() {
-    return {
-        low: hexToRgba(
-            extensionSettings.statBarColorLow || '#cc3333',
-            extensionSettings.statBarColorLowOpacity ?? 100
-        ),
-        high: hexToRgba(
-            extensionSettings.statBarColorHigh || '#33cc66',
-            extensionSettings.statBarColorHighOpacity ?? 100
-        )
-    };
-}
-
 /**
  * Applies the selected theme to the panel.
  */
@@ -106,33 +75,24 @@ export function applyCustomTheme() {
 
     const colors = extensionSettings.customColors;
 
-    // Convert hex colors with opacity to rgba
-    const bgColor = hexToRgba(colors.bg, colors.bgOpacity ?? 100);
-    const accentColor = hexToRgba(colors.accent, colors.accentOpacity ?? 100);
-    const textColor = hexToRgba(colors.text, colors.textOpacity ?? 100);
-    const highlightColor = hexToRgba(colors.highlight, colors.highlightOpacity ?? 100);
-
-    // Create shadow with 50% opacity of highlight color
-    const shadowColor = hexToRgba(colors.highlight, (colors.highlightOpacity ?? 100) * 0.5);
-
     // Apply custom CSS variables as inline styles to main panel
     $panelContainer.css({
-        '--rpg-bg': bgColor,
-        '--rpg-accent': accentColor,
-        '--rpg-text': textColor,
-        '--rpg-highlight': highlightColor,
-        '--rpg-border': highlightColor,
-        '--rpg-shadow': shadowColor
+        '--rpg-bg': colors.bg,
+        '--rpg-accent': colors.accent,
+        '--rpg-text': colors.text,
+        '--rpg-highlight': colors.highlight,
+        '--rpg-border': colors.highlight,
+        '--rpg-shadow': `${colors.highlight}80` // Add alpha for shadow
     });
 
     // Apply custom colors to mobile toggle and thought elements
     const customStyles = {
-        '--rpg-bg': bgColor,
-        '--rpg-accent': accentColor,
-        '--rpg-text': textColor,
-        '--rpg-highlight': highlightColor,
-        '--rpg-border': highlightColor,
-        '--rpg-shadow': shadowColor
+        '--rpg-bg': colors.bg,
+        '--rpg-accent': colors.accent,
+        '--rpg-text': colors.text,
+        '--rpg-highlight': colors.highlight,
+        '--rpg-border': colors.highlight,
+        '--rpg-shadow': `${colors.highlight}80`
     };
 
     const $mobileToggle = $('#rpg-mobile-toggle');
@@ -179,7 +139,6 @@ export function updateFeatureTogglesVisibility() {
     const $htmlToggle = $('#rpg-html-toggle-wrapper');
     const $dialogueColoringToggle = $('#rpg-dialogue-coloring-toggle-wrapper');
     const $deceptionToggle = $('#rpg-deception-toggle-wrapper');
-    const $omniscienceToggle = $('#rpg-omniscience-toggle-wrapper');
     const $cyoaToggle = $('#rpg-cyoa-toggle-wrapper');
     const $spotifyToggle = $('#rpg-spotify-toggle-wrapper');
 
@@ -191,7 +150,6 @@ export function updateFeatureTogglesVisibility() {
     $htmlToggle.toggle(extensionSettings.showHtmlToggle);
     $dialogueColoringToggle.toggle(extensionSettings.showDialogueColoringToggle);
     $deceptionToggle.toggle(extensionSettings.showDeceptionToggle ?? true);
-    $omniscienceToggle.toggle(extensionSettings.showOmniscienceToggle ?? true);
     $cyoaToggle.toggle(extensionSettings.showCYOAToggle ?? true);
     $spotifyToggle.toggle(extensionSettings.showSpotifyToggle);
 
@@ -203,7 +161,6 @@ export function updateFeatureTogglesVisibility() {
     const anyVisible = extensionSettings.showHtmlToggle ||
                       extensionSettings.showDialogueColoringToggle ||
                       (extensionSettings.showDeceptionToggle ?? true) ||
-                      (extensionSettings.showOmniscienceToggle ?? true) ||
                       (extensionSettings.showCYOAToggle ?? true) ||
                       extensionSettings.showSpotifyToggle ||
                       extensionSettings.showDynamicWeatherToggle ||

src/systems/ui/weatherEffects.js

@@ -113,33 +113,82 @@ function parseWeatherType(weatherText) {
 
     const text = weatherText.toLowerCase();
 
-    // Check for specific weather conditions (order matters - check combined effects first)
-    if (text.includes('blizzard')) {
-        return 'blizzard'; // Snow + Wind
-    }
-    if (text.includes('storm') || text.includes('thunder') || text.includes('lightning')) {
-        return 'storm'; // Rain + Lightning
-    }
-    if (text.includes('wind') || text.includes('breeze') || text.includes('gust') || text.includes('gale')) {
-        return 'wind';
-    }
-    if (text.includes('snow') || text.includes('flurries')) {
-        return 'snow';
-    }
-    if (text.includes('rain') || text.includes('drizzle') || text.includes('shower')) {
-        return 'rain';
-    }
-    if (text.includes('mist') || text.includes('fog') || text.includes('haze')) {
-        return 'mist';
-    }
-    if (text.includes('sunny') || text.includes('clear') || text.includes('bright')) {
-        return 'sunny';
-    }
-    if (text.includes('cloud') || text.includes('overcast') || text.includes('indoor') || text.includes('inside')) {
-        return 'none';
-    }
+    const weather_en = new Map([
+    ["blizzard", "blizzard"],
+    ["storm", "storm,thunder,lightning"],
+    ["wind", "wind,breeze,gust,gale"],
+    ["snow", "snow,flurries"],
+    ["rain", "rain,drizzle,shower"],
+    ["mist", "mist,fog,haze"],
+    ["sunny", "sunny,clear,bright"],
+    ["none", "cloud,overcast,indoor,inside"],
+  ]);
 
-    return 'none';
+  const weather_ru = new Map([
+    ["blizzard", "метель"],
+    ["storm", "гроза,буря,шторм"],
+    [
+      "wind",
+      "ветер,ветрено,ветерок,бриз,легкий бриз,слегка ветрено,легкий ветер,шквал,буря",
+    ],
+    ["snow", "снег,снегопад"],
+    ["rain", "дождь,морось,ливень"],
+    ["mist", "мгла,туман,туманно"],
+    ["sunny", "солнечно,ясно,ярко,ясное утро,ясный день"],
+    ["none", "облачно,пасмурно,в помещении,внутри"],
+  ]);
+
+    // Check for specific weather conditions (order matters - check combined effects first)
+    if (
+    weather_en.get("blizzard").includes(text) ||
+    weather_ru.get("blizzard").includes(text)
+  ) {
+    return "blizzard"; // Snow + Wind
+  }
+  if (
+    weather_en.get("storm").includes(text) ||
+    weather_ru.get("storm").includes(text)
+  ) {
+    return "storm"; // Rain + Lightning
+  }
+  if (
+    weather_en.get("wind").includes(text) ||
+    weather_ru.get("wind").includes(text)
+  ) {
+    return "wind";
+  }
+  if (
+    weather_en.get("snow").includes(text) ||
+    weather_ru.get("snow").includes(text)
+  ) {
+    return "snow";
+  }
+  if (
+    weather_en.get("rain").includes(text) ||
+    weather_ru.get("rain").includes(text)
+  ) {
+    return "rain";
+  }
+  if (
+    weather_en.get("mist").includes(text) ||
+    weather_ru.get("mist").includes(text)
+  ) {
+    return "mist";
+  }
+  if (
+    weather_en.get("sunny").includes(text) ||
+    weather_ru.get("sunny").includes(text)
+  ) {
+    return "sunny";
+  }
+  if (
+    weather_en.get("none").includes(text) ||
+    weather_ru.get("none").includes(text)
+  ) {
+    return "none";
+  }
+
+  return "none";
 }
 
 /**

template.html

@@ -139,15 +139,6 @@
                     </label>
                 </div>
 
-                <!-- Omniscience Filter Toggle -->
-                <div class="rpg-toggle-container rpg-feature-col" id="rpg-omniscience-toggle-wrapper">
-                    <label class="rpg-toggle-label" title="Omniscience Filter">
-                        <input type="checkbox" id="rpg-toggle-omniscience">
-                        <i class="fa-solid fa-eye-slash"></i>
-                        <span class="rpg-toggle-text" data-i18n-key="template.mainPanel.omniscienceFilter">Omniscience Filter</span>
-                    </label>
-                </div>
-
                 <!-- CYOA Toggle -->
                 <div class="rpg-toggle-container rpg-feature-col" id="rpg-cyoa-toggle-wrapper">
                     <label class="rpg-toggle-label" title="CYOA">
@@ -250,49 +241,29 @@
                     <div class="rpg-setting-row">
                         <label for="rpg-custom-bg"
                             data-i18n-key="template.settingsModal.themeOptions.custom.background">Background:</label>
-                        <div style="display: flex; gap: 8px; align-items: center;">
-                            <input type="color" id="rpg-custom-bg" value="#1a1a2e" style="width: 60px;" />
-                            <input type="range" id="rpg-custom-bg-opacity" min="0" max="100" value="100" style="flex: 1;" />
-                            <span id="rpg-custom-bg-opacity-value" style="min-width: 35px; text-align: right;">100%</span>
-                        </div>
+                        <input type="color" id="rpg-custom-bg" value="#1a1a2e" />
                     </div>
                     <div class="rpg-setting-row">
                         <label for="rpg-custom-accent"
                             data-i18n-key="template.settingsModal.themeOptions.custom.accent">Accent:</label>
-                        <div style="display: flex; gap: 8px; align-items: center;">
-                            <input type="color" id="rpg-custom-accent" value="#16213e" style="width: 60px;" />
-                            <input type="range" id="rpg-custom-accent-opacity" min="0" max="100" value="100" style="flex: 1;" />
-                            <span id="rpg-custom-accent-opacity-value" style="min-width: 35px; text-align: right;">100%</span>
-                        </div>
+                        <input type="color" id="rpg-custom-accent" value="#16213e" />
                     </div>
                     <div class="rpg-setting-row">
                         <label for="rpg-custom-text"
                             data-i18n-key="template.settingsModal.themeOptions.custom.text">Text:</label>
-                        <div style="display: flex; gap: 8px; align-items: center;">
-                            <input type="color" id="rpg-custom-text" value="#eaeaea" style="width: 60px;" />
-                            <input type="range" id="rpg-custom-text-opacity" min="0" max="100" value="100" style="flex: 1;" />
-                            <span id="rpg-custom-text-opacity-value" style="min-width: 35px; text-align: right;">100%</span>
-                        </div>
+                        <input type="color" id="rpg-custom-text" value="#eaeaea" />
                     </div>
                     <div class="rpg-setting-row">
                         <label for="rpg-custom-highlight"
                             data-i18n-key="template.settingsModal.themeOptions.custom.highlight">Highlight:</label>
-                        <div style="display: flex; gap: 8px; align-items: center;">
-                            <input type="color" id="rpg-custom-highlight" value="#e94560" style="width: 60px;" />
-                            <input type="range" id="rpg-custom-highlight-opacity" min="0" max="100" value="100" style="flex: 1;" />
-                            <span id="rpg-custom-highlight-opacity-value" style="min-width: 35px; text-align: right;">100%</span>
-                        </div>
+                        <input type="color" id="rpg-custom-highlight" value="#e94560" />
                     </div>
                 </div>
 
                 <div class="rpg-setting-row">
                     <label for="rpg-stat-bar-color-low" data-i18n-key="template.settingsModal.theme.statBarLow">Stat Bar
                         Color (Low):</label>
-                    <div style="display: flex; gap: 8px; align-items: center;">
-                        <input type="color" id="rpg-stat-bar-color-low" value="#cc3333" style="width: 60px;" />
-                        <input type="range" id="rpg-stat-bar-color-low-opacity" min="0" max="100" value="100" style="flex: 1;" />
-                        <span id="rpg-stat-bar-color-low-opacity-value" style="min-width: 35px; text-align: right;">100%</span>
-                    </div>
+                    <input type="color" id="rpg-stat-bar-color-low" value="#cc3333" />
                     <small data-i18n-key="template.settingsModal.theme.statBarLowNote">Color when stats are at
                         0%.</small>
                 </div>
@@ -300,11 +271,7 @@
                 <div class="rpg-setting-row">
                     <label for="rpg-stat-bar-color-high" data-i18n-key="template.settingsModal.theme.statBarHigh">Stat
                         Bar Color (High):</label>
-                    <div style="display: flex; gap: 8px; align-items: center;">
-                        <input type="color" id="rpg-stat-bar-color-high" value="#33cc66" style="width: 60px;" />
-                        <input type="range" id="rpg-stat-bar-color-high-opacity" min="0" max="100" value="100" style="flex: 1;" />
-                        <span id="rpg-stat-bar-color-high-opacity-value" style="min-width: 35px; text-align: right;">100%</span>
-                    </div>
+                    <input type="color" id="rpg-stat-bar-color-high" value="#33cc66" />
                     <small data-i18n-key="template.settingsModal.theme.statBarHighNote">Color when stats are at
                         100%.</small>
                 </div>
@@ -421,15 +388,6 @@
                     Display a toggle button to enable/disable special formatting of lies and deceptions crafted by the model, allowing it to easily track whenever one was committed, without showing it to the user.
                 </small>
 
-                <label class="checkbox_label">
-                    <input type="checkbox" id="rpg-toggle-show-omniscience-toggle" />
-                    <span data-i18n-key="template.settingsModal.display.showOmniscienceToggle">Show Omniscience Filter</span>
-                </label>
-                <small style="display: block; margin-left: 24px; margin-top: -8px; color: #888; font-size: 11px;"
-                    data-i18n-key="template.settingsModal.display.showOmniscienceToggleNote">
-                    Display a toggle button to enable/disable the omniscience filter, which instructs the AI to hide information the player character cannot perceive (events behind them, in other rooms, etc.) in special tags.
-                </small>
-
                 <label class="checkbox_label">
                     <input type="checkbox" id="rpg-toggle-show-cyoa-toggle" />
                     <span data-i18n-key="template.settingsModal.display.showCYOAToggle">Show CYOA</span>
@@ -1038,20 +996,6 @@
                 </button>
             </div>
 
-            <!-- Omniscience Filter Prompt -->
-            <div class="rpg-prompt-editor-section">
-                <label for="rpg-prompt-omniscience" style="display: block; margin-bottom: 8px; font-weight: 600;">
-                    <i class="fa-solid fa-eye-slash"></i> Omniscience Filter Prompt
-                </label>
-                <small style="display: block; margin-bottom: 8px; color: #888; font-size: 11px;">
-                    Injected when "Enable Omniscience Filter" is enabled. Instructs AI to separate information the player character cannot perceive into hidden filter tags.
-                </small>
-                <textarea id="rpg-prompt-omniscience" class="rpg-prompt-textarea" rows="6"></textarea>
-                <button class="menu_button rpg-restore-prompt-btn" data-prompt="omniscience" style="margin-top: 8px;">
-                    <i class="fa-solid fa-rotate-left"></i>&nbsp;Restore Default
-                </button>
-            </div>
-
             <!-- CYOA Prompt -->
             <div class="rpg-prompt-editor-section">
                 <label for="rpg-prompt-cyoa" style="display: block; margin-bottom: 8px; font-weight: 600;">
@@ -1094,20 +1038,6 @@
                 </button>
             </div>
 
-            <!-- Context Instructions Prompt -->
-            <div class="rpg-prompt-editor-section">
-                <label for="rpg-prompt-context-instructions" style="display: block; margin-bottom: 8px; font-weight: 600;">
-                    <i class="fa-solid fa-comment-dots"></i> Context Instructions Prompt
-                </label>
-                <small style="display: block; margin-bottom: 8px; color: #888; font-size: 11px;">
-                    Injected in Separate/External mode after the context summary. Tells the AI how to use the context.
-                </small>
-                <textarea id="rpg-prompt-context-instructions" class="rpg-prompt-textarea" rows="4"></textarea>
-                <button class="menu_button rpg-restore-prompt-btn" data-prompt="contextInstructions" style="margin-top: 8px;">
-                    <i class="fa-solid fa-rotate-left"></i>&nbsp;Restore Default
-                </button>
-            </div>
-
             <!-- Random Plot Progression Prompt -->
             <div class="rpg-prompt-editor-section">
                 <label for="rpg-prompt-plot-random" style="display: block; margin-bottom: 8px; font-weight: 600;">
@@ -1194,6 +1124,9 @@
         </div>
 
         <footer class="rpg-settings-popup-footer">
+            <button id="rpg-prompts-restore-all" class="rpg-btn-secondary" type="button">
+                <i class="fa-solid fa-rotate-left"></i> Restore All To Default
+            </button>
             <div class="rpg-footer-right">
                 <button id="rpg-prompts-cancel" class="rpg-btn-secondary" type="button">Cancel</button>
                 <button id="rpg-prompts-save" class="rpg-btn-primary" type="button">