From f155fd003b2b973d015360a0fbbdc343a1df594a Mon Sep 17 00:00:00 2001
From: toasterparty <toasterparty@derpymail.org>
Date: Wed, 31 Jul 2024 10:03:42 -0700
Subject: [PATCH] "forceVanillaLayout" fixes

---
 src/patch_config.rs | 12 ++++++------
 src/patches.rs      |  7 ++-----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/patch_config.rs b/src/patch_config.rs
index 05cdcbdc..a04186ac 100644
--- a/src/patch_config.rs
+++ b/src/patch_config.rs
@@ -2574,11 +2574,11 @@ impl PatchConfigPrivate {
             phazon_elite_without_dynamo: self
                 .game_config
                 .phazon_elite_without_dynamo
-                .unwrap_or(true),
-            main_plaza_door: self.game_config.main_plaza_door.unwrap_or(true),
-            backwards_labs: self.game_config.backwards_labs.unwrap_or(true),
-            backwards_frigate: self.game_config.backwards_frigate.unwrap_or(true),
-            backwards_upper_mines: self.game_config.backwards_upper_mines.unwrap_or(true),
+                .unwrap_or(!force_vanilla_layout),
+            main_plaza_door: self.game_config.main_plaza_door.unwrap_or(!force_vanilla_layout),
+            backwards_labs: self.game_config.backwards_labs.unwrap_or(!force_vanilla_layout),
+            backwards_frigate: self.game_config.backwards_frigate.unwrap_or(!force_vanilla_layout),
+            backwards_upper_mines: self.game_config.backwards_upper_mines.unwrap_or(!force_vanilla_layout),
             backwards_lower_mines: self.game_config.backwards_lower_mines.unwrap_or(false),
             patch_power_conduits: self.game_config.patch_power_conduits.unwrap_or(false),
             remove_mine_security_station_locks: self
@@ -2598,7 +2598,7 @@ impl PatchConfigPrivate {
                 .hall_of_the_elders_bomb_slot_covers,
             automatic_crash_screen: self.preferences.automatic_crash_screen.unwrap_or(true),
             visible_bounding_box: self.preferences.visible_bounding_box.unwrap_or(false),
-            door_destination_scans: self.preferences.door_destination_scans.unwrap_or(true),
+            door_destination_scans: self.preferences.door_destination_scans.unwrap_or(!force_vanilla_layout),
             no_hud: self.preferences.no_hud.unwrap_or(false),
             artifact_hint_behavior,
             flaahgra_music_files,
diff --git a/src/patches.rs b/src/patches.rs
index 2be88988..1005d155 100644
--- a/src/patches.rs
+++ b/src/patches.rs
@@ -16390,8 +16390,7 @@ fn build_and_run_patches<'r>(
                 // this is a hack because something is getting messed up with the MREA objects if this patch never gets used
                 let remove_otrs = config.qol_cosmetic
                     && !(config.shuffle_pickup_position
-                        && room_info.room_id.to_u32() == 0x40C548E9)
-                    && !config.force_vanilla_layout;
+                    && room_info.room_id.to_u32() == 0x40C548E9);
 
                 patcher.add_scly_patch(
                     (pak_name.as_bytes(), room_info.room_id.to_u32()),
@@ -18346,9 +18345,7 @@ fn build_and_run_patches<'r>(
         }
     }
 
-    if !config.force_vanilla_layout {
-        patch_qol_logical(&mut patcher, config, config.version);
-    }
+    patch_qol_logical(&mut patcher, config, config.version);
 
     for (_boss_name, scale) in config.boss_sizes.iter() {
         let boss_name = _boss_name.to_lowercase().replace([' ', '_'], "");