summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/jrummikub/control/RoundControl.java (renamed from src/jrummikub/control/GameControl.java)12
-rw-r--r--src/jrummikub/model/GameState.java19
-rw-r--r--src/jrummikub/model/IStoneTray.java2
-rw-r--r--src/jrummikub/model/StoneHeap.java4
-rw-r--r--src/jrummikub/model/StoneTray.java38
5 files changed, 54 insertions, 21 deletions
diff --git a/src/jrummikub/control/GameControl.java b/src/jrummikub/control/RoundControl.java
index 3b9d4bb..ae834b9 100644
--- a/src/jrummikub/control/GameControl.java
+++ b/src/jrummikub/control/RoundControl.java
@@ -3,15 +3,23 @@ package jrummikub.control;
import jrummikub.model.GameState;
import jrummikub.view.IView;
-public class GameControl {
+public class RoundControl {
private GameState gameState;
private IView view;
- public GameControl(GameState gameState, IView view) {
+ public RoundControl(GameState gameState, IView view) {
this.gameState = gameState;
this.view = view;
}
+ public void startRound() {
+
+ }
+
+ void deal() {
+
+ }
+
private void endOfTurn() {
}
diff --git a/src/jrummikub/model/GameState.java b/src/jrummikub/model/GameState.java
index 23e51b4..84e206f 100644
--- a/src/jrummikub/model/GameState.java
+++ b/src/jrummikub/model/GameState.java
@@ -6,9 +6,9 @@ import java.util.List;
/** Class managing the overall and momentary GameState */
public class GameState {
- ITable table;
- List<Player> players;
- int activePlayer;
+ private ITable table;
+ private List<Player> players;
+ private int activePlayer;
private StoneHeap gameHeap;
public GameState() {
@@ -19,18 +19,27 @@ public class GameState {
players.add(new Player(Color.green));
players.add(new Player(Color.black));
activePlayer = 0;
+
}
public ITable getTable() {
return table;
}
+ public int getPlayerCount() {
+ return players.size();
+ }
+
+ public Player getPlayer(int i) {
+ return players.get(i);
+ }
+
/** Changes the activePlayer to the next {@link Player} in the list */
public void nextPlayer() {
- activePlayer = (activePlayer + 1) % 4;
+ activePlayer = (activePlayer + 1) % players.size();
}
- public Player activePlayer() {
+ public Player getActivePlayer() {
return players.get(activePlayer);
}
diff --git a/src/jrummikub/model/IStoneTray.java b/src/jrummikub/model/IStoneTray.java
index a9afed3..b40066a 100644
--- a/src/jrummikub/model/IStoneTray.java
+++ b/src/jrummikub/model/IStoneTray.java
@@ -37,4 +37,6 @@ public interface IStoneTray<E extends Sizeable> extends
public IStoneTray<E> clone();
+ public int getSize();
+
} \ No newline at end of file
diff --git a/src/jrummikub/model/StoneHeap.java b/src/jrummikub/model/StoneHeap.java
index e74844e..42cb01e 100644
--- a/src/jrummikub/model/StoneHeap.java
+++ b/src/jrummikub/model/StoneHeap.java
@@ -52,4 +52,8 @@ public class StoneHeap {
}
return drawnStones;
}
+
+ public int getSize() {
+ return heap.size();
+ }
}
diff --git a/src/jrummikub/model/StoneTray.java b/src/jrummikub/model/StoneTray.java
index 080786b..d88d60c 100644
--- a/src/jrummikub/model/StoneTray.java
+++ b/src/jrummikub/model/StoneTray.java
@@ -11,7 +11,7 @@ import jrummikub.util.Pair;
* or {@link StoneSet}s.
*
* @param <E>
- * Type of positioned objects (must implement Sizeable)
+ * Type of positioned objects (must implement Sizeable)
*/
public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
protected HashMap<E, Position> objects = new HashMap<E, Position>();
@@ -39,10 +39,12 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
if (position.getY() < currentPosition.getY()) {
continue;
}
- if (position.getX() > currentPosition.getX() + currentObject.getWidth()) {
+ if (position.getX() > currentPosition.getX()
+ + currentObject.getWidth()) {
continue;
}
- if (position.getY() > currentPosition.getY() + currentObject.getHeight()) {
+ if (position.getY() > currentPosition.getY()
+ + currentObject.getHeight()) {
continue;
}
// Position is inside the current object
@@ -70,7 +72,8 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
.entrySet()) {
Position currentPosition = i.getValue();
E currentObject = i.getKey();
- if (!objectsOverlap(object, position, currentObject, currentPosition)) {
+ if (!objectsOverlap(object, position, currentObject,
+ currentPosition)) {
continue;
}
// Object would be placed inside the current object
@@ -81,16 +84,16 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
// Move object to avoid overlap
switch (direction) {
case TOP:
- newPosition = new Position(currentPosition.getX(), position.getY()
- - currentObject.getHeight());
+ newPosition = new Position(currentPosition.getX(),
+ position.getY() - currentObject.getHeight());
break;
case BOTTOM:
- newPosition = new Position(currentPosition.getX(), position.getY()
- + object.getHeight());
+ newPosition = new Position(currentPosition.getX(),
+ position.getY() + object.getHeight());
break;
case LEFT:
- newPosition = new Position(position.getX() - currentObject.getWidth(),
- currentPosition.getY());
+ newPosition = new Position(position.getX()
+ - currentObject.getWidth(), currentPosition.getY());
break;
case RIGHT:
newPosition = new Position(position.getX() + object.getWidth(),
@@ -153,13 +156,15 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
float blockingRight = blocking.getValue().getX()
+ blocking.getKey().getWidth();
float overlapRight = Math.min(objectRight, blockingRight);
- float overlapLeft = Math.max(position.getX(), blocking.getValue().getX());
+ float overlapLeft = Math.max(position.getX(), blocking.getValue()
+ .getX());
float overlapX = overlapRight - overlapLeft;
float objectBottom = position.getY() + object.getHeight();
float blockingBottom = blocking.getValue().getY()
+ blocking.getKey().getHeight();
float overlapBottom = Math.min(objectBottom, blockingBottom);
- float overlapTop = Math.max(position.getY(), blocking.getValue().getY());
+ float overlapTop = Math
+ .max(position.getY(), blocking.getValue().getY());
float overlapY = overlapBottom - overlapTop;
// vertical or horizontal Shift
// TODO magic factor
@@ -178,8 +183,8 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
@Override
public Iterator<Pair<E, Position>> iterator() {
- final Iterator<Map.Entry<E, Position>> entryIterator = objects.entrySet()
- .iterator();
+ final Iterator<Map.Entry<E, Position>> entryIterator = objects
+ .entrySet().iterator();
return new Iterator<Pair<E, Position>>() {
Iterator<Map.Entry<E, Position>> iterator = entryIterator;
@@ -225,4 +230,9 @@ public class StoneTray<E extends Sizeable> implements IStoneTray<E> {
return copy;
}
+ @Override
+ public int getSize() {
+ return objects.size();
+ }
+
}