diff --git a/src/assets/main.css b/src/assets/main.css index d5ab96b..e5ee81c 100644 --- a/src/assets/main.css +++ b/src/assets/main.css @@ -21,3 +21,8 @@ .toggle { margin-top: 0.35em; } + +.btn-outline-warning { + --bs-btn-color: #880; + --bs-btn-active-color: #550; +} diff --git a/src/components/Seed.vue b/src/components/Seed.vue index 43a0a3c..cf4f28a 100644 --- a/src/components/Seed.vue +++ b/src/components/Seed.vue @@ -181,7 +181,9 @@ export default defineComponent({
  • - +
    + +
  • diff --git a/src/components/SeedSettings.vue b/src/components/SeedSettings.vue index 91f625a..3c17cf7 100644 --- a/src/components/SeedSettings.vue +++ b/src/components/SeedSettings.vue @@ -19,6 +19,18 @@ export default defineComponent({ } return rendered; }, + isEnemizer() { + return (this.settings.enemy_shuffle && this.settings.enemy_shuffle != "vanilla") + || (this.settings.boss_shuffle && this.settings.boss_shuffle != "vanilla"); + }, + dungeonItemsShuffled() { + return (this.settings.small_keys && this.settings.small_keys != "dungeons") + || (this.settings.big_keys && this.settings.big_keys != "dungeons") + || (this.settings.maps && this.settings.maps != "dungeons") + || (this.settings.compasses && this.settings.compasses != "dungeons") + || (this.settings.compasses && this.settings.compasses != "dungeons") + || (this.settings.prize_shuffle && this.settings.prize_shuffle != "vanilla"); + } }, methods: { } @@ -28,7 +40,7 @@ export default defineComponent({ diff --git a/src/data/generator-settings.yaml b/src/data/generator-settings.yaml index b9d059b..9468046 100644 --- a/src/data/generator-settings.yaml +++ b/src/data/generator-settings.yaml @@ -7,6 +7,10 @@ base: entrance_shuffle: all skull_woods: all linked_drops: all + door_shuffle: all + door_lobbies: all + door_type_mode: all + trap_door_mode: all boss_shuffle: all enemy_shuffle: all small_keys: all @@ -18,6 +22,8 @@ base: pottery: all prize_shuffle: all boots: all + flute: all + dark_rooms: all apr2025: mode: ['open', 'standard'] weapons: all diff --git a/src/data/settings-display.yaml b/src/data/settings-display.yaml index bbaf583..f8f474f 100644 --- a/src/data/settings-display.yaml +++ b/src/data/settings-display.yaml @@ -31,6 +31,15 @@ entrance_shuffle: crossed: Crossed Entrance Shuffle swapped: Swapped Entrance Shuffle decoupled: Decoupled Entrance Shuffle +door_shuffle: + vanilla: Vanilla Doors + basic: Basic Door Shuffle + paired: Paired Door Shuffle + partitioned: Partitioned Door Shuffle + crossed: Crossed Door Shuffle +door_lobbies: + Vanilla: Vanilla Dungeon Lobbies + Shuffled: Shuffled Dungeon Lobbies enemy_shuffle: vanilla: Vanilla Enemies shuffled: Shuffled Enemies @@ -46,3 +55,8 @@ dungeon_items: wild: Wild nearby: Nearby universal: Universal +prize_shuffle: + vanilla: Prizes on Bosses + dungeon: Prizes Shuffled in Dungeon + nearby: Prizes Shuffled Nearby + wild: Wild Prizes diff --git a/src/data/settings.yaml b/src/data/settings.yaml index 4ca0627..458dcad 100644 --- a/src/data/settings.yaml +++ b/src/data/settings.yaml @@ -253,3 +253,73 @@ boots: display: Pseudoboots starting: display: Starting Boots +flute: + display: Flute + default: normal + values: + normal: + display: Flute Needs Activation + preactivated: + display: Preactivated + starting: + display: Starting Activated Flute +dark_rooms: + display: Dark Room Logic + default: require_lamp + values: + require_lamp: + display: Lamp Required + always_light_cone: + display: Free Light Cone + no_dark_rooms: + display: All Rooms Lit + always_in_logic: + display: Always in Logic + starting_lamp: + display: Starting Lamp +door_shuffle: + display: Door Shuffle + default: vanilla + values: + vanilla: + display: None + basic: + display: Basic + paired: + display: Paired + partitioned: + display: Partitioned + crossed: + display: Crossed +door_lobbies: + display: Dungeon Lobbies + default: vanilla + values: + vanilla: + display: Vanilla + shuffled: + display: Shuffled +door_type_mode: + display: Shuffled Door Types + default: big + values: + original: + display: Key and Bomb Doors + big: + display: Key, Big Key, and Bomb Doors + all: + display: All Door Types + chaos: + display: Chaos +trap_door_mode: + display: Trap Door Removal + default: optional + values: + vanilla: + display: None + optional: + display: Some + boss: + display: Boss + remove_all: + display: All diff --git a/src/views/GenerateView.vue b/src/views/GenerateView.vue index bbbb5ac..5aa597f 100644 --- a/src/views/GenerateView.vue +++ b/src/views/GenerateView.vue @@ -63,23 +63,34 @@ export default defineComponent({ v-model="set.linked_drops" name="linked_drops" generator="base" />
  • - - + + + +
  • - - - - + +
  • - - - - + + + +
  • - + + + + +
    • +
  • + + +