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

Fixed damage multipliers not using implicit tags

Browse Source
This commit is contained in:
Stefan Zermatten
2022-11-19 23:24:11 +02:00
parent cc7dc257fb
commit e06d2befc4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ import {
getPropertiesOfType getPropertiesOfType
} from '/imports/api/engine/loadCreatures.js'; } from '/imports/api/engine/loadCreatures.js';
import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js'; import { applyNodeTriggers } from '/imports/api/engine/actions/applyTriggers.js';
import getEffectivePropTags from '/imports/api/engine/computation/utility/getEffectivePropTags.js';
export default function applyDamage(node, actionContext) { export default function applyDamage(node, actionContext) {
applyNodeTriggers(node, 'before', actionContext); applyNodeTriggers(node, 'before', actionContext);
@@ -173,14 +174,15 @@ function applyDamageMultipliers({ target, damage, damageProp, logValue }) {
function multiplierAppliesTo(damageProp, multiplierType) { function multiplierAppliesTo(damageProp, multiplierType) {
return multiplier => { return multiplier => {
// Apply the default 'ignore x' tags // Apply the default 'ignore x' tags
if (includes(damageProp.tags, `ignore ${multiplierType}`)) return false; const effectiveTags = getEffectivePropTags(damageProp);
if (includes(effectiveTags, `ignore ${multiplierType}`)) return false;
const hasRequiredTags = difference( const hasRequiredTags = difference(
multiplier.includeTags, damageProp.tags multiplier.includeTags, effectiveTags
).length === 0; ).length === 0;
const hasNoExcludedTags = intersection( const hasNoExcludedTags = intersection(
multiplier.excludeTags, damageProp.tags multiplier.excludeTags, effectiveTags
).length === 0; ).length === 0;
return hasRequiredTags && hasNoExcludedTags; return hasRequiredTags && hasNoExcludedTags;