Skip to content

Commit

Permalink
"forceVanillaLayout" fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
toasterparty committed Jul 31, 2024
1 parent bcdc8d6 commit f155fd0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
12 changes: 6 additions & 6 deletions src/patch_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
7 changes: 2 additions & 5 deletions src/patches.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand Down Expand Up @@ -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([' ', '_'], "");
Expand Down

0 comments on commit f155fd0

Please sign in to comment.