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 comments and debug text

Browse Source
This commit is contained in:
Bronya Rand
2023-12-04 18:40:33 -06:00
parent 6b0cca2532
commit 0c6885a453
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1791,25 +1791,26 @@ async function checkWorldInfo(chat, maxContext) {
hasAnyMatch = true; hasAnyMatch = true;
} }
// Simplified AND/NAND if statement. (Proper fix for PR#1356 by Bronya) // Simplified AND ONE/NOT ONE (AND/NOR) if statement. (Proper fix for PR#1356 by Bronya)
// If AND logic and the main checks pass OR if NOT 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 && hasSecondaryMatch) || (selectiveLogic === world_info_logic.NOT_ALL && !hasSecondaryMatch)) { if ((selectiveLogic === world_info_logic.AND && hasSecondaryMatch) || (selectiveLogic === world_info_logic.NOT_ALL && !hasSecondaryMatch)) {
// Differ both logic statements in the debugger // Differ both logic statements in the debugger
if (selectiveLogic === world_info_logic.AND) { if (selectiveLogic === world_info_logic.AND) {
console.debug(`(AND 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}`);
} else { } else {
console.debug(`(NOT AND Check) Activating WI Entry ${entry.uid}. Found match for word "${substituted}" without secondary keyword: ${secondarySubstituted}`); console.debug(`(NOT ONE Check) Activating WI Entry ${entry.uid}. Found match for word "${substituted}" without secondary keyword: ${secondarySubstituted}`);
} }
activatedNow.add(entry); activatedNow.add(entry);
break secondary; break secondary;
} }
} }
// Handle NOT OR logic // Handle NOT ALL (NOT AND) logic
if (selectiveLogic === world_info_logic.NOT_ONE && !hasAnyMatch) { if (selectiveLogic === world_info_logic.NOT_ONE && !hasAnyMatch) {
console.debug(`(NOT OR Check) Activating WI Entry ${entry.uid}. Found match for word "${substituted}" without secondary keyword.`); console.debug(`(NOT ALL Check) Activating WI Entry ${entry.uid}. Found match for word "${substituted}" without secondary keyword.`);
activatedNow.add(entry); activatedNow.add(entry);
} }
// Handle cases where secondary is empty // Handle cases where secondary is empty
} else { } else {
console.debug(`WI UID ${entry.uid}: Activated without filter logic.`); console.debug(`WI UID ${entry.uid}: Activated without filter logic.`);