From f22ff5f0f1d8f9838c30943bde658ca3f282bbc8 Mon Sep 17 00:00:00 2001 From: Ida Massow Date: Tue, 31 May 2011 00:58:46 +0200 Subject: =?UTF-8?q?Tests=20f=C3=BCr=20Sets=20mit=20mehr=20Farben,=20mehr?= =?UTF-8?q?=20Values,=20...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@332 72836036-5685-4462-b002-a69064685172 --- src/jrummikub/model/RoundState.java | 2 +- src/jrummikub/model/StoneColor.java | 10 +++++++++- src/jrummikub/model/StoneHeap.java | 23 +++++++++++++---------- src/jrummikub/model/StoneSet.java | 6 +++--- src/jrummikub/model/Table.java | 21 +++++++++++++-------- 5 files changed, 39 insertions(+), 23 deletions(-) (limited to 'src/jrummikub/model') diff --git a/src/jrummikub/model/RoundState.java b/src/jrummikub/model/RoundState.java index 9f1f7be..01d67d3 100644 --- a/src/jrummikub/model/RoundState.java +++ b/src/jrummikub/model/RoundState.java @@ -23,7 +23,7 @@ public class RoundState implements IRoundState { public RoundState(GameSettings gameSettings) { this.gameSettings = gameSettings; - table = new Table(); + table = new Table(gameSettings); players = new ArrayList(); for (PlayerSettings playerSettings : gameSettings.getPlayerList()) { diff --git a/src/jrummikub/model/StoneColor.java b/src/jrummikub/model/StoneColor.java index 6b1807b..47c5227 100644 --- a/src/jrummikub/model/StoneColor.java +++ b/src/jrummikub/model/StoneColor.java @@ -9,5 +9,13 @@ public enum StoneColor { /** */ BLUE, /** */ - RED + RED, + /** */ + GREEN, + /** */ + VIOLET, + /** */ + BROWN, + /** */ + WHITE } diff --git a/src/jrummikub/model/StoneHeap.java b/src/jrummikub/model/StoneHeap.java index 8199672..27c8d01 100644 --- a/src/jrummikub/model/StoneHeap.java +++ b/src/jrummikub/model/StoneHeap.java @@ -3,7 +3,6 @@ package jrummikub.model; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.EnumSet; import java.util.List; import java.util.Random; @@ -24,21 +23,25 @@ public class StoneHeap { * */ public StoneHeap(GameSettings gameSettings) { heap = new ArrayList(); - for (int i = 1; i <= 13; i++) { + for (int i = 1; i <= gameSettings.getHighestCard(); i++) { for (int j = 0; j < gameSettings.getStoneSetNumber(); j++) { - for (StoneColor c : EnumSet.allOf(StoneColor.class)) { + for (StoneColor c : gameSettings.getStoneColors()) { heap.add(new Stone(i, c)); } } } // Joker - - ArrayList jokerColors = new ArrayList(Arrays.asList(StoneColor.values())); - - StoneColor temp = jokerColors.get(1); - jokerColors.set(1, jokerColors.get(3)); - jokerColors.set(3, temp); - + + ArrayList jokerColors = new ArrayList( + Arrays.asList(StoneColor.values())); + jokerColors.retainAll(gameSettings.getStoneColors()); + + if (jokerColors.size() >= 4) { + StoneColor temp = jokerColors.get(1); + jokerColors.set(1, jokerColors.get(3)); + jokerColors.set(3, temp); + } + int jokersLeft = gameSettings.getJokerNumber(); done: while (true) { for (StoneColor c : jokerColors) { diff --git a/src/jrummikub/model/StoneSet.java b/src/jrummikub/model/StoneSet.java index 2700889..3d6e49e 100644 --- a/src/jrummikub/model/StoneSet.java +++ b/src/jrummikub/model/StoneSet.java @@ -51,8 +51,8 @@ public class StoneSet implements Iterable, Sizeable { * * @return true when the set is valid according to the rules */ - public boolean isValid() { - return classify().getFirst() != INVALID; + public boolean isValid(GameSettings settings) { + return classify(settings).getFirst() != INVALID; } /** @@ -62,7 +62,7 @@ public class StoneSet implements Iterable, Sizeable { * @return GROUP or RUN for valid sets, INVALID otherwise */ - public Pair classify() { + public Pair classify(GameSettings settings) { if (stones.size() < 3) { return new Pair(INVALID, 0); } 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 implements ITable { + private GameSettings gameSettings; private static class StoneInfo { StoneSet set; @@ -18,11 +19,15 @@ public class Table extends StoneTray 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 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 firstSplit = set.splitAt(stonePosition); - Pair secondSplit = firstSplit.getSecond().splitAt(1); + Pair 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 implements ITable { @Override public boolean isValid() { for (Pair i : this) { - if (!i.getFirst().isValid()) { + if (!i.getFirst().isValid(gameSettings)) { return false; } } -- cgit v1.2.3