@yipe/dice 0.2.9 → 0.2.11

package/dist/builder/index.cjs

@@ -2698,7 +2698,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];
@@ -2737,13 +2737,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) {
@@ -2869,6 +2875,37 @@ var RollBuilder = class _RollBuilder {
     const rootConfig = this.getRootDieConfig();
     return rootConfig?.reroll || 0;
   }
+  half() {
+    return new HalfRollBuilder(this);
+  }
+};
+var HalfRollBuilder = class _HalfRollBuilder extends RollBuilder {
+  constructor(innerRoll) {
+    super(0);
+    this.innerRoll = innerRoll;
+  }
+  get lastConfig() {
+    return this.innerRoll.lastConfig;
+  }
+  getSubRollConfigs() {
+    return this.innerRoll.getSubRollConfigs();
+  }
+  toExpression() {
+    const innerExpression = this.innerRoll.toExpression();
+    return `(${innerExpression}) // 2`;
+  }
+  toAST() {
+    return {
+      type: "half",
+      child: this.innerRoll.toAST()
+    };
+  }
+  toPMF(eps = 0) {
+    return pmfFromRollBuilder(this, eps);
+  }
+  copy() {
+    return new _HalfRollBuilder(this.innerRoll.copy());
+  }
 };
 
 // src/builder/factory.ts
@@ -3036,14 +3073,17 @@ function resolve(node, eps = defaultEps) {
         const rerollOne = !!childDie && (childDie.reroll || 0) >= 1;
         return d20RollPMF(node.rollType, rerollOne);
       }
+      case "half": {
+        const childPMF = resolve(node.child, eps);
+        return childPMF.scaleDamage(0.5, "floor");
+      }
     }
   })();
   builderPMFCache.set(cacheKey, result);
   return result;
 }
 function pmfFromRollBuilder(rb, eps = defaultEps) {
-  const configs = rb.getSubRollConfigs?.() ?? [];
-  const ast = astFromRollConfigs(configs) || { type: "constant", value: 0 };
+  const ast = rb.toAST();
   return resolve(ast, eps);
 }
 function resolveSingleDie(die, eps = defaultEps) {
@@ -3106,6 +3146,7 @@ function findDie(node) {
       return void 0;
     case "sum":
     case "d20Roll":
+    case "half":
       return findDie(node.child);
     case "keep":
       return findDie(node.child.child);
@@ -3171,6 +3212,8 @@ function getASTSignature(node) {
       return `keep{c:${node.count},m:${node.mode},ch:${getASTSignature(
         node.child
       )}}`;
+    case "half":
+      return `half{ch:${getASTSignature(node.child)}}`;
     case "add": {
       let constantValue = 0;
       const otherChildrenSigs = [];
@@ -3542,6 +3585,7 @@ RollBuilder.prototype.dc = function(saveDC) {
 
 exports.ACBuilder = ACBuilder;
 exports.DCBuilder = DCBuilder;
+exports.HalfRollBuilder = HalfRollBuilder;
 exports.RollBuilder = RollBuilder;
 exports.SaveBuilder = SaveBuilder;
 exports.builderPMFCache = builderPMFCache;