Merge pull request #59 from Catobat/0.7-dev

Fixed bug with elements being placed in inaccessible locations
minishmaker · Feb 27, 2023 · 91d68bf · 91d68bf
2 parents 7ec9ef7 + 11d92b0
commit 91d68bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/RandomizerCore/Controllers/ShufflerController.cs b/RandomizerCore/Controllers/ShufflerController.cs
@@ -32,7 +32,7 @@ public class ShufflerController
     public string RevName => RevisionIdentifier;
 
     internal static string VersionIdentifier => "v0.7.0";
-    internal static string RevisionIdentifier => "alpha-rev3";
+    internal static string RevisionIdentifier => "alpha-rev3-hotfix";
 
     public string SeedFilename =>
         $"Minish Randomizer-{Shuffler.Seed}-{Shuffler.Version}-{Shuffler.GetOptionsIdentifier()}";

diff --git a/RandomizerCore/Randomizer/Shuffler.cs b/RandomizerCore/Randomizer/Shuffler.cs
@@ -492,7 +492,8 @@ public void RandomizeLocations(bool useSphereBasedShuffler = false)
         FilledLocations.AddRange(nextLocationGroup);
 
         //Grab all items that we need to beat the seed
-        var allItems = MajorItems.Concat(DungeonMajorItems).Concat(DungeonEntrances).ToList();
+        var allItems = MajorItems.Concat(DungeonMajorItems).ToList();
+        var allItemsAndEntrances = MajorItems.Concat(DungeonMajorItems).Concat(DungeonEntrances).ToList();
 
         //Like entrances, constraints shouldn't check logic when placing
         //Shuffle constraints
@@ -526,7 +527,7 @@ public void RandomizeLocations(bool useSphereBasedShuffler = false)
         //Shuffle dungeon minors
         unfilledLocations.AddRange(FillLocationsFrontToBack(DungeonMinorItems,
             unfilledLocations,
-            allItems));
+            allItemsAndEntrances));
 
         unfilledLocations = unfilledLocations.Distinct().ToList();