Refactor settings, add apr2025 generator

src/components/SettingPicker.vue

@@ -2,6 +2,8 @@
 import { defineComponent } from 'vue';
 
 import localforage from "localforage";
+import settingsData from "@/data/settings.yaml";
+import generatorSettings from "@/data/generator-settings.yaml";
 
 export default defineComponent({
   data() {
@@ -16,7 +18,24 @@ export default defineComponent({
     modelValue: null,
     name: null,
     color: "primary",
-    settings: {},
+    generator: null,
+  },
+  computed: {
+    settings() {
+      var generatorValue = generatorSettings[this.generator][this.name]
+      if (generatorValue == "all") {
+        return settingsData[this.name];
+      } else if (Array.isArray(generatorValue)) {
+        const { values, ...newObj } = settingsData[this.name];
+        newObj.values = {};
+        for (const value of generatorValue) {
+          newObj.values[value] = values[value];
+        }
+        return newObj;
+      } else {
+        return generatorValue;
+      }
+    },
   },
   mounted() {
     this.selected = this.settings.default;
@@ -33,12 +52,14 @@ export default defineComponent({
 <template>
   <b>{{ settings.display ?? name }}:</b>
   <div class="nav nav-pills nav-fill mt-1 mb-1">
-    <template v-for="value of Object.keys(settings.values)">
+    <template v-for="value of settings.order ?? Object.keys(settings.values)">
+      <template v-if="settings.values[value]">
         <input type="radio" class="btn-check" :name="name" :id="`${name}_${value}`"
             autocomplete="off" :value="value" v-model="selected" @change="change" />
         <label :class="`btn btn-outline-${color} nav-item m-1`" :for="`${name}_${value}`">
           {{ settings.values[value].display }}
         </label>
       </template>
+    </template>
   </div>
 </template>

src/data/generator-settings.yaml

@@ -0,0 +1,34 @@
+base:
+  mode: all
+  weapons: all
+  goal: all
+  crystals_ganon: all
+  crystals_gt: all
+  entrance_shuffle: all
+  skull_woods: all
+  linked_drops: all
+  boss_shuffle: all
+  enemy_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
+apr2025:
+  mode: ['open', 'standard']
+  weapons: all
+  crystals_ganon: all
+  entrance_shuffle: ['vanilla', 'crossed']
+  dungeon_item_shuffle:
+    display: Dungeon Item Shuffle
+    default: dungeon
+    values:
+      dungeon:
+        display: In Dungeon
+      wild:
+        display: Wild
+  boots: ['normal', 'pseudoboots']

src/data/settings.yaml

@@ -1,12 +1,11 @@
-base:
+race:
-  race:
   default: normal
   values:
     normal:
       display: Normal
     race:
       display: Race
-  mode:
+mode:
   display: Mode
   default: open
   values:
@@ -16,7 +15,7 @@ base:
       display: Standard
     inverted:
       display: Inverted
-  weapons:
+weapons:
   display: Weapons
   default: random
   values:
@@ -28,7 +27,7 @@ base:
       display: Vanilla
     swordless:
       display: Swordless
-  goal:
+goal:
   display: Goal
   default: ganon
   values:
@@ -46,9 +45,10 @@ base:
       display: Ganon Hunt
     completionist:
       display: Completionist
-  crystals_ganon:
+crystals_ganon:
   display: Crystals for Ganon
   default: "7"
+  order: [7, 6, 5, 4, 3, 2, 1, 0, "random"]
   values:
     7:
       display: 7
@@ -68,9 +68,10 @@ base:
       display: 0
     random:
       display: Random
-  crystals_gt:
+crystals_gt:
   display: Crystals for GT
   default: "7"
+  order: [7, 6, 5, 4, 3, 2, 1, 0, "random"]
   values:
     7:
       display: 7
@@ -90,7 +91,7 @@ base:
       display: 0
     random:
       display: Random
-  entrance_shuffle:
+entrance_shuffle:
   display: Entrance Shuffle
   default: vanilla
   values:
@@ -104,7 +105,7 @@ base:
       display: Swapped
     decoupled:
       display: Decoupled
-  skull_woods:
+skull_woods:
   display: Skull Woods Entrances
   default: original
   values:
@@ -116,7 +117,7 @@ base:
       display: Loose
     follow_linked:
       display: Follow Linked
-  linked_drops:
+linked_drops:
   display: Linked Drops
   default: unset
   values:
@@ -126,7 +127,7 @@ base:
       display: Linked
     independent:
       display: Independent
-  boss_shuffle:
+boss_shuffle:
   display: Boss Shuffle
   default: vanilla
   values:
@@ -140,7 +141,7 @@ base:
       display: Random
     prize_unique:
       display: Prize Unique
-  enemy_shuffle:
+enemy_shuffle:
   display: Enemy Shuffle
   default: vanilla
   values:
@@ -148,7 +149,7 @@ base:
       display: None
     shuffled:
       display: Shuffled
-  small_keys:
+small_keys:
   display: Small Key Shuffle
   default: dungeon
   values:
@@ -160,7 +161,7 @@ base:
       display: Nearby
     universal:
       display: Universal
-  big_keys:
+big_keys:
   display: Big Key Shuffle
   default: dungeon
   values:
@@ -170,7 +171,7 @@ base:
       display: Wild
     nearby:
       display: Nearby
-  maps:
+maps:
   display: Map Shuffle
   default: dungeon
   values:
@@ -180,7 +181,7 @@ base:
       display: Wild
     nearby:
       display: Nearby
-  compasses:
+compasses:
   display: Compass Shuffle
   default: dungeon
   values:
@@ -190,7 +191,7 @@ base:
       display: Wild
     nearby:
       display: Nearby
-  shop_shuffle:
+shop_shuffle:
   display: Shop Shuffle
   default: vanilla
   values:
@@ -198,7 +199,7 @@ base:
       display: None
     shuffled:
       display: Shuffled
-  drop_shuffle:
+drop_shuffle:
   display: Drop Shuffle
   default: vanilla
   values:
@@ -208,7 +209,7 @@ base:
       display: Key Drops
     underworld:
       display: All Underworld Enemies
-  pottery:
+pottery:
   display: Pottery Shuffle
   default: vanilla
   values:
@@ -230,7 +231,7 @@ base:
       display: Dungeon
     lottery:
       display: Lottery
-  prize_shuffle:
+prize_shuffle:
   display: Prize Shuffle
   default: vanilla
   values:
@@ -242,7 +243,7 @@ base:
       display: Nearby
     wild:
       display: Wild
-  boots:
+boots:
   display: Boots
   default: normal
   values:

src/router/index.js

@@ -1,6 +1,7 @@
 import { createRouter, createWebHistory } from "vue-router";
 import SeedView from "@/views/SeedView.vue";
 import GenerateView from "@/views/GenerateView.vue";
+import GenerateApr2025View from "@/views/GenerateApr2025View.vue";
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
@@ -11,6 +12,10 @@ const router = createRouter({
       component: GenerateView,
       alias: '/',
     },
+    {
+      path: '/generate/apr2025',
+      component: GenerateApr2025View,
+    },
     {
       path: '/seed/:id',
       name: 'seed',

src/views/GenerateApr2025View.vue

@@ -0,0 +1,79 @@
+<script>
+import { defineComponent } from "vue";
+
+import axios from "axios";
+
+import SettingPicker from "@/components/SettingPicker.vue";
+
+export default defineComponent({
+  components: {
+    SettingPicker,
+  },
+  data() {
+    return {
+      set: {},
+    };
+  },
+  mounted() {
+    document.title = "ALttPRandomizer";
+  },
+  methods: {
+    async generate(race) {
+      const settings = {
+        randomizer: "apr2025",
+        crystals_gt: "random",
+        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>
+    <ul class="list-group list-group-flush">
+      <li class="list-group-item">
+        <SettingPicker color="primary" v-model="set.mode" name="mode" generator="apr2025" />
+        <SettingPicker color="primary" v-model="set.weapons" name="weapons" generator="apr2025" />
+      </li>
+      <li class="list-group-item">
+        <SettingPicker color="success" v-model="set.crystals_ganon" name="crystals_ganon" generator="apr2025" />
+      </li>
+      <li class="list-group-item">
+        <SettingPicker color="warning" v-model="set.entrance_shuffle" name="entrance_shuffle" generator="apr2025" />
+      </li>
+      <li class="list-group-item">
+        <SettingPicker color="danger" v-model="set.small_keys" name="dungeon_item_shuffle" generator="apr2025" />
+      </li>
+      <li class="list-group-item">
+        <SettingPicker color="primary" v-model="set.boots" name="boots" generator="apr2025" />
+      </li>
+    </ul>
+    <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>

src/views/GenerateView.vue

@@ -3,7 +3,6 @@ import { defineComponent } from "vue";
 
 import axios from "axios";
 
-import settingsData from "@/data/settings.yaml";
 import SettingPicker from "@/components/SettingPicker.vue";
 
 export default defineComponent({
@@ -18,14 +17,12 @@ export default defineComponent({
   mounted() {
     document.title = "ALttPRandomizer";
   },
-  computed: {
-    settings() {
-      return settingsData.base;
-    },
-  },
   methods: {
     async generate(race) {
-      const settings = { race: race ? "race" : "normal" };
+      const settings = {
+        randomizer: "base",
+        race: race ? "race" : "normal"
+      };
       for (const setting of Object.keys(this.set)) {
         settings[setting] = this.set[setting];
       }
@@ -49,40 +46,40 @@ export default defineComponent({
     </div>
     <ul class="list-group list-group-flush">
       <li class="list-group-item">
-        <SettingPicker color="primary" v-model="set.mode" name="mode" :settings="settings.mode" />
+        <SettingPicker color="primary" v-model="set.mode" name="mode" generator="base" />
-        <SettingPicker color="primary" v-model="set.weapons" name="weapons" :settings="settings.weapons" />
+        <SettingPicker color="primary" v-model="set.weapons" name="weapons" generator="base" />
       </li>
       <li class="list-group-item">
-        <SettingPicker color="success" v-model="set.goal" name="goal" :settings="settings.goal" />
+        <SettingPicker color="success" v-model="set.goal" name="goal" generator="base" />
         <SettingPicker color="success" v-if="['ganon', 'fast_ganon'].includes(this.set.goal)" 
-            v-model="set.crystals_ganon" name="crystals_ganon" :settings="settings.crystals_ganon" />
+            v-model="set.crystals_ganon" name="crystals_ganon" generator="base" />
-        <SettingPicker color="success" v-model="set.crystals_gt" name="crystals_gt" :settings="settings.crystals_gt" />
+        <SettingPicker color="success" v-model="set.crystals_gt" name="crystals_gt" generator="base" />
       </li>
       <li class="list-group-item">
-        <SettingPicker color="warning" v-model="set.entrance_shuffle" name="entrance_shuffle" :settings="settings.entrance_shuffle" />
+        <SettingPicker color="warning" v-model="set.entrance_shuffle" name="entrance_shuffle" generator="base" />
         <SettingPicker color="warning" v-if="this.set.entrance_shuffle != 'vanilla'"
-            v-model="set.skull_woods" name="skull_woods" :settings="settings.skull_woods" />
+            v-model="set.skull_woods" name="skull_woods" generator="base" />
         <SettingPicker color="warning" v-if="this.set.entrance_shuffle != 'vanilla'"
-            v-model="set.linked_drops" name="linked_drops" :settings="settings.linked_drops" />
+            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" :settings="settings.boss_shuffle" />
+        <SettingPicker color="danger" v-model="set.boss_shuffle" name="boss_shuffle" generator="base" />
-        <SettingPicker color="danger" v-model="set.enemy_shuffle" name="enemy_shuffle" :settings="settings.enemy_shuffle" />
+        <SettingPicker color="danger" v-model="set.enemy_shuffle" name="enemy_shuffle" generator="base" />
       </li>
       <li class="list-group-item">
-        <SettingPicker color="primary" v-model="set.small_keys" name="small_keys" :settings="settings.small_keys" />
+        <SettingPicker color="primary" v-model="set.small_keys" name="small_keys" generator="base" />
-        <SettingPicker color="primary" v-model="set.big_keys" name="big_keys" :settings="settings.big_keys" />
+        <SettingPicker color="primary" v-model="set.big_keys" name="big_keys" generator="base" />
-        <SettingPicker color="primary" v-model="set.maps" name="maps" :settings="settings.maps" />
+        <SettingPicker color="primary" v-model="set.maps" name="maps" generator="base" />
-        <SettingPicker color="primary" v-model="set.compasses" name="compasses" :settings="settings.compasses" />
+        <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" :settings="settings.shop_shuffle" />
+        <SettingPicker color="success" v-model="set.shop_shuffle" name="shop_shuffle" generator="base" />
-        <SettingPicker color="success" v-model="set.drop_shuffle" name="drop_shuffle" :settings="settings.drop_shuffle" />
+        <SettingPicker color="success" v-model="set.drop_shuffle" name="drop_shuffle" generator="base" />
-        <SettingPicker color="success" v-model="set.pottery" name="pottery" :settings="settings.pottery" />
+        <SettingPicker color="success" v-model="set.pottery" name="pottery" generator="base" />
-        <SettingPicker color="success" v-model="set.prize_shuffle" name="prize_shuffle" :settings="settings.prize_shuffle" />
+        <SettingPicker color="success" v-model="set.prize_shuffle" name="prize_shuffle" generator="base" />
       </li>
       <li class="list-group-item">
-        <SettingPicker color="warning" v-model="set.boots" name="boots" :settings="settings.boots" />
+        <SettingPicker color="warning" v-model="set.boots" name="boots" generator="base" />
       </li>
     </ul>
     <div class="card-footer">