General changes to the dice package

The biggest change is the addition of variables and assignment

1 files changed, 103 insertions, 0 deletions

diff --git a/BJC-Utils2/src/main/java/bjc/utils/dice/ComplexDice.java b/BJC-Utils2/src/main/java/bjc/utils/dice/ComplexDice.java
new file mode 100644
index 0000000..98a510a
--- /dev/null
+++ b/BJC-Utils2/src/main/java/bjc/utils/dice/ComplexDice.java
@@ -0,0 +1,103 @@
+package bjc.utils.dice;
+
+/**
+ * Implements a collection of one or more of a particular die, where the
+ * number of dice in the group is variable.
+ * 
+ * @author ben
+ *
+ */
+public class ComplexDice implements IDiceExpression {
+	/**
+	 * The die being rolled
+	 */
+	private IDiceExpression	die;
+
+	/**
+	 * The number of the specified die to roll
+	 */
+	private IDiceExpression	nDice;
+
+	/**
+	 * Create a new collection of dice
+	 * 
+	 * @param nDce
+	 *            The number of dice in the collection
+	 * @param de
+	 *            The type of dice the collection is composed of
+	 */
+	public ComplexDice(IDiceExpression nDce, IDiceExpression de) {
+		nDice = nDce;
+		die = de;
+	}
+
+	/**
+	 * Create a new collection of dice
+	 * 
+	 * @param nDce
+	 *            The number of dice in the collection
+	 * @param de
+	 *            The type of dice the collection is composed of
+	 */
+	public ComplexDice(int nSides, int de) {
+		nDice = new ScalarDie(nSides);
+		die = new Die(de);
+	}
+
+	@Override
+	public int roll() {
+		int res = 0;
+
+		/*
+		 * Add the results of rolling each die
+		 */
+		int nRoll = nDice.roll();
+
+		for (int i = 0; i < nRoll; i++) {
+			res += die.roll();
+		}
+
+		return res;
+	}
+
+	/**
+	 * Create a dice from a string expression
+	 * 
+	 * @param dice
+	 *            The string to parse the dice from
+	 * @return A dice group parsed from the string
+	 */
+	public static ComplexDice fromString(String dice) {
+		/*
+		 * Split it on the dice type marker
+		 */
+		String[] strangs = dice.split("d");
+
+		try {
+			/*
+			 * Create the actual dice
+			 */
+			return new ComplexDice(
+					new ScalarDie(Integer.parseInt(strangs[0])),
+					new Die(Integer.parseInt(strangs[1])));
+		} catch (NumberFormatException nfex) {
+			/*
+			 * Tell the user the expression is invalid
+			 */
+			throw new IllegalArgumentException(
+					"Attempted to create a dice using something that's not"
+							+ " an integer: " + strangs[0] + " and "
+							+ strangs[1] + " are likely culprits.");
+		}
+	}
+
+	@Override
+	public String toString() {
+		if (nDice instanceof ScalarDie && die instanceof Die) {
+			return nDice.toString() + die.toString();
+		} else {
+			return "complex[n=" + nDice.toString() + ", d="
+					+ die.toString() + "]";
+		}
+	}
+}