Merge pull request #73 from munimunigamer/merge-fix-69-70

Quick fix on the merge problem
This commit is contained in:
Spicy Marinara
2025-12-26 18:13:41 +01:00
committed by GitHub
+3 -1
View File
@@ -425,6 +425,8 @@ async function initUI() {
$('#rpg-avatar-llm-instruction').on('input', function() { $('#rpg-avatar-llm-instruction').on('input', function() {
extensionSettings.avatarLLMCustomInstruction = $(this).val().trim(); extensionSettings.avatarLLMCustomInstruction = $(this).val().trim();
saveSettings(); saveSettings();
});
$('#rpg-toggle-dice-display').on('change', function() { $('#rpg-toggle-dice-display').on('change', function() {
extensionSettings.showDiceDisplay = $(this).prop('checked'); extensionSettings.showDiceDisplay = $(this).prop('checked');
saveSettings(); saveSettings();
@@ -521,7 +523,7 @@ async function initUI() {
// Set default HTML prompt as actual text if no custom prompt exists // Set default HTML prompt as actual text if no custom prompt exists
$('#rpg-custom-html-prompt').val(extensionSettings.customHtmlPrompt || DEFAULT_HTML_PROMPT); $('#rpg-custom-html-prompt').val(extensionSettings.customHtmlPrompt || DEFAULT_HTML_PROMPT);
$('#rpg-toggle-plot-buttons').prop('checked', extensionSettings.enablePlotButtons); $('#rpg-toggle-plot-buttons').prop('checked', extensionSettings.enablePlotButtons); $('#rpg-toggle-plot-buttons').prop('checked', extensionSettings.enablePlotButtons); $('#rpg-toggle-plot-buttons').prop('checked', extensionSettings.enablePlotButtons);
$('#rpg-toggle-animations').prop('checked', extensionSettings.enableAnimations); $('#rpg-toggle-animations').prop('checked', extensionSettings.enableAnimations);
// Initialize avatar options // Initialize avatar options