pass dieType as param to DiceRoller

Author: stevesea

README.md

@@ -50,7 +50,7 @@ Future<void> main() async {
 * `2d6` -- roll `2` dice of `6` sides
 * special dice variations:
     * `4dF` -- roll `4` fudge dice (sides: `[-1, -1, 0, 0, 1, 1]`)
-    * `1d%` -- roll `1` percentile dice (equivalent to `1d100`)
+    * `1d%` -- roll `1` percentile dice (equivalent to `1d100` or `1d10 * 10 + 1d10`)
     * `1D66` -- roll `1` D66, aka `1d6*10 + 1d6`
         * **_NOTE_**: you _must_ use uppercase `D66`, lowercase `d66` will be interpreted as a 66-sided die
     * `2d[2,3,5,7]`-- roll 2 dice with values `[2,3,5,7]`

packages/dart_dice_parser/lib/src/dice_roller.dart

@@ -27,12 +27,21 @@ abstract class DiceRoller {
 
   /// return an Stream of ints. length == ndice, range: [min,nsides]
   /// duplicates allowed.
-  Stream<int> roll({required int ndice, required int nsides, int min = 1});
+  Stream<int> roll({
+    required int ndice,
+    required int nsides,
+    int min = 1,
+    DieType dieType = DieType.polyhedral,
+  });
 
-  /// return an Stream of ints selected from the given vals. length = ndice.
+  /// return an Stream of results selected from the given vals. length == ndice.
   /// results should be selected at random from vals.
-  /// duplicates allowed.
-  Stream<int> rollVals(int ndice, List<int> vals);
+  /// duplicates are allowed.
+  Stream<T> rollVals<T>(
+    int ndice,
+    List<T> vals, {
+    DieType dieType = DieType.polyhedral,
+  });
 }
 
 /// a dice roller that uses an RNG
@@ -42,7 +51,7 @@ class RNGRoller extends DiceRoller {
   final Random _random;
 
   /// select n items from the list of values. duplicates are possible
-  Iterable<int> selectNFromVals<int>(num ndice, List<int> vals) => [
+  Iterable<T> selectNFromVals<T>(num ndice, List<T> vals) => [
     for (var i = 0; i < ndice; i++) vals[_random.nextInt(vals.length)],
   ];
 
@@ -57,6 +66,7 @@ class RNGRoller extends DiceRoller {
     required int ndice,
     required int nsides,
     int min = 1,
+    DieType dieType = DieType.polyhedral,
   }) async* {
     RangeError.checkValueInInterval(
       ndice,
@@ -76,7 +86,11 @@ class RNGRoller extends DiceRoller {
   }
 
   @override
-  Stream<int> rollVals(int ndice, List<int> vals) async* {
+  Stream<T> rollVals<T>(
+    int ndice,
+    List<T> vals, {
+    DieType dieType = DieType.polyhedral,
+  }) async* {
     RangeError.checkValueInInterval(
       ndice,
       DiceRoller.minDice,
@@ -120,7 +134,9 @@ class DiceResultRoller with LoggingMixin {
     final results = <RolledDie>[];
     final discarded = <RolledDie>[];
     for (var i = 0; i < ndice; i++) {
-      final digits = await _diceRoller.roll(ndice: 2, nsides: 6).toList();
+      final digits = await _diceRoller
+          .roll(ndice: 2, nsides: 6, dieType: DieType.d66)
+          .toList();
       logger.finest(() => 'roll ${ndice}D66 => $digits $msg');
       final tens = digits[0];
       final ones = digits[1];
@@ -163,7 +179,7 @@ class DiceResultRoller with LoggingMixin {
   /// Roll N fudge dice, return results
   Future<RollResult> rollFudge(int ndice, [String msg = '']) async {
     final results = await _diceRoller
-        .rollVals(ndice, DiceRoller.defaultFudgeVals)
+        .rollVals(ndice, DiceRoller.defaultFudgeVals, dieType: DieType.fudge)
         .toList();
 
     logger.finest(() => 'roll ${ndice}dF => $results $msg');
@@ -182,7 +198,11 @@ class DiceResultRoller with LoggingMixin {
     String msg = '',
   ]) async {
     final results = await _diceRoller
-        .rollVals(ndice, sideVals.toList(growable: false))
+        .rollVals(
+          ndice,
+          sideVals.toList(growable: false),
+          dieType: DieType.nvals,
+        )
         .toList();
 
     logger.finest(

packages/dart_dice_parser/lib/src/enums.dart

@@ -9,9 +9,7 @@ enum DieType implements Comparable<DieType> {
   // 1d[1,3,5,7,9]
   nvals(requirePotentialValues: true),
   // single value (e.g. a sum or count of dice)
-  singleVal(explodable: false, requirePotentialValues: true)
-  //penetration(explodable: false)
-  ;
+  singleVal(explodable: false, requirePotentialValues: true);
 
   const DieType({
     this.explodable = true,

packages/dart_dice_parser/lib/src/parser.dart

@@ -12,7 +12,7 @@ Parser<DiceExpression> parserBuilder(DiceResultRoller roller) {
   builder.primitive(
     digit().star().flatten('integer expected').trim().map(SimpleValue.new),
   );
-  // parens
+  // parens & curlies
   builder.group()
     ..wrapper(char('(').trim(), char(')').trim(), (left, value, right) => value)
     ..wrapper(