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

direct damage (#873)

Browse source
This commit is contained in:
Dapoulp 2025-08-12 18:37:16 +02:00 • committed by GitHub
parent 6e747e67ee
commit 06184773b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 37 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
module/documents/actor.mjs
View file

@ -517,7 +517,7 @@ export default class DhpActor extends Actor {
return canUseArmor || canUseStress;
}
async takeDamage(damages) {
async takeDamage(damages, isDirect = false) {
if (Hooks.call(`${CONFIG.DH.id}.preTakeDamage`, this, damages) === false) return null;
if (this.type === 'companion') {
@ -548,6 +548,7 @@ export default class DhpActor extends Actor {
hpDamage.value = this.convertDamageToThreshold(hpDamage.value);
if (
this.type === 'character' &&
!isDirect &&
this.system.armor &&
this.#canReduceDamage(hpDamage.value, hpDamage.damageTypes)
) {

2
module/documents/chatMessage.mjs
View file

@ -138,7 +138,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
this.consumeOnSuccess();
if (this.system.hasHealing) target.actor.takeHealing(damages);
else target.actor.takeDamage(damages);
else target.actor.takeDamage(damages, this.system.isDirect);
}
}