From 3be45b28c33efb4ffae09f6dd0e8f26c296fc6a9 Mon Sep 17 00:00:00 2001
From: Thaum Rystra <9525416+ThaumRystra@users.noreply.github.com>
Date: Tue, 19 Sep 2023 12:56:33 +0200
Subject: [PATCH] Made damage save form a bit more intuitive

---
 .../client/ui/properties/forms/DamageForm.vue | 57 +++++++++----------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/app/imports/client/ui/properties/forms/DamageForm.vue b/app/imports/client/ui/properties/forms/DamageForm.vue
index 8c5204c0..067dd22c 100644
--- a/app/imports/client/ui/properties/forms/DamageForm.vue
+++ b/app/imports/client/ui/properties/forms/DamageForm.vue
@@ -31,9 +31,22 @@
           @change="change('damageType', ...arguments)"
         />
       </v-col>
+      <v-col cols="12">
+        <smart-toggle
+          label="Target creature"
+          :value="model.target"
+          :options="[
+            {name: 'Action Target', value: 'target'},
+            {name: 'Self', value: 'self'},
+          ]"
+          :error-messages="errors.target"
+          @change="change('target', ...arguments)"
+        />
+      </v-col>
       <v-col cols="12">
         <smart-switch
-          label="Save for half damage"
+          class="mt-0"
+          label="Saving throw"
           :value="!!model.save"
           :error-messages="errors.save"
           @change="(val, ack) => $emit('change', {
@@ -76,24 +89,23 @@
               $emit('change', {path: ['save', 'stat'], value, ack})"
           />
         </v-col>
+        <v-col cols="12">
+          <computed-field
+            v-if="!!model.save"
+            label="Damage on successful save"
+            hint="Use &quot;~damage&quot; to reference the damage that would normally be dealt"
+            placeholder="Half damage"
+            persistent-placeholder
+            :model="model.save.damageFunction"
+            :error-messages="errors['save.damageFunction']"
+            @change="({path, value, ack}) =>
+              $emit('change', {path: ['save', 'damageFunction', ...path], value, ack})"
+          />
+        </v-col>
       </v-row>
     </v-expand-transition>
-    <v-row>
-      <v-col cols="12">
-        <smart-toggle
-          label="Target creature"
-          :value="model.target"
-          :options="[
-            {name: 'Action Target', value: 'target'},
-            {name: 'Self', value: 'self'},
-          ]"
-          :error-messages="errors.target"
-          @change="change('target', ...arguments)"
-        />
-      </v-col>
-    </v-row>
     <form-sections type="damage">
-      <form-section name="Behavior">
+      <form-section name="Log">
         <v-row>
           <v-col cols="12">
             <smart-switch
@@ -103,19 +115,6 @@
               @change="change('silent', ...arguments)"
             />
           </v-col>
-          <v-col cols="12">
-            <computed-field
-              v-if="!!model.save"
-              label="Damage function"
-              hint="Instead of half, you can use a function to determine the new damage to deal; use &quot;~damage&quot; to reference the standard damage"
-              placeholder="~damage / 2"
-              persistent-placeholder
-              :model="model.save.damageFunction"
-              :error-messages="errors['save.damageFunction']"
-              @change="({path, value, ack}) =>
-                $emit('change', {path: ['save', 'damageFunction', ...path], value, ack})"
-            />
-          </v-col>
         </v-row>
       </form-section>
       <slot />