Skip to content

Default SpoilerEscape if escape time calculation fails #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blkerby merged 4 commits into from
Dec 20, 2025
Merged

Default SpoilerEscape if escape time calculation fails #247

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7715bf
Default escape if escape time calculation fails
Noktuska Dec 20, 2025
16d03bb
Set default escape to max timer instead of zero
Noktuska Dec 20, 2025
f47499c
Add empty animals_route if Save the Animals is turned on
Noktuska Dec 20, 2025
c8cdcd1
Fix formatting
Noktuska Dec 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion rust/maprando/src/spoiler_log.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use anyhow::Result;
use hashbrown::HashMap;
use log::warn;
use maprando_game::{
BeamType, Capacity, DoorType, FlagId, Item, LinkIdx, LinkLength, NodeId, Requirement, RoomId,
StepTrailId, TraversalId, VertexId, VertexKey,
Expand Down Expand Up @@ -1264,7 +1265,25 @@ pub fn get_spoiler_log(
randomizer.settings,
save_animals != SaveAnimals::No,
&randomizer.difficulty_tiers[0],
)?;
)
.unwrap_or_else(|_| {
warn!("Failed to compute escape data");
let difficulty = &randomizer.difficulty_tiers[0];
SpoilerEscape {
base_igt_frames: (60.0 * 5995.0 / difficulty.escape_timer_multiplier) as usize,
base_igt_seconds: 5995.0 / difficulty.escape_timer_multiplier,
base_leniency_factor: 1.0,
difficulty_multiplier: difficulty.escape_timer_multiplier,
raw_time_seconds: 5995.0,
final_time_seconds: 5995.0,
animals_route: if save_animals != SaveAnimals::No {
Some(Vec::new())
} else {
None
},
ship_route: Vec::new(),
}
});

let spoiler_objectives: Vec<String> = randomizer
.objectives
Expand Down