[foundryvtt#2548] Update ScaleValueAdvancement to work with backgrounds

arbron · Nov 6, 2023 · 034e7ed · 034e7ed
1 parent b017426
commit 034e7ed
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/module/applications/advancement/scale-value-config.mjs b/module/applications/advancement/scale-value-config.mjs
@@ -44,7 +44,9 @@ export default class ScaleValueConfig extends AdvancementConfig {
    */
   _prepareLevelData() {
     let lastValue = null;
-    return Array.fromRange(CONFIG.DND5E.maxLevel + 1).slice(1).reduce((obj, level) => {
+    let levels = Array.fromRange(CONFIG.DND5E.maxLevel + 1);
+    if ( ["class", "subclass"].includes(this.advancement.parent.type ) ) levels = levels.slice(1);
+    return levels.reduce((obj, level) => {
       obj[level] = { placeholder: this._formatPlaceholder(lastValue), value: null };
       const value = this.advancement.configuration.scale[level];
       if ( value ) {

diff --git a/module/documents/actor/actor.mjs b/module/documents/actor/actor.mjs
@@ -1,9 +1,10 @@
 import Proficiency from "./proficiency.mjs";
+import * as Trait from "./trait.mjs";
+import ScaleValueAdvancement from "../advancement/scale-value.mjs";
 import { d20Roll } from "../../dice/dice.mjs";
 import { simplifyBonus } from "../../utils.mjs";
 import ShortRestDialog from "../../applications/actor/short-rest.mjs";
 import LongRestDialog from "../../applications/actor/long-rest.mjs";
-import * as Trait from "./trait.mjs";
 
 /**
  * Extend the base Actor class to implement additional system-specific logic.
@@ -234,9 +235,10 @@ export default class Actor5e extends Actor {
    * @protected
    */
   _prepareScaleValues() {
-    this.system.scale = Object.entries(this.classes).reduce((scale, [identifier, cls]) => {
-      scale[identifier] = cls.scaleValues;
-      if ( cls.subclass ) scale[cls.subclass.identifier] = cls.subclass.scaleValues;
+    this.system.scale = this.items.reduce((scale, item) => {
+      if ( ScaleValueAdvancement.metadata.validItemTypes.has(item.type) ) {
+        scale[item.identifier] = item.scaleValues;
+      }
       return scale;
     }, {});
   }

diff --git a/module/documents/advancement/scale-value.mjs b/module/documents/advancement/scale-value.mjs
@@ -19,7 +19,7 @@ export default class ScaleValueAdvancement extends Advancement {
       title: game.i18n.localize("DND5E.AdvancementScaleValueTitle"),
       hint: game.i18n.localize("DND5E.AdvancementScaleValueHint"),
       multiLevel: true,
-      validItemTypes: new Set(["class", "subclass"]),
+      validItemTypes: new Set(["background", "class", "subclass"]),
       apps: {
         config: ScaleValueConfig,
         flow: ScaleValueFlow

diff --git a/module/documents/item.mjs b/module/documents/item.mjs
@@ -269,8 +269,9 @@ export default class Item5e extends Item {
    * @type {object}
    */
   get scaleValues() {
-    if ( !["class", "subclass"].includes(this.type) || !this.advancement.byType.ScaleValue ) return {};
-    const level = this.type === "class" ? this.system.levels : this.class?.system.levels ?? 0;
+    if ( !this.advancement.byType.ScaleValue ) return {};
+    const level = this.type === "class" ? this.system.levels : this.type === "subclass" ? this.class?.system.levels
+      : this.parent?.system.details.level ?? 0;
     return this.advancement.byType.ScaleValue.reduce((obj, advancement) => {
       obj[advancement.identifier] = advancement.valueForLevel(level);
       return obj;