summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/model/StoneHeap.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/jrummikub/model/StoneHeap.java')
-rw-r--r--src/jrummikub/model/StoneHeap.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/jrummikub/model/StoneHeap.java b/src/jrummikub/model/StoneHeap.java
index d921c6b..e74844e 100644
--- a/src/jrummikub/model/StoneHeap.java
+++ b/src/jrummikub/model/StoneHeap.java
@@ -20,16 +20,20 @@ public class StoneHeap {
for (int i = 1; i <= 13; i++) {
for (int j = 0; j < 2; j++) {
for (StoneColor c : EnumSet.allOf(StoneColor.class)) {
- heap.add(new Stone(i, c, false));
+ heap.add(new Stone(i, c));
}
}
}
// Joker
- heap.add(new Stone(0, StoneColor.BLACK, true));
- heap.add(new Stone(0, StoneColor.RED, true));
+ heap.add(new Stone(StoneColor.BLACK));
+ heap.add(new Stone(StoneColor.RED));
}
- /** Removes random {@link Stone} from the heap and returns it */
+ /**
+ * Removes random {@link Stone} from the heap and returns it
+ *
+ * @return the drawn stone
+ */
public Stone drawStone() {
return heap.remove(generator.nextInt(heap.size()));
}
@@ -39,6 +43,7 @@ public class StoneHeap {
*
* @param number
* number of requested Stones
+ * @return list of drawn stones
*/
public List<Stone> drawStones(int number) {
List<Stone> drawnStones = new ArrayList<Stone>();