Merge pull request dmdorman#1197 from jasonareid/transform-cleanup

Post-merge cleanups of Transform code
phBalance · Sep 7, 2024 · cebf118 · cebf118
2 parents 2a50b6f + daee827
commit cebf118
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/module/config.mjs b/module/config.mjs
@@ -5333,7 +5333,7 @@ function addPower(powerDescription6e, powerOverrideFor5e) {
                         return 15;
                 }
                 // This should never happen
-                console.error("Invalid TRANSFORM option ID: " + item.system.OPTIONID);
+                console.error(`Invalid TRANSFORM option ID: ${item.system.OPTIONID}`);
                 return 1;
             },
             costEnd: true,

diff --git a/module/item/item-attack.mjs b/module/item/item-attack.mjs
@@ -1357,7 +1357,7 @@ export async function _onRollDamage(event) {
         .makeAdjustmentRoll(!!adjustment)
         .makeFlashRoll(!!senseAffecting)
         .makeEntangleRoll(entangle)
-        .makeTransformRoll(transform)
+        .makeEffectRoll(transform)
         .addStunMultiplier(increasedMultiplierLevels - decreasedMultiplierLevels)
         .addDice(formulaParts.d6Count >= 1 ? formulaParts.d6Count : 0)
         .addHalfDice(formulaParts.halfDieCount >= 1 ? formulaParts.halfDieCount : 0)

diff --git a/module/testing/testing-dice.mjs b/module/testing/testing-dice.mjs
@@ -187,13 +187,13 @@ export function registerDiceTests(quench) {
                         roller.makeFlashRoll(undefined);
                         expect(roller._type).to.equal(HeroRoller.ROLL_TYPE.FLASH);
 
-                        roller.makeTransformRoll(0);
+                        roller.makeEffectRoll(0);
                         expect(roller._type).to.equal(HeroRoller.ROLL_TYPE.FLASH);
-                        roller.makeTransformRoll(false);
+                        roller.makeEffectRoll(false);
                         expect(roller._type).to.equal(HeroRoller.ROLL_TYPE.FLASH);
-                        roller.makeTransformRoll(null);
+                        roller.makeEffectRoll(null);
                         expect(roller._type).to.equal(HeroRoller.ROLL_TYPE.FLASH);
-                        roller.makeTransformRoll(undefined);
+                        roller.makeEffectRoll(undefined);
                         expect(roller._type).to.equal(HeroRoller.ROLL_TYPE.EFFECT);
                     });
 

diff --git a/module/utility/dice.mjs b/module/utility/dice.mjs
@@ -264,13 +264,6 @@ export class HeroRoller {
         return this;
     }
 
-    makeTransformRoll(apply = true) {
-        if (apply) {
-            this._type = HeroRoller.ROLL_TYPE.EFFECT;
-        }
-        return this;
-    }
-
     makeFlashRoll(apply = true) {
         if (apply) {
             this._type = HeroRoller.ROLL_TYPE.FLASH;