@yipe/dice 0.2.8 → 0.2.10

package/dist/builder/index.d.cts

@@ -127,6 +127,7 @@ declare class RollBuilder {
     add(anotherRoll: RollBuilder | undefined): RollBuilder;
     withBonus(anotherRoll: RollBuilder): RollBuilder;
     addRoll(count?: number): RollBuilder;
+    scaleDice(scale: number): RollBuilder;
     doubleDice(): RollBuilder;
     copy(): RollBuilder;
     d4: () => RollBuilder;

package/dist/builder/index.d.ts

@@ -127,6 +127,7 @@ declare class RollBuilder {
     add(anotherRoll: RollBuilder | undefined): RollBuilder;
     withBonus(anotherRoll: RollBuilder): RollBuilder;
     addRoll(count?: number): RollBuilder;
+    scaleDice(scale: number): RollBuilder;
     doubleDice(): RollBuilder;
     copy(): RollBuilder;
     d4: () => RollBuilder;

package/dist/builder/index.js

@@ -2653,13 +2653,19 @@ var RollBuilder = class _RollBuilder {
     ];
     return new this.constructor(configs);
   }
-  doubleDice() {
+  scaleDice(scale) {
+    const scaleInt = Math.floor(scale);
+    if (scaleInt !== scale) throw new Error("Scale must be an integer");
+    if (scaleInt <= 0) throw new Error("Scale must be > 0");
     const newConfigs = this.getSubRollConfigs().map((config) => {
       if (!config.sides || config.sides <= 0) return config;
-      return { ...config, count: config.count * 2 };
+      return { ...config, count: config.count * scaleInt };
     });
     return new this.constructor(newConfigs);
   }
+  doubleDice() {
+    return this.scaleDice(2);
+  }
   copy() {
     return new this.constructor(this.getSubRollConfigs());
   }
@@ -2690,7 +2696,7 @@ var RollBuilder = class _RollBuilder {
     let rootD20Group;
     if (rootConfig && rootConfig.sides === 20) {
       const rootIndex = groupedConfigs.findIndex(
-        ({ config }) => config.sides === rootConfig.sides && config.rollType === rootConfig.rollType && config.reroll === rootConfig.reroll && config.explode === rootConfig.explode && config.minimum === rootConfig.minimum && config.bestOf === rootConfig.bestOf && JSON.stringify(config.keep) === JSON.stringify(rootConfig.keep)
+        ({ config }) => rollConfigsEqual(config, rootConfig) && JSON.stringify(config.keep) === JSON.stringify(rootConfig.keep)
       );
       if (rootIndex !== -1) {
         rootD20Group = groupedConfigs.splice(rootIndex, 1)[0];
@@ -2729,13 +2735,19 @@ var RollBuilder = class _RollBuilder {
       const expression = diceExpressions[i];
       if (i === 0) {
         result = (config.isSubtraction ? "-" : "") + expression;
+        if (config.sides === 20 && totalModifier !== 0) {
+          if (totalModifier > 0) result += ` + ${totalModifier}`;
+          else result += ` - ${Math.abs(totalModifier)}`;
+        }
       } else {
         const operator = config.isSubtraction ? " - " : " + ";
         result += operator + expression;
       }
     }
-    if (totalModifier > 0) result += ` + ${totalModifier}`;
-    else if (totalModifier < 0) result += ` - ${Math.abs(totalModifier)}`;
+    if (diceConfigs.length === 0 || diceConfigs[0].sides !== 20) {
+      if (totalModifier > 0) result += ` + ${totalModifier}`;
+      else if (totalModifier < 0) result += ` - ${Math.abs(totalModifier)}`;
+    }
     return result.replace(/\+ -/g, "-");
   }
   toPMF(eps = 0) {