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

Add winning notification and fix test...

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@161 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-05-06 01:35:09 +02:00
parent 55b19cef1d
commit 193e9247fa
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,7 +81,12 @@ public class RoundControl {
if (clonedTable.isValid()) { if (clonedTable.isValid()) {
gameState.setTable(clonedTable); gameState.setTable(clonedTable);
// TODO Win check System.err.println(gameState.getActivePlayer().getName());
System.err.println(gameState.getActivePlayer().getHand().getSize());
if (gameState.getActivePlayer().getHand().getSize() == 0) {
win();
return;
}
} else { } else {
gameState.getGameHeap().putBack(tableDiff); gameState.getGameHeap().putBack(tableDiff);
dealPenalty(tableDiff.size()); dealPenalty(tableDiff.size());
@ -127,4 +132,8 @@ public class RoundControl {
for (int i = 0; i < count + 3; ++i) for (int i = 0; i < count + 3; ++i)
dealStone(); dealStone();
} }
private void win() {
view.enableWinPanel(true);
}
} }

3
test/jrummikub/control/RoundControlTest.java
View file

@ -61,6 +61,7 @@ public class RoundControlTest {
assertNotNull(view.getTablePanel().rightPlayerName); assertNotNull(view.getTablePanel().rightPlayerName);
assertTrue(view.displayStartTurnPanel); assertTrue(view.displayStartTurnPanel);
assertFalse(view.startTurnEvent.listeners.isEmpty()); assertFalse(view.startTurnEvent.listeners.isEmpty());
assertFalse(view.displayWinPanel);
checkTableDisplay(); checkTableDisplay();
} }
@ -194,6 +195,8 @@ public class RoundControlTest {
view.startTurnEvent.emit(); view.startTurnEvent.emit();
assertFalse(view.displayStartTurnPanel); assertFalse(view.displayStartTurnPanel);
Stone stone = testGameState.players.get(0).hand.stones.remove(0);
newTable.drop(new StoneSet(stone), new Position(0, 0));
testGameState.players.get(0).hand.stones.clear(); testGameState.players.get(0).hand.stones.clear();
resetTurnStart(); resetTurnStart();
view.getPlayerPanel().endTurnEvent.emit(); view.getPlayerPanel().endTurnEvent.emit();