[Rails-commits] 18xx/rails/game/specific/_1856 StockRound_1856.java, 1.1, 1.2

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

Update of /cvsroot/rails/18xx/rails/game/specific/_1856
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26416/rails/game/specific/_1856

Modified Files:
	StockRound_1856.java 
Log Message:
Fixed 1856 float percentage (was incorrectly linked to phase rather than next available train)

Index: StockRound_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/StockRound_1856.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StockRound_1856.java	3 Nov 2008 15:55:00 -0000	1.1
--- StockRound_1856.java	5 Nov 2008 22:44:26 -0000	1.2
***************
*** 3,6 ****
--- 3,8 ----
  import rails.game.PublicCompanyI;
  import rails.game.StockRound;
+ import rails.game.TrainI;
+ import rails.game.TrainManager;
  
  public class StockRound_1856 extends StockRound {
***************
*** 16,26 ****
  
          int unsoldPercentage = company.getUnsoldPercentage();
-         int floatPercentage = getCurrentPhase().getParameterAsInteger("floatPercentage");
          
!         if (floatPercentage == 0) {
!             log.error ("FloatPercentage is null!");
!         } else {
!             log.debug ("Floatpercentage is "+floatPercentage);
          }
          
          //int floatPercentage = Math.min(60, (Integer)getCurrentPhase().getParameter("floatPercentage"));
--- 18,32 ----
  
          int unsoldPercentage = company.getUnsoldPercentage();
          
!         TrainI nextAvailableTrain = TrainManager.get().getAvailableNewTrains().get(0);
!         int trainNumber;
!         try { 
!             trainNumber = Integer.parseInt(nextAvailableTrain.getName());
!         } catch (NumberFormatException e) {
!             trainNumber = 6; // Diesel!
          }
+         int floatPercentage = 10 * trainNumber;
+         
+         log.debug ("Floatpercentage is "+floatPercentage);
          
          //int floatPercentage = Math.min(60, (Integer)getCurrentPhase().getParameter("floatPercentage"));