Merge remote-tracking branch 'origin/main'

src/module/dialog/combatAction.mjs

@@ -35,6 +35,7 @@ export class CombatActionDialog extends HandlebarsApplicationMixin(ApplicationV2
             selectTarget: CombatActionDialog.#onSelectTarget,
             selectWeaponAndSkill: CombatActionDialog.#onSelectWeaponAndSkill,
             selectManeuver: CombatActionDialog.#onSelectManeuver,
+            attack: CombatActionDialog.#onAttack
         }
     }
 
@@ -165,6 +166,12 @@ export class CombatActionDialog extends HandlebarsApplicationMixin(ApplicationV2
         event.preventDefault()
         
         CombatActionDialog._instance.#processOnSubmitForm(event, form, formData)
+        this.close()
+    }
+
+    static async #onAttack(event, target) {
+        CombatActionDialog._instance.#processOnSubmitForm(event, this.element, new FormData(this.element))
+        this.close()
     }
 
     _configureRenderOptions(options) {

src/module/dialog/defenseAction.mjs

@@ -34,6 +34,7 @@ export class DefenseActionDialog extends HandlebarsApplicationMixin(ApplicationV
         actions: {
             selectWeaponAndSkill: DefenseActionDialog.#onSelectWeaponAndSkill,
             selectManeuver: DefenseActionDialog.#onSelectManeuver,
+            defend: DefenseActionDialog.#onDefend,
         }
     }
 
@@ -102,6 +103,11 @@ export class DefenseActionDialog extends HandlebarsApplicationMixin(ApplicationV
             targetNumber: this._targetNumber,
             modDescription: maneuver?.modDescription?.replace("{}", "" + this._mod) ?? ""
         })
+        this.close()
+    }
+
+    static async #onDefend(event, target) {
+       this.element.submit()
     }
 
     _configureRenderOptions(options) {

src/templates/dialog/combat-action.hbs

@@ -57,7 +57,7 @@
 
 
     <div class="actions">
-        <button type="button" {{#if ready}}class="ready" {{else}}data-tooltip="{{notReadyReason}}"{{/if}} type="submit"><i
+        <button type="button" data-action="attack" {{#if ready}}class="ready" {{else}}data-tooltip="{{notReadyReason}}"{{/if}}><i
                 class="fa-solid fa-swords"></i>Angreifen <span
                 class="value"></span></button>
     </div>

src/templates/dialog/defense-action.hbs

@@ -43,7 +43,7 @@
 
 
     <div class="actions">
-        <button type="button" {{#if ready}}class="ready" {{else}}data-tooltip="{{notReadyReason}}"{{/if}} type="submit"><i
+        <button type="button" data-action="defend" {{#if ready}}class="ready" {{else}}data-tooltip="{{notReadyReason}}"{{/if}}><i
                 class="fa-solid fa-shield"></i>Verteidigen <span
                 class="value"></span></button>
     </div>