jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #314 from Jonpot/patch-5

Browse Source 
Fix health bar filtering in dealDamage function
This commit is contained in:
Stefan Zermatten
2023-04-14 11:31:56 +02:00
committed by GitHub
parent 53e88af93a c3c05a0727
commit 2ee3fe1e12
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/imports/api/engine/actions/applyPropertyByType/applyDamage.js
View File

@@ -194,14 +194,18 @@ function dealDamage({ target, damageType, amount, actionContext }) {
let healthBars = getPropertiesOfType(target._id, 'attribute'); let healthBars = getPropertiesOfType(target._id, 'attribute');
// Keep only the healthbars that can take damage/healing // Keep only the healthbars that can take damage/healing
remove(healthBars, (bar) => healthBars = healthBars.filter((bar) => {
bar.attributeType !== 'healthBar' || if (bar.attributeType !== 'healthBar' || bar.inactive || bar.removed || bar.overridden) {
bar.inactive || return false;
bar.removed || }
bar.overridden || if (damageType === 'healing' && bar.healthBarNoHealing) {
(amount >= 0 && bar.healthBarNoDamage) || return false;
(amount < 0 && bar.healthBarNoHealing) }
); if (damageType !== 'healing' && amount >= 0 && bar.healthBarNoDamage) {
return false;
}
return true;
});
// Sort healthbars by damage/healing order or tree order as a fallback // Sort healthbars by damage/healing order or tree order as a fallback
healthBars.sort((a, b) => { healthBars.sort((a, b) => {