[Rails-commits] 18xx/rails/game OperatingRound.java,1.104,1.105

[Stefan F. <ste...@us...>]

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

Modified Files:
	OperatingRound.java 
Log Message:
Minor fixes and improvements to NoMap OperatingCosts

Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** OperatingRound.java	20 Feb 2010 23:08:42 -0000	1.104
--- OperatingRound.java	22 Feb 2010 22:48:18 -0000	1.105
***************
*** 2248,2253 ****
          // LayTile Actions
          for (Integer tc: mapManager.getPossibleTileCosts()) {
!             possibleActions.add(new OperatingCost(
!                     operatingCompany, OperatingCost.OCType.LAY_TILE, tc
                  ));
          }
--- 2248,2254 ----
          // LayTile Actions
          for (Integer tc: mapManager.getPossibleTileCosts()) {
!             if (tc <= operatingCompany.getCash())  
!                 possibleActions.add(new OperatingCost(
!                     operatingCompany, OperatingCost.OCType.LAY_TILE, tc, false
                  ));
          }
***************
*** 2257,2263 ****
              int[] costs = operatingCompany.getBaseTokenLayCosts();
              for (int cost : costs) {
!                 possibleActions.add(new OperatingCost(
                          operatingCompany, OperatingCost.OCType.LAY_BASE_TOKEN,   
!                         cost
                      ));
              }
--- 2258,2265 ----
              int[] costs = operatingCompany.getBaseTokenLayCosts();
              for (int cost : costs) {
!                 if ((cost <= operatingCompany.getCash()) && (cost != 0 || costs.length == 1)) // distance method returns home base, but in sequence costs can be zero 
!                     possibleActions.add(new OperatingCost(
                          operatingCompany, OperatingCost.OCType.LAY_BASE_TOKEN,   
!                         cost, false
                      ));
              }
***************
*** 2266,2276 ****
          // Default OperatingCost Actions
          possibleActions.add(new OperatingCost(
!                 operatingCompany, OperatingCost.OCType.LAY_TILE, 0
              ));
          if (operatingCompany.getNumberOfFreeBaseTokens() != 0 
                  && operatingCompany.getBaseTokenLayCost(null) != 0) {
              possibleActions.add(new OperatingCost(
!                     operatingCompany, OperatingCost.OCType.LAY_BASE_TOKEN, 0
!                 ));
          }
  
--- 2268,2278 ----
          // Default OperatingCost Actions
          possibleActions.add(new OperatingCost(
!                 operatingCompany, OperatingCost.OCType.LAY_TILE, 0, true
              ));
          if (operatingCompany.getNumberOfFreeBaseTokens() != 0 
                  && operatingCompany.getBaseTokenLayCost(null) != 0) {
              possibleActions.add(new OperatingCost(
!                     operatingCompany, OperatingCost.OCType.LAY_BASE_TOKEN, 0, true
!                     ));
          }