sillytavern
Advanced tools
Comparing version 1.9.6 to 1.9.7
@@ -53,3 +53,3 @@ { | ||
}, | ||
"version": "1.9.6", | ||
"version": "1.9.7", | ||
"scripts": { | ||
@@ -56,0 +56,0 @@ "start": "node server.js", |
@@ -518,3 +518,3 @@ import { callPopup, eventSource, event_types, getRequestHeaders, saveSettingsDebounced } from "../../../script.js"; | ||
$('#image_type_toggle').prop('checked', extension_settings.expressions.live2d); | ||
if(extension_settings.expressions.live2d == true){ | ||
if (extension_settings.expressions.live2d) { | ||
setLive2dState(extension_settings.expressions.live2d); | ||
@@ -645,7 +645,7 @@ } | ||
if(live2dPath_f != null){ | ||
if (live2dPath_f != null) { | ||
//console.log("live2dPath_f " + live2dPath_f); | ||
return true; | ||
} else { | ||
//console.log("live2dPath_f is null"); | ||
} else { | ||
//console.log("live2dPath_f is null"); | ||
unloadLiveChar(); | ||
@@ -659,3 +659,3 @@ return false; | ||
function setLive2dState(switch_var){ | ||
function setLive2dState(switch_var) { | ||
extension_settings.expressions.live2d = switch_var; // Store setting | ||
@@ -668,8 +668,8 @@ saveSettingsDebounced(); | ||
if (extension_settings.expressions.live2d) { | ||
loadLiveChar(); | ||
} else { | ||
unloadLiveChar(); | ||
} | ||
handleImageChange(switch_var); // Change image as needed | ||
if (extension_settings.expressions.live2d) { | ||
loadLiveChar(); | ||
} else { | ||
unloadLiveChar(); | ||
} | ||
handleImageChange(switch_var); // Change image as needed | ||
@@ -681,6 +681,2 @@ | ||
}); | ||
} | ||
@@ -875,4 +871,3 @@ | ||
async function setExpression(character, expression, force) { | ||
if (extension_settings.expressions.live2d == false) { | ||
if (!extension_settings.expressions.live2d) { | ||
console.debug('entered setExpressions'); | ||
@@ -970,8 +965,9 @@ await validateImages(character); | ||
}); | ||
} else { | ||
if (extension_settings.expressions.showDefault) { | ||
setDefault(); | ||
} | ||
} | ||
} | ||
else { | ||
if (extension_settings.expressions.showDefault) { | ||
setDefault(); | ||
} | ||
} | ||
@@ -992,10 +988,10 @@ function setDefault() { | ||
if (result) { | ||
// Find the <img> element with id="expression-image" and class="expression" | ||
const imgElement = document.querySelector('img#expression-image.expression'); | ||
//console.log("searching"); | ||
if (imgElement) { | ||
//console.log("setting value"); | ||
imgElement.src = getApiUrl() + '/api/live2d/result_feed'; | ||
} | ||
// Find the <img> element with id="expression-image" and class="expression" | ||
const imgElement = document.querySelector('img#expression-image.expression'); | ||
//console.log("searching"); | ||
if (imgElement) { | ||
//console.log("setting value"); | ||
imgElement.src = getApiUrl() + '/api/live2d/result_feed'; | ||
} | ||
} else { | ||
@@ -1265,10 +1261,11 @@ //console.log("The fetch failed!"); | ||
<div class="inline-drawer-content"> | ||
<!-- Toggle button for aituber/static images --> | ||
<!-- Toggle button for aituber/static images --> | ||
<div class="toggle_button"> | ||
<label class="switch"> | ||
<label class="switch"> | ||
<input id="image_type_toggle" type="checkbox"> | ||
<span class="slider round"></span> | ||
<label for="image_type_toggle">Image Type - Live2d (extras)</label> | ||
</div> | ||
<div class="offline_mode"> | ||
<label for="image_type_toggle">Image Type - Live2d (extras)</label> | ||
</label> | ||
</div> | ||
<div class="offline_mode"> | ||
<small>You are in offline mode. Click on the image below to set the expression.</small> | ||
@@ -1275,0 +1272,0 @@ </div> |
@@ -38,2 +38,3 @@ import { | ||
const MIN_STREAMING_KCPPVERSION = '1.30'; | ||
const KOBOLDCPP_ORDER = [6, 0, 1, 3, 4, 2, 5]; | ||
@@ -147,3 +148,3 @@ function formatKoboldUrl(value) { | ||
return; | ||
} | ||
} | ||
} | ||
@@ -281,2 +282,8 @@ } | ||
}); | ||
$('#samplers_order_recommended').on('click', function () { | ||
kai_settings.sampler_order = KOBOLDCPP_ORDER; | ||
sortItemsByOrder(kai_settings.sampler_order); | ||
saveSettingsDebounced(); | ||
}); | ||
}); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
41263264
65236