From 40858cee415643769ee5f6216b0cd4335996ff2f Mon Sep 17 00:00:00 2001 From: bjculkin Date: Tue, 11 Apr 2017 17:51:13 -0400 Subject: General cleanup and fixes --- dice-lang/src/bjc/dicelang/dice/SimpleDieList.java | 115 ++++++++++++--------- 1 file changed, 65 insertions(+), 50 deletions(-) (limited to 'dice-lang/src/bjc/dicelang/dice/SimpleDieList.java') diff --git a/dice-lang/src/bjc/dicelang/dice/SimpleDieList.java b/dice-lang/src/bjc/dicelang/dice/SimpleDieList.java index 54f8e7a..d5d8364 100644 --- a/dice-lang/src/bjc/dicelang/dice/SimpleDieList.java +++ b/dice-lang/src/bjc/dicelang/dice/SimpleDieList.java @@ -1,51 +1,66 @@ -package bjc.dicelang.dice; - -public class SimpleDieList implements DieList { - private Die numDice; - private Die size; - - public SimpleDieList(Die nDice, Die sze) { - numDice = nDice; - size = sze; - } - - @Override - public boolean canOptimize() { - if(size.canOptimize() && size.optimize() <= 1) - return numDice.canOptimize(); - else - return false; - } - - @Override - public long[] optimize() { - int sze = (int) numDice.optimize(); - long res = size.optimize(); - - long[] ret = new long[sze]; - - for(int i = 0; i < sze; i++) { - ret[i] = res; - } - - return ret; - } - - @Override - public long[] roll() { - int num = (int) numDice.roll(); - - long[] ret = new long[num]; - - for(int i = 0; i < num; i++) { - ret[i] = size.roll(); - } - - return ret; - } - - @Override - public String toString() { - return numDice.toString() + "dl" + size.toString(); - } +package bjc.dicelang.dice; + +/** + * A simple list of dice. + * + * @author EVE + * + */ +public class SimpleDieList implements DieList { + private Die numDice; + private Die size; + + /** + * Create a new list of dice. + * + * @param nDice + * The number of dice in the list. + * + * @param sze + * The size of dice in the list. + */ + public SimpleDieList(Die nDice, Die sze) { + numDice = nDice; + size = sze; + } + + @Override + public boolean canOptimize() { + if(size.canOptimize() && size.optimize() <= 1) + return numDice.canOptimize(); + else + return false; + } + + @Override + public long[] optimize() { + int sze = (int) numDice.optimize(); + long res = size.optimize(); + + long[] ret = new long[sze]; + + for(int i = 0; i < sze; i++) { + ret[i] = res; + } + + return ret; + } + + @Override + public long[] roll() { + int num = (int) numDice.roll(); + + long[] ret = new long[num]; + + for(int i = 0; i < num; i++) { + ret[i] = size.roll(); + } + + return ret; + } + + @Override + public String toString() { + return numDice.toString() + "dl" + size.toString(); + } } \ No newline at end of file -- cgit v1.2.3