diff options
| author | EVE <EVE@EVE-PC> | 2017-03-13 16:41:45 -0400 |
|---|---|---|
| committer | EVE <EVE@EVE-PC> | 2017-03-13 16:41:45 -0400 |
| commit | 01136c6796e21f023713e026674576d8e623462d (patch) | |
| tree | e77886fe0e0adaf3c0430fba9ce248ef83f74fe4 /dice-lang/src/bjc/dicelang/dice/SimpleDie.java | |
| parent | 870d769cfc152171d27b2331a7c590d0b307ad48 (diff) | |
Formatting
Diffstat (limited to 'dice-lang/src/bjc/dicelang/dice/SimpleDie.java')
| -rw-r--r-- | dice-lang/src/bjc/dicelang/dice/SimpleDie.java | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/dice-lang/src/bjc/dicelang/dice/SimpleDie.java b/dice-lang/src/bjc/dicelang/dice/SimpleDie.java index 5ba76ef..fc1aacd 100644 --- a/dice-lang/src/bjc/dicelang/dice/SimpleDie.java +++ b/dice-lang/src/bjc/dicelang/dice/SimpleDie.java @@ -5,36 +5,39 @@ public class SimpleDie implements Die { private Die diceSize;
public SimpleDie(long nDice, long size) {
- numDice = new ScalarDie(nDice);
+ numDice = new ScalarDie(nDice);
diceSize = new ScalarDie(size);
}
public SimpleDie(Die nDice, long size) {
- numDice = nDice;
+ numDice = nDice;
diceSize = new ScalarDie(size);
}
public SimpleDie(long nDice, Die size) {
- numDice = new ScalarDie(nDice);
+ numDice = new ScalarDie(nDice);
diceSize = size;
}
public SimpleDie(Die nDice, Die size) {
- numDice = nDice;
+ numDice = nDice;
diceSize = size;
}
public boolean canOptimize() {
- if(diceSize.canOptimize() && (diceSize.optimize() <= 1)) {
+ if (diceSize.canOptimize() && (diceSize.optimize() <= 1)) {
return numDice.canOptimize();
- } else return false;
+ } else
+ return false;
}
public long optimize() {
long optSize = diceSize.optimize();
- if(optSize == 0) return 0;
- else return numDice.optimize();
+ if (optSize == 0)
+ return 0;
+ else
+ return numDice.optimize();
}
public long roll() {
@@ -43,7 +46,7 @@ public class SimpleDie implements Die { long nDice = numDice.roll();
long dSize = diceSize.roll();
- for(int i = 0; i < nDice; i++) {
+ for (int i = 0; i < nDice; i++) {
total += (Math.abs(DiceBox.rng.nextLong()) % dSize) + 1;
}
|
