dungeonslayers/ds4
dungeonslayers/ds4
2
0
Fork 0
Code Issues 9 Pull requests Projects Releases 14 Packages 1 Activity

correctly handle overrides

Browse source
This commit is contained in:
Johannes Loher 2021-02-18 13:24:52 +01:00
parent 1e349a3b34
commit 24d8926645
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/module/actor/actor.ts
View file

@ -35,6 +35,8 @@ export class DS4Actor extends Actor<DS4ActorData, DS4Item> {
} }
applyActiveEffectsToBaseData(): void { applyActiveEffectsToBaseData(): void {
// reset overrides because our variant of applying active effects does not set them, it only adds overrides
this.overrides = {};
this.applyActiveEffectsFiltered( this.applyActiveEffectsFiltered(
(change) => (change) =>
!this.derivedDataProperties.includes(change.key) && !this.finalDerivedProperties.includes(change.key), !this.derivedDataProperties.includes(change.key) && !this.finalDerivedProperties.includes(change.key),
@ -87,7 +89,7 @@ export class DS4Actor extends Actor<DS4ActorData, DS4Item> {
} }
// Expand the set of final overrides // Expand the set of final overrides
this.overrides = expandObject({ ...flattenObject(this.overrides ?? {}), ...overrides }); this.overrides = expandObject({ ...flattenObject(this.overrides), ...overrides });
} }
protected _getOriginatingItemOfActiveEffect(effect: ActiveEffect<DS4Actor>): DS4Item | undefined { protected _getOriginatingItemOfActiveEffect(effect: ActiveEffect<DS4Actor>): DS4Item | undefined {