Add dungeon map randomizer

2026-01-04 00:43:35 -06:00
parent 9fec8b00fd
commit fd7176d9c9
9 changed files with 203 additions and 54 deletions
--- a/src/components/PresetPicker.vue
+++ b/src/components/PresetPicker.vue
@@ -49,10 +49,12 @@ export default defineComponent({
    },
    presets() {
      const filledPresets = {};
-      for (const presetName of Object.keys(presets[this.generator])) {
-        const preset = JSON.parse(JSON.stringify(presets[this.generator][presetName]));
-        this.fillPreset(preset);
-        filledPresets[presetName] = preset;
+      if (presets[this.generator]) {
+        for (const presetName of Object.keys(presets[this.generator])) {
+          const preset = JSON.parse(JSON.stringify(presets[this.generator][presetName]));
+          this.fillPreset(preset);
+          filledPresets[presetName] = preset;
+        }
      }
      return filledPresets;
    },
--- a/src/components/SettingPicker.vue
+++ b/src/components/SettingPicker.vue
@@ -46,9 +46,11 @@ export default defineComponent({
    },
  },
  async mounted() {
-    this.$refs.tips.forEach(el => new Tooltip(el));
-    this.selected = await localforage.getItem(`${this.prefix}setting_${this.name}`) ?? this.settings.default;
-    this.change();
+    this.$refs.tips?.forEach(el => new Tooltip(el));
+    if (this.settings) {
+      this.selected = await localforage.getItem(`${this.prefix}setting_${this.name}`) ?? this.settings.default;
+      this.change();
+    }
  },
  methods: {
    async change() {
@@ -63,16 +65,18 @@ export default defineComponent({
 </script>

 <template>
-  <b>{{ settings.display ?? name }}:</b>
-  <div class="nav nav-pills nav-fill mt-1 mb-1">
-    <template v-for="value of settings.order ?? Object.keys(settings.values)">
-      <template v-if="settings.values[value]">
-        <input type="radio" class="btn-check" :name="`${prefix}${name}`" :id="`${prefix}${name}_${value}`"
-            autocomplete="off" :value="value" v-model="selected" @change="change" />
-        <label :class="`btn btn-outline-${color} nav-item m-1`" :for="`${prefix}${name}_${value}`" data-bs-toggle="tooltip" data-bs-placement="bottom" :title="settings.values[value].tip" ref="tips">
-          {{ settings.values[value].display }}
-        </label>
+  <template v-if="settings">
+    <b>{{ settings.display ?? name }}:</b>
+    <div class="nav nav-pills nav-fill mt-1 mb-1">
+      <template v-for="value of settings.order ?? Object.keys(settings.values)">
+        <template v-if="settings.values[value]">
+          <input type="radio" class="btn-check" :name="`${prefix}${name}`" :id="`${prefix}${name}_${value}`"
+              autocomplete="off" :value="value" v-model="selected" @change="change" />
+          <label :class="`btn btn-outline-${color} nav-item m-1`" :for="`${prefix}${name}_${value}`" data-bs-toggle="tooltip" data-bs-placement="bottom" :title="settings.values[value].tip" ref="tips">
+            {{ settings.values[value].display }}
+          </label>
+        </template>
      </template>
-    </template>
-  </div>
+    </div>
+  </template>
 </template>
--- a/src/components/SettingsPage.vue
+++ b/src/components/SettingsPage.vue
@@ -4,6 +4,8 @@ import { defineComponent } from "vue";
 import axios from "axios";
 import { Modal } from "bootstrap";

+import generatorSettings from "@/data/generator-settings.yaml";
+
 import AccordionItem from "@/components/AccordionItem.vue";
 import PresetPicker from "@/components/PresetPicker.vue";
 import SettingPicker from "@/components/SettingPicker.vue";
@@ -20,6 +22,7 @@ export default defineComponent({
  props: {
    modelValue: {},
    prefix: null,
+    generator: null,
  },
  data() {
    return {
@@ -30,6 +33,11 @@ export default defineComponent({
      modal: null,
    };
  },
+  computed: {
+    settings() {
+      return generatorSettings[this.generator];
+    }
+  },
  mounted() {
    this.modal = new Modal(document.getElementById("savePresetModal"), {});
  },
@@ -45,7 +53,7 @@ export default defineComponent({
  methods: {
    async generate(race) {
      const settings = {
-        randomizer: "base",
+        randomizer: this.generator,
        race: race ? "race" : "normal"
      };
      for (const setting of Object.keys(this.set)) {
@@ -128,92 +136,99 @@ export default defineComponent({
  </div>
  <div id="settings" class="accordion accordion-flush">
    <AccordionItem>
-      <PresetPicker ref="preset" generator="base" @selected="presetSelected"
+      <PresetPicker ref="preset" :generator="generator" @selected="presetSelected"
          @save="savePreset" />
    </AccordionItem>
    <AccordionItem :expanded="true">
      <template #header>
        <b>World:</b>
      </template>
-      <SettingPicker color="primary" v-model="set.mode" name="mode" generator="base" :prefix="prefix" />
-      <SettingPicker color="primary" v-model="set.weapons" name="weapons" generator="base" :prefix="prefix" />
-      <SettingPicker color="primary" v-model="set.hints" name="hints" generator="base" :prefix="prefix" />
+      <SettingPicker color="primary" v-model="set.mode" name="mode" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="primary" v-model="set.weapons" name="weapons" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="primary" v-model="set.hints" name="hints" :generator="generator" :prefix="prefix" />
    </AccordionItem>
    <AccordionItem :expanded="true">
      <template #header>
        <b>Goal:</b>
      </template>
-      <SettingPicker color="success" v-model="set.goal" name="goal" generator="base" :prefix="prefix" />
+      <SettingPicker color="success" v-model="set.goal" name="goal" :generator="generator" :prefix="prefix" />
      <SettingPicker color="success" v-if="['ganon', 'fast_ganon'].includes(this.set.goal)" 
-          v-model="set.crystals_ganon" name="crystals_ganon" generator="base" :prefix="prefix" />
+          v-model="set.crystals_ganon" name="crystals_ganon" :generator="generator" :prefix="prefix" />
      <SettingPicker color="success" v-if="['ganon', 'fast_ganon'].includes(this.set.goal)" 
-          v-model="set.ganon_item" name="ganon_item" generator="base" :prefix="prefix" />
-      <SettingPicker color="success" v-model="set.crystals_gt" name="crystals_gt" generator="base" :prefix="prefix" />
+          v-model="set.ganon_item" name="ganon_item" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="success" v-model="set.crystals_gt" name="crystals_gt" :generator="generator" :prefix="prefix" />
    </AccordionItem>
    <AccordionItem :expanded="false">
      <template #header>
        <b>Entrance Shuffle:</b>
      </template>
-      <SettingPicker color="warning" v-model="set.entrance_shuffle" name="entrance_shuffle" generator="base" :prefix="prefix" />
+      <SettingPicker color="warning" v-model="set.entrance_shuffle" name="entrance_shuffle" :generator="generator" :prefix="prefix" />
      <SettingPicker color="warning" v-if="this.set.entrance_shuffle != 'vanilla'"
-          v-model="set.skull_woods" name="skull_woods" generator="base" :prefix="prefix" />
+          v-model="set.skull_woods" name="skull_woods" :generator="generator" :prefix="prefix" />
      <SettingPicker color="warning" v-if="this.set.entrance_shuffle != 'vanilla'"
-          v-model="set.linked_drops" name="linked_drops" generator="base" :prefix="prefix" />
+          v-model="set.linked_drops" name="linked_drops" :generator="generator" :prefix="prefix" />
    </AccordionItem>
-    <AccordionItem :expanded="false">
+    <AccordionItem :expanded="false" v-if="settings.door_shuffle">
      <template #header>
        <b>Dungeon Shuffle:</b>
      </template>
-      <SettingPicker color="danger" v-model="set.door_shuffle" name="door_shuffle" generator="base" :prefix="prefix" />
+      <SettingPicker color="danger" v-model="set.door_shuffle" name="door_shuffle" :generator="generator" :prefix="prefix" />
      <SettingPicker color="danger" v-if="this.set.door_shuffle != 'vanilla'"
-          v-model="set.lobbies" name="door_lobbies" generator="base" :prefix="prefix" />
+          v-model="set.lobbies" name="door_lobbies" :generator="generator" :prefix="prefix" />
      <SettingPicker color="danger" v-if="this.set.door_shuffle != 'vanilla'"
-          v-model="set.door_type_mode" name="door_type_mode" generator="base" :prefix="prefix" />
+          v-model="set.door_type_mode" name="door_type_mode" :generator="generator" :prefix="prefix" />
      <SettingPicker color="danger" v-if="this.set.door_shuffle != 'vanilla'"
-          v-model="set.trap_door_mode" name="trap_door_mode" generator="base" :prefix="prefix" />
+          v-model="set.trap_door_mode" name="trap_door_mode" :generator="generator" :prefix="prefix" />
+    </AccordionItem>
+    <AccordionItem :expanded="false">
+      <template #header>
+        <b>Overworld Settings:</b>
+      </template>
+      <SettingPicker color="primary" v-model="set.tile_swap" name="tile_swap" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="primary" v-model="set.flute_shuffle" name="flute_shuffle" :generator="generator" :prefix="prefix" />
    </AccordionItem>
    <AccordionItem :expanded="false">
      <template #header>
        <b>Enemizer:</b>
      </template>
-      <SettingPicker color="success" v-model="set.boss_shuffle" name="boss_shuffle" generator="base" :prefix="prefix" />
-      <SettingPicker color="success" v-model="set.enemy_shuffle" name="enemy_shuffle" generator="base" :prefix="prefix" />
-      <SettingPicker color="success" v-model="set.damage_table_shuffle" name="damage_table_shuffle" generator="base" :prefix="prefix" />
+      <SettingPicker color="success" v-model="set.boss_shuffle" name="boss_shuffle" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="success" v-model="set.enemy_shuffle" name="enemy_shuffle" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="success" v-model="set.damage_table_shuffle" name="damage_table_shuffle" :generator="generator" :prefix="prefix" />
    </AccordionItem>
    <AccordionItem :expanded="false">
      <template #header>
        <b>Dungeon Item Shuffle:</b>
      </template>
-      <SettingPicker color="warning" v-model="set.small_keys" name="small_keys" generator="base" :prefix="prefix" />
-      <SettingPicker color="warning" v-model="set.big_keys" name="big_keys" generator="base" :prefix="prefix" />
-      <SettingPicker color="warning" v-model="set.maps" name="maps" generator="base" :prefix="prefix" />
-      <SettingPicker color="warning" v-model="set.compasses" name="compasses" generator="base" :prefix="prefix" />
+      <SettingPicker color="warning" v-model="set.small_keys" name="small_keys" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="warning" v-model="set.big_keys" name="big_keys" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="warning" v-model="set.maps" name="maps" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="warning" v-model="set.compasses" name="compasses" :generator="generator" :prefix="prefix" />
    </AccordionItem>
    <AccordionItem :expanded="false">
      <template #header>
        <b>Other Pool Settings:</b>
      </template>
-      <SettingPicker color="danger" v-model="set.shop_shuffle" name="shop_shuffle" generator="base" :prefix="prefix" />
-      <SettingPicker color="danger" v-model="set.drop_shuffle" name="drop_shuffle" generator="base" :prefix="prefix" />
-      <SettingPicker color="danger" v-model="set.pottery" name="pottery" generator="base" :prefix="prefix" />
-      <SettingPicker color="danger" v-model="set.prize_shuffle" name="prize_shuffle" generator="base" :prefix="prefix" />
-      <SettingPicker color="danger" v-model="set.follower_shuffle" name="follower_shuffle" generator="base" :prefix="prefix" />
+      <SettingPicker color="danger" v-model="set.shop_shuffle" name="shop_shuffle" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="danger" v-model="set.drop_shuffle" name="drop_shuffle" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="danger" v-model="set.pottery" name="pottery" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="danger" v-model="set.prize_shuffle" name="prize_shuffle" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="danger" v-model="set.follower_shuffle" name="follower_shuffle" :generator="generator" :prefix="prefix" />
    </AccordionItem>
    <AccordionItem :expanded="false">
      <template #header>
        <b>Item Settings:</b>
      </template>
-      <SettingPicker color="primary" v-model="set.boots" name="boots" generator="base" :prefix="prefix" />
-      <SettingPicker color="primary" v-model="set.flute" name="flute" generator="base" :prefix="prefix" />
-      <SettingPicker color="primary" v-model="set.dark_rooms" name="dark_rooms" generator="base" :prefix="prefix" />
-      <SettingPicker color="primary" v-model="set.bombs" name="bombs" generator="base" :prefix="prefix" />
-      <SettingPicker color="primary" v-model="set.book" name="book" generator="base" :prefix="prefix" />
+      <SettingPicker color="primary" v-model="set.boots" name="boots" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="primary" v-model="set.flute" name="flute" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="primary" v-model="set.dark_rooms" name="dark_rooms" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="primary" v-model="set.bombs" name="bombs" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="primary" v-model="set.book" name="book" :generator="generator" :prefix="prefix" />
    </AccordionItem>
    <AccordionItem :expanded="false">
      <template #header>
        <b>Challenge Modes:</b>
      </template>
-      <SettingPicker color="danger" v-model="set.damage_challenge" name="damage_challenge" generator="base" :prefix="prefix" />
+      <SettingPicker color="danger" v-model="set.damage_challenge" name="damage_challenge" :generator="generator" :prefix="prefix" />
    </AccordionItem>
  </div>
 </template>
--- a/src/data/generator-settings.yaml
+++ b/src/data/generator-settings.yaml
@@ -29,6 +29,8 @@ base:
  bombs: all
  book: all
  follower_shuffle: all
+  flute_shuffle: all
+  tile_swap: all
  damage_challenge: all
  hints: all
 apr2025:
@@ -46,3 +48,34 @@ apr2025:
        display: Wild
  boots: ['normal', 'pseudoboots']
  hints: all
+dungeon_map:
+  mode: all
+  weapons: all
+  goal: all
+  crystals_ganon: all
+  crystals_gt: all
+  ganon_item: all
+  entrance_shuffle: all
+  skull_woods: all
+  linked_drops: all
+  boss_shuffle: all
+  enemy_shuffle: all
+  damage_table_shuffle: all
+  small_keys: all
+  big_keys: all
+  maps: all
+  compasses: all
+  shop_shuffle: all
+  drop_shuffle: all
+  pottery: all
+  prize_shuffle: all
+  boots: all
+  flute: all
+  dark_rooms: all
+  bombs: all
+  book: all
+  follower_shuffle: all
+  flute_shuffle: all
+  tile_swap: all
+  damage_challenge: all
+  hints: all
--- a/src/data/presets.yaml
+++ b/src/data/presets.yaml
@@ -30,3 +30,6 @@ base:
    drop_shuffle: keys
    pottery: keys
    dark_rooms: always_light_cone
+dungeon_map:
+  default:
+    display: Default
--- a/src/data/settings.yaml
+++ b/src/data/settings.yaml
@@ -461,6 +461,28 @@ follower_shuffle:
      display: None
    shuffled:
      display: Shuffled
+flute_shuffle:
+  display: Flute Spot Shuffle
+  default: vanilla
+  values:
+    vanilla:
+      display: Vanilla
+      tip: The eight flute spots are at their vanilla locations.
+    random:
+      display: Random
+      tip: The seven flute spots outside the Desert/Mire area are each moved to a random screen, with one spot available on the mountain.
+    balanced:
+      display: Balanced
+      tip: The seven flute spots outside the Desert/Mire area are each moved to a random screen such that no two flute spots are on adjacent screens.
+tile_swap:
+  display: Tile Swap
+  default: vanilla
+  values:
+    vanilla:
+      display: Normal
+    tile_swap:
+      display: Tile Swap
+      tip: Each tile on the overworld has a chance to be swapped with its inverted version.
 damage_challenge:
  display: Damage Mode
  default: normal
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -4,6 +4,7 @@ import MultiView from "@/views/MultiView.vue";
 import GenerateView from "@/views/GenerateView.vue";
 import GenerateMulti from "@/views/GenerateMulti.vue";
 import GenerateApr2025View from "@/views/GenerateApr2025View.vue";
+import GenerateDungeonMapView from "@/views/GenerateDungeonMapView.vue";

 const router = createRouter({
  history: createWebHistory(import.meta.env.BASE_URL),
@@ -24,6 +25,10 @@ const router = createRouter({
      path: '/generate/apr2025',
      component: GenerateApr2025View,
    },
+    {
+      path: '/generate/beta_test',
+      component: GenerateDungeonMapView,
+    },
    {
      path: '/seed/:id',
      name: 'seed',
--- a/src/views/GenerateDungeonMapView.vue
+++ b/src/views/GenerateDungeonMapView.vue
@@ -0,0 +1,65 @@
+<script>
+import { defineComponent } from "vue";
+
+import axios from "axios";
+import { Modal } from "bootstrap";
+
+import SettingsPage from "@/components/SettingsPage.vue";
+
+export default defineComponent({
+  components: {
+    SettingsPage,
+  },
+  data() {
+    return {
+      set: {},
+    };
+  },
+  mounted() {
+    document.title = "ALttPRandomizer"
+  },
+  methods: {
+    async generate(race) {
+      const settings = {
+        randomizer: "dungeon_map",
+        race: race ? "race" : "normal"
+      };
+      for (const setting of Object.keys(this.set)) {
+        settings[setting] = this.set[setting];
+      }
+      await axios.post("/generate", settings)
+        .then(response => {
+          const id = response.data;
+          this.$router.push(`/seed/${id}`);
+        })
+        .catch(error => {
+          console.log(error);
+        });
+    },
+  },
+});
+</script>
+
+<template>
+  <div class="card content-div m-3">
+    <div class="card-header">
+      Generate Seed
+    </div>
+    <div id="settings" class="accordion accordion-flush">
+      <SettingsPage v-model="set" generator="dungeon_map" prefix="dungeon-maps-" />
+    </div>
+    <div class="card-footer">
+      <div class="nav nav-pills nav-fill" role="group">
+        <button type="button" class="m-1 nav-item btn btn-outline-danger"
+            @click="generate(true);">
+          Generate Race ROM
+        </button>
+        <button type="button" class="m-1 nav-item btn btn-outline-primary"
+            @click="generate(false);">
+          Generate ROM
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
--- a/src/views/GenerateView.vue
+++ b/src/views/GenerateView.vue
@@ -46,7 +46,7 @@ export default defineComponent({
      Generate Seed
    </div>
    <div id="settings" class="accordion accordion-flush">
-      <SettingsPage v-model="set" prefix="" />
+      <SettingsPage v-model="set" generator="base" prefix="" />
    </div>
    <div class="card-footer">
      <div class="nav nav-pills nav-fill" role="group">