Add more settings

src/assets/main.css

@@ -21,3 +21,8 @@
 .toggle {
   margin-top: 0.35em;
 }
+
+.btn-outline-warning {
+  --bs-btn-color: #880;
+  --bs-btn-active-color: #550;
+}

src/components/Seed.vue

@@ -181,7 +181,9 @@ export default defineComponent({
           </div>
         </li>
         <li v-if="settings" class="list-group-item">
+          <div class="mb-1">
             <SeedSettings :settings="settings" />
+          </div>
         </li>
         <li class="list-group-item">
           <div class="mb-2">

src/components/SeedSettings.vue

@@ -19,6 +19,18 @@ export default defineComponent({
       }
       return rendered;
     },
+    isEnemizer() {
+      return (this.settings.enemy_shuffle && this.settings.enemy_shuffle != "vanilla")
+          || (this.settings.boss_shuffle && this.settings.boss_shuffle != "vanilla");
+    },
+    dungeonItemsShuffled() {
+      return (this.settings.small_keys && this.settings.small_keys != "dungeons")
+          || (this.settings.big_keys && this.settings.big_keys != "dungeons")
+          || (this.settings.maps && this.settings.maps != "dungeons")
+          || (this.settings.compasses && this.settings.compasses != "dungeons")
+          || (this.settings.compasses && this.settings.compasses != "dungeons")
+          || (this.settings.prize_shuffle && this.settings.prize_shuffle != "vanilla");
+    }
   },
   methods: {
   }
@@ -28,7 +40,7 @@ export default defineComponent({
 <template>
   <div v-if="settings.randomizer && settingsDisplay.randomizer[settings.randomizer]">
     {{ settingsDisplay.randomizer[settings.randomizer] }}
-    <hr>
+    <hr class="mt-2 mb-2" />
   </div>
   <div v-if="settings.goal">
     Goal: {{ settingsDisplay.goal[settings.goal] }}
@@ -39,16 +51,32 @@ export default defineComponent({
   <div v-if="settings.weapons">
     Weapons: {{ settingsDisplay.weapons[settings.weapons] }}
   </div>
-  <hr />
   <div v-if="settings.entrance_shuffle && settings.entrance_shuffle != 'vanilla'">
+    <hr class="mt-2 mb-2" />
+    <div>
       {{ settingsDisplay.entrance_shuffle[settings.entrance_shuffle] }}
     </div>
+  </div>
+  <div v-if="settings.door_shuffle && settings.door_shuffle != 'vanilla'">
+    <hr class="mt-2 mb-2" />
+    <div>
+      {{ settingsDisplay.door_shuffle[settings.door_shuffle] }}
+    </div>
+    <div v-if="settings.door_lobbies && settings.door_lobbies != 'vanilla'">
+      {{ settingsDisplay.door_lobbies[settings.door_lobbies] }}
+    </div>
+  </div>
+  <div v-if="isEnemizer">
+    <hr class="mt-2 mb-2" />
     <div v-if="settings.enemy_shuffle && settings.enemy_shuffle != 'vanilla'">
       {{ settingsDisplay.enemy_shuffle[settings.enemy_shuffle] }}
     </div>
     <div v-if="settings.boss_shuffle && settings.boss_shuffle != 'vanilla'">
       {{ settingsDisplay.boss_shuffle[settings.boss_shuffle] }}
     </div>
+  </div>
+  <div v-if="dungeonItemsShuffled">
+    <hr class="mt-2 mb-2" />
     <div v-if="settings.small_keys && settings.small_keys != 'dungeon'">
       {{ settingsDisplay.dungeon_items[settings.small_keys] }} Small Keys
     </div>
@@ -61,4 +89,8 @@ export default defineComponent({
     <div v-if="settings.compasses && settings.compasses != 'dungeon'">
       {{ settingsDisplay.dungeon_items[settings.compasses] }} Compasses
     </div>
+    <div v-if="settings.prize_shuffle && settings.prize_shuffle != 'vanilla'">
+      {{ settingsDisplay.prize_shuffle[settings.prize_shuffle] }}
+    </div>
+  </div>
 </template>

src/data/generator-settings.yaml

@@ -7,6 +7,10 @@ base:
   entrance_shuffle: all
   skull_woods: all
   linked_drops: all
+  door_shuffle: all
+  door_lobbies: all
+  door_type_mode: all
+  trap_door_mode: all
   boss_shuffle: all
   enemy_shuffle: all
   small_keys: all
@@ -18,6 +22,8 @@ base:
   pottery: all
   prize_shuffle: all
   boots: all
+  flute: all
+  dark_rooms: all
 apr2025:
   mode: ['open', 'standard']
   weapons: all

src/data/settings-display.yaml

@@ -31,6 +31,15 @@ entrance_shuffle:
   crossed: Crossed Entrance Shuffle
   swapped: Swapped Entrance Shuffle
   decoupled: Decoupled Entrance Shuffle
+door_shuffle:
+  vanilla: Vanilla Doors
+  basic: Basic Door Shuffle
+  paired: Paired Door Shuffle
+  partitioned: Partitioned Door Shuffle
+  crossed: Crossed Door Shuffle
+door_lobbies:
+  Vanilla: Vanilla Dungeon Lobbies
+  Shuffled: Shuffled Dungeon Lobbies
 enemy_shuffle:
   vanilla: Vanilla Enemies
   shuffled: Shuffled Enemies
@@ -46,3 +55,8 @@ dungeon_items:
   wild: Wild
   nearby: Nearby
   universal: Universal
+prize_shuffle:
+  vanilla: Prizes on Bosses
+  dungeon: Prizes Shuffled in Dungeon
+  nearby: Prizes Shuffled Nearby
+  wild: Wild Prizes

src/data/settings.yaml

@@ -253,3 +253,73 @@ boots:
       display: Pseudoboots
     starting:
       display: Starting Boots
+flute:
+  display: Flute
+  default: normal
+  values:
+    normal:
+      display: Flute Needs Activation
+    preactivated:
+      display: Preactivated
+    starting:
+      display: Starting Activated Flute
+dark_rooms:
+  display: Dark Room Logic
+  default: require_lamp
+  values:
+    require_lamp:
+      display: Lamp Required
+    always_light_cone:
+      display: Free Light Cone
+    no_dark_rooms:
+      display: All Rooms Lit
+    always_in_logic:
+      display: Always in Logic
+    starting_lamp:
+      display: Starting Lamp
+door_shuffle:
+  display: Door Shuffle
+  default: vanilla
+  values:
+    vanilla:
+      display: None
+    basic:
+      display: Basic
+    paired:
+      display: Paired
+    partitioned:
+      display: Partitioned
+    crossed:
+      display: Crossed
+door_lobbies:
+  display: Dungeon Lobbies
+  default: vanilla
+  values:
+    vanilla:
+      display: Vanilla
+    shuffled:
+      display: Shuffled
+door_type_mode:
+  display: Shuffled Door Types
+  default: big
+  values:
+    original:
+      display: Key and Bomb Doors
+    big:
+      display: Key, Big Key, and Bomb Doors
+    all:
+      display: All Door Types
+    chaos:
+      display: Chaos
+trap_door_mode:
+  display: Trap Door Removal
+  default: optional
+  values:
+    vanilla:
+      display: None
+    optional:
+      display: Some
+    boss:
+      display: Boss
+    remove_all:
+      display: All

src/views/GenerateView.vue

@@ -63,23 +63,34 @@ export default defineComponent({
             v-model="set.linked_drops" name="linked_drops" generator="base" />
       </li>
       <li class="list-group-item">
-        <SettingPicker color="danger" v-model="set.boss_shuffle" name="boss_shuffle" generator="base" />
+        <SettingPicker color="danger" v-model="set.door_shuffle" name="door_shuffle" generator="base" />
-        <SettingPicker color="danger" v-model="set.enemy_shuffle" name="enemy_shuffle" generator="base" />
+        <SettingPicker color="danger" v-if="this.set.door_shuffle != 'vanilla'"
+            v-model="set.door_lobbies" name="door_lobbies" generator="base" />
+        <SettingPicker color="danger" v-if="this.set.door_shuffle != 'vanilla'"
+            v-model="set.door_type_mode" name="door_type_mode" generator="base" />
+        <SettingPicker color="danger" v-if="this.set.door_shuffle != 'vanilla'"
+            v-model="set.trap_door_mode" name="trap_door_mode" generator="base" />
       </li>
       <li class="list-group-item">
-        <SettingPicker color="primary" v-model="set.small_keys" name="small_keys" generator="base" />
+        <SettingPicker color="success" v-model="set.boss_shuffle" name="boss_shuffle" generator="base" />
-        <SettingPicker color="primary" v-model="set.big_keys" name="big_keys" generator="base" />
+        <SettingPicker color="success" v-model="set.enemy_shuffle" name="enemy_shuffle" generator="base" />
-        <SettingPicker color="primary" v-model="set.maps" name="maps" generator="base" />
-        <SettingPicker color="primary" v-model="set.compasses" name="compasses" generator="base" />
       </li>
       <li class="list-group-item">
-        <SettingPicker color="success" v-model="set.shop_shuffle" name="shop_shuffle" generator="base" />
+        <SettingPicker color="warning" v-model="set.small_keys" name="small_keys" generator="base" />
-        <SettingPicker color="success" v-model="set.drop_shuffle" name="drop_shuffle" generator="base" />
+        <SettingPicker color="warning" v-model="set.big_keys" name="big_keys" generator="base" />
-        <SettingPicker color="success" v-model="set.pottery" name="pottery" generator="base" />
+        <SettingPicker color="warning" v-model="set.maps" name="maps" generator="base" />
-        <SettingPicker color="success" v-model="set.prize_shuffle" name="prize_shuffle" generator="base" />
+        <SettingPicker color="warning" v-model="set.compasses" name="compasses" generator="base" />
       </li>
       <li class="list-group-item">
-        <SettingPicker color="warning" v-model="set.boots" name="boots" generator="base" />
+        <SettingPicker color="danger" v-model="set.shop_shuffle" name="shop_shuffle" generator="base" />
+        <SettingPicker color="danger" v-model="set.drop_shuffle" name="drop_shuffle" generator="base" />
+        <SettingPicker color="danger" v-model="set.pottery" name="pottery" generator="base" />
+        <SettingPicker color="danger" v-model="set.prize_shuffle" name="prize_shuffle" generator="base" />
+      </li>
+      <li class="list-group-item">
+        <SettingPicker color="primary" v-model="set.boots" name="boots" generator="base" />
+        <SettingPicker color="primary" v-model="set.flute" name="flute" generator="base" />
+        <SettingPicker color="primary" v-model="set.dark_rooms" name="dark_rooms" generator="base" />
       </li>
     </ul>
     <div class="card-footer">