diff options
author | Ida Massow <massow@informatik.uni-luebeck.de> | 2011-05-31 00:58:46 +0200 |
---|---|---|
committer | Ida Massow <massow@informatik.uni-luebeck.de> | 2011-05-31 00:58:46 +0200 |
commit | f22ff5f0f1d8f9838c30943bde658ca3f282bbc8 (patch) | |
tree | 4e3a34af00086ca862345c4677e69aaed04f3e49 /src/jrummikub/model/Table.java | |
parent | d66d73ea8f9d660d14e3ef80e716ac1628704fe4 (diff) | |
download | JRummikub-f22ff5f0f1d8f9838c30943bde658ca3f282bbc8.tar JRummikub-f22ff5f0f1d8f9838c30943bde658ca3f282bbc8.zip |
Tests für Sets mit mehr Farben, mehr Values, ...
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@332 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/model/Table.java')
-rw-r--r-- | src/jrummikub/model/Table.java | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/jrummikub/model/Table.java b/src/jrummikub/model/Table.java index a3e25eb..87c360c 100644 --- a/src/jrummikub/model/Table.java +++ b/src/jrummikub/model/Table.java @@ -5,6 +5,7 @@ import jrummikub.util.Pair; /** Class administering the {@link Stone}s on the game-Table */ public class Table extends StoneTray<StoneSet> implements ITable { + private GameSettings gameSettings; private static class StoneInfo { StoneSet set; @@ -18,11 +19,15 @@ public class Table extends StoneTray<StoneSet> implements ITable { } } + public Table(GameSettings settings) { + gameSettings = settings; + } + /** * Removes {@link Stone} from the Table * * @param stone - * stone to pick up + * stone to pick up */ @Override public void pickUpStone(Stone stone) { @@ -69,21 +74,21 @@ public class Table extends StoneTray<StoneSet> implements ITable { return info.set; } - private void splitSet(StoneSet set, Position setPosition, - int stonePosition) { + private void splitSet(StoneSet set, Position setPosition, int stonePosition) { pickUp(set); Pair<StoneSet, StoneSet> firstSplit = set.splitAt(stonePosition); - Pair<StoneSet, StoneSet> secondSplit = firstSplit.getSecond().splitAt(1); + Pair<StoneSet, StoneSet> secondSplit = firstSplit.getSecond() + .splitAt(1); StoneSet leftSet = firstSplit.getFirst(); StoneSet rightSet = secondSplit.getSecond(); - if (set.classify().getFirst() == StoneSet.Type.RUN) { + if (set.classify(gameSettings).getFirst() == StoneSet.Type.RUN) { Position leftPosition, rightPosition; leftPosition = setPosition; - rightPosition = new Position(setPosition.getX() + stonePosition + 1, - setPosition.getY()); + rightPosition = new Position( + setPosition.getX() + stonePosition + 1, setPosition.getY()); drop(leftSet, leftPosition); drop(rightSet, rightPosition); @@ -105,7 +110,7 @@ public class Table extends StoneTray<StoneSet> implements ITable { @Override public boolean isValid() { for (Pair<StoneSet, Position> i : this) { - if (!i.getFirst().isValid()) { + if (!i.getFirst().isValid(gameSettings)) { return false; } } |