Update of /cvsroot/rails/18xx/rails/game
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv15090/rails/game
Modified Files:
Round.java StockRound.java PublicCompany.java
Log Message:
18EU bankruptcy rules (Phase 4) - making a restarted company actually operate (!)
Index: PublicCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompany.java,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** PublicCompany.java 24 May 2010 11:42:35 -0000 1.98
--- PublicCompany.java 25 May 2010 20:27:17 -0000 1.99
***************
*** 871,875 ****
hasStarted.set(true);
if (hasStockPrice) buyable.set(true);
!
if (startSpace != null) {
setParSpace(startSpace);
--- 871,878 ----
hasStarted.set(true);
if (hasStockPrice) buyable.set(true);
!
! // In case of a restart: undo closing
! if (closedObject.booleanValue()) closedObject.set(false);
!
if (startSpace != null) {
setParSpace(startSpace);
***************
*** 878,882 ****
}
! if (homeBaseTokensLayTime == WHEN_STARTED) {
layHomeBaseTokens();
}
--- 881,886 ----
}
!
! if (homeBaseTokensLayTime == WHEN_STARTED) {
layHomeBaseTokens();
}
Index: Round.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Round.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** Round.java 15 May 2010 16:36:09 -0000 1.41
--- Round.java 25 May 2010 20:27:17 -0000 1.42
***************
*** 114,117 ****
--- 114,125 ----
return gameManager.getNumberOfPlayers();
}
+
+ protected int getNumberOfActivePlayers () {
+ int number = 0;
+ for (Player player : getPlayers()) {
+ if (!player.isBankrupt()) number++;
+ }
+ return number;
+ }
public PhaseI getCurrentPhase() {
Index: StockRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockRound.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** StockRound.java 9 Apr 2010 21:26:12 -0000 1.73
--- StockRound.java 25 May 2010 20:27:17 -0000 1.74
***************
*** 1224,1228 ****
}
! if (numPasses.intValue() >= numberOfPlayers) {
ReportBuffer.add(LocalText.getText("END_SR",
--- 1224,1228 ----
}
! if (numPasses.intValue() >= getNumberOfActivePlayers()) {
ReportBuffer.add(LocalText.getText("END_SR",
|
