dragonleo/foundry-sw5e
1
0
Fork 0
forked from GitHub-Mirrors/foundry-sw5e
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #9 from DFreds/master

Browse source 
Fix at-will higher level damage calculation
This commit is contained in:
CK 2020-08-14 10:31:40 -04:00 • committed by GitHub
commit 8f1de87b54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
module/item/entity.js
View file

@ -551,9 +551,9 @@ export class Item5e extends Item {
const parts = itemData.damage.parts.map(d => d[0]); const parts = itemData.damage.parts.map(d => d[0]);
if ( versatile && itemData.damage.versatile ) parts[0] = itemData.damage.versatile; if ( versatile && itemData.damage.versatile ) parts[0] = itemData.damage.versatile;
if ( (this.data.type === "power") ) { if ( (this.data.type === "power") ) {
if ( (itemData.scaling.mode === "cantrip") ) { if ( (itemData.scaling.mode === "atwill") ) {
const lvl = this.actor.data.type === "character" ? actorData.details.level : actorData.details.powerLevel; const lvl = this.actor.data.type === "character" ? actorData.details.level : actorData.details.powerLevel;
this._scaleCantripDamage(parts, lvl, itemData.scaling.formula ); this._scaleAtWillDamage(parts, lvl, itemData.scaling.formula );
} else if ( powerLevel && (itemData.scaling.mode === "level") && itemData.scaling.formula ) { } else if ( powerLevel && (itemData.scaling.mode === "level") && itemData.scaling.formula ) {
this._scalePowerDamage(parts, itemData.level, powerLevel, itemData.scaling.formula ); this._scalePowerDamage(parts, itemData.level, powerLevel, itemData.scaling.formula );
} }
@ -588,10 +588,10 @@ export class Item5e extends Item {
/* -------------------------------------------- */ /* -------------------------------------------- */
/** /**
* Adjust a cantrip damage formula to scale it for higher level characters and monsters * Adjust an at-will damage formula to scale it for higher level characters and monsters
* @private * @private
*/ */
_scaleCantripDamage(parts, level, scale) { _scaleAtWillDamage(parts, level, scale) {
const add = Math.floor((level + 1) / 6); const add = Math.floor((level + 1) / 6);
if ( add === 0 ) return; if ( add === 0 ) return;
if ( scale && (scale !== parts[0]) ) { if ( scale && (scale !== parts[0]) ) {