Skip to content

Fix -H and -L rolls #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luccasclezar wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix -H and -L rolls #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b79c73
Fix -H and -L rolls
luccasclezar Oct 7, 2022
1009089
Change from round to ceil on roll results
luccasclezar Nov 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions lib/src/d20.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
/// ```
/// import 'package:d20/d20.dart';
/// ```

import 'dart:math';

import 'package:collection/collection.dart';
import 'package:math_expressions/math_expressions.dart';
import 'roll_result.dart';
import 'roll_statistics.dart';

import '../d20.dart';

final RegExp _singleDiceRegExp = RegExp(r'(\d+)?d(\d+)(-[l|h])?');

Expand Down Expand Up @@ -45,20 +46,22 @@ class D20 {
.toList();
final lowestHighest = match[3];

var sum = results.fold(0, (int sum, int roll) => sum + roll);
int finalResult;

if (lowestHighest == '-l') {
sum -= results.fold<int>(faces, min);
finalResult = results.min;
} else if (lowestHighest == '-h') {
sum -= results.fold<int>(0, max);
finalResult = results.max;
} else {
finalResult = results.fold(0, (int sum, int roll) => sum + roll);
}

return RollResult(
rollNotation: notation,
faces: faces,
numberOfRolls: numberOfRolls,
results: results,
finalResult: sum,
finalResult: finalResult,
);
}

Expand Down Expand Up @@ -122,6 +125,6 @@ class D20 {
// ignore: avoid_as
.evaluate(EvaluationType.REAL, _context) as double;

return exactResult.round();
return exactResult.ceil();
}
}