From 60ad5ad8369a017e2ecff497127f052d119f7aee Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Fri, 14 Mar 2025 15:41:05 -0500 Subject: [PATCH] Collection rate, hints, rename SW settings --- src/components/CollectionRatePicker.vue | 40 +++++++++++++++++++++++++ src/components/Seed.vue | 15 +++++++++- src/components/SettingsPage.vue | 1 + src/data/generator-settings.yaml | 1 + src/data/settings.yaml | 16 +++++++--- 5 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 src/components/CollectionRatePicker.vue diff --git a/src/components/CollectionRatePicker.vue b/src/components/CollectionRatePicker.vue new file mode 100644 index 0000000..78da3ea --- /dev/null +++ b/src/components/CollectionRatePicker.vue @@ -0,0 +1,40 @@ + + + + diff --git a/src/components/Seed.vue b/src/components/Seed.vue index cdcd127..e8af7bf 100644 --- a/src/components/Seed.vue +++ b/src/components/Seed.vue @@ -8,6 +8,7 @@ import QuickswapPicker from "@/components/QuickswapPicker.vue"; import ReduceFlashingPicker from "@/components/ReduceFlashingPicker.vue"; import BackgroundMusicPicker from "@/components/BackgroundMusicPicker.vue"; import MsuResumePicker from "@/components/MsuResumePicker.vue"; +import CollectionRatePicker from "@/components/CollectionRatePicker.vue"; import SeedSettings from "@/components/SeedSettings.vue"; @@ -27,6 +28,7 @@ export default defineComponent({ ReduceFlashingPicker, BackgroundMusicPicker, MsuResumePicker, + CollectionRatePicker, }, data() { return { @@ -35,7 +37,7 @@ export default defineComponent({ baserom_error: null, patch: null, error: null, - settings: null, + settings: {}, multi: null, }; }, @@ -59,6 +61,12 @@ export default defineComponent({ permalink() { return `/seed/${this.id}`; }, + allow_cr() { + if (["triforce_hunt", "trinity", "ganon_hunt"].includes(this.settings.goal)) { + return false; + } + return true; + }, }, methods: { dataLoaded(patch, seedData) { @@ -133,6 +141,10 @@ export default defineComponent({ this.$refs.reduce_flashing.patch(rom); this.$refs.quickswap.patch(rom); + if (this.allow_cr) { + this.$refs.cr.patch(rom); + } + // fast multijunk, too lazy to make it a setting rn rom[0x1800AF] = 0x10; @@ -204,6 +216,7 @@ export default defineComponent({ +
  • diff --git a/src/components/SettingsPage.vue b/src/components/SettingsPage.vue index f8e5648..0954f7f 100644 --- a/src/components/SettingsPage.vue +++ b/src/components/SettingsPage.vue @@ -137,6 +137,7 @@ export default defineComponent({ +