From d609c6be68b4d2c726be3094a59543bfe2170515 Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Fri, 7 Mar 2025 08:02:59 -0600
Subject: [PATCH] Refactor settings, add apr2025 generator

---
 src/components/SettingPicker.vue  |  35 +-
 src/data/generator-settings.yaml  |  34 ++
 src/data/settings.yaml            | 509 +++++++++++++++---------------
 src/router/index.js               |   5 +
 src/views/GenerateApr2025View.vue |  79 +++++
 src/views/GenerateView.vue        |  49 ++-
 6 files changed, 424 insertions(+), 287 deletions(-)
 create mode 100644 src/data/generator-settings.yaml
 create mode 100644 src/views/GenerateApr2025View.vue

diff --git a/src/components/SettingPicker.vue b/src/components/SettingPicker.vue
index 099de64..6ef6169 100644
--- a/src/components/SettingPicker.vue
+++ b/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)">
-      <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 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>
diff --git a/src/data/generator-settings.yaml b/src/data/generator-settings.yaml
new file mode 100644
index 0000000..b9d059b
--- /dev/null
+++ b/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']
diff --git a/src/data/settings.yaml b/src/data/settings.yaml
index 6e1cf18..4ca0627 100644
--- a/src/data/settings.yaml
+++ b/src/data/settings.yaml
@@ -1,254 +1,255 @@
-base:
-  race:
-    default: normal
-    values:
-      normal:
-        display: Normal
-      race:
-        display: Race
-  mode:
-    display: Mode
-    default: open
-    values:
-      open:
-        display: Open
-      standard:
-        display: Standard
-      inverted:
-        display: Inverted
-  weapons:
-    display: Weapons
-    default: random
-    values:
-      random:
-        display: Random
-      assured:
-        display: Assured
-      vanilla:
-        display: Vanilla
-      swordless:
-        display: Swordless
-  goal:
-    display: Goal
-    default: ganon
-    values:
-      ganon:
-        display: Ganon
-      fast_ganon:
-        display: Fast Ganon
-      all_dungeons:
-        display: All Dungeons
-      pedestal:
-        display: Pedestal
-      triforce_hunt:
-        display: Triforce Hunt
-      ganon_hunt:
-        display: Ganon Hunt
-      completionist:
-        display: Completionist
-  crystals_ganon:
-    display: Crystals for Ganon
-    default: "7"
-    values:
-      7:
-        display: 7
-      6:
-        display: 6
-      5:
-        display: 5
-      4:
-        display: 4
-      3:
-        display: 3
-      2:
-        display: 2
-      1:
-        display: 1
-      0:
-        display: 0
-      random:
-        display: Random
-  crystals_gt:
-    display: Crystals for GT
-    default: "7"
-    values:
-      7:
-        display: 7
-      6:
-        display: 6
-      5:
-        display: 5
-      4:
-        display: 4
-      3:
-        display: 3
-      2:
-        display: 2
-      1:
-        display: 1
-      0:
-        display: 0
-      random:
-        display: Random
-  entrance_shuffle:
-    display: Entrance Shuffle
-    default: vanilla
-    values:
-      vanilla:
-        display: None
-      full:
-        display: Full
-      crossed:
-        display: Crossed
-      swapped:
-        display: Swapped
-      decoupled:
-        display: Decoupled
-  skull_woods:
-    display: Skull Woods Entrances
-    default: original
-    values:
-      original:
-        display: Original
-      restricted:
-        display: Restricted
-      loose:
-        display: Loose
-      follow_linked:
-        display: Follow Linked
-  linked_drops:
-    display: Linked Drops
-    default: unset
-    values:
-      unset:
-        display: Unset
-      linked:
-        display: Linked
-      independent:
-        display: Independent
-  boss_shuffle:
-    display: Boss Shuffle
-    default: vanilla
-    values:
-      vanilla:
-        display: None
-      simple:
-        display: Simple
-      full:
-        display: Full
-      random:
-        display: Random
-      prize_unique:
-        display: Prize Unique
-  enemy_shuffle:
-    display: Enemy Shuffle
-    default: vanilla
-    values:
-      vanilla:
-        display: None
-      shuffled:
-        display: Shuffled
-  small_keys:
-    display: Small Key Shuffle
-    default: dungeon
-    values:
-      dungeon:
-        display: In Dungeon
-      wild:
-        display: Wild
-      nearby:
-        display: Nearby
-      universal:
-        display: Universal
-  big_keys:
-    display: Big Key Shuffle
-    default: dungeon
-    values:
-      dungeon:
-        display: In Dungeon
-      wild:
-        display: Wild
-      nearby:
-        display: Nearby
-  maps:
-    display: Map Shuffle
-    default: dungeon
-    values:
-      dungeon:
-        display: In Dungeon
-      wild:
-        display: Wild
-      nearby:
-        display: Nearby
-  compasses:
-    display: Compass Shuffle
-    default: dungeon
-    values:
-      dungeon:
-        display: In Dungeon
-      wild:
-        display: Wild
-      nearby:
-        display: Nearby
-  shop_shuffle:
-    display: Shop Shuffle
-    default: vanilla
-    values:
-      vanilla:
-        display: None
-      shuffled:
-        display: Shuffled
-  drop_shuffle:
-    display: Drop Shuffle
-    default: vanilla
-    values:
-      vanilla:
-        display: None
-      keys:
-        display: Key Drops
-      underworld:
-        display: All Underworld Enemies
-  pottery:
-    display: Pottery Shuffle
-    default: vanilla
-    values:
-      vanilla:
-        display: None
-      keys:
-        display: Keys
-      cave:
-        display: Caves
-      cave_keys:
-        display: Caves & Keys
-      reduced:
-        display: Reduced
-      clustered:
-        display: Clustered
-      non_empty:
-        display: Non-Empty
-      dungeon:
-        display: Dungeon
-      lottery:
-        display: Lottery
-  prize_shuffle:
-    display: Prize Shuffle
-    default: vanilla
-    values:
-      vanilla:
-        display: On Boss
-      dungeon:
-        display: In Dungeon
-      nearby:
-        display: Nearby
-      wild:
-        display: Wild
-  boots:
-    display: Boots
-    default: normal
-    values:
-      normal:
-        display: No Starting Boots
-      pseudoboots:
-        display: Pseudoboots
-      starting:
-        display: Starting Boots
+race:
+  default: normal
+  values:
+    normal:
+      display: Normal
+    race:
+      display: Race
+mode:
+  display: Mode
+  default: open
+  values:
+    open:
+      display: Open
+    standard:
+      display: Standard
+    inverted:
+      display: Inverted
+weapons:
+  display: Weapons
+  default: random
+  values:
+    random:
+      display: Random
+    assured:
+      display: Assured
+    vanilla:
+      display: Vanilla
+    swordless:
+      display: Swordless
+goal:
+  display: Goal
+  default: ganon
+  values:
+    ganon:
+      display: Ganon
+    fast_ganon:
+      display: Fast Ganon
+    all_dungeons:
+      display: All Dungeons
+    pedestal:
+      display: Pedestal
+    triforce_hunt:
+      display: Triforce Hunt
+    ganon_hunt:
+      display: Ganon Hunt
+    completionist:
+      display: Completionist
+crystals_ganon:
+  display: Crystals for Ganon
+  default: "7"
+  order: [7, 6, 5, 4, 3, 2, 1, 0, "random"]
+  values:
+    7:
+      display: 7
+    6:
+      display: 6
+    5:
+      display: 5
+    4:
+      display: 4
+    3:
+      display: 3
+    2:
+      display: 2
+    1:
+      display: 1
+    0:
+      display: 0
+    random:
+      display: Random
+crystals_gt:
+  display: Crystals for GT
+  default: "7"
+  order: [7, 6, 5, 4, 3, 2, 1, 0, "random"]
+  values:
+    7:
+      display: 7
+    6:
+      display: 6
+    5:
+      display: 5
+    4:
+      display: 4
+    3:
+      display: 3
+    2:
+      display: 2
+    1:
+      display: 1
+    0:
+      display: 0
+    random:
+      display: Random
+entrance_shuffle:
+  display: Entrance Shuffle
+  default: vanilla
+  values:
+    vanilla:
+      display: None
+    full:
+      display: Full
+    crossed:
+      display: Crossed
+    swapped:
+      display: Swapped
+    decoupled:
+      display: Decoupled
+skull_woods:
+  display: Skull Woods Entrances
+  default: original
+  values:
+    original:
+      display: Original
+    restricted:
+      display: Restricted
+    loose:
+      display: Loose
+    follow_linked:
+      display: Follow Linked
+linked_drops:
+  display: Linked Drops
+  default: unset
+  values:
+    unset:
+      display: Unset
+    linked:
+      display: Linked
+    independent:
+      display: Independent
+boss_shuffle:
+  display: Boss Shuffle
+  default: vanilla
+  values:
+    vanilla:
+      display: None
+    simple:
+      display: Simple
+    full:
+      display: Full
+    random:
+      display: Random
+    prize_unique:
+      display: Prize Unique
+enemy_shuffle:
+  display: Enemy Shuffle
+  default: vanilla
+  values:
+    vanilla:
+      display: None
+    shuffled:
+      display: Shuffled
+small_keys:
+  display: Small Key Shuffle
+  default: dungeon
+  values:
+    dungeon:
+      display: In Dungeon
+    wild:
+      display: Wild
+    nearby:
+      display: Nearby
+    universal:
+      display: Universal
+big_keys:
+  display: Big Key Shuffle
+  default: dungeon
+  values:
+    dungeon:
+      display: In Dungeon
+    wild:
+      display: Wild
+    nearby:
+      display: Nearby
+maps:
+  display: Map Shuffle
+  default: dungeon
+  values:
+    dungeon:
+      display: In Dungeon
+    wild:
+      display: Wild
+    nearby:
+      display: Nearby
+compasses:
+  display: Compass Shuffle
+  default: dungeon
+  values:
+    dungeon:
+      display: In Dungeon
+    wild:
+      display: Wild
+    nearby:
+      display: Nearby
+shop_shuffle:
+  display: Shop Shuffle
+  default: vanilla
+  values:
+    vanilla:
+      display: None
+    shuffled:
+      display: Shuffled
+drop_shuffle:
+  display: Drop Shuffle
+  default: vanilla
+  values:
+    vanilla:
+      display: None
+    keys:
+      display: Key Drops
+    underworld:
+      display: All Underworld Enemies
+pottery:
+  display: Pottery Shuffle
+  default: vanilla
+  values:
+    vanilla:
+      display: None
+    keys:
+      display: Keys
+    cave:
+      display: Caves
+    cave_keys:
+      display: Caves & Keys
+    reduced:
+      display: Reduced
+    clustered:
+      display: Clustered
+    non_empty:
+      display: Non-Empty
+    dungeon:
+      display: Dungeon
+    lottery:
+      display: Lottery
+prize_shuffle:
+  display: Prize Shuffle
+  default: vanilla
+  values:
+    vanilla:
+      display: On Boss
+    dungeon:
+      display: In Dungeon
+    nearby:
+      display: Nearby
+    wild:
+      display: Wild
+boots:
+  display: Boots
+  default: normal
+  values:
+    normal:
+      display: No Starting Boots
+    pseudoboots:
+      display: Pseudoboots
+    starting:
+      display: Starting Boots
diff --git a/src/router/index.js b/src/router/index.js
index e881937..c47a14e 100644
--- a/src/router/index.js
+++ b/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',
diff --git a/src/views/GenerateApr2025View.vue b/src/views/GenerateApr2025View.vue
new file mode 100644
index 0000000..7621692
--- /dev/null
+++ b/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>
diff --git a/src/views/GenerateView.vue b/src/views/GenerateView.vue
index 2abc5c9..bbbb5ac 100644
--- a/src/views/GenerateView.vue
+++ b/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.weapons" name="weapons" :settings="settings.weapons" />
+        <SettingPicker color="primary" v-model="set.mode" name="mode" generator="base" />
+        <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" />
-        <SettingPicker color="success" v-model="set.crystals_gt" name="crystals_gt" :settings="settings.crystals_gt" />
+            v-model="set.crystals_ganon" name="crystals_ganon" generator="base" />
+        <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.enemy_shuffle" name="enemy_shuffle" :settings="settings.enemy_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" 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.big_keys" name="big_keys" :settings="settings.big_keys" />
-        <SettingPicker color="primary" v-model="set.maps" name="maps" :settings="settings.maps" />
-        <SettingPicker color="primary" v-model="set.compasses" name="compasses" :settings="settings.compasses" />
+        <SettingPicker color="primary" v-model="set.small_keys" name="small_keys" generator="base" />
+        <SettingPicker color="primary" v-model="set.big_keys" name="big_keys" 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" :settings="settings.shop_shuffle" />
-        <SettingPicker color="success" v-model="set.drop_shuffle" name="drop_shuffle" :settings="settings.drop_shuffle" />
-        <SettingPicker color="success" v-model="set.pottery" name="pottery" :settings="settings.pottery" />
-        <SettingPicker color="success" v-model="set.prize_shuffle" name="prize_shuffle" :settings="settings.prize_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" generator="base" />
+        <SettingPicker color="success" v-model="set.pottery" name="pottery" generator="base" />
+        <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">