From 49e878d2742cb593c56c4fdd2f5f1fa8cea00943 Mon Sep 17 00:00:00 2001
From: aquanight <aquanight@gmail.com>
Date: Thu, 5 Mar 2026 23:18:40 -0700
Subject: [PATCH 1/6] Customizable Locked Doors

---
 rust/data/presets/doors/Ammo.json             | 11 +++
 rust/data/presets/doors/Beam.json             | 11 +++
 rust/data/presets/doors/Blue.json             | 11 +++
 .../Community Race Season 4.json              | 12 ++-
 rust/data/presets/full-settings/Default.json  | 12 ++-
 rust/maprando-web/src/web/generate.rs         |  4 +
 rust/maprando-web/src/web/randomize.rs        | 20 ++++-
 .../maprando-web/src/web/randomize/helpers.rs | 20 ++++-
 .../templates/generate/doors.html             | 85 +++++++++++++++++++
 .../templates/generate/help/doors.html        |  6 +-
 .../maprando-web/templates/generate/main.html | 27 ++++--
 .../templates/generate/scripts.html           | 57 ++++++++++++-
 .../templates/seed/seed_header.html           | 27 +++++-
 rust/maprando/src/preset.rs                   | 20 ++++-
 rust/maprando/src/randomize.rs                | 75 ++++++++++------
 rust/maprando/src/settings.rs                 | 41 ++++++++-
 16 files changed, 395 insertions(+), 44 deletions(-)
 create mode 100644 rust/data/presets/doors/Ammo.json
 create mode 100644 rust/data/presets/doors/Beam.json
 create mode 100644 rust/data/presets/doors/Blue.json
 create mode 100644 rust/maprando-web/templates/generate/doors.html

diff --git a/rust/data/presets/doors/Ammo.json b/rust/data/presets/doors/Ammo.json
new file mode 100644
index 0000000000..4c29b04174
--- /dev/null
+++ b/rust/data/presets/doors/Ammo.json
@@ -0,0 +1,11 @@
+{
+    "preset": "Ammo",
+    "red_doors_count": 30,
+    "green_doors_count": 15,
+    "yellow_doors_count": 10,
+    "charge_doors_count": 0,
+    "ice_doors_count": 0,
+    "wave_doors_count": 0,
+    "spazer_doors_count": 0,
+    "plasma_doors_count": 0
+}
diff --git a/rust/data/presets/doors/Beam.json b/rust/data/presets/doors/Beam.json
new file mode 100644
index 0000000000..844e670747
--- /dev/null
+++ b/rust/data/presets/doors/Beam.json
@@ -0,0 +1,11 @@
+{
+    "preset": "Beam",
+    "red_doors_count": 18,
+    "green_doors_count": 10,
+    "yellow_doors_count": 7,
+    "charge_doors_count": 4,
+    "ice_doors_count": 4,
+    "wave_doors_count": 4,
+    "spazer_doors_count": 4,
+    "plasma_doors_count": 4
+}
diff --git a/rust/data/presets/doors/Blue.json b/rust/data/presets/doors/Blue.json
new file mode 100644
index 0000000000..71ef781c72
--- /dev/null
+++ b/rust/data/presets/doors/Blue.json
@@ -0,0 +1,11 @@
+{
+    "preset": "Blue",
+    "red_doors_count": 0,
+    "green_doors_count": 0,
+    "yellow_doors_count": 0,
+    "charge_doors_count": 0,
+    "ice_doors_count": 0,
+    "wave_doors_count": 0,
+    "spazer_doors_count": 0,
+    "plasma_doors_count": 0
+}
diff --git a/rust/data/presets/full-settings/Community Race Season 4.json b/rust/data/presets/full-settings/Community Race Season 4.json
index 744d67113c..58859f508f 100644
--- a/rust/data/presets/full-settings/Community Race Season 4.json	
+++ b/rust/data/presets/full-settings/Community Race Season 4.json	
@@ -4638,7 +4638,17 @@
         "objective_screen": "Enabled"
     },
     "map_layout": "Standard",
-    "doors_mode": "Ammo",
+    "doors_settings": {
+        "preset": "Ammo",
+        "red_doors_count": 30,
+        "green_doors_count": 15,
+        "yellow_doors_count": 10,
+        "charge_doors_count": 0,
+        "ice_doors_count": 0,
+        "wave_doors_count": 0,
+        "spazer_doors_count": 0,
+        "plasma_doors_count": 0
+    },
     "start_location_settings": {
         "mode": "Random",
         "room_id": null,
diff --git a/rust/data/presets/full-settings/Default.json b/rust/data/presets/full-settings/Default.json
index f2aaab7fa8..b7818e54d3 100644
--- a/rust/data/presets/full-settings/Default.json
+++ b/rust/data/presets/full-settings/Default.json
@@ -4638,7 +4638,17 @@
         "objective_screen": "Enabled"
     },
     "map_layout": "Standard",
-    "doors_mode": "Ammo",
+    "doors_settings": {
+        "preset": "Ammo",
+        "red_doors_count": 30,
+        "green_doors_count": 15,
+        "yellow_doors_count": 10,
+        "charge_doors_count": 0,
+        "ice_doors_count": 0,
+        "wave_doors_count": 0,
+        "spazer_doors_count": 0,
+        "plasma_doors_count": 0
+    },
     "start_location_settings": {
         "mode": "Ship"
     },
diff --git a/rust/maprando-web/src/web/generate.rs b/rust/maprando-web/src/web/generate.rs
index c92fed5a65..86a037e575 100644
--- a/rust/maprando-web/src/web/generate.rs
+++ b/rust/maprando-web/src/web/generate.rs
@@ -17,6 +17,7 @@ struct GenerateTemplate<'a> {
     skill_presets_json: String,
     item_presets_json: String,
     qol_presets_json: String,
+    doors_presets_json: String,
     objective_presets_json: String,
     item_priorities: Vec<String>,
     item_names_multiple: Vec<String>,
