From 537e9428e0818e7a6e70fa03cb30aa8ae193e970 Mon Sep 17 00:00:00 2001
From: Bronya Rand <azarieldc@gmail.com>
Date: Tue, 5 Dec 2023 03:00:26 -0600
Subject: [PATCH] proper revert cuz vsc revert weird...

---
 public/index.html            |  6 +++---
 public/scripts/world-info.js | 21 ++++++++++-----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/public/index.html b/public/index.html
index 2c3d8f1f4..4eab27c83 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4072,8 +4072,8 @@
                                     <small class="textAlignCenter">Logic</small>
                                     <select name="entryLogicType" class="widthFitContent margin0">
                                         <option value="0">AND ONE</option>
-                                        <option value="1">NOT ONE</option>
-                                        <option value="2">NOT ALL</option>
+                                        <option value="1">NOT ALL</option>
+                                        <option value="2">NOT ONE</option>
                                     </select>
                                 </div>
                                 <div class="world_entry_form_control keysecondary flex1">
@@ -4943,4 +4943,4 @@
     </script>
 </body>
 
-</html>
+</html>
\ No newline at end of file
diff --git a/public/scripts/world-info.js b/public/scripts/world-info.js
index 429e9d145..2ba9c5249 100644
--- a/public/scripts/world-info.js
+++ b/public/scripts/world-info.js
@@ -37,8 +37,8 @@ const world_info_insertion_strategy = {
 
 const world_info_logic = {
     AND_ONE: 0,
-    NOT_ONE: 1,
-    NOT_ALL: 2,
+    NOT_ALL: 1,
+    NOT_ONE: 2,
 };
 
 let world_info = {};
@@ -1791,26 +1791,25 @@ async function checkWorldInfo(chat, maxContext) {
                                     hasAnyMatch = true;
                                 }
 
-                                // 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 ((selectiveLogic === world_info_logic.AND_ONE && hasSecondaryMatch) || (selectiveLogic === world_info_logic.NOT_ONE && !hasSecondaryMatch)) {
+                                // Simplified AND ONE / NOT ALL if statement. (Proper fix for PR#1356 by Bronya)
+                                // If AND ONE logic and the main checks pass OR if NOT ALL logic and the main checks do not pass
+                                if ((selectiveLogic === world_info_logic.AND_ONE && hasSecondaryMatch) || (selectiveLogic === world_info_logic.NOT_ALL && !hasSecondaryMatch)) {
                                     // Differ both logic statements in the debugger
                                     if (selectiveLogic === world_info_logic.AND_ONE) {
                                         console.debug(`(AND ONE Check) Activating WI Entry ${entry.uid}. Found match for word: ${substituted} ${secondarySubstituted}`);
                                     } else {
-                                        console.debug(`(NOT ONE Check) Activating WI Entry ${entry.uid}. Found match for word "${substituted}" without secondary keyword: ${secondarySubstituted}`);
+                                        console.debug(`(NOT ALL Check) Activating WI Entry ${entry.uid}. Found match for word "${substituted}" without secondary keyword: ${secondarySubstituted}`);
                                     }
                                     activatedNow.add(entry);
                                     break secondary;
                                 }
                             }
 
-                            // Handle NOT ALL logic
-                            if (selectiveLogic === world_info_logic.NOT_ALL && !hasAnyMatch) {
-                                console.debug(`(NOT ALL Check) Activating WI Entry ${entry.uid}, no secondary keywords found.`);
+                            // Handle NOT ONE logic
+                            if (selectiveLogic === world_info_logic.NOT_ONE && !hasAnyMatch) {
+                                console.debug(`(NOT ONE Check) Activating WI Entry ${entry.uid}, no secondary keywords found.`);
                                 activatedNow.add(entry);
                             }
-                            
                         // Handle cases where secondary is empty
                         } else {
                             console.debug(`WI UID ${entry.uid}: Activated without filter logic.`);
@@ -2487,4 +2486,4 @@ jQuery(() => {
             closeOnSelect: false,
         });
     }
-});
+});
\ No newline at end of file