From 635d3150e3e85c01b777ff165e21fa8965d58440 Mon Sep 17 00:00:00 2001
From: EVE <EVE@EVE-PC>
Date: Tue, 14 Mar 2017 12:08:11 -0400
Subject: Cleanup

---
 dice-lang/src/bjc/dicelang/dice/SimpleDie.java | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'dice-lang/src/bjc/dicelang/dice/SimpleDie.java')

diff --git a/dice-lang/src/bjc/dicelang/dice/SimpleDie.java b/dice-lang/src/bjc/dicelang/dice/SimpleDie.java
index fc1aacd..f8dd945 100644
--- a/dice-lang/src/bjc/dicelang/dice/SimpleDie.java
+++ b/dice-lang/src/bjc/dicelang/dice/SimpleDie.java
@@ -1,8 +1,8 @@
 package bjc.dicelang.dice;
 
 public class SimpleDie implements Die {
-	private Die numDice;
-	private Die diceSize;
+	private Die	numDice;
+	private Die	diceSize;
 
 	public SimpleDie(long nDice, long size) {
 		numDice = new ScalarDie(nDice);
@@ -24,39 +24,44 @@ public class SimpleDie implements Die {
 		diceSize = size;
 	}
 
+	@Override
 	public boolean canOptimize() {
-		if (diceSize.canOptimize() && (diceSize.optimize() <= 1)) {
+		if(diceSize.canOptimize() && diceSize.optimize() <= 1)
 			return numDice.canOptimize();
-		} else
+		else
 			return false;
 	}
 
+	@Override
 	public long optimize() {
 		long optSize = diceSize.optimize();
 
-		if (optSize == 0)
+		if(optSize == 0)
 			return 0;
 		else
 			return numDice.optimize();
 	}
 
+	@Override
 	public long roll() {
 		long total = 0;
 
 		long nDice = numDice.roll();
 		long dSize = diceSize.roll();
 
-		for (int i = 0; i < nDice; i++) {
-			total += (Math.abs(DiceBox.rng.nextLong()) % dSize) + 1;
+		for(int i = 0; i < nDice; i++) {
+			total += Math.abs(DiceBox.rng.nextLong()) % dSize + 1;
 		}
 
 		return total;
 	}
 
+	@Override
 	public long rollSingle() {
-		return (Math.abs(DiceBox.rng.nextLong()) % diceSize.roll()) + 1;
+		return Math.abs(DiceBox.rng.nextLong()) % diceSize.roll() + 1;
 	}
 
+	@Override
 	public String toString() {
 		return numDice + "d" + diceSize;
 	}
-- 
cgit v1.2.3