@@ -117,6 +118,8 @@ async fn generate(app_data: web::Data<AppData>) -> impl Responder {
         serde_json::to_string(&app_data.preset_data.item_progression_presets).unwrap();
     let qol_presets_json =
         serde_json::to_string(&app_data.preset_data.quality_of_life_presets).unwrap();
+    let doors_presets_json =
+        serde_json::to_string(&app_data.preset_data.doors_presets).unwrap();
     let objective_presets_json =
         serde_json::to_string(&app_data.preset_data.objective_presets).unwrap();
 
@@ -167,6 +170,7 @@ async fn generate(app_data: web::Data<AppData>) -> impl Responder {
         skill_presets_json,
         item_presets_json,
         qol_presets_json,
+        doors_presets_json,
         objective_presets_json,
         tech_description: &app_data.game_data.tech_description,
         tech_dependencies_str: &tech_dependencies_strs,
diff --git a/rust/maprando-web/src/web/randomize.rs b/rust/maprando-web/src/web/randomize.rs
index 70ccdd541f..8772922124 100644
--- a/rust/maprando-web/src/web/randomize.rs
+++ b/rust/maprando-web/src/web/randomize.rs
@@ -54,7 +54,15 @@ struct SeedData {
     momentum_conservation: bool,
     fanfares: String,
     objectives: Vec<String>,
-    doors: String,
+    doors_preset: Option<String>,
+    red_doors_count: i32,
+    green_doors_count: i32,
+    yellow_doors_count: i32,
+    charge_doors_count: i32,
+    ice_doors_count: i32,
+    wave_doors_count: i32,
+    spazer_doors_count: i32,
+    plasma_doors_count: i32,
     start_location_mode: String,
     map_layout: String,
     save_animals: String,
@@ -333,7 +341,15 @@ async fn randomize(
             .iter()
             .map(|x| to_variant_name(x).unwrap().to_string())
             .collect(),
-        doors: to_variant_name(&settings.doors_mode).unwrap().to_string(),
+        doors_preset: settings.doors_settings.preset.clone(),
+        red_doors_count: settings.doors_settings.red_doors_count,
+        green_doors_count: settings.doors_settings.green_doors_count,
+        yellow_doors_count: settings.doors_settings.yellow_doors_count,
+        charge_doors_count: settings.doors_settings.charge_doors_count,
+        ice_doors_count: settings.doors_settings.ice_doors_count,
+        wave_doors_count: settings.doors_settings.wave_doors_count,
+        spazer_doors_count: settings.doors_settings.spazer_doors_count,
+        plasma_doors_count: settings.doors_settings.plasma_doors_count,
         start_location_mode: if settings.start_location_settings.mode == StartLocationMode::Custom {
             output.randomization.start_location.name.clone()
         } else {
diff --git a/rust/maprando-web/src/web/randomize/helpers.rs b/rust/maprando-web/src/web/randomize/helpers.rs
index a590fb1dda..a51df5d265 100644
--- a/rust/maprando-web/src/web/randomize/helpers.rs
+++ b/rust/maprando-web/src/web/randomize/helpers.rs
@@ -60,7 +60,15 @@ pub struct SeedHeaderTemplate<'a> {
     fanfares: String,
     etank_refill: String,
     disableable_etanks: String,
-    doors: String,
+    doors_preset: String,
+    red_doors_count: i32,
+    green_doors_count: i32,
+    yellow_doors_count: i32,
+    charge_doors_count: i32,
+    ice_doors_count: i32,
+    wave_doors_count: i32,
+    spazer_doors_count: i32,
+    plasma_doors_count: i32,
     start_location_mode: String,
     map_layout: String,
     save_animals: String,
@@ -466,7 +474,15 @@ pub fn render_seed(
             DisableETankSetting::Unrestricted => "Unrestricted",
         }
         .to_string(),
-        doors: seed_data.doors.clone(),
+        doors_preset: seed_data.doors_preset.clone().unwrap_or("Custom".to_string()),
+        red_doors_count: seed_data.red_doors_count,
+        green_doors_count: seed_data.green_doors_count,
+        yellow_doors_count: seed_data.yellow_doors_count,
+        charge_doors_count: seed_data.charge_doors_count,
+        ice_doors_count: seed_data.ice_doors_count,
+        wave_doors_count: seed_data.wave_doors_count,
+        spazer_doors_count: seed_data.spazer_doors_count,
+        plasma_doors_count: seed_data.plasma_doors_count,
         start_location_mode: seed_data.start_location_mode.clone(),
         map_layout: seed_data.map_layout.clone(),
         save_animals: seed_data.save_animals.clone(),
diff --git a/rust/maprando-web/templates/generate/doors.html b/rust/maprando-web/templates/generate/doors.html
new file mode 100644
index 0000000000..96d944ae15
--- /dev/null
+++ b/rust/maprando-web/templates/generate/doors.html
@@ -0,0 +1,85 @@
+<div class="modal" id="doorsModal" tabindex="-1">
+    <div class="modal-dialog modal-fullscreen-sm-down modal-dialog-centered" style="max-width:max(min(90vw, 992px), 576px)">
+        <div class="modal-content">
+            <div class="modal-header">
+            <h1 class="modal-title fs-5">Doors</h1>
+            <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+            </div>
+            
+            <div class="modal-body p-1">
+                <div class="form-group row">
+                    <div class="col-lg-3 m-2">
+                        <label for="preset">Missile Doors:</label>
+                    </div>
+                    <div class="col-lg-3 m-2">
+                        <input type="text" class="form-control door-count" name="red_doors_count" id="red_doors_count" value="0" onchange="doorsSettingsChanged()">
+                    </div>
+                </div>
+
+                <div class="form-group row">
+                    <div class="col-lg-3 m-2">
+                        <label for="preset">Super Doors:</label>
+                    </div>
+                    <div class="col-lg-3 m-2">
+                        <input type="text" class="form-control door-count" name="green_doors_count" id="green_doors_count" value="0" onchange="doorsSettingsChanged()">
+                    </div>
+                </div>
+
+                <div class="form-group row">
+                    <div class="col-lg-3 m-2">
+                        <label for="preset">Power Bomb Doors:</label>
+                    </div>
+                    <div class="col-lg-3 m-2">
+                        <input type="text" class="form-control door-count" name="yellow_doors_count" id="yellow_doors_count" value="0" onchange="doorsSettingsChanged()">
+                    </div>
+                </div>
+
+                <div class="form-group row">
+                    <div class="col-lg-3 m-2">
+                        <label for="preset">Charge Beam Doors:</label>
+                    </div>
+                    <div class="col-lg-3 m-2">
+                        <input type="text" class="form-control door-count" name="charge_doors_count" id="charge_doors_count" value="0" onchange="doorsSettingsChanged()">
+                    </div>
+                </div>
+
+                <div class="form-group row">
+                    <div class="col-lg-3 m-2">
+                        <label for="preset">Ice Beam Doors:</label>
+                    </div>
+                    <div class="col-lg-3 m-2">
+                        <input type="text" class="form-control door-count" name="ice_doors_count" id="ice_doors_count" value="0" onchange="doorsSettingsChanged()">
+                    </div>
+                </div>
+
+                <div class="form-group row">
+                    <div class="col-lg-3 m-2">
+                        <label for="preset">Wave Beam Doors:</label>
+                    </div>
+                    <div class="col-lg-3 m-2">
+                        <input type="text" class="form-control door-count" name="wave_doors_count" id="wave_doors_count" value="0" onchange="doorsSettingsChanged()">
+                    </div>
+                </div>
+
+                <div class="form-group row">
+                    <div class="col-lg-3 m-2">
+                        <label for="preset">Spazer Doors:</label>
+                    </div>
+                    <div class="col-lg-3 m-2">
+                        <input type="text" class="form-control door-count" name="spazer_doors_count" id="spazer_doors_count" value="0" onchange="doorsSettingsChanged()">
+                    </div>
+                </div>
+
+                <div class="form-group row">
+                    <div class="col-lg-3 m-2">
+                        <label for="preset">Plasma Beam Doors:</label>
+                    </div>
+                    <div class="col-lg-3 m-2">
+                        <input type="text" class="form-control door-count" name="plasma_doors_count" id="plasma_doors_count" value="0" onchange="doorsSettingsChanged()">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
diff --git a/rust/maprando-web/templates/generate/help/doors.html b/rust/maprando-web/templates/generate/help/doors.html
index 7b73287396..5484547094 100644
--- a/rust/maprando-web/templates/generate/help/doors.html
+++ b/rust/maprando-web/templates/generate/help/doors.html
@@ -1,9 +1,9 @@
 <!-- Button trigger modal -->
-<button type="button" class="btn mr-1 px-2 py-1" data-bs-toggle="modal" data-bs-target="#doorsModal">
+<button type="button" class="btn mr-1 px-2 py-1" data-bs-toggle="modal" data-bs-target="#doorsHelpModal">
   <i class="bi bi-question-circle"></i>
 </button>
 <!-- Modal -->
-<div class="modal" id="doorsModal" tabindex="-1">
+<div class="modal" id="doorsHelpModal" tabindex="-1">
   <div class="modal-dialog modal-lg">
     <div class="modal-content">
       <div class="modal-header">
@@ -26,6 +26,8 @@ <h1 class="modal-title fs-5">Doors</h1>
           one side of the door also unlocks the other.</p>
         <p>Ammo and beam doors will not be placed on or immediately connect to any special tile such as a save, map,
           refill, objective "X", or a gray door.</p>
+        <p>Click on the gear icon to customize the number of ammo and beam doors that can appear. This sets the maximum
+          number of doors, and the randomizer will attempt to place that many. In certain cases, fewer doors than the maximum can be placed.</p>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
diff --git a/rust/maprando-web/templates/generate/main.html b/rust/maprando-web/templates/generate/main.html
index d1dbb58057..12be61b1ea 100644
--- a/rust/maprando-web/templates/generate/main.html
+++ b/rust/maprando-web/templates/generate/main.html
@@ -51,6 +51,12 @@
     for (p of qolPresetsArr) {
         qolPresets[p.preset] = p;
     }
+    
+    let doorsPresetsArr = {{ doors_presets_json|safe }};
+    let doorsPresets = {};
+    for (p of doorsPresetsArr) {
+        doorsPresets[p.preset] = p;
+    }
 
     let objectivePresetsArr = {{ objective_presets_json|safe }};
     let objectivePresets = {};
@@ -213,12 +219,20 @@ <h3 class="mt-3 mb-2">Generate Game</h3>
                     <label for="doors">Doors</label>
                 </div>
                 <div id="doors" class="col-lg-4 btn-group" role="group">
-                    <input type="radio" class="btn-check" name="doors" id="doorsBlue" value="Blue" onchange="fullSettingsChanged()">
-                    <label class="btn btn-outline-primary" for="doorsBlue">Blue</label>
-                    <input type="radio" class="btn-check" name="doors" id="doorsAmmo" value="Ammo" onchange="fullSettingsChanged()" checked=true>
-                    <label class="btn btn-outline-primary" for="doorsAmmo">Ammo</label>
-                    <input type="radio" class="btn-check" name="doors" id="doorsBeam" value="Beam" onchange="fullSettingsChanged()">
-                    <label class="btn btn-outline-primary" for="doorsBeam">Beam</label>
+                {% for preset in preset_data.doors_presets.iter() %}
+                {% let name = preset.preset.as_ref().unwrap() %}
+                    <input type="radio" class="btn-check doors-preset-button" name="doors_preset" value="{{+ name}}"
+                        id="doors{{+ name }}" autocomplete="off"
+                        onchange="doorsPresetChanged()"
+                        {% if loop.index0 == 0 %}
+                        checked
+                        {% endif %}
+                        >
+                    <label class="btn btn-outline-primary p-2" for="doors{{+ name }}">{{+ name }}</label>
+                {% endfor %}
+                <button type="button" style="flex:none" class="btn btn-secondary ms-1 me-0 p-2" data-bs-toggle="modal" data-bs-target="#doorsModal">
+                    <i class="bi bi-gear"></i>
+                </button>    
                 </div>
             </div>
 
@@ -289,6 +303,7 @@ <h2 class="accordion-header">
             {% include "item_progression.html" %}
             {% include "quality_of_life.html" %}
             {% include "objectives.html" %}
+            {% include "doors.html" %}
             {% include "start_location.html" %}
         </form>
     </div>
diff --git a/rust/maprando-web/templates/generate/scripts.html b/rust/maprando-web/templates/generate/scripts.html
index d63b81e12d..4b432ea977 100644
--- a/rust/maprando-web/templates/generate/scripts.html
+++ b/rust/maprando-web/templates/generate/scripts.html
@@ -287,7 +287,17 @@
         },
         "objective_settings": buildObjectiveSettings(formData),
         "map_layout": formData.get("map_layout"),
-        "doors_mode": formData.get("doors"),
+        "doors_settings": {
+            "preset": formData.get("doors_preset"),
+            "red_doors_count": tryParseInt(formData.get("red_doors_count")),
+            "green_doors_count": tryParseInt(formData.get("green_doors_count")),
+            "yellow_doors_count": tryParseInt(formData.get("yellow_doors_count")),
+            "charge_doors_count": tryParseInt(formData.get("charge_doors_count")),
+            "ice_doors_count": tryParseInt(formData.get("ice_doors_count")),
+            "wave_doors_count": tryParseInt(formData.get("wave_doors_count")),
+            "spazer_doors_count": tryParseInt(formData.get("spazer_doors_count")),
+            "plasma_doors_count": tryParseInt(formData.get("plasma_doors_count")),
+        },
         "start_location_settings": buildStartLocationSettings(formData),
         "save_animals": formData.get("save_animals"),
         "other_settings": {
@@ -518,6 +528,29 @@
     applyRadioValue("persistBlueSuit", preset.persist_blue_suit);
 }
 
+function applyDoorsPreset(preset) {
+    for (presetEl of document.getElementsByClassName("doors-preset-button")) {
+        if (presetEl.value == preset.preset) {
+            presetEl.checked = true;
+            let p = objectivePresets[presetEl.value];
+            if (p !== undefined) {
+                preset = p;
+            }
+        } else {
+            presetEl.checked = false;
+        }
+    }
+
+    document.getElementById("red_doors_count").value = preset.red_doors_count;
+    document.getElementById("green_doors_count").value = preset.green_doors_count;
+    document.getElementById("yellow_doors_count").value = preset.yellow_doors_count;
+    document.getElementById("charge_doors_count").value = preset.charge_doors_count;
+    document.getElementById("ice_doors_count").value = preset.ice_doors_count;
+    document.getElementById("wave_doors_count").value = preset.wave_doors_count;
+    document.getElementById("spazer_doors_count").value = preset.spazer_doors_count;
+    document.getElementById("plasma_doors_count").value = preset.plasma_doors_count;
+}
+
 function applyStartLocationSettings(preset) {
     applyRadioValue("startLocation", preset.mode);
     if (preset.mode == "Custom") {
@@ -540,9 +573,9 @@
     applyItemProgressionPreset(preset.item_progression_settings);
     applyQolPreset(preset.quality_of_life_settings);
     applyObjectivePreset(preset.objective_settings);
+    applyDoorsPreset(preset.doors_settings);
 
     applyRadioValue("mapLayout", preset.map_layout);
-    applyRadioValue("doors", preset.doors_mode);
     applyStartLocationSettings(preset.start_location_settings);
     applyRadioValue("saveAnimals", preset.save_animals);
 
@@ -685,6 +718,26 @@
     qualityOfLifePresetChanged();
 }
 
+function doorsPresetChanged() {
+    for (presetEl of document.getElementsByClassName("doors-preset-button")) {
+        if (presetEl.checked) {
+            let preset = doorsPresets[presetEl.value];
+            applyDoorsPreset(preset);
+        }
+    }
+    fullSettingsChanged();
+}
+
+function doorsSettingsChanged() {
+    for (let preset of doorsPresetsArr) {
+        document.getElementById(`doors${preset.preset}`).checked = false;
+    }
+    for (var presetEl of document.getElementsByClassName("doors-preset-button")) {
+        presetEl.checked = false;
+    }
+    doorsPresetChanged();
+}
+
 function applyAreaAssignmentPreset(preset) {
     if (preset == "Standard") {
         document.getElementById("areaAssignmentPresetStandard").checked = true;
diff --git a/rust/maprando-web/templates/seed/seed_header.html b/rust/maprando-web/templates/seed/seed_header.html
index cb0176b4e3..0b986cb184 100644
--- a/rust/maprando-web/templates/seed/seed_header.html
+++ b/rust/maprando-web/templates/seed/seed_header.html
@@ -61,7 +61,32 @@
         </div>
         <div class="row">
             <div class="col-5 col-sm-4 col-md-3">Doors:</div>
-            <div class="col-7 col-sm-8 col-md-9">{{+ doors }}</div>
+            <div class="col-7 col-sm-8 col-md-9">{{+ doors_preset }}
+            {% if red_doors_count > 0 %}
+            <span>Red {{+ red_doors_count }} </span>
+            {% endif %}
+            {% if green_doors_count > 0 %}
+            <span>Green {{+ green_doors_count }} </span>
+            {% endif %}
+            {% if yellow_doors_count > 0 %}
+            <span>Yellow {{+ yellow_doors_count }} </span>
+            {% endif %}
+            {% if charge_doors_count > 0 %}
+            <span>Charge {{+ charge_doors_count }} </span>
+            {% endif %}
+            {% if ice_doors_count > 0 %}
+            <span>Ice {{+ ice_doors_count }} </span>
+            {% endif %}
+            {% if wave_doors_count > 0 %}
+            <span>Wave {{+ wave_doors_count }} </span>
+            {% endif %}
+            {% if spazer_doors_count > 0 %}
+            <span>Spazer {{+ spazer_doors_count }} </span>
+            {% endif %}
+            {% if plasma_doors_count > 0 %}
+            <span>Plasma {{+ plasma_doors_count }} </span>
+            {% endif %}
+            </div>
         </div>
         <div class="row">
             <div class="col-5 col-sm-4 col-md-3">Start location:</div>
diff --git a/rust/maprando/src/preset.rs b/rust/maprando/src/preset.rs
index 76a77442ca..2d5787938f 100644
--- a/rust/maprando/src/preset.rs
+++ b/rust/maprando/src/preset.rs
@@ -10,7 +10,7 @@ use crate::{
     randomize::DifficultyConfig,
     settings::{
         ItemProgressionSettings, ObjectiveSettings, QualityOfLifeSettings, RandomizerSettings,
-        SkillAssumptionSettings,
+        SkillAssumptionSettings, DoorsSettings
     },
 };
 
@@ -46,6 +46,7 @@ pub struct PresetData {
     pub full_presets: Vec<RandomizerSettings>,
     pub default_preset: RandomizerSettings,
     pub logic_page_presets: Vec<RandomizerSettings>,
+    pub doors_presets: Vec<DoorsSettings>,
 }
 
 fn get_tech_by_difficulty(
@@ -213,6 +214,22 @@ impl PresetData {
             objective_presets.push(preset);
         }
 
+        let doors_preset_names = [
+            "Blue",
+            "Ammo",
+            "Beam"
+        ];
+        let doors_preset_path = presets_path.join("doors");
+        let mut doors_presets: Vec<DoorsSettings> = vec![];
+        for name in doors_preset_names {
+            let path = doors_preset_path.join(format!("{name}.json"));
+            let preset_str = std::fs::read_to_string(path.clone())
+                .context(format!("reading from {}", path.display()))?;
+            let preset: DoorsSettings = serde_json::from_str(&preset_str).context(format!("parsing {}", path.display()))?;
+            assert!(preset.preset == Some(name.to_string()));
+            doors_presets.push(preset);
+        }
+
         let full_preset_names = ["Default", "Community Race Season 4"];
         let full_preset_path = presets_path.join("full-settings");
         let mut full_presets: Vec<RandomizerSettings> = vec![];
@@ -252,6 +269,7 @@ impl PresetData {
             default_preset,
             logic_page_presets,
             full_presets,
+            doors_presets
         };
         Ok(preset_data)
     }
diff --git a/rust/maprando/src/randomize.rs b/rust/maprando/src/randomize.rs
index 3e0b7fc936..400b226e03 100644
--- a/rust/maprando/src/randomize.rs
+++ b/rust/maprando/src/randomize.rs
@@ -3209,32 +3209,57 @@ pub fn randomize_doors(
     let mut used_locs: HashSet<(RoomGeometryRoomIdx, usize, usize)> = HashSet::new();
     let mut used_beam_rooms: HashSet<RoomGeometryRoomIdx> = HashSet::new();
     let mut door_types = vec![];
+    
+    if settings.doors_settings.red_doors_count > 0 {
+        door_types.extend(vec![DoorType::Red; settings.doors_settings.red_doors_count as usize]);
+    }
+    if settings.doors_settings.green_doors_count > 0 {
+        door_types.extend(vec![DoorType::Green; settings.doors_settings.green_doors_count as usize]);
+    }
+    if settings.doors_settings.yellow_doors_count > 0 {
+        door_types.extend(vec![DoorType::Yellow; settings.doors_settings.yellow_doors_count as usize]);
+    }
+    if settings.doors_settings.charge_doors_count > 0 {
+        door_types.extend(vec![DoorType::Beam(BeamType::Charge); settings.doors_settings.charge_doors_count as usize]);
+    }
+    if settings.doors_settings.ice_doors_count > 0 {
+        door_types.extend(vec![DoorType::Beam(BeamType::Ice); settings.doors_settings.ice_doors_count as usize]);
+    }
+    if settings.doors_settings.wave_doors_count > 0 {
+        door_types.extend(vec![DoorType::Beam(BeamType::Wave); settings.doors_settings.wave_doors_count as usize]);
+    }
+    if settings.doors_settings.spazer_doors_count > 0 {
+        door_types.extend(vec![DoorType::Beam(BeamType::Spazer); settings.doors_settings.spazer_doors_count as usize]);
+    }
+    if settings.doors_settings.plasma_doors_count > 0 {
+        door_types.extend(vec![DoorType::Beam(BeamType::Plasma); settings.doors_settings.plasma_doors_count as usize]);
+    }
 
-    match settings.doors_mode {
-        DoorsMode::Blue => {}
-        DoorsMode::Ammo => {
-            let red_doors_cnt = 30;
-            let green_doors_cnt = 15;
-            let yellow_doors_cnt = 10;
-            door_types.extend(vec![DoorType::Red; red_doors_cnt]);
-            door_types.extend(vec![DoorType::Green; green_doors_cnt]);
-            door_types.extend(vec![DoorType::Yellow; yellow_doors_cnt]);
-        }
-        DoorsMode::Beam => {
-            let red_doors_cnt = 18;
-            let green_doors_cnt = 10;
-            let yellow_doors_cnt = 7;
-            let beam_door_each_cnt = 4;
-            door_types.extend(vec![DoorType::Red; red_doors_cnt]);
-            door_types.extend(vec![DoorType::Green; green_doors_cnt]);
-            door_types.extend(vec![DoorType::Yellow; yellow_doors_cnt]);
-            door_types.extend(vec![DoorType::Beam(BeamType::Charge); beam_door_each_cnt]);
-            door_types.extend(vec![DoorType::Beam(BeamType::Ice); beam_door_each_cnt]);
-            door_types.extend(vec![DoorType::Beam(BeamType::Wave); beam_door_each_cnt]);
-            door_types.extend(vec![DoorType::Beam(BeamType::Spazer); beam_door_each_cnt]);
-            door_types.extend(vec![DoorType::Beam(BeamType::Plasma); beam_door_each_cnt]);
-        }
-    };
+//    match settings.doors_mode {
+//        DoorsMode::Blue => {}
+//        DoorsMode::Ammo => {
+//            let red_doors_cnt = 30;
+//            let green_doors_cnt = 15;
+//            let yellow_doors_cnt = 10;
+//            door_types.extend(vec![DoorType::Red; red_doors_cnt]);
+//            door_types.extend(vec![DoorType::Green; green_doors_cnt]);
+//            door_types.extend(vec![DoorType::Yellow; yellow_doors_cnt]);
+//        }
+//        DoorsMode::Beam => {
+//            let red_doors_cnt = 18;
+//            let green_doors_cnt = 10;
+//            let yellow_doors_cnt = 7;
+//            let beam_door_each_cnt = 4;
+//            door_types.extend(vec![DoorType::Red; red_doors_cnt]);
+//            door_types.extend(vec![DoorType::Green; green_doors_cnt]);
+//            door_types.extend(vec![DoorType::Yellow; yellow_doors_cnt]);
+//            door_types.extend(vec![DoorType::Beam(BeamType::Charge); beam_door_each_cnt]);
+//            door_types.extend(vec![DoorType::Beam(BeamType::Ice); beam_door_each_cnt]);
+//            door_types.extend(vec![DoorType::Beam(BeamType::Wave); beam_door_each_cnt]);
+//            door_types.extend(vec![DoorType::Beam(BeamType::Spazer); beam_door_each_cnt]);
+//            door_types.extend(vec![DoorType::Beam(BeamType::Plasma); beam_door_each_cnt]);
+//        }
+//    };
     let walls = get_walls(map, game_data);
     let door_conns = get_randomizable_door_connections(game_data, map, &walls, objectives);
     let mut locked_doors: Vec<LockedDoor> = vec![];
diff --git a/rust/maprando/src/settings.rs b/rust/maprando/src/settings.rs
index 9826b936c4..ebc324d298 100644
--- a/rust/maprando/src/settings.rs
+++ b/rust/maprando/src/settings.rs
@@ -18,7 +18,8 @@ pub struct RandomizerSettings {
     pub quality_of_life_settings: QualityOfLifeSettings,
     pub objective_settings: ObjectiveSettings,
     pub map_layout: String,
-    pub doors_mode: DoorsMode,
+//    pub doors_mode: DoorsMode,
+    pub doors_settings: DoorsSettings,
     pub start_location_settings: StartLocationSettings,
     pub save_animals: SaveAnimals,
     pub other_settings: OtherSettings,
@@ -26,6 +27,19 @@ pub struct RandomizerSettings {
     pub debug: bool,
 }
 
+#[derive(Serialize, Deserialize, Clone, PartialEq)]
+pub struct DoorsSettings {
+    pub preset: Option<String>,
+    pub red_doors_count: i32,
+    pub green_doors_count: i32,
+    pub yellow_doors_count: i32,
+    pub charge_doors_count: i32,
+    pub ice_doors_count: i32,
+    pub wave_doors_count: i32,
+    pub spazer_doors_count: i32,
+    pub plasma_doors_count: i32
+}
+
 #[derive(Serialize, Deserialize, Clone, PartialEq)]
 pub struct SkillAssumptionSettings {
     pub preset: Option<String>,
@@ -919,6 +933,30 @@ fn upgrade_objective_settings(
     Ok(())
 }
 
+fn upgrade_doors_settings(
+    settings: &mut serde_json::Value,
+    preset_data: &PresetData) -> Result<()> {
+    let settings_obj = settings
+        .as_object_mut()
+        .context("expected settings to be object")?;
+
+    if !settings_obj.contains_key("doors_settings") {
+        settings_obj.insert(
+            "doors_settings".to_string(),
+            serde_json::to_value(preset_data.doors_presets[0].clone()).unwrap(),
+        );
+    }
+    
+    if settings_obj.contains_key("doors_mode") {
+        *settings_obj
+            .get_mut("doors_settings")
+            .unwrap()
+            .get_mut("preset")
+            .unwrap() = settings_obj["doors_mode"].as_str().unwrap().into();
+    }
+    Ok(())
+}
+
 fn upgrade_other_settings(settings: &mut serde_json::Value) -> Result<()> {
     let settings_obj = settings
         .as_object_mut()
@@ -989,6 +1027,7 @@ pub fn try_upgrade_settings(
     upgrade_item_progression_settings(&mut settings)?;
     upgrade_qol_settings(&mut settings)?;
     upgrade_map_setting(&mut settings)?;
+    upgrade_doors_settings(&mut settings, preset_data)?;
     upgrade_other_settings(&mut settings)?;
     upgrade_start_location_setings(&mut settings)?;
     upgrade_animals_setting(&mut settings)?;

From fd5e33246e97dbc856fa283410356dd432f32b46 Mon Sep 17 00:00:00 2001
From: aquanight <aquanight@gmail.com>
Date: Fri, 6 Mar 2026 09:55:04 -0700
Subject: [PATCH 2/6] Limit 55 total locked doors

---
 rust/maprando/src/randomize.rs | 34 +++++++++-------------------------
 1 file changed, 9 insertions(+), 25 deletions(-)

diff --git a/rust/maprando/src/randomize.rs b/rust/maprando/src/randomize.rs
index 400b226e03..8f04a66714 100644
--- a/rust/maprando/src/randomize.rs
+++ b/rust/maprando/src/randomize.rs
@@ -3234,32 +3234,16 @@ pub fn randomize_doors(
     if settings.doors_settings.plasma_doors_count > 0 {
         door_types.extend(vec![DoorType::Beam(BeamType::Plasma); settings.doors_settings.plasma_doors_count as usize]);
     }
+    
+    while door_types.len() > 55 {
+        // Randomly remove door locks to get back down to 55
+        let mut remove_doors = rand::seq::index::sample(&mut rng, door_types.len(), door_types.len() - 55).into_vec();
+        remove_doors.sort();
+        while let Some(rd) = remove_doors.pop() {
+            door_types.swap_remove(rd);
+        }
+    }
 
-//    match settings.doors_mode {
-//        DoorsMode::Blue => {}
-//        DoorsMode::Ammo => {
-//            let red_doors_cnt = 30;
-//            let green_doors_cnt = 15;
-//            let yellow_doors_cnt = 10;
-//            door_types.extend(vec![DoorType::Red; red_doors_cnt]);
-//            door_types.extend(vec![DoorType::Green; green_doors_cnt]);
-//            door_types.extend(vec![DoorType::Yellow; yellow_doors_cnt]);
-//        }
-//        DoorsMode::Beam => {
-//            let red_doors_cnt = 18;
-//            let green_doors_cnt = 10;
-//            let yellow_doors_cnt = 7;
-//            let beam_door_each_cnt = 4;
-//            door_types.extend(vec![DoorType::Red; red_doors_cnt]);
-//            door_types.extend(vec![DoorType::Green; green_doors_cnt]);
-//            door_types.extend(vec![DoorType::Yellow; yellow_doors_cnt]);
-//            door_types.extend(vec![DoorType::Beam(BeamType::Charge); beam_door_each_cnt]);
-//            door_types.extend(vec![DoorType::Beam(BeamType::Ice); beam_door_each_cnt]);
-//            door_types.extend(vec![DoorType::Beam(BeamType::Wave); beam_door_each_cnt]);
-//            door_types.extend(vec![DoorType::Beam(BeamType::Spazer); beam_door_each_cnt]);
-//            door_types.extend(vec![DoorType::Beam(BeamType::Plasma); beam_door_each_cnt]);
-//        }
-//    };
     let walls = get_walls(map, game_data);
     let door_conns = get_randomizable_door_connections(game_data, map, &walls, objectives);
     let mut locked_doors: Vec<LockedDoor> = vec![];

From bc240abd3d92f01a37b4d9ab35017b4a9d183fff Mon Sep 17 00:00:00 2001
From: aquanight <aquanight@gmail.com>
Date: Fri, 6 Mar 2026 10:03:30 -0700
Subject: [PATCH 3/6] format/clippy/fix tests

---
 rust/maprando-web/src/web/generate.rs         |  3 +-
 .../maprando-web/src/web/randomize/helpers.rs |  5 +-
 rust/maprando/src/preset.rs                   | 15 +++---
 rust/maprando/src/randomize.rs                | 49 ++++++++++++++-----
 rust/maprando/src/settings.rs                 |  8 +--
 rust/maprando/tests/logic_scenarios.rs        | 16 ++++--
 6 files changed, 65 insertions(+), 31 deletions(-)

diff --git a/rust/maprando-web/src/web/generate.rs b/rust/maprando-web/src/web/generate.rs
index 86a037e575..1930f5d7dc 100644
--- a/rust/maprando-web/src/web/generate.rs
+++ b/rust/maprando-web/src/web/generate.rs
@@ -118,8 +118,7 @@ async fn generate(app_data: web::Data<AppData>) -> impl Responder {
         serde_json::to_string(&app_data.preset_data.item_progression_presets).unwrap();
     let qol_presets_json =
         serde_json::to_string(&app_data.preset_data.quality_of_life_presets).unwrap();
-    let doors_presets_json =
-        serde_json::to_string(&app_data.preset_data.doors_presets).unwrap();
+    let doors_presets_json = serde_json::to_string(&app_data.preset_data.doors_presets).unwrap();
     let objective_presets_json =
         serde_json::to_string(&app_data.preset_data.objective_presets).unwrap();
 
diff --git a/rust/maprando-web/src/web/randomize/helpers.rs b/rust/maprando-web/src/web/randomize/helpers.rs
index a51df5d265..0ec7b32db1 100644
--- a/rust/maprando-web/src/web/randomize/helpers.rs
+++ b/rust/maprando-web/src/web/randomize/helpers.rs
@@ -474,7 +474,10 @@ pub fn render_seed(
             DisableETankSetting::Unrestricted => "Unrestricted",
         }
         .to_string(),
-        doors_preset: seed_data.doors_preset.clone().unwrap_or("Custom".to_string()),
+        doors_preset: seed_data
+            .doors_preset
+            .clone()
+            .unwrap_or("Custom".to_string()),
         red_doors_count: seed_data.red_doors_count,
         green_doors_count: seed_data.green_doors_count,
         yellow_doors_count: seed_data.yellow_doors_count,
diff --git a/rust/maprando/src/preset.rs b/rust/maprando/src/preset.rs
index 2d5787938f..22eaca5f1c 100644
--- a/rust/maprando/src/preset.rs
+++ b/rust/maprando/src/preset.rs
@@ -9,8 +9,8 @@ use serde::{Deserialize, Serialize};
 use crate::{
     randomize::DifficultyConfig,
     settings::{
-        ItemProgressionSettings, ObjectiveSettings, QualityOfLifeSettings, RandomizerSettings,
-        SkillAssumptionSettings, DoorsSettings
+        DoorsSettings, ItemProgressionSettings, ObjectiveSettings, QualityOfLifeSettings,
+        RandomizerSettings, SkillAssumptionSettings,
     },
 };
 
@@ -214,18 +214,15 @@ impl PresetData {
             objective_presets.push(preset);
         }
 
-        let doors_preset_names = [
-            "Blue",
-            "Ammo",
-            "Beam"
-        ];
+        let doors_preset_names = ["Blue", "Ammo", "Beam"];
         let doors_preset_path = presets_path.join("doors");
         let mut doors_presets: Vec<DoorsSettings> = vec![];
         for name in doors_preset_names {
             let path = doors_preset_path.join(format!("{name}.json"));
             let preset_str = std::fs::read_to_string(path.clone())
                 .context(format!("reading from {}", path.display()))?;
-            let preset: DoorsSettings = serde_json::from_str(&preset_str).context(format!("parsing {}", path.display()))?;
+            let preset: DoorsSettings =
+                serde_json::from_str(&preset_str).context(format!("parsing {}", path.display()))?;
             assert!(preset.preset == Some(name.to_string()));
             doors_presets.push(preset);
         }
@@ -269,7 +266,7 @@ impl PresetData {
             default_preset,
             logic_page_presets,
             full_presets,
-            doors_presets
+            doors_presets,
         };
         Ok(preset_data)
     }
diff --git a/rust/maprando/src/randomize.rs b/rust/maprando/src/randomize.rs
index 8f04a66714..540272f997 100644
--- a/rust/maprando/src/randomize.rs
+++ b/rust/maprando/src/randomize.rs
@@ -5,7 +5,7 @@ use crate::helpers::get_item_priorities;
 use crate::patch::NUM_AREAS;
 use crate::patch::map_tiles::get_objective_tiles;
 use crate::settings::{
-    AreaAssignmentBaseOrder, DoorsMode, FillerItemPriority, ItemCount, ItemPlacementStyle,
+    AreaAssignmentBaseOrder, FillerItemPriority, ItemCount, ItemPlacementStyle,
     ItemPriorityStrength, KeyItemPriority, MotherBrainFight, Objective, ObjectiveSetting,
     ProgressionRate, RandomizerSettings, SaveAnimals, SkillAssumptionSettings, SpeedBooster,
     StartLocationMode, WallJump,
@@ -3209,35 +3209,60 @@ pub fn randomize_doors(
     let mut used_locs: HashSet<(RoomGeometryRoomIdx, usize, usize)> = HashSet::new();
     let mut used_beam_rooms: HashSet<RoomGeometryRoomIdx> = HashSet::new();
     let mut door_types = vec![];
-    
+
     if settings.doors_settings.red_doors_count > 0 {
-        door_types.extend(vec![DoorType::Red; settings.doors_settings.red_doors_count as usize]);
+        door_types.extend(vec![
+            DoorType::Red;
+            settings.doors_settings.red_doors_count as usize
+        ]);
     }
     if settings.doors_settings.green_doors_count > 0 {
-        door_types.extend(vec![DoorType::Green; settings.doors_settings.green_doors_count as usize]);
+        door_types.extend(vec![
+            DoorType::Green;
+            settings.doors_settings.green_doors_count as usize
+        ]);
     }
     if settings.doors_settings.yellow_doors_count > 0 {
-        door_types.extend(vec![DoorType::Yellow; settings.doors_settings.yellow_doors_count as usize]);
+        door_types.extend(vec![
+            DoorType::Yellow;
+            settings.doors_settings.yellow_doors_count as usize
+        ]);
     }
     if settings.doors_settings.charge_doors_count > 0 {
-        door_types.extend(vec![DoorType::Beam(BeamType::Charge); settings.doors_settings.charge_doors_count as usize]);
+        door_types.extend(vec![
+            DoorType::Beam(BeamType::Charge);
+            settings.doors_settings.charge_doors_count as usize
+        ]);
     }
     if settings.doors_settings.ice_doors_count > 0 {
-        door_types.extend(vec![DoorType::Beam(BeamType::Ice); settings.doors_settings.ice_doors_count as usize]);
+        door_types.extend(vec![
+            DoorType::Beam(BeamType::Ice);
+            settings.doors_settings.ice_doors_count as usize
+        ]);
     }
     if settings.doors_settings.wave_doors_count > 0 {
-        door_types.extend(vec![DoorType::Beam(BeamType::Wave); settings.doors_settings.wave_doors_count as usize]);
+        door_types.extend(vec![
+            DoorType::Beam(BeamType::Wave);
+            settings.doors_settings.wave_doors_count as usize
+        ]);
     }
     if settings.doors_settings.spazer_doors_count > 0 {
-        door_types.extend(vec![DoorType::Beam(BeamType::Spazer); settings.doors_settings.spazer_doors_count as usize]);
+        door_types.extend(vec![
+            DoorType::Beam(BeamType::Spazer);
+            settings.doors_settings.spazer_doors_count as usize
+        ]);
     }
     if settings.doors_settings.plasma_doors_count > 0 {
-        door_types.extend(vec![DoorType::Beam(BeamType::Plasma); settings.doors_settings.plasma_doors_count as usize]);
+        door_types.extend(vec![
+            DoorType::Beam(BeamType::Plasma);
+            settings.doors_settings.plasma_doors_count as usize
+        ]);
     }
-    
+
     while door_types.len() > 55 {
         // Randomly remove door locks to get back down to 55
-        let mut remove_doors = rand::seq::index::sample(&mut rng, door_types.len(), door_types.len() - 55).into_vec();
+        let mut remove_doors =
+            rand::seq::index::sample(&mut rng, door_types.len(), door_types.len() - 55).into_vec();
         remove_doors.sort();
         while let Some(rd) = remove_doors.pop() {
             door_types.swap_remove(rd);
diff --git a/rust/maprando/src/settings.rs b/rust/maprando/src/settings.rs
index ebc324d298..7672bd3d34 100644
--- a/rust/maprando/src/settings.rs
+++ b/rust/maprando/src/settings.rs
@@ -18,7 +18,6 @@ pub struct RandomizerSettings {
     pub quality_of_life_settings: QualityOfLifeSettings,
     pub objective_settings: ObjectiveSettings,
     pub map_layout: String,
-//    pub doors_mode: DoorsMode,
     pub doors_settings: DoorsSettings,
     pub start_location_settings: StartLocationSettings,
     pub save_animals: SaveAnimals,
@@ -37,7 +36,7 @@ pub struct DoorsSettings {
     pub ice_doors_count: i32,
     pub wave_doors_count: i32,
     pub spazer_doors_count: i32,
-    pub plasma_doors_count: i32
+    pub plasma_doors_count: i32,
 }
 
 #[derive(Serialize, Deserialize, Clone, PartialEq)]
@@ -935,7 +934,8 @@ fn upgrade_objective_settings(
 
 fn upgrade_doors_settings(
     settings: &mut serde_json::Value,
-    preset_data: &PresetData) -> Result<()> {
+    preset_data: &PresetData,
+) -> Result<()> {
     let settings_obj = settings
         .as_object_mut()
         .context("expected settings to be object")?;
@@ -946,7 +946,7 @@ fn upgrade_doors_settings(
             serde_json::to_value(preset_data.doors_presets[0].clone()).unwrap(),
         );
     }
-    
+
     if settings_obj.contains_key("doors_mode") {
         *settings_obj
             .get_mut("doors_settings")
diff --git a/rust/maprando/tests/logic_scenarios.rs b/rust/maprando/tests/logic_scenarios.rs
index 5149006990..50b115ff86 100644
--- a/rust/maprando/tests/logic_scenarios.rs
+++ b/rust/maprando/tests/logic_scenarios.rs
@@ -5,8 +5,8 @@ use hashbrown::HashMap;
 use maprando::{
     randomize::{DifficultyConfig, LockedDoor, Preprocessor, make_locked_door_data},
     settings::{
-        DisableETankSetting, InitialMapRevealSettings, ItemProgressionSettings, Objective,
-        ObjectiveSettings, OtherSettings, QualityOfLifeSettings, RandomizerSettings,
+        DisableETankSetting, DoorsSettings, InitialMapRevealSettings, ItemProgressionSettings,
+        Objective, ObjectiveSettings, OtherSettings, QualityOfLifeSettings, RandomizerSettings,
         SkillAssumptionSettings, StartLocationSettings,
     },
     traverse::{LockedDoorData, Traverser},
@@ -271,7 +271,17 @@ fn get_settings(scenario: &Scenario) -> Result<RandomizerSettings> {
             objective_screen: maprando::settings::ObjectiveScreen::Disabled,
         },
         map_layout: String::new(),
-        doors_mode: maprando::settings::DoorsMode::Blue,
+        doors_settings: DoorsSettings {
+            preset: Some("Blue".to_string()),
+            red_doors_count: 0,
+            green_doors_count: 0,
+            yellow_doors_count: 0,
+            charge_doors_count: 0,
+            ice_doors_count: 0,
+            wave_doors_count: 0,
+            spazer_doors_count: 0,
+            plasma_doors_count: 0,
+        },
         start_location_settings: StartLocationSettings {
             mode: maprando::settings::StartLocationMode::Ship,
             room_id: None,

From 5651ed0482a22bfc502aef080748f7fdc5316c5a Mon Sep 17 00:00:00 2001
From: aquanight <aquanight@gmail.com>
Date: Fri, 6 Mar 2026 10:21:17 -0700
Subject: [PATCH 4/6] Fix oversize door pool to use keep-weighting rather than
 remove-weighting

---
 rust/maprando/src/randomize.rs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/rust/maprando/src/randomize.rs b/rust/maprando/src/randomize.rs
index 540272f997..51b5816f70 100644
--- a/rust/maprando/src/randomize.rs
+++ b/rust/maprando/src/randomize.rs
@@ -3259,14 +3259,16 @@ pub fn randomize_doors(
         ]);
     }
 
-    while door_types.len() > 55 {
-        // Randomly remove door locks to get back down to 55
-        let mut remove_doors =
-            rand::seq::index::sample(&mut rng, door_types.len(), door_types.len() - 55).into_vec();
-        remove_doors.sort();
-        while let Some(rd) = remove_doors.pop() {
-            door_types.swap_remove(rd);
-        }
+    if door_types.len() > 55 {
+        let mut keep_doors_idx =
+            rand::seq::index::sample(&mut rng, door_types.len(), 55).into_vec();
+        keep_doors_idx.sort();
+        let mut keep_doors = Vec::with_capacity(55);
+        for idx in keep_doors_idx.into_iter() {
+            keep_doors.push(door_types[idx]);
+        }
+        door_types.clear();
+        door_types.extend(keep_doors);
     }
 
     let walls = get_walls(map, game_data);

From c3d0e616d923d5eb1266279ce3bf0bc422b4d795 Mon Sep 17 00:00:00 2001
From: aquanight <aquanight@gmail.com>
Date: Fri, 6 Mar 2026 13:54:05 -0700
Subject: [PATCH 5/6] Improve seed details description of door settings

---
 .../templates/seed/doors_details.html         | 39 +++++++++++++++++++
 .../templates/seed/seed_header.html           | 36 +++++------------
 2 files changed, 49 insertions(+), 26 deletions(-)
 create mode 100644 rust/maprando-web/templates/seed/doors_details.html

diff --git a/rust/maprando-web/templates/seed/doors_details.html b/rust/maprando-web/templates/seed/doors_details.html
new file mode 100644
index 0000000000..5201f1fd8f
--- /dev/null
+++ b/rust/maprando-web/templates/seed/doors_details.html
@@ -0,0 +1,39 @@
+<div class="row">
+    <div class="col-6 col-sm-5 col-md-4 col-lg-3">Missile Doors:</div>
+    <div class="col-6 col-sm-7 col-md-8 col-lg-9">{{+ red_doors_count }}</div>
+</div>
+
+<div class="row">
+    <div class="col-6 col-sm-5 col-md-4 col-lg-3">Super Doors:</div>
+    <div class="col-6 col-sm-7 col-md-8 col-lg-9">{{+ green_doors_count }}</div>
+</div>
+
+<div class="row">
+    <div class="col-6 col-sm-5 col-md-4 col-lg-3">Power Bomb Doors:</div>
+    <div class="col-6 col-sm-7 col-md-8 col-lg-9">{{+ yellow_doors_count }}</div>
+</div>
+
+<div class="row">
+    <div class="col-6 col-sm-5 col-md-4 col-lg-3">Charge Beam Doors:</div>
+    <div class="col-6 col-sm-7 col-md-8 col-lg-9">{{+ charge_doors_count }}</div>
+</div>
+
+<div class="row">
+    <div class="col-6 col-sm-5 col-md-4 col-lg-3">Ice Beam Doors:</div>
+    <div class="col-6 col-sm-7 col-md-8 col-lg-9">{{+ ice_doors_count }}</div>
+</div>
+
+<div class="row">
+    <div class="col-6 col-sm-5 col-md-4 col-lg-3">Wave Beam Doors:</div>
+    <div class="col-6 col-sm-7 col-md-8 col-lg-9">{{+ wave_doors_count }}</div>
+</div>
+
+<div class="row">
+    <div class="col-6 col-sm-5 col-md-4 col-lg-3">Spazer Doors:</div>
+    <div class="col-6 col-sm-7 col-md-8 col-lg-9">{{+ spazer_doors_count }}</div>
+</div>
+
+<div class="row">
+    <div class="col-6 col-sm-5 col-md-4 col-lg-3">Plasma Beam Doors:</div>
+    <div class="col-6 col-sm-7 col-md-8 col-lg-9">{{+ plasma_doors_count }}</div>
+</div>
diff --git a/rust/maprando-web/templates/seed/seed_header.html b/rust/maprando-web/templates/seed/seed_header.html
index 0b986cb184..322e20aa1c 100644
--- a/rust/maprando-web/templates/seed/seed_header.html
+++ b/rust/maprando-web/templates/seed/seed_header.html
@@ -61,32 +61,7 @@
         </div>
         <div class="row">
             <div class="col-5 col-sm-4 col-md-3">Doors:</div>
-            <div class="col-7 col-sm-8 col-md-9">{{+ doors_preset }}
-            {% if red_doors_count > 0 %}
-            <span>Red {{+ red_doors_count }} </span>
-            {% endif %}
-            {% if green_doors_count > 0 %}
-            <span>Green {{+ green_doors_count }} </span>
-            {% endif %}
-            {% if yellow_doors_count > 0 %}
-            <span>Yellow {{+ yellow_doors_count }} </span>
-            {% endif %}
-            {% if charge_doors_count > 0 %}
-            <span>Charge {{+ charge_doors_count }} </span>
-            {% endif %}
-            {% if ice_doors_count > 0 %}
-            <span>Ice {{+ ice_doors_count }} </span>
-            {% endif %}
-            {% if wave_doors_count > 0 %}
-            <span>Wave {{+ wave_doors_count }} </span>
-            {% endif %}
-            {% if spazer_doors_count > 0 %}
-            <span>Spazer {{+ spazer_doors_count }} </span>
-            {% endif %}
-            {% if plasma_doors_count > 0 %}
-            <span>Plasma {{+ plasma_doors_count }} </span>
-            {% endif %}
-            </div>
+            <div class="col-7 col-sm-8 col-md-9">{{+ doors_preset }}</div>
         </div>
         <div class="row">
             <div class="col-5 col-sm-4 col-md-3">Start location:</div>
@@ -152,6 +127,15 @@ <h2 class="accordion-header">
                         {% include "quality_of_life_details.html" %}
                     </div>
                 </div>
+                
+                <div class="card">
+                    <div class="card-header">
+                        Doors details
+                    </div>
+                    <div class="card-body">
+                        {% include "doors_details.html" %}
+                    </div>
+                </div>
 
                 <div class="card">
                     <div class="card-header">

From 30c8e10d64a53630153bf453d0293aff6ad67dad Mon Sep 17 00:00:00 2001
From: Brent Kerby <blkerby@gmail.com>
Date: Mon, 9 Mar 2026 19:11:10 -0600
Subject: [PATCH 6/6] increase door count limit

---
 patches/rom_map/Bank 83.txt                    |  7 ++++---
 patches/src/item_dots_disappear.asm            |  4 ++--
 .../maprando-web/templates/generate/doors.html | 18 +++++++++---------
 rust/maprando-web/templates/generate/main.html |  2 +-
 rust/maprando/src/patch/map_tiles.rs           |  4 ++--
 rust/maprando/src/randomize.rs                 | 14 +++++++++-----
 6 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/patches/rom_map/Bank 83.txt b/patches/rom_map/Bank 83.txt
index 6e349082c3..46816f6359 100644
--- a/patches/rom_map/Bank 83.txt	
+++ b/patches/rom_map/Bank 83.txt	
@@ -1,10 +1,11 @@
 0000 - AD66: Used by vanilla game
 AD66 - AD72: escape_autosave.asm
-B000 - B700: items_disappear.asm
+B000 - B700: [FREE]
 B700 - B800: rng_fix.asm
 B800 - BA00: Mosaic (Area FX.asm)
 BA00 - BA15: vanilla_bugfixes.asm
-BA15 - BB00: [free]
+BA15 - BB00: [FREE]
 BB00 - BC40: disableable_etanks.asm
-BC40 - F000: [free space]
+BC40 - E000: [FREE]
+E000 - F000: item_dots_disappear.asm
 F000 - end:  Mosaic (FX data)
\ No newline at end of file
diff --git a/patches/src/item_dots_disappear.asm b/patches/src/item_dots_disappear.asm
index 3bbabbf2e2..6af682a2bc 100644
--- a/patches/src/item_dots_disappear.asm
+++ b/patches/src/item_dots_disappear.asm
@@ -2,8 +2,8 @@ arch snes.cpu
 lorom
 
 ; Must match locations in patch/map_tiles.rs
-!item_list_ptrs = $83B000
-!item_list_sizes = $83B00C
+!item_list_ptrs = $83E000
+!item_list_sizes = $83E00C
 
 !bank_82_freespace_start = $82FD00
 !bank_82_freespace_end = $82FD80
diff --git a/rust/maprando-web/templates/generate/doors.html b/rust/maprando-web/templates/generate/doors.html
index 96d944ae15..9be5e08e5b 100644
--- a/rust/maprando-web/templates/generate/doors.html
+++ b/rust/maprando-web/templates/generate/doors.html
@@ -1,5 +1,5 @@
 <div class="modal" id="doorsModal" tabindex="-1">
-    <div class="modal-dialog modal-fullscreen-sm-down modal-dialog-centered" style="max-width:max(min(90vw, 992px), 576px)">
+    <div class="modal-dialog modal-lg modal-dialog-centered">
         <div class="modal-content">
             <div class="modal-header">
             <h1 class="modal-title fs-5">Doors</h1>
@@ -9,7 +9,7 @@ <h1 class="modal-title fs-5">Doors</h1>
             <div class="modal-body p-1">
                 <div class="form-group row">
                     <div class="col-lg-3 m-2">
-                        <label for="preset">Missile Doors:</label>
+                        <label for="red_doors_count">Missile Doors:</label>
                     </div>
                     <div class="col-lg-3 m-2">
                         <input type="text" class="form-control door-count" name="red_doors_count" id="red_doors_count" value="0" onchange="doorsSettingsChanged()">
@@ -18,7 +18,7 @@ <h1 class="modal-title fs-5">Doors</h1>
 
                 <div class="form-group row">
                     <div class="col-lg-3 m-2">
-                        <label for="preset">Super Doors:</label>
+                        <label for="green_doors_count">Super Doors:</label>
                     </div>
                     <div class="col-lg-3 m-2">
                         <input type="text" class="form-control door-count" name="green_doors_count" id="green_doors_count" value="0" onchange="doorsSettingsChanged()">
@@ -27,7 +27,7 @@ <h1 class="modal-title fs-5">Doors</h1>
 
                 <div class="form-group row">
                     <div class="col-lg-3 m-2">
-                        <label for="preset">Power Bomb Doors:</label>
+                        <label for="yellow_doors_count">Power Bomb Doors:</label>
                     </div>
                     <div class="col-lg-3 m-2">
                         <input type="text" class="form-control door-count" name="yellow_doors_count" id="yellow_doors_count" value="0" onchange="doorsSettingsChanged()">
@@ -36,7 +36,7 @@ <h1 class="modal-title fs-5">Doors</h1>
 
                 <div class="form-group row">
                     <div class="col-lg-3 m-2">
-                        <label for="preset">Charge Beam Doors:</label>
+                        <label for="charge_doors_count">Charge Beam Doors:</label>
                     </div>
                     <div class="col-lg-3 m-2">
                         <input type="text" class="form-control door-count" name="charge_doors_count" id="charge_doors_count" value="0" onchange="doorsSettingsChanged()">
@@ -45,7 +45,7 @@ <h1 class="modal-title fs-5">Doors</h1>
 
                 <div class="form-group row">
                     <div class="col-lg-3 m-2">
-                        <label for="preset">Ice Beam Doors:</label>
+                        <label for="ice_doors_count">Ice Beam Doors:</label>
                     </div>
                     <div class="col-lg-3 m-2">
                         <input type="text" class="form-control door-count" name="ice_doors_count" id="ice_doors_count" value="0" onchange="doorsSettingsChanged()">
@@ -54,7 +54,7 @@ <h1 class="modal-title fs-5">Doors</h1>
 
                 <div class="form-group row">
                     <div class="col-lg-3 m-2">
-                        <label for="preset">Wave Beam Doors:</label>
+                        <label for="wave_doors_count">Wave Beam Doors:</label>
                     </div>
                     <div class="col-lg-3 m-2">
                         <input type="text" class="form-control door-count" name="wave_doors_count" id="wave_doors_count" value="0" onchange="doorsSettingsChanged()">
@@ -63,7 +63,7 @@ <h1 class="modal-title fs-5">Doors</h1>
 
                 <div class="form-group row">
                     <div class="col-lg-3 m-2">
-                        <label for="preset">Spazer Doors:</label>
+                        <label for="spazer_doors_count">Spazer Doors:</label>
                     </div>
                     <div class="col-lg-3 m-2">
                         <input type="text" class="form-control door-count" name="spazer_doors_count" id="spazer_doors_count" value="0" onchange="doorsSettingsChanged()">
@@ -72,7 +72,7 @@ <h1 class="modal-title fs-5">Doors</h1>
 
                 <div class="form-group row">
                     <div class="col-lg-3 m-2">
-                        <label for="preset">Plasma Beam Doors:</label>
+                        <label for="plasma_doors_count">Plasma Beam Doors:</label>
                     </div>
                     <div class="col-lg-3 m-2">
                         <input type="text" class="form-control door-count" name="plasma_doors_count" id="plasma_doors_count" value="0" onchange="doorsSettingsChanged()">
diff --git a/rust/maprando-web/templates/generate/main.html b/rust/maprando-web/templates/generate/main.html
index 12be61b1ea..3512cb5c60 100644
--- a/rust/maprando-web/templates/generate/main.html
+++ b/rust/maprando-web/templates/generate/main.html
@@ -224,7 +224,7 @@ <h3 class="mt-3 mb-2">Generate Game</h3>
                     <input type="radio" class="btn-check doors-preset-button" name="doors_preset" value="{{+ name}}"
                         id="doors{{+ name }}" autocomplete="off"
                         onchange="doorsPresetChanged()"
-                        {% if loop.index0 == 0 %}
+                        {% if loop.index0 == 1 %}
                         checked
                         {% endif %}
                         >
diff --git a/rust/maprando/src/patch/map_tiles.rs b/rust/maprando/src/patch/map_tiles.rs
index 54e25c7c2e..0bb977eabe 100644
--- a/rust/maprando/src/patch/map_tiles.rs
+++ b/rust/maprando/src/patch/map_tiles.rs
@@ -2374,7 +2374,7 @@ impl<'a> MapPatcher<'a> {
         area_data: &[Vec<(ItemIdx, RoomId, MapTile)>],
     ) -> Result<()> {
         // Write per-area item listings, to be used by the patch `item_dots_disappear.asm`.
-        let base_ptr = 0x83B000;
+        let base_ptr = 0x83E000;
         let mut data_ptr = base_ptr + 24;
         for (area_idx, data) in area_data.iter().enumerate() {
             self.rom.write_u16(
@@ -2400,7 +2400,7 @@ impl<'a> MapPatcher<'a> {
             }
             assert_eq!(data_ptr, data_start + 6 * data.len());
         }
-        assert!(data_ptr <= 0x83B600);
+        assert!(data_ptr <= 0x83F000);
         Ok(())
     }
 
diff --git a/rust/maprando/src/randomize.rs b/rust/maprando/src/randomize.rs
index 51b5816f70..2936f4f10b 100644
--- a/rust/maprando/src/randomize.rs
+++ b/rust/maprando/src/randomize.rs
@@ -3258,12 +3258,18 @@ pub fn randomize_doors(
             settings.doors_settings.plasma_doors_count as usize
         ]);
     }
+    let walls = get_walls(map, game_data);
+    let door_conns = get_randomizable_door_connections(game_data, map, &walls, objectives);
 
-    if door_types.len() > 55 {
+    // The ability to support more doors is limited by the space for dynamic tiles in bank E4.
+    // That data could possibly be moved out to another bank to free up more space.
+    // For now we limit the amount of ammo/beam doors to 120.
+    let door_count_limit = door_conns.len().min(120);
+    if door_types.len() > door_count_limit {
         let mut keep_doors_idx =
-            rand::seq::index::sample(&mut rng, door_types.len(), 55).into_vec();
+            rand::seq::index::sample(&mut rng, door_types.len(), door_count_limit).into_vec();
         keep_doors_idx.sort();
-        let mut keep_doors = Vec::with_capacity(55);
+        let mut keep_doors = Vec::with_capacity(door_count_limit);
         for idx in keep_doors_idx.into_iter() {
             keep_doors.push(door_types[idx]);
         }
@@ -3271,8 +3277,6 @@ pub fn randomize_doors(
         door_types.extend(keep_doors);
     }
 
-    let walls = get_walls(map, game_data);
-    let door_conns = get_randomizable_door_connections(game_data, map, &walls, objectives);
     let mut locked_doors: Vec<LockedDoor> = vec![];
     let total_cnt = door_types.len();
     let idxs = rand::seq::index::sample(&mut rng, door_conns.len(), total_cnt);