Add options for removing palace room types from the pool

- Remove long dead end rooms (Less time waste for beginners)
- Remove "expert" rooms (Useful so we can enable 5.0 rooms for the Beginner preset)
- Updated some room tags in PalaceRooms.json
- Update Beginner Preset

Author: initsu

CrossPlatformUI/Lang/Resources.resx

@@ -765,7 +765,23 @@ prevent duplicates for Random Walk generated palaces.</value>
 <value>Allows rooms that require an item or spell to traverse to appear in any palace. Otherwise,
 palaces can only contain blocks according to the following table.</value>
 	</data>
-	<data name="BossRoomsExitToToolTip" xml:space="preserve">
+	<data name="RemoveLongDeadEndsToolTip" xml:space="preserve">
+<value>Removes dead-end rooms from the room pool. This helps newer players who are not yet
+familiar with all rooms in the randomizer by reducing time spent exploring long dead ends,
+evening the odds a bit and lowering the learning curve.
+
+This option is only available when the 5.0 room pool is enabled
+(as it is the only pool that contains short dead-end replacements.)</value>
+	</data>
+	<data name="IncludeExpertRoomsToolTip" xml:space="preserve">
+<value>Includes the more demanding palace rooms in the room pool. These rooms may feature:
+
+  • Precise, punishing platforming over lava
+  • Unfair enemy placements
+  • Repeated required 3-tile-high jumps</value>
+	</data>
+
+    <data name="BossRoomsExitToToolTip" xml:space="preserve">
 <value>Selects whether the boss room exits into the overworld (like in vanilla), or more palace
 rooms. This can be selected for all palaces, Randomly per palace, or Random but the same
 selection for all palaces. When a palace continues outside, there will always be an

CrossPlatformUI/Presets/BeginnerPreset.cs

@@ -31,16 +31,20 @@ public static class BeginnerPreset
         RiverDevilBlockerOption = RiverDevilBlockerOption.PATH,
         EastRocks = false,
         GenerateBaguWoods = false,
-        LessImportantLocationsOption = LessImportantLocationsOption.HIDE,
+        LessImportantLocationsOption = LessImportantLocationsOption.REMOVE,
         RestrictConnectionCaveShuffle = true,
         AllowConnectionCavesToBeBlocked = false,
         GoodBoots = true,
         HidePalace = false,
         HideKasuto = false,
-        WestBiome = Biome.RANDOM_NO_VANILLA_OR_SHUFFLE,
-        EastBiome = Biome.RANDOM_NO_VANILLA_OR_SHUFFLE,
+        WestSize = OverworldSizeOption.MEDIUM,
+        EastSize = OverworldSizeOption.MEDIUM,
+        DmSize = DmSizeOption.SMALL,
+        MazeSize = MazeSizeOption.MEDIUM,
+        WestBiome = Biome.VANILLALIKE,
+        EastBiome = Biome.VANILLALIKE,
+        DmBiome = Biome.VANILLALIKE,
         MazeBiome = Biome.VANILLALIKE,
-        DmBiome = Biome.RANDOM_NO_VANILLA_OR_SHUFFLE,
         WestClimate = ClimateEnum.VANILLA_WEIGHTED_WEST,
         EastClimate = ClimateEnum.VANILLA_WEIGHTED_EAST,
         DmClimate = ClimateEnum.CLASSIC,
@@ -53,7 +57,7 @@ public static class BeginnerPreset
         GpLength = PalaceLengthOption.SHORT,
         IncludeVanillaRooms = true,
         Includev4_0Rooms = true,
-        Includev5_0Rooms = false,
+        Includev5_0Rooms = true,
         TBirdRequired = true,
         RemoveTBird = false,
         PalacesToCompleteMin = 6,

CrossPlatformUI/Presets/FullShufflePreset.cs

@@ -61,6 +61,7 @@ public static class FullShufflePreset
         ReduceDripperVariance = false,
         ChangePalacePallettes = true,
         RandomizeBossItemDrop = true,
+        PalaceDropStyle = PalaceDropStyle.RANDOM,
         BossRoomsExitType = BossRoomsExitType.OVERWORLD,
         NoDuplicateRoomsByLayout = true,
         BlockingRoomsInAnyPalace = true,

CrossPlatformUI/Presets/MaxRando2025Preset.cs

@@ -61,6 +61,7 @@ public static class MaxRando2025Preset
         ReduceDripperVariance = true,
         ChangePalacePallettes = true,
         RandomizeBossItemDrop = true,
