bartek/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add helper roll() static method to DiceRoller

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2022-08-30 21:38:22 +02:00
parent 0338fa1c07
commit ecb2c09636
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
api/src/main/java/com/bartlomiejpluta/base/util/random/DiceRoller.java
View File

@@ -29,23 +29,6 @@ public class DiceRoller {
return Math.max(0, sum);
}
public static DiceRoller of(String code) {
var intMatcher = INT_PATTERN.matcher(code);
if(intMatcher.matches()) {
return new DiceRoller(0, 0, Integer.parseInt(code));
}
var codeMatcher = CODE_PATTERN.matcher(code);
if(codeMatcher.matches()) {
var rolls = Integer.parseInt(codeMatcher.group(1));
var dice = Integer.parseInt(codeMatcher.group(2));
var modifier = Integer.parseInt(Optional.ofNullable(codeMatcher.group(3)).orElse("0"));
return new DiceRoller(rolls, dice, modifier);
}
throw new IllegalArgumentException("Argument is supposed to be in RPG dice code format (e.g. 2d4+2) or simple integer");
}
public int min() {
return Math.max(0, modifier + rolls);
}
@@ -75,4 +58,25 @@ public class DiceRoller {
public String toString() {
return format("%s (min=%d, max=%d)", code(), min(), max());
}
public static DiceRoller of(String code) {
var intMatcher = INT_PATTERN.matcher(code);
if(intMatcher.matches()) {
return new DiceRoller(0, 0, Integer.parseInt(code));
}
var codeMatcher = CODE_PATTERN.matcher(code);
if(codeMatcher.matches()) {
var rolls = Integer.parseInt(codeMatcher.group(1));
var dice = Integer.parseInt(codeMatcher.group(2));
var modifier = Integer.parseInt(Optional.ofNullable(codeMatcher.group(3)).orElse("0"));
return new DiceRoller(rolls, dice, modifier);
}
throw new IllegalArgumentException("Argument is supposed to be in RPG dice code format (e.g. 2d4+2) or simple integer");
}
public static int roll(String code) {
return of(code).roll();
}
}