Remove Cantrip Scaling, push parts separately for scaling.

foundryvtt · Feb 18, 2020 · 4328c17 · 4328c17
1 parent d8018d9
commit 4328c17
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/scripts/config.js b/scripts/config.js
@@ -848,6 +848,5 @@ CONFIG.languages = {
 
 CONFIG.spellScalingModes = {
  "none": "None",
- "cantrip": "Cantrip",
  "level": "Heightened +1"
 }
diff --git a/scripts/item/item.js b/scripts/item/item.js
@@ -628,8 +628,10 @@ class ItemPF2e extends Item {
  rollData.item = itemData;
 
  if (itemData.damage.applyMod) parts.push(rollData.abilities[abl].mod);
- if (itemData.scaling.mode === "level" && itemData.scaling.formula !== "" && itemData.level.value < spellLvl) {
- parts.push(`(${spellLvl - itemData.level.value})*(${itemData.scaling.formula})`)
+ let scaling = itemData.scaling || {}
+ if (scaling.mode === "level" && scaling.formula !== "" && itemData.level.value < spellLvl) {
+ let scaling_parts = Array(spellLvl - itemData.level.value).fill(scaling.formula)
+ parts.push(...scaling_parts)
  }
 
  // Call the roll helper utility