{% include "help/race.html" %}
diff --git a/rust/maprando-web/templates/generate/help/variations/disable_bluesuit.html b/rust/maprando-web/templates/generate/help/variations/disable_bluesuit.html
index ba0987839f..9035d0a96d 100644
--- a/rust/maprando-web/templates/generate/help/variations/disable_bluesuit.html
+++ b/rust/maprando-web/templates/generate/help/variations/disable_bluesuit.html
@@ -7,12 +7,14 @@
-
When this option is enabled, the game will be modified so that Samus is no longer able to obtain a Bluesuit.
- Any logic that would require the use of a Bluesuit will also be disabled during generation.
+
When this option is enabled, the game is modified so that Samus is not able to obtain a blue suit,
+ a glitched state in which Samus would remain permanently blue (e.g. after interrupting a shinespark with
+ a Crystal Flash, an R-mode standup, Draygon kill, or Baby Metroid hug).
+ Any logic that would require the use of a blue suit will also be disabled.
@@ -541,5 +540,4 @@
Quality-of-life options
{% include "help/quality/persist_flash_suit.html" %}
{% include "help/quality/persist_blue_suit.html" %}
-
{% include "initial_map_reveal.html" %}
diff --git a/rust/maprando/src/randomize.rs b/rust/maprando/src/randomize.rs
index f314945875..b70a7e3791 100644
--- a/rust/maprando/src/randomize.rs
+++ b/rust/maprando/src/randomize.rs
@@ -27,15 +27,16 @@ use maprando_game::{
GameData, GrappleJumpPosition, GrappleSwingBlock, HubLocation, Item, ItemId, ItemLocationId,
Link, LinksDataGroup, MainEntranceCondition, Map, NodeId, NotableId, Physics, Requirement,
RoomGeometryRoomIdx, RoomId, SidePlatformEntrance, SidePlatformEnvironment, SparkPosition,
- StartLocation, TECH_ID_CAN_ARTIFICIAL_MORPH, TECH_ID_CAN_CARRY_FLASH_SUIT,
- TECH_ID_CAN_DISABLE_EQUIPMENT, TECH_ID_CAN_ENTER_G_MODE, TECH_ID_CAN_ENTER_G_MODE_IMMOBILE,
- TECH_ID_CAN_ENTER_R_MODE, TECH_ID_CAN_GRAPPLE_JUMP, TECH_ID_CAN_GRAPPLE_TELEPORT,
- TECH_ID_CAN_HEATED_G_MODE, TECH_ID_CAN_HORIZONTAL_SHINESPARK, TECH_ID_CAN_MIDAIR_SHINESPARK,
- TECH_ID_CAN_MOCKBALL, TECH_ID_CAN_MOONFALL, TECH_ID_CAN_PRECISE_GRAPPLE,
+ StartLocation, TECH_ID_CAN_ARTIFICIAL_MORPH, TECH_ID_CAN_CARRY_BLUE_SUIT,
+ TECH_ID_CAN_CARRY_FLASH_SUIT, TECH_ID_CAN_DISABLE_EQUIPMENT, TECH_ID_CAN_ENTER_G_MODE,
+ TECH_ID_CAN_ENTER_G_MODE_IMMOBILE, TECH_ID_CAN_ENTER_R_MODE, TECH_ID_CAN_GRAPPLE_JUMP,
+ TECH_ID_CAN_GRAPPLE_TELEPORT, TECH_ID_CAN_HEATED_G_MODE, TECH_ID_CAN_HORIZONTAL_SHINESPARK,
+ TECH_ID_CAN_MIDAIR_SHINESPARK, TECH_ID_CAN_MOCKBALL, TECH_ID_CAN_MOONFALL,
+ TECH_ID_CAN_PRECISE_GRAPPLE, TECH_ID_CAN_R_MODE_KNOCKBACK_SPARK,
TECH_ID_CAN_RIGHT_SIDE_DOOR_STUCK, TECH_ID_CAN_RIGHT_SIDE_DOOR_STUCK_FROM_WATER,
TECH_ID_CAN_SAMUS_EATER_TELEPORT, TECH_ID_CAN_SHINECHARGE_MOVEMENT,
- TECH_ID_CAN_SIDE_PLATFORM_CROSS_ROOM_JUMP, TECH_ID_CAN_SPEEDBALL,
- TECH_ID_CAN_SPRING_BALL_BOUNCE, TECH_ID_CAN_STATIONARY_SPIN_JUMP,
+ TECH_ID_CAN_SIDE_PLATFORM_CROSS_ROOM_JUMP, TECH_ID_CAN_SLOPE_SPARK, TECH_ID_CAN_SPEEDBALL,
+ TECH_ID_CAN_SPIKE_SUIT, TECH_ID_CAN_SPRING_BALL_BOUNCE, TECH_ID_CAN_STATIONARY_SPIN_JUMP,
TECH_ID_CAN_STUTTER_WATER_SHINECHARGE, TECH_ID_CAN_SUPER_SINK, TECH_ID_CAN_TEMPORARY_BLUE,
TECH_ID_CAN_TRICKY_CARRY_FLASH_SUIT, TechId, TemporaryBlueDirection, TraversalId, VertexId,
VertexKey,
@@ -110,16 +111,6 @@ impl DifficultyConfig {
}
}
- // if other_settings.disable_spikesuit {
- // let tech_idx = game_data.tech_isv.index_by_key[&TECH_ID_CAN_CARRY_FLASH_SUIT];
- // tech[tech_idx] = false; -- can carry flashsuit is probably wrong as you can still elevator CF / cf inteerupt.
- // }
-
- // if other_settings.disable_bluesuit {
- // let tech_idx = game_data.tech_isv.index_by_key[&TECH_ID_CAN_CARRY_BLUE_SUIT];
- // tech[tech_idx] = false;
- // }
-
for &(room_id, notable_id) in implicit_notables {
let notable_idx = game_data.notable_isv.index_by_key[&(room_id, notable_id)];
notables[notable_idx] = true;
@@ -3201,12 +3192,24 @@ pub fn get_difficulty_tiers(
implicit_tech: &[TechId],
implicit_notables: &[(RoomId, NotableId)],
) -> Vec
{
- let main_tier = DifficultyConfig::new(
+ let mut main_tier = DifficultyConfig::new(
&settings.skill_assumption_settings,
game_data,
implicit_tech,
implicit_notables,
);
+
+ if settings.other_settings.disable_spikesuit {
+ main_tier.tech[game_data.tech_isv.index_by_key[&TECH_ID_CAN_SPIKE_SUIT]] = false;
+ main_tier.tech[game_data.tech_isv.index_by_key[&TECH_ID_CAN_SLOPE_SPARK]] = false;
+ main_tier.tech[game_data.tech_isv.index_by_key[&TECH_ID_CAN_R_MODE_KNOCKBACK_SPARK]] =
+ false;
+ }
+
+ if settings.other_settings.disable_bluesuit {
+ main_tier.tech[game_data.tech_isv.index_by_key[&TECH_ID_CAN_CARRY_BLUE_SUIT]] = false;
+ }
+
let mut difficulty_tiers = vec![];
difficulty_tiers.push(main_tier.clone());
diff --git a/rust/maprando/src/settings.rs b/rust/maprando/src/settings.rs
index b4e6f9e4b6..a247a70c80 100644
--- a/rust/maprando/src/settings.rs
+++ b/rust/maprando/src/settings.rs
@@ -911,6 +911,14 @@ fn upgrade_other_settings(settings: &mut serde_json::Value) -> Result<()> {
*area_assignment = serde_json::to_value(AreaAssignment::from_preset(preset))?;
}
+ if other_settings.get("disable_spikesuit").is_none() {
+ other_settings.insert("disable_spikesuit".to_string(), false.into());
+ }
+
+ if other_settings.get("disable_bluesuit").is_none() {
+ other_settings.insert("disable_bluesuit".to_string(), false.into());
+ }
+
Ok(())
}
diff --git a/rust/maprando/tests/presets/v119-Default.json b/rust/maprando/tests/presets/v119-Default.json
index f10cf0ca67..2854762dfd 100644
--- a/rust/maprando/tests/presets/v119-Default.json
+++ b/rust/maprando/tests/presets/v119-Default.json
@@ -4346,8 +4346,6 @@
"maps_revealed": null,
"map_station_reveal": "Full",
"energy_free_shinesparks": false,
- "disable_spikesuit": false,
- "disable_bluesuit": false,
"ultra_low_qol": false,
"race_mode": false,
"random_seed": null