rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update nums

This commit is contained in:
Bronya Rand 2023-12-04 18:44:49 -06:00
parent 5adfd107c0
commit d6649bf7d0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/scripts/world-info.js
View File

@ -37,8 +37,8 @@ const world_info_insertion_strategy = {
const world_info_logic = { const world_info_logic = {
AND_ONE: 0, AND_ONE: 0,
NOT_ALL: 1, NOT_ONE: 1,
NOT_ONE: 2, NOT_ALL: 2,
}; };
let world_info = {}; let world_info = {};
@ -1793,7 +1793,7 @@ async function checkWorldInfo(chat, maxContext) {
// Simplified AND ONE / NOT ONE if statement. (Proper fix for PR#1356 by Bronya) // Simplified AND ONE / NOT ONE if statement. (Proper fix for PR#1356 by Bronya)
// If AND ONE logic and the main checks pass OR if NOT ONE logic and the main checks do not pass // If AND ONE logic and the main checks pass OR if NOT ONE logic and the main checks do not pass
if ((selectiveLogic === world_info_logic.AND_ONE && hasSecondaryMatch) || (selectiveLogic === world_info_logic.NOT_ALL && !hasSecondaryMatch)) { if ((selectiveLogic === world_info_logic.AND_ONE && hasSecondaryMatch) || (selectiveLogic === world_info_logic.NOT_ONE && !hasSecondaryMatch)) {
// Differ both logic statements in the debugger // Differ both logic statements in the debugger
if (selectiveLogic === world_info_logic.AND_ONE) { if (selectiveLogic === world_info_logic.AND_ONE) {
console.debug(`(AND ONE Check) Activating WI Entry ${entry.uid}. Found match for word: ${substituted} ${secondarySubstituted}`); console.debug(`(AND ONE Check) Activating WI Entry ${entry.uid}. Found match for word: ${substituted} ${secondarySubstituted}`);
@ -1806,7 +1806,7 @@ async function checkWorldInfo(chat, maxContext) {
} }
// Handle NOT ALL logic // Handle NOT ALL logic
if (selectiveLogic === world_info_logic.NOT_ONE && !hasAnyMatch) { if (selectiveLogic === world_info_logic.NOT_ALL && !hasAnyMatch) {
console.debug(`(NOT ALL Check) Activating WI Entry ${entry.uid}, no secondary keywords found.`); console.debug(`(NOT ALL Check) Activating WI Entry ${entry.uid}, no secondary keywords found.`);
activatedNow.add(entry); activatedNow.add(entry);
} }