public/fvtt-hero-system-6
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 40 Wiki Activity

Fixes from 29th of june

Browse Source
This commit is contained in:
LeRatierBretonnien 2023-06-30 22:20:44 +02:00
parent 297c94adb7
commit 8f10b9825e
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/hero6-actor.js
View File

@ -398,11 +398,15 @@ export class Hero6Actor extends Actor {
} }
game.combat.rebuildInitiative() game.combat.rebuildInitiative()
} }
async disableAbortAction() {
await this.setFlag("world", "abort-action", { state: false, count: 0 })
}
async abortAction() { async abortAction() {
if (this.getFlag("world", "abort-action")) { let abort = this.getFlag("world", "abort-action")
await this.setFlag("world", "abort-action", false) if ( abort.state) {
await this.setFlag("world", "abort-action", { state: false, count: 0 })
} else { } else {
await this.setFlag("world", "abort-action", true) await this.setFlag("world", "abort-action", { state: true, count: 0 })
} }
game.combat.rebuildInitiative() game.combat.rebuildInitiative()
} }
@ -410,7 +414,8 @@ export class Hero6Actor extends Actor {
return this.getFlag("world", "hold-action") return this.getFlag("world", "hold-action")
} }
getAbortAction() { getAbortAction() {
return this.getFlag("world", "abort-action") let abort = this.getFlag("world", "abort-action")
return abort?.state || false
} }
/* -------------------------------------------- */ /* -------------------------------------------- */

1
modules/hero6-combat.js
View File

@ -80,6 +80,7 @@ export class Hero6Combat extends Combat {
} }
if (c.actor.getAbortAction()) { if (c.actor.getAbortAction()) {
name = c.actor.name + " (A)" name = c.actor.name + " (A)"
c.actor.disableAbortAction()
} }
updList.push({ _id: id, name: name, initiative: baseInit, holdAction: c.holdAction }) updList.push({ _id: id, name: name, initiative: baseInit, holdAction: c.holdAction })
} else { } else {

4
system.json
View File

@ -91,7 +91,7 @@
"styles": [ "styles": [
"styles/simple.css" "styles/simple.css"
], ],
"version": "10.0.42", "version": "10.0.43",
"compatibility": { "compatibility": {
"minimum": "10", "minimum": "10",
"verified": "10", "verified": "10",
@ -99,7 +99,7 @@
}, },
"title": "Hero System v6 for FoundrtVTT (Official)", "title": "Hero System v6 for FoundrtVTT (Official)",
"manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/raw/branch/main/system.json", "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/raw/branch/main/system.json",
"download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.42.zip", "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.43.zip",
"url": "https://www.uberwald.me/gitea/uberwald/", "url": "https://www.uberwald.me/gitea/uberwald/",
"background": "images/ui/hro6_welcome_page.webp", "background": "images/ui/hro6_welcome_page.webp",
"id": "fvtt-hero-system-6" "id": "fvtt-hero-system-6"

4
templates/actors/actor-sheet.hbs
View File

@ -183,8 +183,8 @@
<input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.spd.value" value="{{characteristics.spd.value}}" data-dtype="Number" /> <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.spd.value" value="{{characteristics.spd.value}}" data-dtype="Number" />
<span class="item-field-label-very-short">&nbsp;</span> <span class="item-field-label-very-short">&nbsp;</span>
<button class="chat-card-button item-field-label-medium hold-action">Hold action</button> <button class="chat-card-button item-field-label-medium hold-action">Hold/Unhold</button>
<button class="chat-card-button item-field-label-medium abort-action">Abort action</button> <button class="chat-card-button item-field-label-medium abort-action">Abort/Unabort</button>
<span class="">&nbsp;</span> <span class="">&nbsp;</span>
<label class="item-field-label-long">Presence attack</label> <label class="item-field-label-long">Presence attack</label>