A bunch more fixes. This concludes all the fixes/improvements from running a bunch of random% seeds.

Author: Ellendar

RandomizerCore/CustomTexts.cs

@@ -842,9 +842,9 @@ private static void GenerateSpellHints(IEnumerable<Location> locations, List<Tex
                     hints[mirrorSpellHintIndex] = mirrorHint;
                 }
 
+                itemLocation = locations.FirstOrDefault(i => i.Collectables.Contains(Collectable.WATER))!;
                 if (itemLocation != null)
                 {
-                    itemLocation = locations.FirstOrDefault(i => i.Collectables.Contains(Collectable.WATER))!;
                     Text waterHint = Text.GenerateHelpfulHint(locations.ToList(), itemLocation, Collectable.WATER, props.IncludeSpellsInShuffle);
                     hints[waterSpellHintIndex] = waterHint;
                 }

RandomizerCore/Hyrule.cs

@@ -36,7 +36,7 @@ public class Hyrule
     //The higher you set it, the more likely a given terrain is to find a set of items that works, resulting in fewer terrain generations.
     //It will also increase the number of seeds that have more arcane solutions, where only a specific item route works.
     //This was originally set to 10, but increasing it to 100 massively reduces the number of extremely degenerate caldera and mountain generation times
-    private const int NON_TERRAIN_SHUFFLE_ATTEMPT_LIMIT = 200;
+    private const int NON_TERRAIN_SHUFFLE_ATTEMPT_LIMIT = 100;
 
     //This controls how many times
     private const int NON_CONTINENT_SHUFFLE_ATTEMPT_LIMIT = 10;

RandomizerCore/Sidescroll/CoordinatePalaceGenerator.cs

@@ -44,7 +44,7 @@ protected static bool AddSpecialRoomsByReplacement(Palace palace, RoomPool roomP
             }
         }
         //Tbird Room
-        else
+        else if(!props.RemoveTbird)
         {
             if (roomPool.TbirdRooms.Count == 0)
             {
@@ -139,7 +139,7 @@ protected static bool AddSpecialRoomsByReplacement(Palace palace, RoomPool roomP
         //Maybe we use ShuffleRooms()?
         //So for now we suffer lesser performance (but still way better than Reconstructed so do we care?)
         if (!palace.AllReachable()
-            || (palace.Number == 7 && props.RequireTbird && !palace.RequiresThunderbird())
+            || (palace.Number == 7 && !props.RemoveTbird && !palace.RequiresThunderbird())
             || (palace.Number == 7 && !palace.IsBossRoomAtLeastMinDistance(props.DarkLinkMinDistance))
         )
         {

RandomizerCore/Sidescroll/Palace.cs

@@ -1296,15 +1296,8 @@ public void ValidateRoomConnections()
         }
     }
 
-    public byte AssignMapNumbers(byte currentMap, bool isGP, bool isVanilla, int roomCount)
+    public byte AssignMapNumbers(byte currentMap, bool isGP, bool isVanilla, int roomCount, bool removeTbird)
     {
-        //I have no idea why this was here and it breaks stuff. For future removal.
-        /*
-        if(isVanilla)
-        {
-            return AllRooms.Max(i => (byte)(i.Map + 1));
-        }
-        */
         int startingCurrentMap = currentMap;
         if (!AllRooms.Contains(Entrance!))
         {
@@ -1324,7 +1317,7 @@ public byte AssignMapNumbers(byte currentMap, bool isGP, bool isVanilla, int roo
             throw new Exception("Palace has an extra boss room");
         }
         BossRoom.Map = currentMap++;
-        if (isGP)
+        if (isGP && !removeTbird)
         {
             if (TbirdRoom == null || !AllRooms.Contains(TbirdRoom))
             {

RandomizerCore/Sidescroll/PalaceGenerator.cs

@@ -59,7 +59,6 @@ protected static bool AllowDuplicatePrevention(RandomizerProperties props, int p
             }
             return false;
         }
-        return true;
     }
 
     [Conditional("DEBUG")]
@@ -86,7 +85,7 @@ public static void DebugCheckDuplicates(RandomizerProperties props, Palace palac
                 if (room.HasItem) { continue; }
                 if (room.LinkedRoom != null) { continue; }
                 var sideviewBytes = room.SideView;
-                Debug.Assert(!usedRoomVariants.Contains(sideviewBytes));
+                //Debug.Assert(!usedRoomVariants.Contains(sideviewBytes));
                 usedRoomVariants.Add(sideviewBytes);
             }
         }

RandomizerCore/Sidescroll/Palaces.cs

@@ -104,17 +104,17 @@ public async Task<List<Palace>> CreatePalaces(Random r, RandomizerProperties pro
 
             if (palace.PalaceGroup == PalaceGrouping.Palace125)
             {
-                group1MapIndex = palace.AssignMapNumbers(group1MapIndex, currentPalace == 7, palaceStyle.UsesVanillaRoomPool(), palaceSize);
+                group1MapIndex = palace.AssignMapNumbers(group1MapIndex, currentPalace == 7, palaceStyle.UsesVanillaRoomPool(), palaceSize, props.RemoveTbird);
             }
 
             if (palace.PalaceGroup == PalaceGrouping.Palace346)
             {
-                group2MapIndex = palace.AssignMapNumbers(group2MapIndex, currentPalace == 7, palaceStyle.UsesVanillaRoomPool(), palaceSize);
+                group2MapIndex = palace.AssignMapNumbers(group2MapIndex, currentPalace == 7, palaceStyle.UsesVanillaRoomPool(), palaceSize, props.RemoveTbird);
             }
 
             if (palace.PalaceGroup == PalaceGrouping.PalaceGp)
             {
-                group3MapIndex = palace.AssignMapNumbers(group3MapIndex, currentPalace == 7, palaceStyle.UsesVanillaRoomPool(), palaceSize);
+                group3MapIndex = palace.AssignMapNumbers(group3MapIndex, currentPalace == 7, palaceStyle.UsesVanillaRoomPool(), palaceSize, props.RemoveTbird);
             }
             palace.AllRooms.ForEach(i => i.PalaceNumber = currentPalace);
             palace.ValidateRoomConnections();