cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-12 03:31:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Action chat message + formatTarget fix (#410)

Browse source
This commit is contained in:
Dapoulp 2025-07-25 21:34:03 +02:00 • committed by GitHub
parent 62b9a8fbee
commit fcba5041e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
module/data/action/baseAction.mjs
View file

@ -117,6 +117,8 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
async use(event, ...args) { async use(event, ...args) {
if (!this.actor) throw new Error("An Action can't be used outside of an Actor context."); if (!this.actor) throw new Error("An Action can't be used outside of an Actor context.");
if(this.chatDisplay) this.toChat();
let config = this.prepareConfig(event); let config = this.prepareConfig(event);
for(let i = 0; i < this.constructor.extraSchemas.length; i++) { for(let i = 0; i < this.constructor.extraSchemas.length; i++) {
let clsField = this.constructor.getActionField(this.constructor.extraSchemas[i]); let clsField = this.constructor.getActionField(this.constructor.extraSchemas[i]);

4
module/data/chat-message/adversaryRoll.mjs
View file

@ -1,5 +1,3 @@
import DHBaseAction from '../../data/action/baseAction.mjs';
const fields = foundry.data.fields; const fields = foundry.data.fields;
export default class DHAdversaryRoll extends foundry.abstract.TypeDataModel { export default class DHAdversaryRoll extends foundry.abstract.TypeDataModel {
@ -44,7 +42,7 @@ export default class DHAdversaryRoll extends foundry.abstract.TypeDataModel {
this.hasHitTarget = this.targets.filter(t => t.hit === true).length > 0; this.hasHitTarget = this.targets.filter(t => t.hit === true).length > 0;
this.currentTargets = this.currentTargets =
this.targetSelection !== true this.targetSelection !== true
? Array.from(game.user.targets).map(t => DHBaseAction.formatTarget(t)) ? Array.from(game.user.targets).map(t => game.system.api.fields.ActionFields.TargetField.formatTarget(t))
: this.targets; : this.targets;
} }
} }

4
module/data/chat-message/applyEffects.mjs
View file

@ -1,5 +1,3 @@
import DHBaseAction from "../action/baseAction.mjs";
export default class DHApplyEffect extends foundry.abstract.TypeDataModel { export default class DHApplyEffect extends foundry.abstract.TypeDataModel {
static defineSchema() { static defineSchema() {
const fields = foundry.data.fields; const fields = foundry.data.fields;
@ -27,7 +25,7 @@ export default class DHApplyEffect extends foundry.abstract.TypeDataModel {
this.hasHitTarget = this.targets.filter(t => t.hit === true).length > 0; this.hasHitTarget = this.targets.filter(t => t.hit === true).length > 0;
this.currentTargets = this.currentTargets =
this.targetSelection !== true this.targetSelection !== true
? Array.from(game.user.targets).map(t => DHBaseAction.formatTarget(t)) ? Array.from(game.user.targets).map(t => game.system.api.fields.ActionFields.TargetField.formatTarget(t))
: this.targets; : this.targets;
} }

2
module/data/chat-message/damageRoll.mjs
View file

@ -40,7 +40,7 @@ export default class DHDamageRoll extends foundry.abstract.TypeDataModel {
this.hasHitTarget = this.targets.filter(t => t.hit === true).length > 0; this.hasHitTarget = this.targets.filter(t => t.hit === true).length > 0;
this.currentTargets = this.currentTargets =
this.targetSelection !== true this.targetSelection !== true
? Array.from(game.user.targets).map(t => DHBaseAction.formatTarget(t)) ? Array.from(game.user.targets).map(t => game.system.api.fields.ActionFields.TargetField.formatTarget(t))
: this.targets; : this.targets;
} }
} }

2
module/documents/item.mjs
View file

@ -106,8 +106,6 @@ export default class DHItem extends foundry.documents.Item {
} }
if (action) return action.use(event); if (action) return action.use(event);
} }
return this.toChat();
} }
async toChat(origin) { async toChat(origin) {

2
templates/ui/chat/parts/target-chat.hbs
View file

@ -9,7 +9,7 @@
<label class="button-target-selection{{#unless @root.targetSelection}} target-selected{{/unless}}">{{localize "DAGGERHEART.UI.Chat.damageRoll.selectedTarget"}}</label> <label class="button-target-selection{{#unless @root.targetSelection}} target-selected{{/unless}}">{{localize "DAGGERHEART.UI.Chat.damageRoll.selectedTarget"}}</label>
</div> </div>
{{#if (and hasSave @root.targetSelection @root.hasHitTarget)}} {{#if (and hasSave @root.targetSelection @root.hasHitTarget)}}
<button class="inner-button inner-button-right roll-all-save-button">{{localize "DAGERHEART.GENERAL.rollAll"}} <i class="fa-solid fa-shield"></i></button> <button class="inner-button inner-button-right roll-all-save-button">{{localize "DAGGERHEART.GENERAL.rollAll"}} <i class="fa-solid fa-shield"></i></button>
{{/if}} {{/if}}
<div class="target-section"> <div class="target-section">
{{#each currentTargets as |target|}} {{#each currentTargets as |target|}}