From 1bff7e49ed64d74e36d901e84c594cf63b58350b Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Fri, 18 Mar 2016 19:47:49 -0400 Subject: General changes to the dice package The biggest change is the addition of variables and assignment --- .../main/java/bjc/utils/dice/CompoundDiceExpression.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'BJC-Utils2/src/main/java/bjc/utils/dice/CompoundDiceExpression.java') diff --git a/BJC-Utils2/src/main/java/bjc/utils/dice/CompoundDiceExpression.java b/BJC-Utils2/src/main/java/bjc/utils/dice/CompoundDiceExpression.java index 4dd6926..12238c8 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/dice/CompoundDiceExpression.java +++ b/BJC-Utils2/src/main/java/bjc/utils/dice/CompoundDiceExpression.java @@ -53,15 +53,21 @@ public class CompoundDiceExpression implements IDiceExpression { return right.roll() * left.roll(); case DIVIDE: /* - * Round to keep results as integers. - * We don't really have any need for floating-point dice + * Round to keep results as integers. We don't really have + * any need for floating-point dice */ return Math.round(right.roll() / left.roll()); default: - throw new IllegalStateException( - "Got passed a invalid ScalarExpressionType " - + det + ". WAT"); + throw new IllegalArgumentException( + "Got passed a invalid ScalarExpressionType " + det + + ". WAT"); } } + + @Override + public String toString() { + return "dice-exp[type=" + det + ", l=" + left.toString() + ", r=" + + right.toString() + "]"; + } } -- cgit v1.2.3