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

Current Target Save & Action without roll chat message (#528)

Browse source
This commit is contained in:
Dapoulp 2025-08-02 21:29:11 +02:00 • committed by GitHub
parent 73a19fc0bb
commit 2f39e04da5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 224 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -114,7 +114,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
async use(event, ...args) {
if (!this.actor) throw new Error("An Action can't be used outside of an Actor context.");
if (this.chatDisplay) this.toChat();
if (this.chatDisplay) await this.toChat();
let config = this.prepareConfig(event);
for (let i = 0; i < this.constructor.extraSchemas.length; i++) {
@ -139,11 +139,16 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
config = await this.actor.diceRoll(config);
if (!config) return;
}
if (this.doFollowUp()) {
if (this.rollDamage) await this.rollDamage(event, config);
if (this.rollHealing) await this.rollHealing(event, config);
if (this.trigger) await this.trigger(event, config);
if (this.rollDamage && this.damage.parts.length) await this.rollDamage(event, config);
else if (this.trigger) await this.trigger(event, config);
else if(this.hasSave || this.hasEffect) {
const roll = new Roll('');
roll._evaluated = true;
if(this.hasTarget) config.targetSelection = config.targets.length > 0;
await CONFIG.Dice.daggerheart.DHRoll.toMessage(roll, config);
}
}
// Consume resources
@ -254,6 +259,10 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
/* SAVE */
/* EFFECTS */
get hasEffect() {
return this.effects?.length > 0;
}
async applyEffects(event, data, targets) {
targets ??= data.system.targets;
const force = true; /* Where should this come from? */
@ -343,10 +352,16 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
async updateChatMessage(message, targetId, changes, chain = true) {
setTimeout(async () => {
const chatMessage = ui.chat.collection.get(message._id),
msgTargets = chatMessage.system.targets,
msgTarget = msgTargets.find(mt => mt.id === targetId);
msgTarget = chatMessage.system.targets.find(mt => mt.id === targetId) ?? chatMessage.system.oldTargets.find(mt => mt.id === targetId);
msgTarget.saved = changes;
await chatMessage.update({ 'system.targets': msgTargets });
await chatMessage.update(
{
system: {
targets: chatMessage.system.targets,
oldTargets: chatMessage.system.oldTargets
}
}
);
}, 100);
if (chain) {
if (message.system.source.message)

4
module/data/action/damageAction.mjs
View file

@ -45,12 +45,12 @@ export default class DHDamageAction extends DHBaseAction {
formulas = this.formatFormulas(formulas, systemData);
delete systemData.evaluate;
systemData.targets.forEach(t => t.hit = true);
const config = {
...systemData,
roll: formulas,
dialog: {},
data: this.getRollData()
data: this.getRollData(),
targetSelection: systemData.targets.length > 0
}
if (this.hasSave) config.onSave = this.save.damageMod;
if (data.system) {

13
module/data/action/effectAction.mjs
View file

@ -2,17 +2,4 @@ import DHBaseAction from './baseAction.mjs';
export default class DHEffectAction extends DHBaseAction {
static extraSchemas = [...super.extraSchemas, 'effects', 'target'];
async trigger(event, data) {
if (this.effects.length) {
const cls = getDocumentClass('ChatMessage'),
msg = {
type: 'applyEffect',
user: game.user.id,
system: data
};
return await cls.create(msg);
} else this.toChat(this.id);
}
}