From d2845183ed0365942164968ee7a01cdb07952e7d Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Tue, 22 Jul 2025 13:02:33 -0500
Subject: [PATCH] Damage challenge and damage table shuffle

---
 package-lock.json                |  7 ++++---
 src/components/SettingsPage.vue  |  7 +++++++
 src/data/generator-settings.yaml |  2 ++
 src/data/settings-display.yaml   |  3 +++
 src/data/settings.yaml           | 18 ++++++++++++++++++
 5 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ee4f114..41e0ee7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2116,14 +2116,15 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
-      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
         "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
         "mime-types": "^2.1.12"
       },
       "engines": {
diff --git a/src/components/SettingsPage.vue b/src/components/SettingsPage.vue
index d782fbe..72be8e3 100644
--- a/src/components/SettingsPage.vue
+++ b/src/components/SettingsPage.vue
@@ -176,6 +176,7 @@ export default defineComponent({
       </template>
       <SettingPicker color="success" v-model="set.boss_shuffle" name="boss_shuffle" generator="base" :prefix="prefix" />
       <SettingPicker color="success" v-model="set.enemy_shuffle" name="enemy_shuffle" generator="base" :prefix="prefix" />
+      <SettingPicker color="success" v-model="set.damage_table_shuffle" name="damage_table_shuffle" generator="base" :prefix="prefix" />
     </AccordionItem>
     <AccordionItem :expanded="false">
       <template #header>
@@ -206,6 +207,12 @@ export default defineComponent({
       <SettingPicker color="primary" v-model="set.bombs" name="bombs" generator="base" :prefix="prefix" />
       <SettingPicker color="primary" v-model="set.book" name="book" generator="base" :prefix="prefix" />
     </AccordionItem>
+    <AccordionItem :expanded="false">
+      <template #header>
+        <b>Challenge Modes:</b>
+      </template>
+      <SettingPicker color="danger" v-model="set.damage_challenge" name="damage_challenge" generator="base" :prefix="prefix" />
+    </AccordionItem>
   </div>
 </template>
 
diff --git a/src/data/generator-settings.yaml b/src/data/generator-settings.yaml
index d3060bc..d10deb8 100644
--- a/src/data/generator-settings.yaml
+++ b/src/data/generator-settings.yaml
@@ -13,6 +13,7 @@ base:
   trap_door_mode: all
   boss_shuffle: all
   enemy_shuffle: all
+  damage_table_shuffle: all
   small_keys: all
   big_keys: all
   maps: all
@@ -27,6 +28,7 @@ base:
   bombs: all
   book: all
   follower_shuffle: all
+  damage_challenge: all
   hints: all
 apr2025:
   mode: ['open', 'standard']
diff --git a/src/data/settings-display.yaml b/src/data/settings-display.yaml
index a8d2b64..ad8ce05 100644
--- a/src/data/settings-display.yaml
+++ b/src/data/settings-display.yaml
@@ -47,6 +47,9 @@ enemy_shuffle:
   vanilla: Vanilla Enemies
   shuffled: Shuffled Enemies
   mimics: All Mimics
+damage_table_shuffle:
+  vanilla: Vanilla
+  randomized: Randomized
 boss_shuffle:
   vanilla: Vanilla Bosses
   simple: Simple Boss Shuffle
diff --git a/src/data/settings.yaml b/src/data/settings.yaml
index 1b52d97..b4cc9a9 100644
--- a/src/data/settings.yaml
+++ b/src/data/settings.yaml
@@ -155,6 +155,14 @@ enemy_shuffle:
       display: Shuffled
     mimics:
       display: All Mimics
+damage_table_shuffle:
+  display: Damage Table Shuffle
+  default: vanilla
+  values:
+    vanilla:
+      display: None
+    randomized:
+      display: Randomized
 small_keys:
   display: Small Key Shuffle
   default: dungeon
@@ -351,6 +359,16 @@ follower_shuffle:
       display: None
     shuffled:
       display: Shuffled
+damage_challenge:
+  display: Damage Mode
+  default: normal
+  values:
+    normal:
+      display: Normal
+    ohko:
+      display: One-Hit KO
+    gloom:
+      display: Gloom
 hints:
   display: Hints
   default: off