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

Merge branch 'master' into professorbunbury-sw5e

Browse source
This commit is contained in:
CK 2020-08-31 16:54:03 -04:00 • committed by GitHub
commit 6edc557219
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
88 changed files with 1813 additions and 527 deletions
Download patch file Download diff file Expand all files Collapse all files

10
module/item/entity.js
View file

@ -41,7 +41,7 @@ export class Item5e extends Item {
* @type {boolean}
*/
get hasAttack() {
return ["mwak", "rwak", "msak", "rsak"].includes(this.data.data.actionType);
return ["mwak", "rwak", "mpak", "rpak"].includes(this.data.data.actionType);
}
/* -------------------------------------------- */
@ -553,9 +553,9 @@ export class Item5e extends Item {
const parts = itemData.damage.parts.map(d => d[0]);
if ( versatile && itemData.damage.versatile ) parts[0] = itemData.damage.versatile;
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;
this._scaleCantripDamage(parts, lvl, itemData.scaling.formula );
this._scaleAtWillDamage(parts, lvl, itemData.scaling.formula );
} else if ( powerLevel && (itemData.scaling.mode === "level") && itemData.scaling.formula ) {
this._scalePowerDamage(parts, itemData.level, powerLevel, itemData.scaling.formula );
}
@ -590,10 +590,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
*/
_scaleCantripDamage(parts, level, scale) {
_scaleAtWillDamage(parts, level, scale) {
const add = Math.floor((level + 1) / 6);
if ( add === 0 ) return;
if ( scale && (scale !== parts[0]) ) {