summaryrefslogtreecommitdiff
path: root/dice-lang/src/bjc/dicelang/ComplexDice.java
diff options
context:
space:
mode:
authorbculkin2442 <bjculkin@mix.wvu.edu>2017-02-05 07:02:45 -0500
committerbculkin2442 <bjculkin@mix.wvu.edu>2017-02-05 07:02:45 -0500
commit186b9131d46d886c98316e5b582e0cdd734a5024 (patch)
tree5a81a9163817f1b4cd9948a57dc9569d975bc38f /dice-lang/src/bjc/dicelang/ComplexDice.java
parente7a7cf10e2e9e05a6b12fd7c4d8d0ff2146901d9 (diff)
Cleanup
Diffstat (limited to 'dice-lang/src/bjc/dicelang/ComplexDice.java')
-rw-r--r--dice-lang/src/bjc/dicelang/ComplexDice.java17
1 files changed, 4 insertions, 13 deletions
diff --git a/dice-lang/src/bjc/dicelang/ComplexDice.java b/dice-lang/src/bjc/dicelang/ComplexDice.java
index 9bf191f..a21900a 100644
--- a/dice-lang/src/bjc/dicelang/ComplexDice.java
+++ b/dice-lang/src/bjc/dicelang/ComplexDice.java
@@ -21,6 +21,7 @@ public class ComplexDice implements IDiceExpression {
if (!expression.contains("d")) {
return new Die(Integer.parseInt(expression));
}
+
// Split it on the dice type marker
String[] strangs = expression.split("d");
@@ -42,12 +43,12 @@ public class ComplexDice implements IDiceExpression {
}
}
- /**
+ /*
* The die being rolled
*/
private IDiceExpression die;
- /**
+ /*
* The number of the particular die to roll
*/
private IDiceExpression nDice;
@@ -101,11 +102,6 @@ public class ComplexDice implements IDiceExpression {
return nDice.optimize();
}
- /*
- * (non-Javadoc)
- *
- * @see bjc.utils.dice.IDiceExpression#roll()
- */
@Override
public int roll() {
int res = 0;
@@ -129,11 +125,6 @@ public class ComplexDice implements IDiceExpression {
return res;
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
@Override
public String toString() {
// Print simple dice groups in a much clearer manner
@@ -144,4 +135,4 @@ public class ComplexDice implements IDiceExpression {
return "complex[n=" + nDice.toString() + ", d=" + die.toString()
+ "]";
}
-} \ No newline at end of file
+}