1 files changed, 96 insertions, 21 deletions

@@ -50,9 +50,16 @@ namespace ManifoldGardenArchipelago
 
     public abstract class Requirement
     {
+        public enum Decision
+        {
+            Maybe,
+            No,
+            Yes,
+        }
+
         public RequirementReferences references = new();
 
-        public abstract bool Check();
+        public abstract Decision Check();
     }
 
     public class AndRequirement : Requirement
@@ -69,9 +76,19 @@ namespace ManifoldGardenArchipelago
             }
         }
 
-        public override bool Check()
+        public override Decision Check()
         {
-            return _requirements.All(x => x.Check());
+            foreach (var requirement in _requirements)
+            {
+                Decision decision = requirement.Check();
+
+                if (decision != Decision.Yes)
+                {
+                    return decision;
+                }
+            }
+
+            return Decision.Yes;
         }
 
         public override string ToString()
@@ -94,9 +111,19 @@ namespace ManifoldGardenArchipelago
             }
         }
 
-        public override bool Check()
+        public override Decision Check()
         {
-            return _requirements.Any(x => x.Check());
+            foreach (var requirement in _requirements)
+            {
+                Decision decision = requirement.Check();
+
+                if (decision != Decision.No)
+                {
+                    return decision;
+                }
+            }
+
+            return Decision.No;
         }
 
         public override string ToString()
@@ -116,9 +143,9 @@ namespace ManifoldGardenArchipelago
             references.items.Add(itemName);
         }
 
-        public override bool Check()
+        public override Decision Check()
         {
-            return Plugin.archipelagoManager.HasItem(_itemName);
+            return Plugin.archipelagoManager.HasItem(_itemName) ? Decision.Yes : Decision.No;
         }
 
         public override string ToString()
@@ -138,9 +165,9 @@ namespace ManifoldGardenArchipelago
             references.scenes.Add(sceneName);
         }
 
-        public override bool Check()
+        public override Decision Check()
         {
-            return Plugin.slotSave.VisitedScenes.Contains(_sceneName);
+            return Plugin.slotSave.VisitedScenes.Contains(_sceneName) ? Decision.Yes : Decision.No;
         }
 
         public override string ToString()
@@ -161,9 +188,16 @@ namespace ManifoldGardenArchipelago
             references.buttons.Add(button);
         }
 
-        public override bool Check()
+        public override Decision Check()
         {
-            return Plugin.slotSave.ActivatedButtons.Contains(_button);
+            if (Plugin.slotSave.ActivatedButtons.TryGetValue(_button, out bool value))
+            {
+                return value ? Decision.Yes : Decision.No;
+            }
+            else
+            {
+                return Decision.Maybe;
+            }
         }
 
         public override string ToString()
@@ -184,9 +218,16 @@ namespace ManifoldGardenArchipelago
             references.sockets.Add(socket);
         }
 
-        public override bool Check()
+        public override Decision Check()
         {
-            return Plugin.slotSave.ActivatedSockets.Contains(_socket);
+            if (Plugin.slotSave.ActivatedSockets.TryGetValue(_socket, out bool value))
+            {
+                return value ? Decision.Yes : Decision.No;
+            }
+            else
+            {
+                return Decision.Maybe;
+            }
         }
 
         public override string ToString()
@@ -207,9 +248,16 @@ namespace ManifoldGardenArchipelago
             references.pads.Add(pad);
         }
 
-        public override bool Check()
+        public override Decision Check()
         {
-            return Plugin.slotSave.ActivatedPads.Contains(_pad);
+            if (Plugin.slotSave.ActivatedPads.TryGetValue(_pad, out bool value))
+            {
+                return value ? Decision.Yes : Decision.No;
+            }
+            else
+            {
+                return Decision.Maybe;
+            }
         }
 
         public override string ToString()
@@ -230,9 +278,16 @@ namespace ManifoldGardenArchipelago
             references.waterwheels.Add(waterwheel);
         }
 
-        public override bool Check()
+        public override Decision Check()
         {
-            return Plugin.slotSave.ActivatedWaterwheels.Contains(_waterwheel);
+            if (Plugin.slotSave.ActivatedWaterwheels.TryGetValue(_waterwheel, out bool value))
+            {
+                return value ? Decision.Yes : Decision.No;
+            }
+            else
+            {
+                return Decision.Maybe;
+            }
         }
 
         public override string ToString()
@@ -253,9 +308,16 @@ namespace ManifoldGardenArchipelago
             references.spheres.Add(sphere);
         }
 
-        public override bool Check()
+        public override Decision Check()
         {
-            return Plugin.slotSave.ActivatedSpheres.Contains(_sphere);
+            if (Plugin.slotSave.ActivatedSpheres.TryGetValue(_sphere, out bool value))
+            {
+                return value ? Decision.Yes : Decision.No;
+            }
+            else
+            {
+                return Decision.Maybe;
+            }
         }
 
         public override string ToString()
@@ -275,9 +337,22 @@ namespace ManifoldGardenArchipelago
             references = requirement.references;
         }
 
-        public override bool Check()
+        public override Decision Check()
         {
-            return !_requirement.Check();
+            Decision subdec = _requirement.Check();
+
+            if (subdec == Decision.Yes)
+            {
+                return Decision.No;
+            }
+            else if (subdec == Decision.No)
+            {
+                return Decision.Yes;
+            }
+            else
+            {
+                return Decision.Maybe;
+            }
         }
 
         public override string ToString()