From 635d3150e3e85c01b777ff165e21fa8965d58440 Mon Sep 17 00:00:00 2001 From: EVE Date: Tue, 14 Mar 2017 12:08:11 -0400 Subject: Cleanup --- dice-lang/src/bjc/dicelang/dice/ExplodingDice.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'dice-lang/src/bjc/dicelang/dice/ExplodingDice.java') diff --git a/dice-lang/src/bjc/dicelang/dice/ExplodingDice.java b/dice-lang/src/bjc/dicelang/dice/ExplodingDice.java index eeafbd1..928ae25 100644 --- a/dice-lang/src/bjc/dicelang/dice/ExplodingDice.java +++ b/dice-lang/src/bjc/dicelang/dice/ExplodingDice.java @@ -21,9 +21,9 @@ public class ExplodingDice implements DieList { /* * The conditions for exploding. */ - private Predicate explodeOn; - private String explodePattern; - private boolean explodePenetrates; + private Predicate explodeOn; + private String explodePattern; + private boolean explodePenetrates; /** * Create a new exploding die. @@ -89,11 +89,12 @@ public class ExplodingDice implements DieList { List resList = new LinkedList<>(); - while (explodeOn.test(oldRes)) { + while(explodeOn.test(oldRes)) { oldRes = source.rollSingle(); - if (explodePenetrates) + if(explodePenetrates) { oldRes -= 1; + } resList.add(oldRes); } @@ -101,7 +102,7 @@ public class ExplodingDice implements DieList { newRes[0] = res; int i = 1; - for (long rll : resList) { + for(long rll : resList) { newRes[i] = rll; i += 1; } @@ -111,10 +112,9 @@ public class ExplodingDice implements DieList { @Override public String toString() { - if (explodePattern == null) { + if(explodePattern == null) return source + (explodePenetrates ? "p" : "") + "!"; - } else { + else return source + (explodePenetrates ? "p" : "") + "!" + explodePattern; - } } } -- cgit v1.2.3