remove random_seed from presets

rust/data/presets/full-settings/Community Race Season 5.json

@@ -4912,7 +4912,6 @@
         "all_enemies_respawn": false,
         "race_mode": true,
         "savestate": "No",
-        "random_seed": null,
         "disable_spikesuit": false,
         "disable_bluesuit": false,
         "enable_major_glitches": false

rust/data/presets/full-settings/Default.json

@@ -4826,7 +4826,6 @@
         "enable_major_glitches": false,
         "speed_booster": "Vanilla",
         "race_mode": false,
-        "savestate": "No",
-        "random_seed": null
+        "savestate": "No"
     }
 }

rust/data/presets/full-settings/Mentor Tournament.json

@@ -4912,7 +4912,6 @@
         "all_enemies_respawn": false,
         "race_mode": true,
         "savestate": "No",
-        "random_seed": null,
         "disable_spikesuit": false,
         "disable_bluesuit": false,
         "enable_major_glitches": false

rust/data/presets/full-settings/Summer Series Expert Challenge.json

@@ -4824,7 +4824,6 @@
         "all_enemies_respawn": false,
         "race_mode": true,
         "savestate": "No",
-        "random_seed": null,
         "disable_spikesuit": false,
         "disable_bluesuit": false,
         "enable_major_glitches": false

rust/maprando-web/src/main.rs

@@ -497,6 +497,7 @@ struct SeedData {
 struct RandomizeRequest {
     spoiler_token: Text<String>,
     settings: Text<String>,
+    random_seed: Option<Text<String>>,
 }
 
 #[derive(Serialize)]
@@ -524,9 +525,10 @@ enum AttemptError {
 fn handle_randomize_request(
     settings: RandomizerSettings,
     app_data: actix_web::web::Data<AppData>,
+    requested_seed: Option<usize>,
 ) -> Result<AttemptOutput, AttemptError> {
     let race_mode = settings.other_settings.race_mode;
-    let random_seed = match (settings.other_settings.random_seed, race_mode) {
+    let random_seed = match (requested_seed, race_mode) {
         (_, true) | (None, _) => get_random_seed(),
         (Some(s), false) => s,
     };
@@ -683,9 +685,14 @@ async fn randomize(
         settings.name = Some("Custom".to_string());
     }
 
-    if settings.other_settings.random_seed == Some(0) {
-        return HttpResponse::BadRequest().body("Invalid random seed: 0");
-    }
+    let requested_seed: Option<usize> = match req.random_seed.as_ref().map(|s| s.0.trim()) {
+        None | Some("") => None,
+        Some(s) => match s.parse::<usize>() {
+            Ok(v) if v != 0 => Some(v),
+            Ok(_) => None,
+            Err(_) => return HttpResponse::BadRequest().body("Invalid random seed"),
+        },
+    };
 
     if settings.skill_assumption_settings.ridley_proficiency < 0.0
         || settings.skill_assumption_settings.ridley_proficiency > 1.0
@@ -694,9 +701,10 @@ async fn randomize(
     }
 
     let settings_copy = settings.clone();
+
     let app_data_copy = app_data.clone();
-    let output_result = actix_web::rt::task::spawn_blocking(|| {
-        handle_randomize_request(settings_copy, app_data_copy)
+    let output_result = actix_web::rt::task::spawn_blocking(move || {
+        handle_randomize_request(settings_copy, app_data_copy, requested_seed)
     })
     .await
     .unwrap();

rust/maprando-web/templates/generate/scripts.html

@@ -374,7 +374,6 @@
             "all_enemies_respawn": formData.get("all_enemies_respawn") == "true",
             "race_mode": formData.get("race_mode") == "true",
             "savestate": formData.get("savestate"),
-            "random_seed": tryParseInt(formData.get("random_seed")),
             "disable_spikesuit": formData.get("disable_spike_suit") == "true",
             "disable_bluesuit": formData.get("disable_blue_suit") == "true",
             "enable_major_glitches": formData.get("enable_major_glitches") == "true",
@@ -503,6 +502,7 @@
     let formData = new FormData();
     formData.append("spoiler_token", document.getElementById("spoilerToken").value);
     formData.append("settings", JSON.stringify(settings));
+    formData.append("random_seed", document.getElementById("randomSeed").value);
     let errorEl = document.getElementById("errorMsg");
     let response;
     try {
@@ -694,7 +694,6 @@
     applyRadioValue("speedBooster", other.speed_booster);
     applyRadioValue("raceMode", other.race_mode);
     applyRadioValue("saveStateMode", other.savestate);
-    document.getElementById("randomSeed").value = other.random_seed;
 }
 
 async function upgradeSettings(settings) {
@@ -1467,7 +1466,6 @@
     document.getElementById("spoilerToken").value = localStorage["spoilerToken"];
 }
 function checkOtherOptions() {
-    document.getElementById("randomSeed").value = "";
     if (document.getElementById("fullSettingsPreset").value !== "") {
         return;
     }

rust/maprando/src/bin/maprando-cli.rs

@@ -90,7 +90,6 @@ fn get_settings(args: &Args, preset_data: &PresetData) -> Result<RandomizerSetti
         let s = std::fs::read_to_string(path)?;
         settings.quality_of_life_settings = serde_json::from_str(&s)?;
     }
-    settings.other_settings.random_seed = args.random_seed;
     Ok(settings)
 }
 

rust/maprando/src/settings.rs

@@ -660,7 +660,6 @@ pub struct OtherSettings {
     pub speed_booster: SpeedBooster,
     pub race_mode: bool,
     pub savestate: SaveState,
-    pub random_seed: Option<usize>,
 }
 
 #[derive(Clone, Copy, Serialize, Deserialize, Debug, PartialEq, Eq)]

rust/maprando/tests/logic_scenarios.rs

@@ -359,7 +359,6 @@ fn get_settings(scenario: &Scenario) -> Result<RandomizerSettings> {
             enable_major_glitches: false,
             race_mode: false,
             savestate: maprando::settings::SaveState::No,
-            random_seed: None,
         },
         debug: false,
     })