Compare commits

...

5 Commits
0.10.0 ... main

Author SHA1 Message Date
root d5386fad8c auto commit 2026-03-14 14:59:54 +01:00
macniel 85403fbc0a Merge remote-tracking branch 'origin/main' 2026-03-14 14:46:03 +01:00
macniel f4b4233dcb fixes close on submit 2026-03-14 14:45:50 +01:00
macniel b59be2e977 fixes inability to roll attack or parry. 2026-03-14 14:43:07 +01:00
root e4779b14a2 auto commit 2026-03-14 11:08:31 +01:00
5 changed files with 17 additions and 4 deletions

View File

@ -35,6 +35,7 @@ export class CombatActionDialog extends HandlebarsApplicationMixin(ApplicationV2
selectTarget: CombatActionDialog.#onSelectTarget, selectTarget: CombatActionDialog.#onSelectTarget,
selectWeaponAndSkill: CombatActionDialog.#onSelectWeaponAndSkill, selectWeaponAndSkill: CombatActionDialog.#onSelectWeaponAndSkill,
selectManeuver: CombatActionDialog.#onSelectManeuver, selectManeuver: CombatActionDialog.#onSelectManeuver,
attack: CombatActionDialog.#onAttack
} }
} }
@ -165,6 +166,12 @@ export class CombatActionDialog extends HandlebarsApplicationMixin(ApplicationV2
event.preventDefault() event.preventDefault()
CombatActionDialog._instance.#processOnSubmitForm(event, form, formData) 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) { _configureRenderOptions(options) {

View File

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

View File

@ -2,7 +2,7 @@
"id": "DSA_4-1", "id": "DSA_4-1",
"title": "Das Schwarze Auge 4.1", "title": "Das Schwarze Auge 4.1",
"description": "Noch ein Spielsystem für Das Schwarze Auge 4.1", "description": "Noch ein Spielsystem für Das Schwarze Auge 4.1",
"version": "0.9.2", "version": "0.10.1",
"compatibility": { "compatibility": {
"minimum": 12, "minimum": 12,
"verified": 13 "verified": 13
@ -364,5 +364,5 @@
"primaryTokenAttribute": "lep.aktuell", "primaryTokenAttribute": "lep.aktuell",
"url": "https://git.macniel.online/macniel/foundry-dsa41-game", "url": "https://git.macniel.online/macniel/foundry-dsa41-game",
"manifest": "https://git.macniel.online/macniel/foundry-dsa41-game/raw/branch/main/src/system.json", "manifest": "https://git.macniel.online/macniel/foundry-dsa41-game/raw/branch/main/src/system.json",
"download": "https://git.macniel.online/macniel/foundry-dsa41-game/releases/download/0.9.2/release.zip" "download": "https://git.macniel.online/macniel/foundry-dsa41-game/releases/download/0.10.1/release.zip"
} }

View File

@ -57,7 +57,7 @@
<div class="actions"> <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="fa-solid fa-swords"></i>Angreifen <span
class="value"></span></button> class="value"></span></button>
</div> </div>

View File

@ -43,7 +43,7 @@
<div class="actions"> <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="fa-solid fa-shield"></i>Verteidigen <span
class="value"></span></button> class="value"></span></button>
</div> </div>