neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tests für Sets mit mehr Farben, mehr Values, ...

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@332 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-05-31 00:58:46 +02:00
parent d66d73ea8f
commit f22ff5f0f1
12 changed files with 308 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/jrummikub/control/RoundControl.java
View file

@ -78,22 +78,23 @@ public class RoundControl {
}
private void prepareTurn() {
boolean isHuman = roundState.getActivePlayer().getPlayerSettings().getTurnControlType() == HUMAN;
boolean isHuman = roundState.getActivePlayer().getPlayerSettings()
.getTurnControlType() == HUMAN;
clonedTable = (ITable) roundState.getTable().clone();
if (isHuman) {
view.enableStartTurnPanel(true);
} else {
view.enableThinkPanel(true);
}
view.getTablePanel().setStoneSets(clonedTable);
view.setCurrentPlayerName(roundState.getActivePlayer()
.getPlayerSettings().getName());
view.setCurrentPlayerColor(roundState.getActivePlayer()
.getPlayerSettings().getColor());
view.setHasLaidOut(roundState.getActivePlayer().getLaidOut());
if (!isHuman)
startTurn();
}
@ -101,7 +102,8 @@ public class RoundControl {
private void startTurn() {
if (turnControl != null)
return;
boolean isHuman = roundState.getActivePlayer().getPlayerSettings().getTurnControlType() == HUMAN;
boolean isHuman = roundState.getActivePlayer().getPlayerSettings()
.getTurnControlType() == HUMAN;
boolean inspectOnly = roundState.getTurnNumber() < 1;
boolean mayRedeal = inspectOnly
&& roundState.getActivePlayer().getHand()
@ -110,10 +112,11 @@ public class RoundControl {
if (isHuman) {
view.getPlayerPanel().setEndTurnMode(inspectOnly, mayRedeal);
}
turnControl = TurnControlFactory.getFactory(roundState.getActivePlayer()
.getPlayerSettings().getTurnControlType()).create();
turnControl.setup(roundState.getActivePlayer(), clonedTable,
view, inspectOnly, mayRedeal);
turnControl = TurnControlFactory.getFactory(
roundState.getActivePlayer().getPlayerSettings()
.getTurnControlType()).create();
turnControl.setup(roundState.getActivePlayer(), clonedTable, view,
inspectOnly, mayRedeal);
turnControl.getEndOfTurnEvent().add(new IListener() {
@Override
public void handle() {
@ -148,7 +151,8 @@ public class RoundControl {
int totalValue = 0;
for (StoneSet set : newSets) {
totalValue += set.classify().getSecond();
totalValue += set.classify(roundState.getGameSettings())
.getSecond();
}
return totalValue == 0