[Rails-commits] 18xx/rails/game StockRound.java, 1.72, 1.73 GameManager.java, 1.98, 1.99 GameManagerI.java, 1.32, 1.33

[Erik V. <ev...@us...>]

Update of /cvsroot/rails/18xx/rails/game
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv4492/rails/game

Modified Files:
	StockRound.java GameManager.java GameManagerI.java 
Log Message:
1835: higher certificate limit if 80% owned.

Index: GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** GameManager.java	4 Apr 2010 22:02:53 -0000	1.98
--- GameManager.java	9 Apr 2010 21:26:12 -0000	1.99
***************
*** 1180,1184 ****
      }
  
!     public int getPlayerCertificateLimit() {
          return playerCertificateLimit.intValue();
      }
--- 1180,1184 ----
      }
  
!     public int getPlayerCertificateLimit(Player player) {
          return playerCertificateLimit.intValue();
      }

Index: GameManagerI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManagerI.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** GameManagerI.java	28 Mar 2010 20:14:20 -0000	1.32
--- GameManagerI.java	9 Apr 2010 21:26:12 -0000	1.33
***************
*** 10,14 ****
  import rails.game.correct.CorrectionType;
  import rails.game.model.ModelObject;
- import rails.game.move.AddToList;
  import rails.game.move.MoveStack;
  import rails.game.move.MoveableHolder;
--- 10,13 ----
***************
*** 170,174 ****
      public String getGameOption (String key);
  
!     public int getPlayerCertificateLimit();
      public void setPlayerCertificateLimit(int newLimit);
      public ModelObject getPlayerCertificateLimitModel ();
--- 169,173 ----
      public String getGameOption (String key);
  
!     public int getPlayerCertificateLimit(Player player);
      public void setPlayerCertificateLimit(int newLimit);
      public ModelObject getPlayerCertificateLimitModel ();

Index: StockRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockRound.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** StockRound.java	2 Apr 2010 20:03:54 -0000	1.72
--- StockRound.java	9 Apr 2010 21:26:12 -0000	1.73
***************
*** 735,739 ****
                          currentPlayer.getName()
                                  + LocalText.getText("WouldExceedCertLimit",
!                                         String.valueOf(gameManager.getPlayerCertificateLimit()));
                  break;
              }
--- 735,739 ----
                          currentPlayer.getName()
                                  + LocalText.getText("WouldExceedCertLimit",
!                                         String.valueOf(gameManager.getPlayerCertificateLimit(currentPlayer)));
                  break;
              }
***************
*** 1364,1368 ****
  
          // Over the total certificate hold Limit?
!         if (player.getPortfolio().getCertificateCount() > gameManager.getPlayerCertificateLimit())
              return true;
  
--- 1364,1368 ----
  
          // Over the total certificate hold Limit?
!         if (player.getPortfolio().getCertificateCount() > gameManager.getPlayerCertificateLimit(player))
              return true;
  
***************
*** 1386,1390 ****
          if (comp.hasFloated() && comp.getCurrentSpace().isNoCertLimit())
              return true;
!         if (player.getPortfolio().getCertificateCount() + number > gameManager.getPlayerCertificateLimit())
              return false;
          return true;
--- 1386,1390 ----
          if (comp.hasFloated() && comp.getCurrentSpace().isNoCertLimit())
              return true;
!         if (player.getPortfolio().getCertificateCount() + number > gameManager.getPlayerCertificateLimit(player))
              return false;
          return true;