From c74cb8eaf454d9243b75e3770001d8d128356b28 Mon Sep 17 00:00:00 2001 From: "Benjamin J. Culkin" Date: Sun, 23 Jul 2017 22:58:58 -0300 Subject: Format --- dice-lang/src/bjc/dicelang/dice/ExplodingDice.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 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 15d6572..7036f32 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 final Predicate explodeOn; - private final String explodePattern; - private final boolean explodePenetrates; + private final Predicate explodeOn; + private final String explodePattern; + private final boolean explodePenetrates; /** * Create a new exploding die. @@ -48,7 +48,8 @@ public class ExplodingDice implements DieList { * Whether or not for explosions to penetrate (-1 to * exploded die). */ - public ExplodingDice(final Die src, final Predicate explode, final boolean penetrate) { + public ExplodingDice(final Die src, final Predicate explode, + final boolean penetrate) { this(src, explode, null, penetrate); } @@ -65,7 +66,8 @@ public class ExplodingDice implements DieList { * @param patt * The string the condition came from, for printing. */ - public ExplodingDice(final Die src, final Predicate explode, final String patt, final boolean penetrate) { + public ExplodingDice(final Die src, final Predicate explode, final String patt, + final boolean penetrate) { source = src; explodeOn = explode; explodePattern = patt; @@ -95,6 +97,7 @@ public class ExplodingDice implements DieList { if (explodePenetrates) { oldRes -= 1; } + resList.add(oldRes); } @@ -102,6 +105,7 @@ public class ExplodingDice implements DieList { newRes[0] = res; int i = 1; + for (final long rll : resList) { newRes[i] = rll; i += 1; -- cgit v1.2.3