rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix a couple of issues with Group VN & overrides

Browse Source
This commit is contained in:
Cohee
2023-06-04 20:52:34 +03:00
parent f74342e83d
commit c5d51fcd3c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/scripts/extensions/expressions/index.js
View File

@ -142,7 +142,9 @@ async function visualNovelSetCharacterSprites(container, name, expression) {
const noSprites = sprites.length === 0; const noSprites = sprites.length === 0;
if (expressionImage.length > 0) { if (expressionImage.length > 0) {
if (name == character.name) { if (name == spriteFolderName) {
await validateImages(spriteFolderName, true);
setExpressionOverrideHtml(true); // <= force clear expression override input
const currentSpritePath = labels.includes(expression) ? sprites.find(x => x.label === expression)?.path : ''; const currentSpritePath = labels.includes(expression) ? sprites.find(x => x.label === expression)?.path : '';
const path = currentSpritePath || defaultSpritePath || ''; const path = currentSpritePath || defaultSpritePath || '';
@ -362,6 +364,7 @@ async function moduleWorker() {
spriteCache = {}; spriteCache = {};
expressionsList = await getExpressionsList(); expressionsList = await getExpressionsList();
await validateImages(spriteFolderName, true); await validateImages(spriteFolderName, true);
await forceUpdateVisualNovelMode();
} }
offlineMode.css('display', 'none'); offlineMode.css('display', 'none');
@ -423,7 +426,6 @@ function getSpriteFolderName(message) {
} }
const folderName = avatarPath.replace(/\.[^/.]+$/, ""); const folderName = avatarPath.replace(/\.[^/.]+$/, "");
console.debug(`Folder for ${message.name}:`, folderName);
return folderName; return folderName;
} }
@ -845,7 +847,7 @@ async function onClickExpressionDelete(event) {
await validateImages(name); await validateImages(name);
} }
function setExpressionOverrideHtml() { function setExpressionOverrideHtml(forceClear = false) {
const currentLastMessage = getLastCharacterMessage(); const currentLastMessage = getLastCharacterMessage();
const avatarFileName = getSpriteFolderName(currentLastMessage); const avatarFileName = getSpriteFolderName(currentLastMessage);
if (!avatarFileName) { if (!avatarFileName) {
@ -861,6 +863,10 @@ function setExpressionOverrideHtml() {
} else if (expressionOverride) { } else if (expressionOverride) {
delete extension_settings.expressionOverrides[expressionOverride.name]; delete extension_settings.expressionOverrides[expressionOverride.name];
} }
if (forceClear && !expressionOverride) {
$("#expression_override").val("");
}
} }
(function () { (function () {