+        PalaceDropStyle = PalaceDropStyle.ANY_EXIT,
         BossRoomsExitType = BossRoomsExitType.RANDOM_PER_PALACE,
         NoDuplicateRoomsByLayout = true,
         BlockingRoomsInAnyPalace = true,

CrossPlatformUI/Presets/NormalPreset.cs

@@ -61,6 +61,7 @@ public static class NormalPreset
         ReduceDripperVariance = true,
         ChangePalacePallettes = true,
         RandomizeBossItemDrop = false,
+        PalaceDropStyle = PalaceDropStyle.RANDOM,
         BossRoomsExitType = BossRoomsExitType.OVERWORLD,
         NoDuplicateRoomsByLayout = true,
         BlockingRoomsInAnyPalace = true,

CrossPlatformUI/Presets/StandardPreset.cs

@@ -61,6 +61,7 @@ public static class StandardPreset
         ReduceDripperVariance = true,
         ChangePalacePallettes = true,
         RandomizeBossItemDrop = true,
+        PalaceDropStyle = PalaceDropStyle.ANY_EXIT,
         BossRoomsExitType = BossRoomsExitType.OVERWORLD,
         NoDuplicateRoomsByLayout = true,
         BlockingRoomsInAnyPalace = true,

CrossPlatformUI/Presets/StandardSwissPreset.cs

@@ -61,6 +61,7 @@ public static class StandardSwissPreset
         ReduceDripperVariance = true,
         ChangePalacePallettes = true,
         RandomizeBossItemDrop = false,
+        PalaceDropStyle = PalaceDropStyle.ANY_EXIT,
         BossRoomsExitType = BossRoomsExitType.OVERWORLD,
         NoDuplicateRoomsByLayout = true,
         BlockingRoomsInAnyPalace = true,

CrossPlatformUI/Presets/UpstartsTournamentPreset.cs

@@ -57,6 +57,7 @@ public static class UpstartsTournamentPreset
         PalacesToCompleteMax = 6,
         RestartAtPalacesOnGameOver = true,
         ChangePalacePallettes = true,
+        PalaceDropStyle = PalaceDropStyle.ANY_EXIT,
         BossRoomsExitType = BossRoomsExitType.OVERWORLD,
         NoDuplicateRoomsByLayout = false,
         NoDuplicateRoomsByEnemies = true,

CrossPlatformUI/ViewModels/Tabs/PalacesViewModel.cs

@@ -13,6 +13,8 @@ public class PalacesViewModel : ReactiveObject, IActivatableViewModel
     public MainViewModel Main { get; }
 
     public IObservable<bool> RandomStylesAllowVanillaIncludedObservable { get; }
+    public IObservable<bool> RemoveLongDeadEndsIncludedObservable { get; }
+    public IObservable<bool> IncludeExpertRoomsIncludedObservable { get; }
 
     public PalacesViewModel(MainViewModel main)
     {
@@ -23,6 +25,14 @@ public PalacesViewModel(MainViewModel main)
             .Select(_ => Main.Config.randomStylesAllowVanillaIncluded())
             .DistinctUntilChanged();
 
+        RemoveLongDeadEndsIncludedObservable = Main.FlagsChanged
+            .Select(_ => Main.Config.removeLongDeadEndsIncluded())
+            .DistinctUntilChanged();
+
+        IncludeExpertRoomsIncludedObservable = Main.FlagsChanged
+            .Select(_ => Main.Config.includeExpertRoomsIncluded())
+            .DistinctUntilChanged();
+
         this.WhenActivated(OnActivate);
     }
 

CrossPlatformUI/Views/Tabs/PalacesView.axaml

@@ -201,6 +201,16 @@
                         </ToolTip>
                     </ToolTip.Tip>
                 </CheckBox>
+                <CheckBox IsChecked="{Binding Main.Config.RemoveLongDeadEnds}"
+                          IsEnabled="{Binding RemoveLongDeadEndsIncludedObservable^}"
+                          Content="Remove Long Dead End Rooms">
+                    <ToolTip.Tip><TextBlock Text="{x:Static lang:Resources.RemoveLongDeadEndsToolTip}"/></ToolTip.Tip>
+                </CheckBox>
+                <CheckBox IsChecked="{Binding Main.Config.IncludeExpertRooms}"
+                          IsEnabled="{Binding IncludeExpertRoomsIncludedObservable^}"
+                          Content="Include Expert Rooms">
+                    <ToolTip.Tip><TextBlock Text="{x:Static lang:Resources.IncludeExpertRoomsToolTip}"/></ToolTip.Tip>
+                </CheckBox>
             </StackPanel>
 
             <StackPanel Grid.Column="2" Margin="0 0">