committing before doing a gigantic refactor

Author: Dreamie-TMC

RandomizerCore/Randomizer/Logic/Dependency/NotItemDependency.cs

@@ -4,16 +4,16 @@ namespace RandomizerCore.Randomizer.Logic.Dependency;
 
 public class NotItemDependency : DependencyBase
 {
-    private readonly Item _requiredItem;
+    private readonly Item _excludedItem;
 
     public NotItemDependency(Item item)
     {
-        _requiredItem = item;
+        _excludedItem = item;
     }
 
     public override bool DependencyFulfilled(List<Item> availableItems, List<Location.Location> locations, Item? itemToPlace = null)
     {
-        return !_requiredItem.Equals(itemToPlace);
+        return !_excludedItem.EqualsIgnoreShufflePool(itemToPlace);
 
         //Console.WriteLine($"Missing {RequiredItem.Type}");
     }

RandomizerCore/Randomizer/Logic/Location/Location.cs

@@ -162,7 +162,9 @@ public bool CanPlace(Item itemToPlace, List<Item> availableItems, List<Location>
         if (!SecondaryAddressed && itemToPlace.SubValue != 0) return false;
 
         // Can only place in correct dungeon
-        if (itemToPlace.Dungeon != "" && !Dungeons.Contains(itemToPlace.Dungeon)) return false; 
+        if (itemToPlace.Dungeon != "" && !Dungeons.Contains(itemToPlace.Dungeon)) return false;
+
+        if ((Type == LocationType.DungeonPrize && itemToPlace.ShufflePool is not ItemPool.DungeonPrize) || (itemToPlace.ShufflePool is ItemPool.DungeonPrize && Type != LocationType.DungeonPrize)) return false;
 
         return ShufflerConstraints.All(constraint => constraint.Invoke(this, itemToPlace, availableItems, locations));
 
@@ -175,20 +177,20 @@ public bool IsAccessible(List<Item> availableItems, List<Location> locations, It
 
         RecursionCount++;
 
-        if (_availableCache != null)
-        {
-            RecursionCount--;
-            return (bool)_availableCache;
-        }
+        //if (_availableCache != null)
+        //{
+        //    RecursionCount--;
+        //    return (bool)_availableCache;
+        //}
 
         if (Dependencies.Any(dependency => !dependency.DependencyFulfilled(availableItems, locations, itemToPlace)))
         {
-            _availableCache = false;
+            //_availableCache = false;
             RecursionCount--;
             return false;
         }
 
-        _availableCache = true;
+        //_availableCache = true;
         RecursionCount--;
         return true;
     }

RandomizerCore/Randomizer/Models/Item.cs

@@ -72,7 +72,13 @@ public override bool Equals(object? obj)
     {
         if (obj == null || GetType() != obj.GetType()) return false;
         var asItem = (Item)obj;
-        return asItem.Type == Type && (asItem.SubValue == SubValue || asItem.UseAny || UseAny);
+        return asItem.Type == Type && (asItem.SubValue == SubValue || asItem.UseAny || UseAny) && asItem.ShufflePool == ShufflePool;
+    }
+
+    public bool EqualsIgnoreShufflePool(Item? item)
+    {
+        if (item == null) return false;
+        return item.Value.Type == Type && (item.Value.SubValue == SubValue || item.Value.UseAny || UseAny);
     }
 
     public override int GetHashCode()

RandomizerCore/Randomizer/Models/Sphere.cs

@@ -11,4 +11,20 @@ public class Sphere
     public int SphereNumber { get; set; }
 
     public int TotalShuffledLocations { get; set; }
+    
+    public int MaxRetryCount { get; set; }
+    
+    public int CurrentAttemptCount { get; set; }
+
+    public List<Item> PreFilledItemsAddedThisSphere { get; set; }
+
+    public List<Location> PreFilledLocationsAddedThisSphere { get; set; }
+
+    //public List<Item> ElementsPlacedThisSphere { get; set; }
+
+    //public List<Location> ElementLocationsThisSphere { get; set; }
+
+    //public List<Item> DungeonItemsPlacedThisSphere { get; set; }
+
+    //public List<Location> DungeonLocationsPlacedThisSphere { get; set; }
 }