Refactor settings, add apr2025 generator

This commit is contained in:
2025-03-07 08:02:59 -06:00
parent dfb1cf67cc
commit d609c6be68
6 changed files with 424 additions and 287 deletions

View File

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

View File

@@ -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']

View File

@@ -1,254 +1,255 @@
base: race:
race: default: normal
default: normal values:
values: normal:
normal: display: Normal
display: Normal race:
race: display: Race
display: Race mode:
mode: display: Mode
display: Mode default: open
default: open values:
values: open:
open: display: Open
display: Open standard:
standard: display: Standard
display: Standard inverted:
inverted: display: Inverted
display: Inverted weapons:
weapons: display: Weapons
display: Weapons default: random
default: random values:
values: random:
random: display: Random
display: Random assured:
assured: display: Assured
display: Assured vanilla:
vanilla: display: Vanilla
display: Vanilla swordless:
swordless: display: Swordless
display: Swordless goal:
goal: display: Goal
display: Goal default: ganon
default: ganon values:
values: ganon:
ganon: display: Ganon
display: Ganon fast_ganon:
fast_ganon: display: Fast Ganon
display: Fast Ganon all_dungeons:
all_dungeons: display: All Dungeons
display: All Dungeons pedestal:
pedestal: display: Pedestal
display: Pedestal triforce_hunt:
triforce_hunt: display: Triforce Hunt
display: Triforce Hunt ganon_hunt:
ganon_hunt: display: Ganon Hunt
display: Ganon Hunt completionist:
completionist: display: Completionist
display: Completionist crystals_ganon:
crystals_ganon: display: Crystals for Ganon
display: Crystals for Ganon default: "7"
default: "7" order: [7, 6, 5, 4, 3, 2, 1, 0, "random"]
values: values:
7: 7:
display: 7 display: 7
6: 6:
display: 6 display: 6
5: 5:
display: 5 display: 5
4: 4:
display: 4 display: 4
3: 3:
display: 3 display: 3
2: 2:
display: 2 display: 2
1: 1:
display: 1 display: 1
0: 0:
display: 0 display: 0
random: random:
display: Random display: Random
crystals_gt: crystals_gt:
display: Crystals for GT display: Crystals for GT
default: "7" default: "7"
values: order: [7, 6, 5, 4, 3, 2, 1, 0, "random"]
7: values:
display: 7 7:
6: display: 7
display: 6 6:
5: display: 6
display: 5 5:
4: display: 5
display: 4 4:
3: display: 4
display: 3 3:
2: display: 3
display: 2 2:
1: display: 2
display: 1 1:
0: display: 1
display: 0 0:
random: display: 0
display: Random random:
entrance_shuffle: display: Random
display: Entrance Shuffle entrance_shuffle:
default: vanilla display: Entrance Shuffle
values: default: vanilla
vanilla: values:
display: None vanilla:
full: display: None
display: Full full:
crossed: display: Full
display: Crossed crossed:
swapped: display: Crossed
display: Swapped swapped:
decoupled: display: Swapped
display: Decoupled decoupled:
skull_woods: display: Decoupled
display: Skull Woods Entrances skull_woods:
default: original display: Skull Woods Entrances
values: default: original
original: values:
display: Original original:
restricted: display: Original
display: Restricted restricted:
loose: display: Restricted
display: Loose loose:
follow_linked: display: Loose
display: Follow Linked follow_linked:
linked_drops: display: Follow Linked
display: Linked Drops linked_drops:
default: unset display: Linked Drops
values: default: unset
unset: values:
display: Unset unset:
linked: display: Unset
display: Linked linked:
independent: display: Linked
display: Independent independent:
boss_shuffle: display: Independent
display: Boss Shuffle boss_shuffle:
default: vanilla display: Boss Shuffle
values: default: vanilla
vanilla: values:
display: None vanilla:
simple: display: None
display: Simple simple:
full: display: Simple
display: Full full:
random: display: Full
display: Random random:
prize_unique: display: Random
display: Prize Unique prize_unique:
enemy_shuffle: display: Prize Unique
display: Enemy Shuffle enemy_shuffle:
default: vanilla display: Enemy Shuffle
values: default: vanilla
vanilla: values:
display: None vanilla:
shuffled: display: None
display: Shuffled shuffled:
small_keys: display: Shuffled
display: Small Key Shuffle small_keys:
default: dungeon display: Small Key Shuffle
values: default: dungeon
dungeon: values:
display: In Dungeon dungeon:
wild: display: In Dungeon
display: Wild wild:
nearby: display: Wild
display: Nearby nearby:
universal: display: Nearby
display: Universal universal:
big_keys: display: Universal
display: Big Key Shuffle big_keys:
default: dungeon display: Big Key Shuffle
values: default: dungeon
dungeon: values:
display: In Dungeon dungeon:
wild: display: In Dungeon
display: Wild wild:
nearby: display: Wild
display: Nearby nearby:
maps: display: Nearby
display: Map Shuffle maps:
default: dungeon display: Map Shuffle
values: default: dungeon
dungeon: values:
display: In Dungeon dungeon:
wild: display: In Dungeon
display: Wild wild:
nearby: display: Wild
display: Nearby nearby:
compasses: display: Nearby
display: Compass Shuffle compasses:
default: dungeon display: Compass Shuffle
values: default: dungeon
dungeon: values:
display: In Dungeon dungeon:
wild: display: In Dungeon
display: Wild wild:
nearby: display: Wild
display: Nearby nearby:
shop_shuffle: display: Nearby
display: Shop Shuffle shop_shuffle:
default: vanilla display: Shop Shuffle
values: default: vanilla
vanilla: values:
display: None vanilla:
shuffled: display: None
display: Shuffled shuffled:
drop_shuffle: display: Shuffled
display: Drop Shuffle drop_shuffle:
default: vanilla display: Drop Shuffle
values: default: vanilla
vanilla: values:
display: None vanilla:
keys: display: None
display: Key Drops keys:
underworld: display: Key Drops
display: All Underworld Enemies underworld:
pottery: display: All Underworld Enemies
display: Pottery Shuffle pottery:
default: vanilla display: Pottery Shuffle
values: default: vanilla
vanilla: values:
display: None vanilla:
keys: display: None
display: Keys keys:
cave: display: Keys
display: Caves cave:
cave_keys: display: Caves
display: Caves & Keys cave_keys:
reduced: display: Caves & Keys
display: Reduced reduced:
clustered: display: Reduced
display: Clustered clustered:
non_empty: display: Clustered
display: Non-Empty non_empty:
dungeon: display: Non-Empty
display: Dungeon dungeon:
lottery: display: Dungeon
display: Lottery lottery:
prize_shuffle: display: Lottery
display: Prize Shuffle prize_shuffle:
default: vanilla display: Prize Shuffle
values: default: vanilla
vanilla: values:
display: On Boss vanilla:
dungeon: display: On Boss
display: In Dungeon dungeon:
nearby: display: In Dungeon
display: Nearby nearby:
wild: display: Nearby
display: Wild wild:
boots: display: Wild
display: Boots boots:
default: normal display: Boots
values: default: normal
normal: values:
display: No Starting Boots normal:
pseudoboots: display: No Starting Boots
display: Pseudoboots pseudoboots:
starting: display: Pseudoboots
display: Starting Boots starting:
display: Starting Boots

View File

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

View File

@@ -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>

View File

@@ -3,7 +3,6 @@ import { defineComponent } from "vue";
import axios from "axios"; import axios from "axios";
import settingsData from "@/data/settings.yaml";
import SettingPicker from "@/components/SettingPicker.vue"; import SettingPicker from "@/components/SettingPicker.vue";
export default defineComponent({ export default defineComponent({
@@ -18,14 +17,12 @@ export default defineComponent({
mounted() { mounted() {
document.title = "ALttPRandomizer"; document.title = "ALttPRandomizer";
}, },
computed: {
settings() {
return settingsData.base;
},
},
methods: { methods: {
async generate(race) { 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)) { for (const setting of Object.keys(this.set)) {
settings[setting] = this.set[setting]; settings[setting] = this.set[setting];
} }
@@ -49,40 +46,40 @@ export default defineComponent({
</div> </div>
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush">
<li class="list-group-item"> <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>
<li class="list-group-item"> <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)" <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>
<li class="list-group-item"> <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'" <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'" <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>
<li class="list-group-item"> <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>
<li class="list-group-item"> <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>
<li class="list-group-item"> <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>
<li class="list-group-item"> <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> </li>
</ul> </ul>
<div class="card-footer"> <div class="card-footer">