diff --git a/src/components/SeedSettings.vue b/src/components/SeedSettings.vue index 1d13673..e7762fd 100644 --- a/src/components/SeedSettings.vue +++ b/src/components/SeedSettings.vue @@ -31,6 +31,11 @@ export default defineComponent({ || (this.settings.compasses && this.settings.compasses != "dungeon") || (this.settings.prize_shuffle && this.settings.prize_shuffle != "vanilla"); }, + extraPool() { + return (this.settings.shop_shuffle && this.settings.shop_shuffle != "vanilla") + || (this.settings.drop_shuffle && this.settings.drop_shuffle != "vanilla") + || (this.settings.pottery && this.settings.pottery != "vanilla"); + }, multilink() { if (this.multi) { return `/multi/${this.multi}`; @@ -73,8 +78,8 @@ export default defineComponent({
{{ settingsDisplay.door_shuffle[settings.door_shuffle] }}
-
- {{ settingsDisplay.door_lobbies[settings.door_lobbies] }} +
+ {{ settingsDisplay.lobbies[settings.lobbies] }}
@@ -104,4 +109,16 @@ export default defineComponent({ {{ settingsDisplay.prize_shuffle[settings.prize_shuffle] }}
+
+
+
+ {{ settingsDisplay.shop_shuffle[settings.shop_shuffle] }} +
+
+ {{ settingsDisplay.drop_shuffle[settings.drop_shuffle] }} +
+
+ {{ settingsDisplay.pottery[settings.pottery] }} +
+
diff --git a/src/data/settings-display.yaml b/src/data/settings-display.yaml index ca1ee51..72d1589 100644 --- a/src/data/settings-display.yaml +++ b/src/data/settings-display.yaml @@ -4,6 +4,7 @@ goal: ganon: "{{ crystals_ganon }} Crystal Ganon" fast_ganon: "{{ crystals_ganon }} Crystal Fast Ganon" all_dungeons: All Dungeons + trinity: Trinity triforce_hunt: Triforce Hunt ganon_hunt: Ganon Hunt completionist: Completionist @@ -41,8 +42,8 @@ door_shuffle: partitioned: Partitioned Door Shuffle crossed: Crossed Door Shuffle lobbies: - Vanilla: Vanilla Dungeon Lobbies - Shuffled: Shuffled Dungeon Lobbies + vanilla: Vanilla Dungeon Lobbies + shuffled: Shuffled Dungeon Lobbies enemy_shuffle: vanilla: Vanilla Enemies shuffled: Shuffled Enemies @@ -61,6 +62,23 @@ dungeon_items: wild: Wild nearby: Nearby universal: Universal +shop_shuffle: + vanilla: None + shuffled: Shuffled Shops +drop_shuffle: + vanilla: None + keys: Enemy Key Drops Shuffled + underworld: All Underworld Enemy Drops Shuffled +pottery: + vanilla: None + keys: Key Pots Shuffled + cave: Cave Pots Shuffled + cave_keys: Cave & Key Pots Shuffled + reduced: Reduced Pot Shuffle + clustered: Clustered Pot Shuffle + non_empty: Non-Empty Pot Shuffle + dungeon: Dungeon Pots Shuffled + lottery: 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 eaa0f60..b768c11 100644 --- a/src/data/settings.yaml +++ b/src/data/settings.yaml @@ -344,8 +344,8 @@ pottery: display: Reduced tip: Underworld pots that either contain a key in vanilla or are not inside a dungeon are shuffled into the pool of items, as well as about a quarter of all remaining dungeon pots. clustered: - tip: Underworld pots that either contain a key in vanilla or are not inside a dungeon are shuffled into the pool of items, as well as about half of all remaining dungeon pots. display: Clustered + tip: Underworld pots that either contain a key in vanilla or are not inside a dungeon are shuffled into the pool of items, as well as about half of all remaining dungeon pots. non_empty: display: Non-Empty tip: Items inside every pot that is non-empty is vanilla are shuffled into the pool of items. @@ -353,7 +353,7 @@ pottery: display: Dungeon tip: Underworld pots that are within a dungeon are shuffled into the pool of items. lottery: - display: Lottery + display: All tip: All underworld pots are shuffled into the pool of items. boots: display: Boots