From 4d35f4a815eec3c5b1abd0dd00ce49add3cd3c52 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Sun, 25 Jan 2026 13:30:39 -0600 Subject: [PATCH] Rename settings --- src/components/Seed.vue | 9 ++++- src/components/SeedSettings.vue | 2 +- src/components/SettingPicker.vue | 4 ++- src/components/SettingsPage.vue | 8 +++-- src/data/generator-settings.yaml | 7 ++-- src/data/presets.yaml | 57 ++++++++++++++++++++++++++++++-- src/data/settings-display.yaml | 4 +-- src/data/settings.yaml | 42 ++++++++++++++++------- src/router/index.js | 8 ++--- 9 files changed, 111 insertions(+), 30 deletions(-) diff --git a/src/components/Seed.vue b/src/components/Seed.vue index 8d2f3b2..8a97e8b 100644 --- a/src/components/Seed.vue +++ b/src/components/Seed.vue @@ -75,6 +75,13 @@ export default defineComponent({ } return true; }, + romname() { + if (this.multi) { + return `GK_${this.multi}_${this.settings.player_name}.sfc`; + } else { + return `GK_${this.id}.sfc`; + } + }, }, methods: { async retryGeneration() { @@ -190,7 +197,7 @@ export default defineComponent({ const blob = new Blob([rom], { type: 'octet/stream' }); const link = document.getElementById('downloader'); link.href = URL.createObjectURL(blob); - link.download = `GK_${this.id}.sfc`; + link.download = this.romname; link.click(); }, async downloadSpoiler() { diff --git a/src/components/SeedSettings.vue b/src/components/SeedSettings.vue index e7762fd..672027d 100644 --- a/src/components/SeedSettings.vue +++ b/src/components/SeedSettings.vue @@ -51,7 +51,7 @@ export default defineComponent({ - - + @@ -223,7 +225,7 @@ export default defineComponent({ - + diff --git a/src/data/generator-settings.yaml b/src/data/generator-settings.yaml index 823f023..cbe792b 100644 --- a/src/data/generator-settings.yaml +++ b/src/data/generator-settings.yaml @@ -22,7 +22,7 @@ base: compasses: all shop_shuffle: all drop_shuffle: all - pottery: all + pot_shuffle: all prize_shuffle: all boots: all flute: all @@ -50,12 +50,13 @@ apr2025: display: Wild boots: ['normal', 'pseudoboots'] hints: all -dungeon_map: +beta: mode: all weapons: all goal: all crystals_ganon: all bosses_ganon: all + triforce_pieces: all crystals_gt: all ganon_item: all entrance_shuffle: all @@ -77,7 +78,7 @@ dungeon_map: show_map: all shop_shuffle: all drop_shuffle: all - pottery: all + pot_shuffle: all prize_shuffle: all boots: all flute: all diff --git a/src/data/presets.yaml b/src/data/presets.yaml index 164e38b..4718954 100644 --- a/src/data/presets.yaml +++ b/src/data/presets.yaml @@ -25,11 +25,62 @@ base: door_shuffle: crossed door_lobbies: shuffled door_type_mode: all - trap_door_mode: optional + trap_door_mode: some enemy_shuffle: mimics drop_shuffle: keys - pottery: keys + pot_shuffle: keys dark_rooms: always_light_cone -dungeon_map: +beta: default: display: Default + criss_cross_boss: + display: CrissCross Boss + hints: on + show_loot: always + goal: boss_hunt + bosses_ganon: 10of12 + ganon_item: random + crystals_gt: random + entrance_shuffle: crossed + skull_woods: vanilla_drops + door_shuffle: crossed + lobbies: shuffled + door_type_mode: big + trap_door_mode: some + small_keys: wild + big_keys: wild + maps: wild + compasses: wild + shop_shuffle: shuffled + drop_shuffle: keys + pot_shuffle: keys + prize_shuffle: wild + boots: pseudoboots + flute: pseudoflute + dark_rooms: always_light_cone + book: crystal_switches + bunday: + display: Approximate Bunday + show_loot: never + show_map: visited + goal: trinity + crystals_ganon: random + triforce_pieces: 125of175 + crystals_gt: random + entrance_shuffle: crossed + skull_woods: chaos + linked_drops: independent + door_shuffle: crossed + lobbies: shuffled + door_type_mode: chaos + trap_door_mode: some + enemy_shuffle: shuffled + boss_shuffle: random + small_keys: wild + big_keys: wild + compasses: wild + maps: wild + pot_shuffle: all + drop_shuffle: underworld + shop_shuffle: shuffled + bombs: bomb_bag_required diff --git a/src/data/settings-display.yaml b/src/data/settings-display.yaml index a244723..636abae 100644 --- a/src/data/settings-display.yaml +++ b/src/data/settings-display.yaml @@ -70,7 +70,7 @@ drop_shuffle: vanilla: None keys: Enemy Key Drops Shuffled underworld: All Underworld Enemy Drops Shuffled -pottery: +pot_shuffle: vanilla: None keys: Key Pots Shuffled cave: Cave Pots Shuffled @@ -79,7 +79,7 @@ pottery: clustered: Clustered Pot Shuffle non_empty: Non-Empty Pot Shuffle dungeon: Dungeon Pots Shuffled - lottery: All Pots Shuffled + all: All Pots Shuffled prize_shuffle: vanilla: Prizes on Bosses dungeon: Prizes Shuffled in Dungeon diff --git a/src/data/settings.yaml b/src/data/settings.yaml index 3dfc858..ca79b09 100644 --- a/src/data/settings.yaml +++ b/src/data/settings.yaml @@ -111,6 +111,22 @@ bosses_ganon: "12of12": display: "12 Total Bosses" tip: To defeat Ganon, you must defeat all 12 of the dungeon bosses. +triforce_pieces: + display: Triforce Pieces + default: "20of30" + values: + "8of10": + display: "8 out of 10" + "20of30": + display: "20 out of 30" + "67of100": + display: "67 out of 100" + "125of175": + display: "125 out of 175" + tip: Will probably fail to generate without a setting such as pottery lottery or underworld enemy drop shuffle to add a lot of checks to the pool. + "400of500": + display: "400 out of 500" + tip: Will probably fail to generate without a setting such as pottery lottery or underworld enemy drop shuffle to add a lot of checks to the pool. crystals_gt: display: Crystals for GT default: "7" @@ -193,26 +209,26 @@ links_house: display: Shuffled skull_woods: display: Skull Woods Entrances - default: original + default: default values: - original: + default: display: Shuffled in SW tip: The entrances (aside from the fire-locked skull entrance) and drops in Skull Woods are each shuffled within their own pool. - restricted: + vanilla_drops: display: Vanilla Drops tip: The entrances (aside from the fire-locked skull entrance) in Skull Woods are shuffled within their own pool, and the drops all lead to their vanilla placements. loose: display: Vanilla Drops, Loose Entrances tip: The drops into Skull Woods all lead to their vanilla location; the entrances are shuffled into the main pool of entrances. - follow_linked: + chaos: display: Chaos tip: The front entrance to Skull Woods (with the drop that leads to the Big Chest) and the middle entrance (with the northern drop accessible from the back) form two more linked dropdowns that are shuffled into the broader pool of dropdowns. The remaining two drops both lead to their vanilla locations. linked_drops: display: Linked Drops - default: unset + default: default values: - unset: - display: Unset + default: + display: Default tip: Dropdowns are linked unless the entrance shuffle mode is set to decoupled. linked: display: Linked @@ -349,7 +365,7 @@ drop_shuffle: underworld: display: All Underworld Enemies tip: Drops from every underworld enemy are shuffled into the pool of items. -pottery: +pot_shuffle: display: Pottery Shuffle default: vanilla values: @@ -377,7 +393,7 @@ pottery: dungeon: display: Dungeon tip: Underworld pots that are within a dungeon are shuffled into the pool of items. - lottery: + all: display: All tip: All underworld pots are shuffled into the pool of items. boots: @@ -412,9 +428,11 @@ mirror: default: normal values: normal: - display: No Starting Mirror + display: Default + tip: The player will begin with a mirror scroll if door shuffle is enabled, and nothing otherwise. scroll: display: Mirror Scroll + tip: The player will begin with a mirror scroll, which allows warping to the start of dungeons, but not traversing from the dark world to the light world. starting: display: Starting Mirror dark_rooms: @@ -488,11 +506,11 @@ door_type_mode: display: Chaos trap_door_mode: display: Trap Door Removal - default: optional + default: some values: vanilla: display: None - optional: + some: display: Some boss: display: Boss diff --git a/src/router/index.js b/src/router/index.js index 06c2708..be194f9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -27,15 +27,15 @@ const router = createRouter({ component: GenerateApr2025View, }, { - path: '/generate/beta_test', + path: '/generate/beta', component: GenerateView, - alias: '/generate/beta', - props: { generator: "dungeon_map", prefix: "dungeon-maps-" }, + alias: '/generate/beta_test', + props: { generator: "beta", prefix: "dungeon-maps-" }, }, { path: '/multibeta', component: GenerateMulti, - props: { generator: "dungeon_map", prefix: "dungeon-maps-" }, + props: { generator: "beta", prefix: "dungeon-maps-" }, }, { path: '/seed/:id',