Finish die rewrite

This adds all of the remaining missing die modifiers, as well as a few
base die types that were missing.

1 files changed, 34 insertions, 5 deletions

diff --git a/dice/src/main/java/bjc/dicelang/dicev2/Dies.java b/dice/src/main/java/bjc/dicelang/dicev2/Dies.java
index 98ffbaa..1d29b55 100644
--- a/dice/src/main/java/bjc/dicelang/dicev2/Dies.java
+++ b/dice/src/main/java/bjc/dicelang/dicev2/Dies.java
@@ -1,16 +1,13 @@
 package bjc.dicelang.dicev2;
 
 import java.util.Random;
+import java.util.function.IntSupplier;
 
 public class Dies {
-	public static Die scalar(int val) {
+	public static Die scalar(long val) {
 		return new ScalarDie(val);
 	}
 
-	public static Die scalar(Random rnd, int val) {
-		return new ScalarDie(rnd, val);
-	}
-
 	public static Die polyhedral(int dice, int sides) {
 		return new PolyhedralDie(dice, sides);
 	}
@@ -26,4 +23,36 @@ public class Dies {
 	public static Die fudge(Random rnd, int dice) {
 		return new FudgeDie(rnd, dice);
 	}
+
+	public static Die composite(Die numDice, Die numSides) {
+		return new CompositeDie(numDice, numSides);
+	}
+
+	public static Die composite(Die numDice, Die numSides, boolean rerollSides) {
+		return new CompositeDie(numDice, numSides, rerollSides);
+	}
+
+	public static Die composite(Random rnd, Die numDice, Die numSides) {
+		return new CompositeDie(rnd, numDice, numSides);
+	}
+
+	public static Die composite(Random rnd, Die numDice, Die numSides, boolean rerollSides) {
+		return new CompositeDie(rnd, numDice, numSides, rerollSides);
+	}
+
+	public static Die computed(IntSupplier numDice, IntSupplier numSides) {
+		return new ComputedDie(numDice, numSides);
+	}
+
+	public static Die computed(IntSupplier numDice, IntSupplier numSides, boolean rerollSides) {
+		return new ComputedDie(numDice, numSides, rerollSides);
+	}
+
+	public static Die computed(Random rnd, IntSupplier numDice, IntSupplier numSides) {
+		return new ComputedDie(rnd, numDice, numSides);
+	}
+
+	public static Die computed(Random rnd, IntSupplier numDice, IntSupplier numSides, boolean rerollSides) {
+		return new ComputedDie(rnd, numDice, numSides, rerollSides);
+	}
 }