@yipe/dice 0.2.9 → 0.2.10

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) {