rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-01-20 13:38:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

bak should not be here

Browse Source
This commit is contained in:
Bronya Rand 2023-12-04 16:05:05 -06:00
parent f71b83b14f
commit a90fe54e5b
2 changed files with 4 additions and 2497 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1780,9 +1780,10 @@ async function checkWorldInfo(chat, maxContext) {
console.debug(`WI UID:${entry.uid}: Filtering for secondary keyword - "${secondarySubstituted}".`);
// Simplified AND/NOT if statement. (Proper fix for PR#1356 by Bronya)
if (selectiveLogic === 0 && secondarySubstituted && matchKeys(textToScan, secondarySubstituted.trim()) ||
selectiveLogic === 1 && !(secondarySubstituted && matchKeys(textToScan, secondarySubstituted.trim()))) {
if (selectiveLogic === 0) {
if (selectiveLogic === 0 && (secondarySubstituted && matchKeys(textToScan, secondarySubstituted.trim())) || // If AND logic and the main checks pass
selectiveLogic === 1 && !(secondarySubstituted && matchKeys(textToScan, secondarySubstituted.trim()))) { // OR if NOT logic and the main checks do not pass
// Differ both logic statements in the debugger
if (selectiveLogic === 0) {
console.debug(`(AND Check) Activating WI Entry ${entry.uid}. Found match for word: ${substituted} ${secondarySubstituted}`);
} else {
console.debug(`(NOT Check) Activating WI Entry ${entry.uid}. Found match for word "${substituted}" without secondary keyword: ${secondarySubstituted}`);

2494
public/scripts/world-info.js.bak
View File

File diff suppressed because it is too large Load Diff