rails-commits — CVS Commits

[Rails-commits] 18xx/rails/game/state IntegerState.java, 1.4, 1.5 State.java, 1.14, 1.15

[Freek D. <mac...@us...>]

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

Modified Files:
	IntegerState.java State.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: IntegerState.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/state/IntegerState.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IntegerState.java	4 Sep 2009 18:35:53 -0000	1.4
--- IntegerState.java	31 Jan 2010 22:22:33 -0000	1.5
***************
*** 42,47 ****
  
      @Override
! 	public String getText() {
!     	return ""+intValue();
      }
  }
--- 42,47 ----
  
      @Override
!     public String getText() {
!         return ""+intValue();
      }
  }

Index: State.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/state/State.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** State.java	1 Jan 2010 14:34:54 -0000	1.14
--- State.java	31 Jan 2010 22:22:33 -0000	1.15
***************
*** 76,80 ****
  
      @Override
! 	public String getText() {
          if (object != null) {
              return object.toString();
--- 76,80 ----
  
      @Override
!     public String getText() {
          if (object != null) {
              return object.toString();
***************
*** 85,89 ****
  
      @Override
! 	public String toString() {
          return name;
      }
--- 85,89 ----
  
      @Override
!     public String toString() {
          return name;
      }

[Rails-commits] 18xx/rails/game/specific/_18EU StockRound_18EU.java, 1.34, 1.35

[Freek D. <mac...@us...>]

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

Modified Files:
	StockRound_18EU.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: StockRound_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/StockRound_18EU.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** StockRound_18EU.java	22 Jan 2010 21:28:42 -0000	1.34
--- StockRound_18EU.java	31 Jan 2010 22:22:33 -0000	1.35
***************
*** 27,39 ****
      protected boolean phase5Reached = false;
  
! 	/**
! 	 * Constructor with the GameManager, will call super class (StockRound's) Constructor to initialize
! 	 *
! 	 * @param aGameManager The GameManager Object needed to initialize the Stock Round
! 	 *
! 	 */
! 	public StockRound_18EU (GameManagerI aGameManager) {
! 		super (aGameManager);
! 	}
  
      @Override
--- 27,39 ----
      protected boolean phase5Reached = false;
  
!     /**
!      * Constructor with the GameManager, will call super class (StockRound's) Constructor to initialize
!      *
!      * @param aGameManager The GameManager Object needed to initialize the Stock Round
!      *
!      */
!     public StockRound_18EU (GameManagerI aGameManager) {
!         super (aGameManager);
!     }
  
      @Override
***************
*** 532,536 ****
  
          if (cert != null) {
!         	ReportBuffer.add("");
              ReportBuffer.add(LocalText.getText("MERGE_MINOR_LOG",
                      currentPlayer.getName(),
--- 532,536 ----
  
          if (cert != null) {
!             ReportBuffer.add("");
              ReportBuffer.add(LocalText.getText("MERGE_MINOR_LOG",
                      currentPlayer.getName(),
***************
*** 546,560 ****
                      minor.getName() ));
              if (major != null) {
!             	if (action.getReplaceToken()) {
                      ReportBuffer.add(LocalText.getText("ExchangesBaseToken",
!                     		major.getName(),
                              minor.getName(),
                              homeHex.getName()));
!             	} else {
                      ReportBuffer.add(LocalText.getText("NoBaseTokenExchange",
!                     		major.getName(),
!                     		minor.getName(),
!                     		homeHex.getName()));
!             	}
              }
              cert.moveTo(currentPlayer.getPortfolio());
--- 546,560 ----
                      minor.getName() ));
              if (major != null) {
!                 if (action.getReplaceToken()) {
                      ReportBuffer.add(LocalText.getText("ExchangesBaseToken",
!                             major.getName(),
                              minor.getName(),
                              homeHex.getName()));
!                 } else {
                      ReportBuffer.add(LocalText.getText("NoBaseTokenExchange",
!                             major.getName(),
!                             minor.getName(),
!                             homeHex.getName()));
!                 }
              }
              cert.moveTo(currentPlayer.getPortfolio());
***************
*** 562,566 ****
              checkFlotation(major);
          } else {
!         	ReportBuffer.add("");
              ReportBuffer.add(LocalText.getText("CLOSE_MINOR_LOG",
                      currentPlayer.getName(),
--- 562,566 ----
              checkFlotation(major);
          } else {
!             ReportBuffer.add("");
              ReportBuffer.add(LocalText.getText("CLOSE_MINOR_LOG",
                      currentPlayer.getName(),

[Rails-commits] 18xx/rails/test GameTest.java,1.6,1.7

[Freek D. <mac...@us...>]

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

Modified Files:
	GameTest.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: GameTest.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/test/GameTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GameTest.java	6 Nov 2009 20:21:24 -0000	1.6
--- GameTest.java	31 Jan 2010 22:22:33 -0000	1.7
***************
*** 32,43 ****
          System.out.println("Configuration file = " + myConfigFile);
  
!     	int nargs = 0;
!     	if (args != null && args.length > 0) {
!     		for (String arg : args) {
!     			System.out.println ("Arg "+(++nargs)+": "+arg);
!     		}
!     	}
  
!     	/* Start the rails.game selector, which will do all the rest. */
          new GameSetupWindow();
      }
--- 32,43 ----
          System.out.println("Configuration file = " + myConfigFile);
  
!         int nargs = 0;
!         if (args != null && args.length > 0) {
!             for (String arg : args) {
!                 System.out.println ("Arg "+(++nargs)+": "+arg);
!             }
!         }
  
!         /* Start the rails.game selector, which will do all the rest. */
          new GameSetupWindow();
      }

[Rails-commits] 18xx/rails/game/specific/_18AL AssignNamedTrains.java, 1.6, 1.7 NameTrains.java, 1.5, 1.6 NamedTrainToken.java, 1.4, 1.5

[Freek D. <mac...@us...>]

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

Modified Files:
	AssignNamedTrains.java NameTrains.java NamedTrainToken.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: NameTrains.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18AL/NameTrains.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NameTrains.java	19 Jan 2010 19:53:28 -0000	1.5
--- NameTrains.java	31 Jan 2010 22:22:33 -0000	1.6
***************
*** 18,22 ****
  
      @Override
! 	public void configureFromXML(Tag tag) throws ConfigurationException {
  
          super.configureFromXML(tag);
--- 18,22 ----
  
      @Override
!     public void configureFromXML(Tag tag) throws ConfigurationException {
  
          super.configureFromXML(tag);
***************
*** 66,70 ****
  
      @Override
! 	public void finishConfiguration (GameManagerI gameManager)
      throws ConfigurationException {
  
--- 66,70 ----
  
      @Override
!     public void finishConfiguration (GameManagerI gameManager)
      throws ConfigurationException {
  
***************
*** 94,103 ****
  
      @Override
! 	public String toMenu() {
          return description;
      }
  
      @Override
! 	public String toString() {
          return description;
      }
--- 94,103 ----
  
      @Override
!     public String toMenu() {
          return description;
      }
  
      @Override
!     public String toString() {
          return description;
      }

Index: NamedTrainToken.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18AL/NamedTrainToken.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NamedTrainToken.java	2 Nov 2009 23:30:36 -0000	1.4
--- NamedTrainToken.java	31 Jan 2010 22:22:33 -0000	1.5
***************
*** 66,70 ****
  
      @Override
! 	public String toString() {
          return description;
      }
--- 66,70 ----
  
      @Override
!     public String toString() {
          return description;
      }

Index: AssignNamedTrains.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18AL/AssignNamedTrains.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AssignNamedTrains.java	4 Nov 2009 20:33:22 -0000	1.6
--- AssignNamedTrains.java	31 Jan 2010 22:22:32 -0000	1.7
***************
*** 64,73 ****
  
      @Override
! 	public String toMenu() {
          return ((NameTrains) specialProperty).toMenu();
      }
  
      @Override
! 	public String toString() {
          StringBuffer b = new StringBuffer("AssignNamedTrains ");
          for (NamedTrainToken token : ((NameTrains) getSpecialProperty()).getTokens()) {
--- 64,73 ----
  
      @Override
!     public String toMenu() {
          return ((NameTrains) specialProperty).toMenu();
      }
  
      @Override
!     public String toString() {
          StringBuffer b = new StringBuffer("AssignNamedTrains ");
          for (NamedTrainToken token : ((NameTrains) getSpecialProperty()).getTokens()) {

[Rails-commits] 18xx/rails/game/specific/_1856 CGRFormationRound.java, 1.31, 1.32 OperatingRound_1856.java, 1.28, 1.29 PublicCompany_CGR.java, 1.7, 1.8 StockRound_1856.java, 1.13, 1.14

[Freek D. <mac...@us...>]

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

Modified Files:
	CGRFormationRound.java OperatingRound_1856.java 
	PublicCompany_CGR.java StockRound_1856.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: StockRound_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/StockRound_1856.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** StockRound_1856.java	16 Jan 2010 14:09:51 -0000	1.13
--- StockRound_1856.java	31 Jan 2010 22:22:32 -0000	1.14
***************
*** 7,19 ****
  public class StockRound_1856 extends StockRound {
  
! 	/**
! 	 * Constructor with the GameManager, will call super class (StockRound's) Constructor to initialize
! 	 *
! 	 * @param aGameManager The GameManager Object needed to initialize the Stock Round
! 	 *
! 	 */
! 	public StockRound_1856 (GameManagerI aGameManager) {
! 		super (aGameManager);
! 	}
  
      /**
--- 7,19 ----
  public class StockRound_1856 extends StockRound {
  
!     /**
!      * Constructor with the GameManager, will call super class (StockRound's) Constructor to initialize
!      *
!      * @param aGameManager The GameManager Object needed to initialize the Stock Round
!      *
!      */
!     public StockRound_1856 (GameManagerI aGameManager) {
!         super (aGameManager);
!     }
  
      /**
***************
*** 95,114 ****
              PublicCompanyI company) {
  
!     	if (company.getName().equalsIgnoreCase(PublicCompany_CGR.NAME)
!     			&& ((PublicCompany_CGR)company).hasTemporaryPresident()) {
!     		log.debug("Resetting temp. president");
              ipo.swapPresidentCertificate(company,
                      currentPlayer.getPortfolio());
              Player oldPresident = company.getPresident();
!     		((PublicCompany_CGR)company).setTemporaryPresident(null);
!     		company.getPresident().getPortfolio().getShareModel(company).update();
!     		if (currentPlayer != oldPresident) {
!     			oldPresident.getPortfolio().getShareModel(company).update();
!     		}
!     	}
      }
  
!    	@Override
! 	public void resume() {
      }
  
--- 95,114 ----
              PublicCompanyI company) {
  
!         if (company.getName().equalsIgnoreCase(PublicCompany_CGR.NAME)
!                 && ((PublicCompany_CGR)company).hasTemporaryPresident()) {
!             log.debug("Resetting temp. president");
              ipo.swapPresidentCertificate(company,
                      currentPlayer.getPortfolio());
              Player oldPresident = company.getPresident();
!             ((PublicCompany_CGR)company).setTemporaryPresident(null);
!             company.getPresident().getPortfolio().getShareModel(company).update();
!             if (currentPlayer != oldPresident) {
!                 oldPresident.getPortfolio().getShareModel(company).update();
!             }
!         }
      }
  
!        @Override
!     public void resume() {
      }
  

Index: CGRFormationRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/CGRFormationRound.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** CGRFormationRound.java	14 Jan 2010 20:56:45 -0000	1.31
--- CGRFormationRound.java	31 Jan 2010 22:22:32 -0000	1.32
***************
*** 22,26 ****
      private String cgrName = PublicCompany_CGR.NAME;
      private PublicCompany_CGR cgr
!     	= (PublicCompany_CGR)gameManager.getCompanyManager().getCompanyByName(cgrName);
      private List<TrainI> trainsToDiscardFrom = null;
      private boolean forcedTrainDiscard = true;
--- 22,26 ----
      private String cgrName = PublicCompany_CGR.NAME;
      private PublicCompany_CGR cgr
!         = (PublicCompany_CGR)gameManager.getCompanyManager().getCompanyByName(cgrName);
      private List<TrainI> trainsToDiscardFrom = null;
      private boolean forcedTrainDiscard = true;
***************
*** 36,43 ****
  
      private static int[][] certLimitsTable = {
!     	{10, 13, 15, 18, 20, 22, 25, 28},
!     	{8, 10, 12, 14, 16, 18, 20, 22},
!     	{7, 8, 10, 11, 13, 15, 16, 18},
!     	{6, 7, 8, 10, 11, 12, 14, 15}
      };
  
--- 36,43 ----
  
      private static int[][] certLimitsTable = {
!         {10, 13, 15, 18, 20, 22, 25, 28},
!         {8, 10, 12, 14, 16, 18, 20, 22},
!         {7, 8, 10, 11, 13, 15, 16, 18},
!         {6, 7, 8, 10, 11, 12, 14, 15}
      };
  
***************
*** 66,70 ****
  
          ReportBuffer.add(LocalText.getText("StartFormationRound",
!         		cgrName,
                  startingPlayer.getName()));
  
--- 66,70 ----
  
          ReportBuffer.add(LocalText.getText("StartFormationRound",
!                 cgrName,
                  startingPlayer.getName()));
  
***************
*** 167,171 ****
              numberOfLoans = currentCompany.getCurrentNumberOfLoans();
              if (numberOfLoans == 0) {
!             	continue;
              }
  
--- 167,171 ----
              numberOfLoans = currentCompany.getCurrentNumberOfLoans();
              if (numberOfLoans == 0) {
!                 continue;
              }
  
***************
*** 424,428 ****
          // Clone the shares list first
          certs = new ArrayList<PublicCertificateI>
!         		(unavailable.getCertificatesPerCompany(PublicCompany_CGR.NAME));
          for (PublicCertificateI cert : certs) {
              cert.moveTo(ipo);
--- 424,428 ----
          // Clone the shares list first
          certs = new ArrayList<PublicCertificateI>
!                 (unavailable.getCertificatesPerCompany(PublicCompany_CGR.NAME));
          for (PublicCertificateI cert : certs) {
              cert.moveTo(ipo);
***************
*** 431,443 ****
          // Assign the new president
          if (newPresident.getPortfolio().getShare(cgr) == cgr.getShareUnit()) {
!         	// Nobody has 2 shares, then takes the first player who has got one share
!         	log.debug("Nobody has two shares, creating a temp.pres.: "+firstCGRowner.getName());
!         	cgr.setTemporaryPresident(firstCGRowner);
!         	newPresident = firstCGRowner;
          } else if (temporaryPresident != null && temporaryPresident != newPresident) {
!         	log.debug("Moving pres.share from "+temporaryPresident.getName()
!         			+" to "+newPresident.getName());
!         		temporaryPresident.getPortfolio().swapPresidentCertificate(cgr,
!         				newPresident.getPortfolio());
          }
  
--- 431,443 ----
          // Assign the new president
          if (newPresident.getPortfolio().getShare(cgr) == cgr.getShareUnit()) {
!             // Nobody has 2 shares, then takes the first player who has got one share
!             log.debug("Nobody has two shares, creating a temp.pres.: "+firstCGRowner.getName());
!             cgr.setTemporaryPresident(firstCGRowner);
!             newPresident = firstCGRowner;
          } else if (temporaryPresident != null && temporaryPresident != newPresident) {
!             log.debug("Moving pres.share from "+temporaryPresident.getName()
!                     +" to "+newPresident.getName());
!                 temporaryPresident.getPortfolio().swapPresidentCertificate(cgr,
!                         newPresident.getPortfolio());
          }
  
***************
*** 482,486 ****
                  cgr.start(startSpace);
                  message = LocalText.getText("START_MERGED_COMPANY",
!                 		PublicCompany_CGR.NAME,
                          Bank.format(startSpace.getPrice()),
                          startSpace.getName());
--- 482,486 ----
                  cgr.start(startSpace);
                  message = LocalText.getText("START_MERGED_COMPANY",
!                         PublicCompany_CGR.NAME,
                          Bank.format(startSpace.getPrice()),
                          startSpace.getName());
***************
*** 502,508 ****
          gameManager.setPlayerCertificateLimit(newCertLimit);
          message = LocalText.getText("CertificateLimit",
!         		newCertLimit,
!         		numPlayers,
!         		numCompanies);
          DisplayBuffer.add(message);
          ReportBuffer.add(message);
--- 502,508 ----
          gameManager.setPlayerCertificateLimit(newCertLimit);
          message = LocalText.getText("CertificateLimit",
!                 newCertLimit,
!                 numPlayers,
!                 numCompanies);
          DisplayBuffer.add(message);
          ReportBuffer.add(message);
***************
*** 516,520 ****
          for (PublicCompanyI comp : mergingCompanies) {
  
!         	// Exchange home tokens and collect non-home tokens
              for (TokenI token :comp.getTokens()) {
                  if (token instanceof BaseToken) {
--- 516,520 ----
          for (PublicCompanyI comp : mergingCompanies) {
  
!             // Exchange home tokens and collect non-home tokens
              for (TokenI token :comp.getTokens()) {
                  if (token instanceof BaseToken) {
***************
*** 545,549 ****
              // Move any still valid bonuses
              if (comp.getBonuses() != null) {
! 	            List<Bonus> bonuses = new ArrayList<Bonus> (comp.getBonuses());
  bonuses:        for (Bonus bonus : bonuses) {
                      comp.removeBonus(bonus);
--- 545,549 ----
              // Move any still valid bonuses
              if (comp.getBonuses() != null) {
!                 List<Bonus> bonuses = new ArrayList<Bonus> (comp.getBonuses());
  bonuses:        for (Bonus bonus : bonuses) {
                      comp.removeBonus(bonus);
***************
*** 569,575 ****
                          }
                      }
! 	            	cgr.addBonus(new Bonus(cgr, bonus.getName(), bonus.getValue(),
                              bonus.getLocations()));
! 	            }
              }
          }
--- 569,575 ----
                          }
                      }
!                     cgr.addBonus(new Bonus(cgr, bonus.getName(), bonus.getValue(),
                              bonus.getLocations()));
!                 }
              }
          }
***************
*** 683,687 ****
  
      @Override
! 	public boolean process (PossibleAction action) {
  
          boolean result = true;
--- 683,687 ----
  
      @Override
!     public boolean process (PossibleAction action) {
  
          boolean result = true;
***************
*** 831,838 ****
  
      public List<PublicCompanyI> getMergingCompanies() {
! 		return mergingCompanies;
! 	}
  
! 	@Override
      public String toString() {
          return "1856 CGRFormationRound";
--- 831,838 ----
  
      public List<PublicCompanyI> getMergingCompanies() {
!         return mergingCompanies;
!     }
  
!     @Override
      public String toString() {
          return "1856 CGRFormationRound";

Index: OperatingRound_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/OperatingRound_1856.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** OperatingRound_1856.java	14 Jan 2010 20:56:29 -0000	1.28
--- OperatingRound_1856.java	31 Jan 2010 22:22:32 -0000	1.29
***************
*** 116,120 ****
                      && ((PublicCompany_CGR)operatingCompany).runsWithBorrowedTrain()) {
                  DisplayBuffer.add(LocalText.getText("RunsWithBorrowedTrain",
!                 		PublicCompany_CGR.NAME, "D"));
                  possibleActions.add(new SetDividend(
                          operatingCompany.getLastRevenue(), true,
--- 116,120 ----
                      && ((PublicCompany_CGR)operatingCompany).runsWithBorrowedTrain()) {
                  DisplayBuffer.add(LocalText.getText("RunsWithBorrowedTrain",
!                         PublicCompany_CGR.NAME, "D"));
                  possibleActions.add(new SetDividend(
                          operatingCompany.getLastRevenue(), true,
***************
*** 122,134 ****
              } else {
  
! 	            int[] allowedRevenueActions =
! 	                    operatingCompany.isSplitAlways()
! 	                            ? new int[] { SetDividend.SPLIT }
! 	                            : operatingCompany.isSplitAllowed()
! 	                                    ? new int[] { SetDividend.PAYOUT,
! 	                                            SetDividend.SPLIT,
! 	                                            SetDividend.WITHHOLD }
! 	                                    : new int[] { SetDividend.PAYOUT,
! 	                                            SetDividend.WITHHOLD };
  
                  // Check if any loan interest can be paid
--- 122,134 ----
              } else {
  
!                 int[] allowedRevenueActions =
!                         operatingCompany.isSplitAlways()
!                                 ? new int[] { SetDividend.SPLIT }
!                                 : operatingCompany.isSplitAllowed()
!                                         ? new int[] { SetDividend.PAYOUT,
!                                                 SetDividend.SPLIT,
!                                                 SetDividend.WITHHOLD }
!                                         : new int[] { SetDividend.PAYOUT,
!                                                 SetDividend.WITHHOLD };
  
                  // Check if any loan interest can be paid
***************
*** 142,149 ****
                  }
  
! 	            possibleActions.add(new SetDividend(
! 	                    operatingCompany.getLastRevenue(), true,
! 	                    allowedRevenueActions,
! 	                    requiredCash));
              }
  
--- 142,149 ----
                  }
  
!                 possibleActions.add(new SetDividend(
!                         operatingCompany.getLastRevenue(), true,
!                         allowedRevenueActions,
!                         requiredCash));
              }
  
***************
*** 463,467 ****
      public void resume (List<PublicCompanyI> mergingCompanies) {
  
!     	// End of CGRFormationRound
          finalLoanRepaymentPending.set(false);
          guiHints.setActivePanel(GuiDef.Panel.MAP);
--- 463,467 ----
      public void resume (List<PublicCompanyI> mergingCompanies) {
  
!         // End of CGRFormationRound
          finalLoanRepaymentPending.set(false);
          guiHints.setActivePanel(GuiDef.Panel.MAP);
***************
*** 484,488 ****
  
          for (PublicCompanyI company : mergingCompanies) {
!        		if (companiesOperatedThisRound.contains(company)) cgrCanOperate = false;
          }
  
--- 484,488 ----
  
          for (PublicCompanyI company : mergingCompanies) {
!                if (companiesOperatedThisRound.contains(company)) cgrCanOperate = false;
          }
  
***************
*** 533,538 ****
          }
          ReportBuffer.add(LocalText.getText("EndOfFormationRound",
!         		cgr.getName(),
!         		getRoundName()));
          ReportBuffer.add (message);
          DisplayBuffer.add(message);
--- 533,538 ----
          }
          ReportBuffer.add(LocalText.getText("EndOfFormationRound",
!                 cgr.getName(),
!                 getRoundName()));
          ReportBuffer.add (message);
          DisplayBuffer.add(message);
***************
*** 544,548 ****
              log.debug ("Next operating company: "+operatingCompany.getName());
          } else {
!         	finishOR();
              return false;
          }
--- 544,548 ----
              log.debug ("Next operating company: "+operatingCompany.getName());
          } else {
!             finishOR();
              return false;
          }

Index: PublicCompany_CGR.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/PublicCompany_CGR.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PublicCompany_CGR.java	8 Jan 2010 21:30:46 -0000	1.7
--- PublicCompany_CGR.java	31 Jan 2010 22:22:32 -0000	1.8
***************
*** 10,14 ****
  public class PublicCompany_CGR extends PublicCompany {
  
! 	public static final String NAME = "CGR";
  
      /** Special rules apply before CGR has got its first permanent train */
--- 10,14 ----
  public class PublicCompany_CGR extends PublicCompany {
  
!     public static final String NAME = "CGR";
  
      /** Special rules apply before CGR has got its first permanent train */
***************
*** 45,58 ****
  
      public boolean hasTemporaryPresident () {
!     	return getTemporaryPresident() != null;
      }
  
      public Player getTemporaryPresident() {
!     	if (temporaryPresident != null) {
!     		return (Player) temporaryPresident.getObject();
!     	} else {
!     		return null;
!     	}
! 	}
      
      public boolean mayBuyTrainType (TrainI train) {
--- 45,58 ----
  
      public boolean hasTemporaryPresident () {
!         return getTemporaryPresident() != null;
      }
  
      public Player getTemporaryPresident() {
!         if (temporaryPresident != null) {
!             return (Player) temporaryPresident.getObject();
!         } else {
!             return null;
!         }
!     }
      
      public boolean mayBuyTrainType (TrainI train) {
***************
*** 61,81 ****
  
      @Override
! 	public Player getPresident() {
!     	if (hasTemporaryPresident()) {
!     		return getTemporaryPresident();
!     	} else {
!     		return super.getPresident();
!     	}
      }
  
! 	public void setTemporaryPresident(Player temporaryPresident) {
! 		if (this.temporaryPresident == null) {
! 			this.temporaryPresident = new State ("CGR_TempPres", Player.class);
! 		}
! 		this.temporaryPresident.set(temporaryPresident);
! 	}
  
! 	@Override
! 	public boolean canRunTrains() {
          if (!hadPermanentTrain()) {
              return true;
--- 61,81 ----
  
      @Override
!     public Player getPresident() {
!         if (hasTemporaryPresident()) {
!             return getTemporaryPresident();
!         } else {
!             return super.getPresident();
!         }
      }
  
!     public void setTemporaryPresident(Player temporaryPresident) {
!         if (this.temporaryPresident == null) {
!             this.temporaryPresident = new State ("CGR_TempPres", Player.class);
!         }
!         this.temporaryPresident.set(temporaryPresident);
!     }
  
!     @Override
!     public boolean canRunTrains() {
          if (!hadPermanentTrain()) {
              return true;
***************
*** 94,98 ****
       */
      @Override
! 	public void withhold(int amount) {
          if (amount > 0) new CashMove(bank, this, amount);
          if (hasStockPrice && !runsWithBorrowedTrain()) {
--- 94,98 ----
       */
      @Override
!     public void withhold(int amount) {
          if (amount > 0) new CashMove(bank, this, amount);
          if (hasStockPrice && !runsWithBorrowedTrain()) {
***************
*** 142,146 ****
  
      @Override
! 	public void adjustSharePrice (int actionPerformed, int numberOfSharesSold,
              StockMarketI stockMarket) {
  
--- 142,146 ----
  
      @Override
!     public void adjustSharePrice (int actionPerformed, int numberOfSharesSold,
              StockMarketI stockMarket) {
  
***************
*** 164,168 ****
  
      @Override
! 	public void setOperated() {
          super.setOperated();
  
--- 164,168 ----
  
      @Override
!     public void setOperated() {
          super.setOperated();
  
***************
*** 174,188 ****
  
      @Override
! 	public boolean mustOwnATrain() {
!     	if (!hadPermanentTrain()) {
!     		return false;
!     	} else {
!     		return super.mustOwnATrain();
!     	}
      }
  
      @Override
! 	public String getExtraShareMarks () {
!     	return (hasTemporaryPresident() ? "T" : "");
      }
  }
--- 174,188 ----
  
      @Override
!     public boolean mustOwnATrain() {
!         if (!hadPermanentTrain()) {
!             return false;
!         } else {
!             return super.mustOwnATrain();
!         }
      }
  
      @Override
!     public String getExtraShareMarks () {
!         return (hasTemporaryPresident() ? "T" : "");
      }
  }

[Rails-commits] 18xx/rails/game/specific/_1835 StockRound_1835.java, 1.4, 1.5

[Freek D. <mac...@us...>]

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

Modified Files:
	StockRound_1835.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: StockRound_1835.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1835/StockRound_1835.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StockRound_1835.java	15 Jan 2009 20:53:28 -0000	1.4
--- StockRound_1835.java	31 Jan 2010 22:22:30 -0000	1.5
***************
*** 10,22 ****
  public class StockRound_1835 extends StockRound {
  
! 	/**
! 	 * Constructor with the GameManager, will call super class (StockRound's) Constructor to initialize
! 	 *
! 	 * @param aGameManager The GameManager Object needed to initialize the Stock Round
! 	 *
! 	 */
! 	public StockRound_1835 (GameManagerI aGameManager) {
! 		super (aGameManager);
! 	}
  
      /**
--- 10,22 ----
  public class StockRound_1835 extends StockRound {
  
!     /**
!      * Constructor with the GameManager, will call super class (StockRound's) Constructor to initialize
!      *
!      * @param aGameManager The GameManager Object needed to initialize the Stock Round
!      *
!      */
!     public StockRound_1835 (GameManagerI aGameManager) {
!         super (aGameManager);
!     }
  
      /**

[Rails-commits] 18xx/rails/game/special LocatedBonus.java, 1.2, 1.3 SellBonusToken.java, 1.5, 1.6 SpecialProperty.java, 1.21, 1.22 SpecialTileLay.java, 1.9, 1.10 SpecialTokenLay.java, 1.12, 1.13

[Freek D. <mac...@us...>]

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

Modified Files:
	LocatedBonus.java SellBonusToken.java SpecialProperty.java 
	SpecialTileLay.java SpecialTokenLay.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: SpecialTokenLay.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/SpecialTokenLay.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** SpecialTokenLay.java	19 Jan 2010 19:54:47 -0000	1.12
--- SpecialTokenLay.java	31 Jan 2010 22:22:30 -0000	1.13
***************
*** 19,23 ****
  
      @Override
! 	public void configureFromXML(Tag tag) throws ConfigurationException {
  
          super.configureFromXML(tag);
--- 19,23 ----
  
      @Override
!     public void configureFromXML(Tag tag) throws ConfigurationException {
  
          super.configureFromXML(tag);
***************
*** 68,80 ****
  
          if (tokenClass == BaseToken.class) {
!         	description = LocalText.getText("LayBaseTokenInfo",
!         			locationCodes,
!         			(extra ? LocalText.getText("extra"):LocalText.getText("notExtra")),
!         			(free ? LocalText.getText("noCost") : LocalText.getText("normalCost")));
          } else if (tokenClass == BonusToken.class) {
!         	description = LocalText.getText("LayBonusTokenInfo",
!         			tokenName,
!         			Bank.format(tokenValue),
!         			locationCodes);
          }
      }
--- 68,80 ----
  
          if (tokenClass == BaseToken.class) {
!             description = LocalText.getText("LayBaseTokenInfo",
!                     locationCodes,
!                     (extra ? LocalText.getText("extra"):LocalText.getText("notExtra")),
!                     (free ? LocalText.getText("noCost") : LocalText.getText("normalCost")));
          } else if (tokenClass == BonusToken.class) {
!             description = LocalText.getText("LayBonusTokenInfo",
!                     tokenName,
!                     Bank.format(tokenValue),
!                     locationCodes);
          }
      }
***************
*** 87,91 ****
  
          if (token instanceof BonusToken) {
!         	((BonusToken)token).prepareForRemoval(gameManager.getPhaseManager());
          }
      }
--- 87,91 ----
  
          if (token instanceof BonusToken) {
!             ((BonusToken)token).prepareForRemoval(gameManager.getPhaseManager());
          }
      }
***************
*** 128,132 ****
  
      @Override
! 	public String toString() {
          return "SpecialTokenLay comp=" + privateCompany.getName() + " type="
                 + tokenClass.getSimpleName() + ": "
--- 128,132 ----
  
      @Override
!     public String toString() {
          return "SpecialTokenLay comp=" + privateCompany.getName() + " type="
                 + tokenClass.getSimpleName() + ": "
***************
*** 136,146 ****
  
      @Override
! 	public String toMenu() {
!     	return description;
      }
  
      @Override
! 	public String getInfo() {
!     	return description;
      }
  }
--- 136,146 ----
  
      @Override
!     public String toMenu() {
!         return description;
      }
  
      @Override
!     public String getInfo() {
!         return description;
      }
  }

Index: SpecialProperty.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/SpecialProperty.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** SpecialProperty.java	19 Jan 2010 19:54:43 -0000	1.21
--- SpecialProperty.java	31 Jan 2010 22:22:30 -0000	1.22
***************
*** 160,164 ****
       */
      public void moveTo(MoveableHolder newHolder) {
!     	if (transferText.equals("")) return;
          //if (newHolder instanceof Portfolio) {
              new ObjectMove(this, holder, newHolder);
--- 160,164 ----
       */
      public void moveTo(MoveableHolder newHolder) {
!         if (transferText.equals("")) return;
          //if (newHolder instanceof Portfolio) {
              new ObjectMove(this, holder, newHolder);
***************
*** 167,171 ****
  
      @Override
! 	public String toString() {
          return getClass().getSimpleName() + " of private "
                 + privateCompany.getName();
--- 167,171 ----
  
      @Override
!     public String toString() {
          return getClass().getSimpleName() + " of private "
                 + privateCompany.getName();
***************
*** 182,191 ****
      /** Default Info text. To be overridden where useful. */
      public String getInfo() {
!     	return toString();
      }
  
      /** Default Help text: "You can " + the menu description */
      public String getHelp() {
!     	return LocalText.getText ("YouCan", Util.lowerCaseFirst(toMenu()));
  
      }
--- 182,191 ----
      /** Default Info text. To be overridden where useful. */
      public String getInfo() {
!         return toString();
      }
  
      /** Default Help text: "You can " + the menu description */
      public String getHelp() {
!         return LocalText.getText ("YouCan", Util.lowerCaseFirst(toMenu()));
  
      }

Index: LocatedBonus.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/LocatedBonus.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LocatedBonus.java	31 Oct 2009 17:08:26 -0000	1.2
--- LocatedBonus.java	31 Jan 2010 22:22:30 -0000	1.3
***************
*** 23,27 ****
  
      @Override
! 	public void configureFromXML(Tag tag) throws ConfigurationException {
  
          super.configureFromXML(tag);
--- 23,27 ----
  
      @Override
!     public void configureFromXML(Tag tag) throws ConfigurationException {
  
          super.configureFromXML(tag);
***************
*** 70,75 ****
  
  
! 	@Override
! 	public String toString() {
          return "LocatedBonus "+name+" comp=" + privateCompany.getName() + " hex="
                 + locationCodes + " value=" + value;
--- 70,75 ----
  
  
!     @Override
!     public String toString() {
          return "LocatedBonus "+name+" comp=" + privateCompany.getName() + " hex="
                 + locationCodes + " value=" + value;

Index: SellBonusToken.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/SellBonusToken.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SellBonusToken.java	28 Dec 2009 14:53:00 -0000	1.5
--- SellBonusToken.java	31 Jan 2010 22:22:30 -0000	1.6
***************
*** 22,26 ****
  
      @Override
! 	public void configureFromXML(Tag tag) throws ConfigurationException {
          super.configureFromXML(tag);
  
--- 22,26 ----
  
      @Override
!     public void configureFromXML(Tag tag) throws ConfigurationException {
          super.configureFromXML(tag);
  
***************
*** 60,65 ****
  
       @Override
! 	public void setExercised () {
!     	numberSold.add(1);
      }
       
--- 60,65 ----
  
       @Override
!     public void setExercised () {
!         numberSold.add(1);
      }
       
***************
*** 98,110 ****
  
      public CashHolder getSeller() {
! 		return (CashHolder) seller.getObject();
! 	}
  
! 	public void setSeller(CashHolder seller) {
! 		this.seller.set(seller);
! 	}
  
! 	@Override
! 	public String toString() {
          return "SellBonusToken comp=" + privateCompany.getName() + " hex="
                 + locationCodes + " value=" + value + " price=" + price
--- 98,110 ----
  
      public CashHolder getSeller() {
!         return (CashHolder) seller.getObject();
!     }
  
!     public void setSeller(CashHolder seller) {
!         this.seller.set(seller);
!     }
  
!     @Override
!     public String toString() {
          return "SellBonusToken comp=" + privateCompany.getName() + " hex="
                 + locationCodes + " value=" + value + " price=" + price

Index: SpecialTileLay.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/special/SpecialTileLay.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SpecialTileLay.java	25 Jan 2010 20:51:59 -0000	1.9
--- SpecialTileLay.java	31 Jan 2010 22:22:30 -0000	1.10
***************
*** 19,23 ****
  
      @Override
! 	public void configureFromXML(Tag tag) throws ConfigurationException {
          super.configureFromXML(tag);
  
--- 19,23 ----
  
      @Override
!     public void configureFromXML(Tag tag) throws ConfigurationException {
          super.configureFromXML(tag);
  
***************
*** 41,55 ****
  
          if (tileNumber > 0) {
! 	    	description = LocalText.getText("LayNamedTileInfo",
! 	    			tileNumber,
! 	    			name != null ? name : "",
! 	    			locationCodes,
! 	    			(extra ? LocalText.getText("extra"):LocalText.getText("notExtra")),
! 	    			(free ? LocalText.getText("noCost") : LocalText.getText("normalCost")));
          } else {
! 	    	description = LocalText.getText("LayTileInfo",
! 	    			locationCodes,
! 	    			(extra ? LocalText.getText("extra"):LocalText.getText("notExtra")),
! 	    			(free ? LocalText.getText("noCost") : LocalText.getText("normalCost")));
          }
  
--- 41,55 ----
  
          if (tileNumber > 0) {
!             description = LocalText.getText("LayNamedTileInfo",
!                     tileNumber,
!                     name != null ? name : "",
!                     locationCodes,
!                     (extra ? LocalText.getText("extra"):LocalText.getText("notExtra")),
!                     (free ? LocalText.getText("noCost") : LocalText.getText("normalCost")));
          } else {
!             description = LocalText.getText("LayTileInfo",
!                     locationCodes,
!                     (extra ? LocalText.getText("extra"):LocalText.getText("notExtra")),
!                     (free ? LocalText.getText("noCost") : LocalText.getText("normalCost")));
          }
  
***************
*** 57,61 ****
  
      @Override
! 	public void finishConfiguration (GameManagerI gameManager)
      throws ConfigurationException {
  
--- 57,61 ----
  
      @Override
!     public void finishConfiguration (GameManagerI gameManager)
      throws ConfigurationException {
  
***************
*** 112,116 ****
  
      @Override
! 	public String toString() {
          return "SpecialTileLay comp=" + privateCompany.getName() + " hex="
                 + locationCodes + " extra=" + extra + " cost=" + free;
--- 112,116 ----
  
      @Override
!     public String toString() {
          return "SpecialTileLay comp=" + privateCompany.getName() + " hex="
                 + locationCodes + " extra=" + extra + " cost=" + free;
***************
*** 118,128 ****
  
      @Override
! 	public String toMenu() {
!     	return description;
      }
  
      @Override
! 	public String getInfo() {
!     	return description;
      }
  }
--- 118,128 ----
  
      @Override
!     public String toMenu() {
!         return description;
      }
  
      @Override
!     public String getInfo() {
!         return description;
      }
  }

[Rails-commits] 18xx/rails/game/model BonusModel.java, 1.2, 1.3 ModelObject.java, 1.8, 1.9 PriceModel.java, 1.8, 1.9 TrainsModel.java, 1.7, 1.8 ViewUpdate.java, 1.1, 1.2

[Freek D. <mac...@us...>]

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

Modified Files:
	BonusModel.java ModelObject.java PriceModel.java 
	TrainsModel.java ViewUpdate.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: ViewUpdate.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/model/ViewUpdate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ViewUpdate.java	13 Dec 2009 16:39:48 -0000	1.1
--- ViewUpdate.java	31 Jan 2010 22:22:29 -0000	1.2
***************
*** 15,56 ****
  public class ViewUpdate implements Serializable {
  
! 	protected Map<String, Object> updates = new HashMap<String, Object>(4);
  
! 	public static final String TEXT = "TEXT";
! 	public static final String BGCOLOUR = "BGCOLOUR";
  
      public static final long serialVersionUID = 1L;
  
      public ViewUpdate (String key, Object value) {
! 		addObject (key, value);
! 	}
  
! 	public ViewUpdate (String text) {
! 		addObject (TEXT, text);
! 	}
  
! 	/** Add an object.
! 	 * Return this ViewUpdate to enable chaining.
! 	 */
! 	public ViewUpdate addObject (String key, Object value) {
! 		updates.put(key, value);
! 		return this;
! 	}
  
! 	public Set<String> getKeys () {
! 		return updates.keySet();
! 	}
  
! 	public boolean hasKey (String key) {
! 		return updates.containsKey(key);
! 	}
  
! 	public Object getValue(String key) {
! 		return updates.get(key);
! 	}
  
! 	public String getText () {
! 		return (String) updates.get(TEXT);
! 	}
  
  }
--- 15,56 ----
  public class ViewUpdate implements Serializable {
  
!     protected Map<String, Object> updates = new HashMap<String, Object>(4);
  
!     public static final String TEXT = "TEXT";
!     public static final String BGCOLOUR = "BGCOLOUR";
  
      public static final long serialVersionUID = 1L;
  
      public ViewUpdate (String key, Object value) {
!         addObject (key, value);
!     }
  
!     public ViewUpdate (String text) {
!         addObject (TEXT, text);
!     }
  
!     /** Add an object.
!      * Return this ViewUpdate to enable chaining.
!      */
!     public ViewUpdate addObject (String key, Object value) {
!         updates.put(key, value);
!         return this;
!     }
  
!     public Set<String> getKeys () {
!         return updates.keySet();
!     }
  
!     public boolean hasKey (String key) {
!         return updates.containsKey(key);
!     }
  
!     public Object getValue(String key) {
!         return updates.get(key);
!     }
  
!     public String getText () {
!         return (String) updates.get(TEXT);
!     }
  
  }

Index: PriceModel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/model/PriceModel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PriceModel.java	13 Dec 2009 16:39:48 -0000	1.8
--- PriceModel.java	31 Jan 2010 22:22:29 -0000	1.9
***************
*** 30,44 ****
  
      @Override
! 	public Object getUpdate() {
!     	if (stockPrice != null) {
!     		return new ViewUpdate(getText())
!     				.addObject(ViewUpdate.BGCOLOUR, stockPrice.getColour());
!     	} else {
!     		return getText();
!     	}
      }
  
      @Override
! 	public String getText() {
          if (stockPrice != null) {
              return Bank.format(stockPrice.getPrice()) + " ("
--- 30,44 ----
  
      @Override
!     public Object getUpdate() {
!         if (stockPrice != null) {
!             return new ViewUpdate(getText())
!                     .addObject(ViewUpdate.BGCOLOUR, stockPrice.getColour());
!         } else {
!             return getText();
!         }
      }
  
      @Override
!     public String getText() {
          if (stockPrice != null) {
              return Bank.format(stockPrice.getPrice()) + " ("

Index: ModelObject.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/model/ModelObject.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ModelObject.java	13 Dec 2009 16:39:48 -0000	1.8
--- ModelObject.java	31 Jan 2010 22:22:29 -0000	1.9
***************
*** 23,29 ****
  
      @Override
! 	public void addObserver (Observer o) {
!     	super.addObserver(o);
!     	notifyViewObjects();
      }
  
--- 23,29 ----
  
      @Override
!     public void addObserver (Observer o) {
!         super.addObserver(o);
!         notifyViewObjects();
      }
  
***************
*** 49,53 ****
      /** Default update is just text */
      public Object getUpdate () {
!     	return getText();
      }
  
--- 49,53 ----
      /** Default update is just text */
      public Object getUpdate () {
!         return getText();
      }
  

Index: BonusModel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/model/BonusModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BonusModel.java	26 Dec 2009 12:46:52 -0000	1.2
--- BonusModel.java	31 Jan 2010 22:22:29 -0000	1.3
***************
*** 16,20 ****
      }
  
! 	public void set(List<Bonus> bonuses) {
  
          this.bonuses = bonuses;
--- 16,20 ----
      }
  
!     public void set(List<Bonus> bonuses) {
  
          this.bonuses = bonuses;
***************
*** 23,40 ****
  
      @Override
! 	public String getText() {
  
!     	if (bonuses == null || bonuses.isEmpty()) return "";
  
!     	StringBuffer b = new StringBuffer("<html><center>");
  
!     	for (Bonus bonus : bonuses) {
!     		if (b.length() > 14) {
!     			b.append("<br>");
!     		}
!     		b.append(bonus.getIdForView()).append("+").append(Bank.format(bonus.getValue()));
!     	}
  
!     	return b.toString();
      }
  
--- 23,40 ----
  
      @Override
!     public String getText() {
  
!         if (bonuses == null || bonuses.isEmpty()) return "";
  
!         StringBuffer b = new StringBuffer("<html><center>");
  
!         for (Bonus bonus : bonuses) {
!             if (b.length() > 14) {
!                 b.append("<br>");
!             }
!             b.append(bonus.getIdForView()).append("+").append(Bank.format(bonus.getValue()));
!         }
  
!         return b.toString();
      }
  

Index: TrainsModel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/model/TrainsModel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TrainsModel.java	4 Nov 2009 20:33:22 -0000	1.7
--- TrainsModel.java	31 Jan 2010 22:22:29 -0000	1.8
***************
*** 16,20 ****
  
      @Override
! 	public String getText() {
          if (option == FULL_LIST) {
              return portfolio.makeFullListOfTrains();
--- 16,20 ----
  
      @Override
!     public String getText() {
          if (option == FULL_LIST) {
              return portfolio.makeFullListOfTrains();

[Rails-commits] 18xx/rails/game/move AddToList.java, 1.4, 1.5 CashMove.java, 1.6, 1.7 Move.java, 1.3, 1.4 MoveSet.java, 1.13, 1.14 MoveStack.java, 1.3, 1.4 ObjectMove.java, 1.7, 1.8 PriceTokenMove.java, 1.5, 1.6

[Freek D. <mac...@us...>]

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

Modified Files:
	AddToList.java CashMove.java Move.java MoveSet.java 
	MoveStack.java ObjectMove.java PriceTokenMove.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: PriceTokenMove.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/PriceTokenMove.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PriceTokenMove.java	7 Oct 2009 19:00:38 -0000	1.5
--- PriceTokenMove.java	31 Jan 2010 22:22:30 -0000	1.6
***************
*** 28,32 ****
  
      @Override
! 	public boolean execute() {
          stockMarket.processMove(company, from, to);
          return true;
--- 28,32 ----
  
      @Override
!     public boolean execute() {
          stockMarket.processMove(company, from, to);
          return true;
***************
*** 34,38 ****
  
      @Override
! 	public boolean undo() {
          stockMarket.processMove(company, to, from);
          return true;
--- 34,38 ----
  
      @Override
!     public boolean undo() {
          stockMarket.processMove(company, to, from);
          return true;
***************
*** 40,44 ****
  
      @Override
! 	public String toString() {
          return "PriceTokenMove: " + company.getName() + " from " + from
                 + " to " + to;
--- 40,44 ----
  
      @Override
!     public String toString() {
          return "PriceTokenMove: " + company.getName() + " from " + from
                 + " to " + to;

Index: MoveSet.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/MoveSet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MoveSet.java	26 Nov 2009 20:14:30 -0000	1.13
--- MoveSet.java	31 Jan 2010 22:22:30 -0000	1.14
***************
*** 31,35 ****
  
      protected void addMove (Move move) {
!     	moves.add(move);
          log.debug("Done: " + move);
      }
--- 31,35 ----
  
      protected void addMove (Move move) {
!         moves.add(move);
          log.debug("Done: " + move);
      }
***************
*** 46,51 ****
  
          // Create a reversed move list
!     	List<Move> reversedMoves = new ArrayList<Move>(moves);
!     	Collections.reverse(reversedMoves);
          for (Move move : reversedMoves) {
              move.undo();
--- 46,51 ----
  
          // Create a reversed move list
!         List<Move> reversedMoves = new ArrayList<Move>(moves);
!         Collections.reverse(reversedMoves);
          for (Move move : reversedMoves) {
              move.undo();
***************
*** 63,67 ****
  
      protected boolean isLinkedToPreviousMove() {
!     	return linkedToPreviousMoveSet;
      }
  
--- 63,67 ----
  
      protected boolean isLinkedToPreviousMove() {
!         return linkedToPreviousMoveSet;
      }
  
***************
*** 73,90 ****
  
      protected static void add (Move move) {
!     	move.execute();
  
!     	MoveStack moveStack = getMoveStack();
!     	if (moveStack != null) moveStack.addMove(move);
      }
  
      private static MoveStack getMoveStack () {
!     	GameManagerI gameManager = GameManager.getInstance();
!     	if (gameManager != null) {
!     		return gameManager.getMoveStack();
!     	} else {
!     		// No GM during game setup; no problem, as MoveSets are not yet enabled then.
!     		return null;
!     	}
      }
  
--- 73,90 ----
  
      protected static void add (Move move) {
!         move.execute();
  
!         MoveStack moveStack = getMoveStack();
!         if (moveStack != null) moveStack.addMove(move);
      }
  
      private static MoveStack getMoveStack () {
!         GameManagerI gameManager = GameManager.getInstance();
!         if (gameManager != null) {
!             return gameManager.getMoveStack();
!         } else {
!             // No GM during game setup; no problem, as MoveSets are not yet enabled then.
!             return null;
!         }
      }
  

Index: Move.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/Move.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Move.java	23 Sep 2009 21:38:57 -0000	1.3
--- Move.java	31 Jan 2010 22:22:30 -0000	1.4
***************
*** 18,25 ****
  public abstract class Move {
  
! 	/** Any ModelObjects that need be updated.
! 	 * Will only be used by subclasses where it matters.
! 	 */
! 	protected List<ModelObject> models = null;
  
      protected static Logger log =
--- 18,25 ----
  public abstract class Move {
  
!     /** Any ModelObjects that need be updated.
!      * Will only be used by subclasses where it matters.
!      */
!     protected List<ModelObject> models = null;
  
      protected static Logger log =
***************
*** 31,45 ****
  
      public void registerModelToUpdate (ModelObject model) {
!     	if (models == null) models = new ArrayList<ModelObject>(2);
!     	models.add(model);
      }
  
      // Could also be built into execute() and update()
      public void updateModels () {
!     	if (models != null) {
!     		for (ModelObject model : models) {
!     			model.update();
!     		}
!     	}
      }
  }
--- 31,45 ----
  
      public void registerModelToUpdate (ModelObject model) {
!         if (models == null) models = new ArrayList<ModelObject>(2);
!         models.add(model);
      }
  
      // Could also be built into execute() and update()
      public void updateModels () {
!         if (models != null) {
!             for (ModelObject model : models) {
!                 model.update();
!             }
!         }
      }
  }

Index: MoveStack.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/MoveStack.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MoveStack.java	22 Jan 2010 21:28:06 -0000	1.3
--- MoveStack.java	31 Jan 2010 22:22:30 -0000	1.4
***************
*** 107,112 ****
      public boolean undoMoveSet (boolean forced) {
          if (lastIndex >= 0 && lastIndex < moveStack.size()
!         		&& (forced || moveStack.get(lastIndex).isUndoableByPlayer())
!         		&& currentMoveSet == null) {
              MoveSet undoAction;
              do {
--- 107,112 ----
      public boolean undoMoveSet (boolean forced) {
          if (lastIndex >= 0 && lastIndex < moveStack.size()
!                 && (forced || moveStack.get(lastIndex).isUndoableByPlayer())
!                 && currentMoveSet == null) {
              MoveSet undoAction;
              do {

Index: AddToList.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/AddToList.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AddToList.java	23 Sep 2009 21:38:57 -0000	1.4
--- AddToList.java	31 Jan 2010 22:22:29 -0000	1.5
***************
*** 34,38 ****
  
      @Override
! 	public boolean execute() {
          list.add(object);
          updateModels();
--- 34,38 ----
  
      @Override
!     public boolean execute() {
          list.add(object);
          updateModels();
***************
*** 41,45 ****
  
      @Override
! 	public boolean undo() {
          list.remove(object);
          updateModels();
--- 41,45 ----
  
      @Override
!     public boolean undo() {
          list.remove(object);
          updateModels();
***************
*** 48,52 ****
  
      @Override
! 	public String toString() {
          return "AddToList " + listName + ": " + object.toString();
      }
--- 48,52 ----
  
      @Override
!     public String toString() {
          return "AddToList " + listName + ": " + object.toString();
      }

Index: CashMove.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/CashMove.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CashMove.java	4 Nov 2009 20:33:22 -0000	1.6
--- CashMove.java	31 Jan 2010 22:22:30 -0000	1.7
***************
*** 36,40 ****
  
      @Override
! 	public boolean execute() {
  
          transferCash(from, to, amount);
--- 36,40 ----
  
      @Override
!     public boolean execute() {
  
          transferCash(from, to, amount);
***************
*** 43,47 ****
  
      @Override
! 	public boolean undo() {
  
          transferCash(to, from, amount);
--- 43,47 ----
  
      @Override
!     public boolean undo() {
  
          transferCash(to, from, amount);
***************
*** 55,59 ****
  
      @Override
! 	public String toString() {
          return "CashMove: " + Bank.format(amount) + " from " + from.getName()
                 + " to " + to.getName();
--- 55,59 ----
  
      @Override
!     public String toString() {
          return "CashMove: " + Bank.format(amount) + " from " + from.getName()
                 + " to " + to.getName();

Index: ObjectMove.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/ObjectMove.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ObjectMove.java	8 Jan 2010 21:31:00 -0000	1.7
--- ObjectMove.java	31 Jan 2010 22:22:30 -0000	1.8
***************
*** 41,52 ****
  
      @Override
! 	public boolean execute() {
  
!     	return (from == null || from.removeObject(moveableObject))
                 && to.addObject(moveableObject);
      }
  
      @Override
! 	public boolean undo() {
  
          return to.removeObject(moveableObject)
--- 41,52 ----
  
      @Override
!     public boolean execute() {
  
!         return (from == null || from.removeObject(moveableObject))
                 && to.addObject(moveableObject);
      }
  
      @Override
!     public boolean undo() {
  
          return to.removeObject(moveableObject)
***************
*** 55,59 ****
  
      @Override
! 	public String toString() {
          if (moveableObject == null) log.error("Token is null");
          if (from == null) log.warn("From is null");
--- 55,59 ----
  
      @Override
!     public String toString() {
          if (moveableObject == null) log.error("Token is null");
          if (from == null) log.warn("From is null");

[Rails-commits] 18xx/rails/game/action AssignNamedTrains.java, 1.3, 1.4 BuyBonusToken.java, 1.3, 1.4 BuyPrivate.java, 1.6, 1.7 BuyTrain.java, 1.16, 1.17 LayBaseToken.java, 1.5, 1.6 LayBonusToken.java, 1.8, 1.9 NullAction.java, 1.9, 1.10 PossibleAction.java, 1.15, 1.16 RequestTurn.java, 1.1, 1.2 SellShares.java, 1.6, 1.7

[Freek D. <mac...@us...>]

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

Modified Files:
	AssignNamedTrains.java BuyBonusToken.java BuyPrivate.java 
	BuyTrain.java LayBaseToken.java LayBonusToken.java 
	NullAction.java PossibleAction.java RequestTurn.java 
	SellShares.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: RequestTurn.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/RequestTurn.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RequestTurn.java	18 Jan 2010 18:49:12 -0000	1.1
--- RequestTurn.java	31 Jan 2010 22:22:29 -0000	1.2
***************
*** 13,45 ****
  
      public RequestTurn (Player player) {
! 		super();
! 		// Override player set by superclass
! 		if (player != null) {
! 			requestingPlayerName = player.getName();
! 		}
! 	}
  
!    	public String getRequestingPlayerName() {
! 		return requestingPlayerName;
! 	}
  
! 	@Override
! 	public boolean equals(PossibleAction pa) {
! 		return pa != null
! 				&& pa instanceof RequestTurn
! 				&& requestingPlayerName.equals(((RequestTurn)pa).requestingPlayerName);
! 	}
  
      private void readObject(ObjectInputStream in) throws IOException,
!     	ClassNotFoundException {
  
!     		in.defaultReadObject();
!     	}
  
  
! 	@Override
! 	public String toString() {
! 		return requestingPlayerName+" requests turn";
! 	}
  
  }
--- 13,45 ----
  
      public RequestTurn (Player player) {
!         super();
!         // Override player set by superclass
!         if (player != null) {
!             requestingPlayerName = player.getName();
!         }
!     }
  
!        public String getRequestingPlayerName() {
!         return requestingPlayerName;
!     }
  
!     @Override
!     public boolean equals(PossibleAction pa) {
!         return pa != null
!                 && pa instanceof RequestTurn
!                 && requestingPlayerName.equals(((RequestTurn)pa).requestingPlayerName);
!     }
  
      private void readObject(ObjectInputStream in) throws IOException,
!         ClassNotFoundException {
  
!             in.defaultReadObject();
!         }
  
  
!     @Override
!     public String toString() {
!         return requestingPlayerName+" requests turn";
!     }
  
  }

Index: PossibleAction.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/PossibleAction.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PossibleAction.java	19 Jan 2010 19:54:42 -0000	1.15
--- PossibleAction.java	31 Jan 2010 22:22:29 -0000	1.16
***************
*** 38,42 ****
      public PossibleAction() {
  
!     	gameManager = GameManager.getInstance();
          Player player = gameManager.getCurrentPlayer();
          if (player != null) {
--- 38,42 ----
      public PossibleAction() {
  
!         gameManager = GameManager.getInstance();
          Player player = gameManager.getCurrentPlayer();
          if (player != null) {
***************
*** 76,89 ****
  
      protected GameManagerI getGameManager() {
!     	return GameManager.getInstance();
      }
  
      protected CompanyManagerI getCompanyManager () {
!     	return getGameManager().getCompanyManager();
      }
  
      /** Default version of an Menu item text. To be overridden where useful. */
      public String toMenu() {
!     	return toString();
      }
  
--- 76,89 ----
  
      protected GameManagerI getGameManager() {
!         return GameManager.getInstance();
      }
  
      protected CompanyManagerI getCompanyManager () {
!         return getGameManager().getCompanyManager();
      }
  
      /** Default version of an Menu item text. To be overridden where useful. */
      public String toMenu() {
!         return toString();
      }
  
***************
*** 91,95 ****
              ClassNotFoundException {
          in.defaultReadObject();
!     	gameManager = GameManager.getInstance();
  
      }
--- 91,95 ----
              ClassNotFoundException {
          in.defaultReadObject();
!         gameManager = GameManager.getInstance();
  
      }

Index: LayBaseToken.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/LayBaseToken.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LayBaseToken.java	30 Oct 2009 21:53:04 -0000	1.5
--- LayBaseToken.java	31 Jan 2010 22:22:28 -0000	1.6
***************
*** 65,69 ****
  
      @Override
! 	public boolean equals(PossibleAction action) {
          if (!(action instanceof LayBaseToken)) return false;
          LayBaseToken a = (LayBaseToken) action;
--- 65,69 ----
  
      @Override
!     public boolean equals(PossibleAction action) {
          if (!(action instanceof LayBaseToken)) return false;
          LayBaseToken a = (LayBaseToken) action;
***************
*** 75,79 ****
  
      @Override
! 	public String toString() {
          StringBuffer b = new StringBuffer("LayBaseToken ");
          if (chosenHex == null) {
--- 75,79 ----
  
      @Override
!     public String toString() {
          StringBuffer b = new StringBuffer("LayBaseToken ");
          if (chosenHex == null) {

Index: SellShares.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/SellShares.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SellShares.java	29 Oct 2009 19:41:29 -0000	1.6
--- SellShares.java	31 Jan 2010 22:22:29 -0000	1.7
***************
*** 93,97 ****
  
      @Override
! 	public boolean equals(PossibleAction action) {
          if (!(action instanceof SellShares)) return false;
          SellShares a = (SellShares) action;
--- 93,97 ----
  
      @Override
!     public boolean equals(PossibleAction action) {
          if (!(action instanceof SellShares)) return false;
          SellShares a = (SellShares) action;
***************
*** 103,107 ****
  
      @Override
! 	public String toString() {
          return "SellShares: "
                 + (numberSold > 0 ? numberSold : "max " + maximumNumber)
--- 103,107 ----
  
      @Override
!     public String toString() {
          return "SellShares: "
                 + (numberSold > 0 ? numberSold : "max " + maximumNumber)

Index: BuyBonusToken.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/BuyBonusToken.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BuyBonusToken.java	4 Nov 2009 20:33:21 -0000	1.3
--- BuyBonusToken.java	31 Jan 2010 22:22:28 -0000	1.4
***************
*** 39,44 ****
      public BuyBonusToken(SellBonusToken specialProperty) {
  
!     	this.specialProperty = specialProperty;
!     	this.specialPropertyId = specialProperty.getUniqueId();
          this.privateCompany = specialProperty.getCompany();
          this.privateCompanyName = privateCompany.getName();
--- 39,44 ----
      public BuyBonusToken(SellBonusToken specialProperty) {
  
!         this.specialProperty = specialProperty;
!         this.specialPropertyId = specialProperty.getUniqueId();
          this.privateCompany = specialProperty.getCompany();
          this.privateCompanyName = privateCompany.getName();
***************
*** 59,99 ****
  
      public String getPrivateCompanyName() {
! 		return privateCompanyName;
! 	}
  
! 	public CashHolder getSeller() {
! 		return seller;
! 	}
  
! 	public String getSellerName() {
! 		return sellerName;
! 	}
  
! 	public SellBonusToken getSpecialProperty() {
! 		return specialProperty;
! 	}
  
! 	public String getName() {
! 		return name;
! 	}
  
! 	public int getValue() {
! 		return value;
! 	}
  
! 	public String getLocationString() {
! 		return locationString;
! 	}
  
! 	public int getPrice() {
          return price;
      }
  
      @Override
! 	public boolean equals(PossibleAction action) {
          if (!(action instanceof BuyBonusToken)) return false;
          BuyBonusToken a = (BuyBonusToken) action;
          return a.privateCompany == privateCompany
!         		&& a.name.equals(name)
                  && a.price == price
                  && a.value == value
--- 59,99 ----
  
      public String getPrivateCompanyName() {
!         return privateCompanyName;
!     }
  
!     public CashHolder getSeller() {
!         return seller;
!     }
  
!     public String getSellerName() {
!         return sellerName;
!     }
  
!     public SellBonusToken getSpecialProperty() {
!         return specialProperty;
!     }
  
!     public String getName() {
!         return name;
!     }
  
!     public int getValue() {
!         return value;
!     }
  
!     public String getLocationString() {
!         return locationString;
!     }
  
!     public int getPrice() {
          return price;
      }
  
      @Override
!     public boolean equals(PossibleAction action) {
          if (!(action instanceof BuyBonusToken)) return false;
          BuyBonusToken a = (BuyBonusToken) action;
          return a.privateCompany == privateCompany
!                 && a.name.equals(name)
                  && a.price == price
                  && a.value == value
***************
*** 102,111 ****
  
      @Override
! 	public String toString() {
          return "BuyBonusToken " + privateCompanyName
!         		+ " owner=" + sellerName
!         		+ " price=" + price
!         		+ " value=" + value
!         		+ " locations=" + locationString;
      }
  
--- 102,111 ----
  
      @Override
!     public String toString() {
          return "BuyBonusToken " + privateCompanyName
!                 + " owner=" + sellerName
!                 + " price=" + price
!                 + " value=" + value
!                 + " locations=" + locationString;
      }
  
***************
*** 119,126 ****
                  getCompanyManager().getPrivateCompany(privateCompanyName);
          if (sellerName.equalsIgnoreCase("Bank")) {
!         	seller = gameManager.getBank();
          } else if (sellerName != null) {
!         	seller =
!         		getCompanyManager().getPublicCompany(sellerName);
          }
          if (specialPropertyId > 0) {
--- 119,126 ----
                  getCompanyManager().getPrivateCompany(privateCompanyName);
          if (sellerName.equalsIgnoreCase("Bank")) {
!             seller = gameManager.getBank();
          } else if (sellerName != null) {
!             seller =
!                 getCompanyManager().getPublicCompany(sellerName);
          }
          if (specialPropertyId > 0) {

Index: BuyTrain.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/BuyTrain.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** BuyTrain.java	26 Jan 2010 20:09:39 -0000	1.16
--- BuyTrain.java	31 Jan 2010 22:22:28 -0000	1.17
***************
*** 87,92 ****
  
      public void setHasNoTrains(boolean hasNoTrains) {
! 		this.hasNoTrains = hasNoTrains;
! 	}
      
      public void setExtraMessage (String message) {
--- 87,92 ----
  
      public void setHasNoTrains(boolean hasNoTrains) {
!         this.hasNoTrains = hasNoTrains;
!     }
      
      public void setExtraMessage (String message) {
***************
*** 94,98 ****
      }
  
! 	public String getExtraMessage() {
          return extraMessage;
      }
--- 94,98 ----
      }
  
!     public String getExtraMessage() {
          return extraMessage;
      }
***************
*** 165,172 ****
  
      public boolean hasNoTrains() {
! 		return hasNoTrains;
! 	}
  
! 	public Portfolio getHolder() {
          return getTrain().getHolder();
      }
--- 165,172 ----
  
      public boolean hasNoTrains() {
!         return hasNoTrains;
!     }
  
!     public Portfolio getHolder() {
          return getTrain().getHolder();
      }

Index: BuyPrivate.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/BuyPrivate.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BuyPrivate.java	29 Oct 2009 19:41:30 -0000	1.6
--- BuyPrivate.java	31 Jan 2010 22:22:28 -0000	1.7
***************
*** 69,73 ****
  
      @Override
! 	public boolean equals(PossibleAction action) {
          if (!(action instanceof BuyPrivate)) return false;
          BuyPrivate a = (BuyPrivate) action;
--- 69,73 ----
  
      @Override
!     public boolean equals(PossibleAction action) {
          if (!(action instanceof BuyPrivate)) return false;
          BuyPrivate a = (BuyPrivate) action;
***************
*** 78,82 ****
  
      @Override
! 	public String toString() {
          return "BuyPrivate " + privateCompany.getName() + " holder="
                 + privateCompany.getPortfolio().getName();
--- 78,82 ----
  
      @Override
!     public String toString() {
          return "BuyPrivate " + privateCompany.getName() + " holder="
                 + privateCompany.getPortfolio().getName();

Index: NullAction.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/NullAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NullAction.java	20 Jan 2010 19:50:47 -0000	1.9
--- NullAction.java	31 Jan 2010 22:22:29 -0000	1.10
***************
*** 29,33 ****
  
      @Override
! 	public boolean equals(PossibleAction action) {
          if (!(action instanceof NullAction)) return false;
          NullAction a = (NullAction) action;
--- 29,33 ----
  
      @Override
!     public boolean equals(PossibleAction action) {
          if (!(action instanceof NullAction)) return false;
          NullAction a = (NullAction) action;
***************
*** 36,40 ****
  
      @Override
! 	public String toString() {
          return name[mode];
      }
--- 36,40 ----
  
      @Override
!     public String toString() {
          return name[mode];
      }

Index: LayBonusToken.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/LayBonusToken.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** LayBonusToken.java	19 Jan 2010 19:54:38 -0000	1.8
--- LayBonusToken.java	31 Jan 2010 22:22:28 -0000	1.9
***************
*** 37,41 ****
      public void finishConfiguration (GameManagerI gameManager)
      throws ConfigurationException {
!     	token.prepareForRemoval(gameManager.getPhaseManager());
      }
  
--- 37,41 ----
      public void finishConfiguration (GameManagerI gameManager)
      throws ConfigurationException {
!         token.prepareForRemoval(gameManager.getPhaseManager());
      }
  
***************
*** 45,49 ****
  
      @Override
! 	public boolean equals(PossibleAction action) {
          if (!(action instanceof LayBonusToken)) return false;
          LayBonusToken a = (LayBonusToken) action;
--- 45,49 ----
  
      @Override
!     public boolean equals(PossibleAction action) {
          if (!(action instanceof LayBonusToken)) return false;
          LayBonusToken a = (LayBonusToken) action;
***************
*** 53,57 ****
  
      @Override
! 	public String toString() {
          StringBuffer b = new StringBuffer("LayBonusToken ");
          if (chosenHex == null) {
--- 53,57 ----
  
      @Override
!     public String toString() {
          StringBuffer b = new StringBuffer("LayBonusToken ");
          if (chosenHex == null) {

Index: AssignNamedTrains.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/AssignNamedTrains.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AssignNamedTrains.java	11 Sep 2009 19:26:44 -0000	1.3
--- AssignNamedTrains.java	31 Jan 2010 22:22:28 -0000	1.4
***************
*** 22,26 ****
  
      @Override
! 	public String toString() {
          StringBuffer b = new StringBuffer("AssignNamedTrains ");
          for (NamedTrainToken token : namedTrainsSpecialProperty.getTokens()) {
--- 22,26 ----
  
      @Override
!     public String toString() {
          StringBuffer b = new StringBuffer("AssignNamedTrains ");
          for (NamedTrainToken token : namedTrainsSpecialProperty.getTokens()) {

[Rails-commits] 18xx/rails/game Bank.java, 1.18, 1.19 Bonus.java, 1.6, 1.7 BonusToken.java, 1.15, 1.16 City.java, 1.9, 1.10 CompanyManager.java, 1.20, 1.21 ComponentManager.java, 1.16, 1.17 DisplayBuffer.java, 1.8, 1.9 Game.java, 1.46, 1.47 GameDef.java, 1.2, 1.3 GameManager.java, 1.81, 1.82 GameManagerI.java, 1.26, 1.27 MapHex.java, 1.33, 1.34 MapManager.java, 1.13, 1.14 OperatingRound.java, 1.93, 1.94 Phase.java, 1.16, 1.17 PhaseManager.java, 1.19, 1.20 Player.java, 1.23, 1.24 Portfolio.java, 1.42, 1.43 PrivateCompany.java, 1.30, 1.31 PublicCertificate.java, 1.17, 1.18 PublicCompany.java, 1.78, 1.79 PublicCompanyI.java, 1.41, 1.42 ReportBuffer.java, 1.8, 1.9 Round.java, 1.36, 1.37 ShareSellingRound.java, 1.28, 1.29 StartItem.java, 1.20, 1.21 StartRound.java, 1.34, 1.35 StartRound_1830.java, 1.28, 1.29 StartRound_1835.java, 1.22, 1.23 StockMarket.java, 1.24, 1.25 StockRound.java, 1.57, 1.58 StockSpace.java, 1.9, 1.10 Tile.java, 1.35, 1.36 TrainManager.java, 1.25, 1.26 TrainType.java, 1.27, 1.28 TrainTypeI.java, 1.11, 1.12 TreasuryShareRound.java, 1.19, 1.20

[Freek D. <mac...@us...>]

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

Modified Files:
	Bank.java Bonus.java BonusToken.java City.java 
	CompanyManager.java ComponentManager.java DisplayBuffer.java 
	Game.java GameDef.java GameManager.java GameManagerI.java 
	MapHex.java MapManager.java OperatingRound.java Phase.java 
	PhaseManager.java Player.java Portfolio.java 
	PrivateCompany.java PublicCertificate.java PublicCompany.java 
	PublicCompanyI.java ReportBuffer.java Round.java 
	ShareSellingRound.java StartItem.java StartRound.java 
	StartRound_1830.java StartRound_1835.java StockMarket.java 
	StockRound.java StockSpace.java Tile.java TrainManager.java 
	TrainType.java TrainTypeI.java TreasuryShareRound.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: Bank.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Bank.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Bank.java	15 Jan 2010 19:55:55 -0000	1.18
--- Bank.java	31 Jan 2010 22:22:27 -0000	1.19
***************
*** 194,201 ****
  
      public static String format(int amount) {
!     	// Replace @ with the amount
!     	String result = instance.moneyFormat.replaceFirst("@", String.valueOf(amount));
!     	// Move any minus to the front
!     	if (amount < 0) result = result.replaceFirst("(.+)-", "-$1");
          return result;
      }
--- 194,201 ----
  
      public static String format(int amount) {
!         // Replace @ with the amount
!         String result = instance.moneyFormat.replaceFirst("@", String.valueOf(amount));
!         // Move any minus to the front
!         if (amount < 0) result = result.replaceFirst("(.+)-", "-$1");
          return result;
      }

Index: PublicCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompany.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** PublicCompany.java	22 Jan 2010 21:23:43 -0000	1.78
--- PublicCompany.java	31 Jan 2010 22:22:28 -0000	1.79
***************
*** 551,557 ****
          Tag optionsTag = tag.getChild("Options");
          if (optionsTag != null) {
!         	mustTradeTrainsAtFixedPrice = optionsTag.getAttributeAsBoolean
!         		("mustTradeTrainsAtFixedPrice", mustTradeTrainsAtFixedPrice);
!         	canClose = optionsTag.getAttributeAsBoolean("canClose", canClose);
          }
      }
--- 551,557 ----
          Tag optionsTag = tag.getChild("Options");
          if (optionsTag != null) {
!             mustTradeTrainsAtFixedPrice = optionsTag.getAttributeAsBoolean
!                 ("mustTradeTrainsAtFixedPrice", mustTradeTrainsAtFixedPrice);
!             canClose = optionsTag.getAttributeAsBoolean("canClose", canClose);
          }
      }
***************
*** 655,659 ****
              cert.setUniqueId(name, i);
              cert.setInitiallyAvailable(cert.isInitiallyAvailable()
!             		&& this.certsAreInitiallyAvailable);
          }
  
--- 655,659 ----
              cert.setUniqueId(name, i);
              cert.setInitiallyAvailable(cert.isInitiallyAvailable()
!                     && this.certsAreInitiallyAvailable);
          }
  
***************
*** 916,920 ****
          for (PublicCertificateI cert : certificates) {
              if (cert.getHolder() != scrapHeap) {
!             	cert.moveTo(scrapHeap);
              }
          }
--- 916,920 ----
          for (PublicCertificateI cert : certificates) {
              if (cert.getHolder() != scrapHeap) {
!                 cert.moveTo(scrapHeap);
              }
          }
***************
*** 1086,1090 ****
          certificates = new ArrayList<PublicCertificateI>();
          for (PublicCertificateI cert : list) {
!         	certificates.add(new PublicCertificate(cert));
          }
      }
--- 1086,1090 ----
          certificates = new ArrayList<PublicCertificateI>();
          for (PublicCertificateI cert : list) {
!             certificates.add(new PublicCertificate(cert));
          }
      }
***************
*** 1236,1241 ****
                  sharesPerRecipient.put(recipient, cert.getShares());
              } else {
!             	sharesPerRecipient.put(recipient,
!             		sharesPerRecipient.get(recipient) + cert.getShares());
              }
          }
--- 1236,1241 ----
                  sharesPerRecipient.put(recipient, cert.getShares());
              } else {
!                 sharesPerRecipient.put(recipient,
!                     sharesPerRecipient.get(recipient) + cert.getShares());
              }
          }
***************
*** 1247,1254 ****
              part = (int) Math.ceil(amount * shares * shareUnit.intValue() / 100.0);
              ReportBuffer.add(LocalText.getText("Payout",
!             		recipient.getName(),
!             		Bank.format(part),
!             		shares,
!             		shareUnit.intValue()));
              new CashMove(bank, recipient, part);
          }
--- 1247,1254 ----
              part = (int) Math.ceil(amount * shares * shareUnit.intValue() / 100.0);
              ReportBuffer.add(LocalText.getText("Payout",
!                     recipient.getName(),
!                     Bank.format(part),
!                     shares,
!                     shareUnit.intValue()));
              new CashMove(bank, recipient, part);
          }
***************
*** 1490,1494 ****
      public void buyTrain(TrainI train, int price) {
          if (train.getOwner() instanceof PublicCompanyI) {
!         	((MoneyModel)((PublicCompanyI)train.getOwner()).getTrainsSpentThisTurnModel()).add(-price);
          }
          portfolio.buyTrain(train, price);
--- 1490,1494 ----
      public void buyTrain(TrainI train, int price) {
          if (train.getOwner() instanceof PublicCompanyI) {
!             ((MoneyModel)((PublicCompanyI)train.getOwner()).getTrainsSpentThisTurnModel()).add(-price);
          }
          portfolio.buyTrain(train, price);
***************
*** 1531,1546 ****
                      new ArrayList<SpecialPropertyI>(2);
              List<SpecialPropertyI> spsToMoveToGM =
!                 	new ArrayList<SpecialPropertyI>(2);
              for (SpecialPropertyI sp : sps) {
                  if (sp.getTransferText().equalsIgnoreCase("toCompany")) {
                      spsToMoveHere.add(sp);
                  } else if (sp.getTransferText().equalsIgnoreCase("toGameManager")) {
!                 	// This must be SellBonusToken - remember the owner!
!                 	if (sp instanceof SellBonusToken) {
!                 		((SellBonusToken)sp).setSeller(this);
                          // Also note 1 has been used
                          ((SellBonusToken)sp).setExercised();
!                 	}
!                 	spsToMoveToGM.add(sp);
                  }
              }
--- 1531,1546 ----
                      new ArrayList<SpecialPropertyI>(2);
              List<SpecialPropertyI> spsToMoveToGM =
!                     new ArrayList<SpecialPropertyI>(2);
              for (SpecialPropertyI sp : sps) {
                  if (sp.getTransferText().equalsIgnoreCase("toCompany")) {
                      spsToMoveHere.add(sp);
                  } else if (sp.getTransferText().equalsIgnoreCase("toGameManager")) {
!                     // This must be SellBonusToken - remember the owner!
!                     if (sp instanceof SellBonusToken) {
!                         ((SellBonusToken)sp).setSeller(this);
                          // Also note 1 has been used
                          ((SellBonusToken)sp).setExercised();
!                     }
!                     spsToMoveToGM.add(sp);
                  }
              }
***************
*** 1624,1631 ****
  
      public boolean addBonus(Bonus bonus) {
!     	if (bonuses == null) {
!     		bonuses = new ArrayList<Bonus>(2);
              bonusValue.set(bonuses);
!     	}
          new AddToList<Bonus> (bonuses, bonus, name+"_Bonuses", bonusValue);
          return true;
--- 1624,1631 ----
  
      public boolean addBonus(Bonus bonus) {
!         if (bonuses == null) {
!             bonuses = new ArrayList<Bonus>(2);
              bonusValue.set(bonuses);
!         }
          new AddToList<Bonus> (bonuses, bonus, name+"_Bonuses", bonusValue);
          return true;
***************
*** 1633,1654 ****
  
      public boolean removeBonus(Bonus bonus) {
!     	new RemoveFromList<Bonus> (bonuses, bonus, name+"_Bonuses", bonusValue);
          return true;
      }
  
      public boolean removeBonus (String name) {
!     	if (bonuses != null && !bonuses.isEmpty()) {
!     		for(Bonus bonus : bonuses) {
!     			if (bonus.getName().equals(name)) return removeBonus(bonus);
!     		}
!     	}
!     	return false;
      }
  
      public List<Bonus> getBonuses() {
! 		return bonuses;
! 	}
  
! 	public BonusModel getBonusTokensModel() {
          return bonusValue;
      }
--- 1633,1654 ----
  
      public boolean removeBonus(Bonus bonus) {
!         new RemoveFromList<Bonus> (bonuses, bonus, name+"_Bonuses", bonusValue);
          return true;
      }
  
      public boolean removeBonus (String name) {
!         if (bonuses != null && !bonuses.isEmpty()) {
!             for(Bonus bonus : bonuses) {
!                 if (bonus.getName().equals(name)) return removeBonus(bonus);
!             }
!         }
!         return false;
      }
  
      public List<Bonus> getBonuses() {
!         return bonuses;
!     }
  
!     public BonusModel getBonusTokensModel() {
          return bonusValue;
      }
***************
*** 1782,1786 ****
  
      public boolean mustTradeTrainsAtFixedPrice() {
!     	return mustTradeTrainsAtFixedPrice;
      }
  
--- 1782,1786 ----
  
      public boolean mustTradeTrainsAtFixedPrice() {
!         return mustTradeTrainsAtFixedPrice;
      }
  
***************
*** 1823,1830 ****
  
      public boolean canClose() {
! 		return canClose;
! 	}
  
! 	@Override
      public Object clone() {
  
--- 1823,1830 ----
  
      public boolean canClose() {
!         return canClose;
!     }
  
!     @Override
      public Object clone() {
  
***************
*** 1848,1855 ****
      }
  
! 	/** Extra codes to be added to the president's indicator in the Game Status window.
! 	 * Normally nothing (see 1856 CGR for an exception). */
! 	public String getExtraShareMarks () {
! 		return "";
! 	}
  }
--- 1848,1855 ----
      }
  
!     /** Extra codes to be added to the president's indicator in the Game Status window.
!      * Normally nothing (see 1856 CGR for an exception). */
!     public String getExtraShareMarks () {
!         return "";
!     }
  }

Index: StartRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StartRound.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** StartRound.java	14 Jan 2010 20:59:03 -0000	1.34
--- StartRound.java	31 Jan 2010 22:22:28 -0000	1.35
***************
*** 307,315 ****
  
      @Override
! 	protected void finishRound() {
!     	super.finishRound();
      }
  
!     	/*----- Setting up the UI for the next action -----*/
  
     /**
--- 307,315 ----
  
      @Override
!     protected void finishRound() {
!         super.finishRound();
      }
  
!         /*----- Setting up the UI for the next action -----*/
  
     /**

Index: Player.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Player.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Player.java	5 Jan 2010 20:55:32 -0000	1.23
--- Player.java	31 Jan 2010 22:22:28 -0000	1.24
***************
*** 98,102 ****
  
      public void updateWorth () {
!     	worth.update();
      }
  
--- 98,102 ----
  
      public void updateWorth () {
!         worth.update();
      }
  

Index: GameDef.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameDef.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GameDef.java	15 Jan 2010 19:55:59 -0000	1.2
--- GameDef.java	31 Jan 2010 22:22:28 -0000	1.3
***************
*** 9,32 ****
  public class GameDef {
  
! 	public enum Parm {
  
! 		NO_SALE_IN_FIRST_SR (false),
! 		NO_SALE_IF_NOT_OPERATED (false),
! 		STOCK_ROUND_SEQUENCE(StockRound.SELL_BUY_SELL),
! 		PLAYER_SHARE_LIMIT (60),
! 		POOL_SHARE_LIMIT(50),
! 		TREASURY_SHARE_LIMIT(50),
! 		FIXED_PRICE_TRAINS_BETWEEN_PRESIDENTS(false),
! 		SKIP_FIRST_STOCK_ROUND(false);
  
! 		private Object defaultValue;
  
! 		Parm (boolean defaultValue) { this.defaultValue = defaultValue; }
! 		Parm (int defaultValue) { this.defaultValue = defaultValue; }
  
! 		public Object defaultValue() { return defaultValue; }
! 		public boolean defaultValueAsBoolean() { return (Boolean) defaultValue; }
! 		public int defaultValueAsInt() { return (Integer) defaultValue; }
! 	}
  
  }
--- 9,32 ----
  public class GameDef {
  
!     public enum Parm {
  
!         NO_SALE_IN_FIRST_SR (false),
!         NO_SALE_IF_NOT_OPERATED (false),
!         STOCK_ROUND_SEQUENCE(StockRound.SELL_BUY_SELL),
!         PLAYER_SHARE_LIMIT (60),
!         POOL_SHARE_LIMIT(50),
!         TREASURY_SHARE_LIMIT(50),
!         FIXED_PRICE_TRAINS_BETWEEN_PRESIDENTS(false),
!         SKIP_FIRST_STOCK_ROUND(false);
  
!         private Object defaultValue;
  
!         Parm (boolean defaultValue) { this.defaultValue = defaultValue; }
!         Parm (int defaultValue) { this.defaultValue = defaultValue; }
  
!         public Object defaultValue() { return defaultValue; }
!         public boolean defaultValueAsBoolean() { return (Boolean) defaultValue; }
!         public int defaultValueAsInt() { return (Integer) defaultValue; }
!     }
  
  }

Index: PublicCompanyI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompanyI.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** PublicCompanyI.java	8 Jan 2010 21:30:46 -0000	1.41
--- PublicCompanyI.java	31 Jan 2010 22:22:28 -0000	1.42
***************
*** 349,353 ****
  
      public int sharesOwnedByPlayers();
! 	public String getExtraShareMarks ();
      
      public ModelObject getClosedModel ();
--- 349,353 ----
  
      public int sharesOwnedByPlayers();
!     public String getExtraShareMarks ();
      
      public ModelObject getClosedModel ();

Index: StockMarket.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockMarket.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** StockMarket.java	13 Dec 2009 16:39:49 -0000	1.24
--- StockMarket.java	31 Jan 2010 22:22:28 -0000	1.25
***************
*** 47,55 ****
      public void configureFromXML(Tag tag) throws ConfigurationException {
  
!     	// Define a default stockspace type with colour white
!     	defaultType = new StockSpaceType(DEFAULT, StockSpaceType.WHITE);
!     	stockSpaceTypes.put (DEFAULT, defaultType);
  
!     	/* Read and configure the stock market space types */
          List<Tag> typeTags = tag.getChildren(StockSpaceTypeI.ELEMENT_ID);
  
--- 47,55 ----
      public void configureFromXML(Tag tag) throws ConfigurationException {
  
!         // Define a default stockspace type with colour white
!         defaultType = new StockSpaceType(DEFAULT, StockSpaceType.WHITE);
!         stockSpaceTypes.put (DEFAULT, defaultType);
  
!         /* Read and configure the stock market space types */
          List<Tag> typeTags = tag.getChildren(StockSpaceTypeI.ELEMENT_ID);
  
***************
*** 237,241 ****
          // Check if company may enter a "Closed" area
          while (getStockSpace(newrow, col).closesCompany() && !company.canClose())
!         	newrow--;
  
          /*
--- 237,241 ----
          // Check if company may enter a "Closed" area
          while (getStockSpace(newrow, col).closesCompany() && !company.canClose())
!             newrow--;
  
          /*
***************
*** 266,272 ****
          int col = oldsquare.getColumn();
          if (col < numCols - 1 && !oldsquare.isLeftOfLedge()
!         		&& (newsquare = getStockSpace(row, col + 1)) != null) {}
          else if (row > 0
!         		&& (newsquare = getStockSpace(row - 1, col)) != null) {}
          prepareMove(company, oldsquare, newsquare);
      }
--- 266,272 ----
          int col = oldsquare.getColumn();
          if (col < numCols - 1 && !oldsquare.isLeftOfLedge()
!                 && (newsquare = getStockSpace(row, col + 1)) != null) {}
          else if (row > 0
!                 && (newsquare = getStockSpace(row - 1, col)) != null) {}
          prepareMove(company, oldsquare, newsquare);
      }
***************
*** 279,288 ****
          if (col > 0 && (newsquare = getStockSpace(row, col - 1)) != null) {}
          else if (row < numRows - 1 &&
!         		(newsquare = getStockSpace(row + 1, col)) != null) {}
          else {
              newsquare = oldsquare;
          }
          if (newsquare.closesCompany()) {
!         	if (!company.canClose()) return; // E.g. 1856 CGR
              company.setClosed();
              oldsquare.removeToken(company);
--- 279,288 ----
          if (col > 0 && (newsquare = getStockSpace(row, col - 1)) != null) {}
          else if (row < numRows - 1 &&
!                 (newsquare = getStockSpace(row + 1, col)) != null) {}
          else {
              newsquare = oldsquare;
          }
          if (newsquare.closesCompany()) {
!             if (!company.canClose()) return; // E.g. 1856 CGR
              company.setClosed();
              oldsquare.removeToken(company);

Index: StartRound_1830.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StartRound_1830.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** StartRound_1830.java	1 Jan 2010 18:57:21 -0000	1.28
--- StartRound_1830.java	31 Jan 2010 22:22:28 -0000	1.29
***************
*** 42,52 ****
          StartItem item;
          while ((item = startPacket.getFirstUnsoldItem()) != null
!         		&& item.getBidders() == 1 && item.needsPriceSetting() == null) {
              assignItem(item.getBidder(), item, item.getBid(), 0);
  
              // Check if this has exhausted the start packet
              if (startPacket.areAllSold()) {
!             	finishRound();
!             	break;
              }
          }
--- 42,52 ----
          StartItem item;
          while ((item = startPacket.getFirstUnsoldItem()) != null
!                 && item.getBidders() == 1 && item.needsPriceSetting() == null) {
              assignItem(item.getBidder(), item, item.getBid(), 0);
  
              // Check if this has exhausted the start packet
              if (startPacket.areAllSold()) {
!                 finishRound();
!                 break;
              }
          }
***************
*** 107,112 ****
                              break; // No more actions possible!
                          } else {
!                         	// ERROR, this should have been detected in process()!
!                         	log.error("??? Wrong place to assign item "+item.getName());
                              assignItem(item.getBidder(), item, item.getBid(), 0);
                          }
--- 107,112 ----
                              break; // No more actions possible!
                          } else {
!                             // ERROR, this should have been detected in process()!
!                             log.error("??? Wrong place to assign item "+item.getName());
                              assignItem(item.getBidder(), item, item.getBid(), 0);
                          }
***************
*** 323,330 ****
                  // More than one left: find next bidder
  
!             	if (GameOption.OPTION_VALUE_YES.equalsIgnoreCase(getGameOption("LeaveAuctionOnPass"))) {
!             		// Game option: player to leave auction after a pass (default no).
!             		auctionItem.setBid(-1, player);
!             	}
  
                  setNextBiddingPlayer(auctionItem,
--- 323,330 ----
                  // More than one left: find next bidder
  
!                 if (GameOption.OPTION_VALUE_YES.equalsIgnoreCase(getGameOption("LeaveAuctionOnPass"))) {
!                     // Game option: player to leave auction after a pass (default no).
!                     auctionItem.setBid(-1, player);
!                 }
  
                  setNextBiddingPlayer(auctionItem,

Index: Phase.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Phase.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Phase.java	19 Jan 2010 19:54:47 -0000	1.16
--- Phase.java	31 Jan 2010 22:22:28 -0000	1.17
***************
*** 165,169 ****
  
      public String getTileColoursString() {
!     	return colourList;
      }
  
--- 165,169 ----
  
      public String getTileColoursString() {
!         return colourList;
      }
  
***************
*** 247,254 ****
  
      public List<Closeable> getClosedObjects() {
! 		return closedObjects;
! 	}
  
! 	@Override
      public String toString() {
          return name;
--- 247,254 ----
  
      public List<Closeable> getClosedObjects() {
!         return closedObjects;
!     }
  
!     @Override
      public String toString() {
          return name;

Index: ComponentManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/ComponentManager.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ComponentManager.java	15 Jan 2010 19:55:59 -0000	1.16
--- ComponentManager.java	31 Jan 2010 22:22:28 -0000	1.17
***************
*** 42,46 ****
  
      public static synchronized ComponentManager configureInstance(String gameName, Tag tag,
!     		Map<String, String> gameOptions)
              throws ConfigurationException {
          return new ComponentManager(gameName, tag, gameOptions);
--- 42,46 ----
  
      public static synchronized ComponentManager configureInstance(String gameName, Tag tag,
!             Map<String, String> gameOptions)
              throws ConfigurationException {
          return new ComponentManager(gameName, tag, gameOptions);

Index: TrainTypeI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/TrainTypeI.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TrainTypeI.java	4 Nov 2009 20:33:22 -0000	1.11
--- TrainTypeI.java	31 Jan 2010 22:22:28 -0000	1.12
***************
*** 108,111 ****
      public int getIndex();
  
! 	public TrainManager getTrainManager();
  }
--- 108,111 ----
      public int getIndex();
  
!     public TrainManager getTrainManager();
  }

Index: CompanyManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/CompanyManager.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** CompanyManager.java	17 Jan 2010 14:05:48 -0000	1.20
--- CompanyManager.java	31 Jan 2010 22:22:28 -0000	1.21
***************
*** 1 ****
! /* $Header$ */
package rails.game;

import java.util.*;

import org.apache.log4j.Logger;

import rails.util.LocalText;
import rails.util.Tag;

public class CompanyManager implements CompanyManagerI, ConfigurableComponentI {

    /** A List with all private companies */
    private List<PrivateCompanyI> lPrivateCompanies =
            new ArrayList<PrivateCompanyI>();

    /** A List with all public companies */
    private List<PublicCompanyI> lPublicCompanies =
            new ArrayList<PublicCompanyI>();

    /** A map with all private companies by name */
    private Map<String, PrivateCompanyI> mPrivateCompanies =
            new HashMap<String, PrivateCompanyI>();

    /** A map with all public (i.e. non-private) companies by name */
    private Map<String, PublicCompanyI> mPublicCompanies =
            new HashMap<String, PublicCompanyI>();

    /** A map of all type names to maps of companies of that type by name */
    // TODO Redundant, current usage can be replaced.
    private Map<String, HashMap<String, CompanyI>> mCompaniesByTypeAndName =
            new HashMap<String, HashMap<String, CompanyI>>();

    /** A list of all start packets (usually one) */
    private List<StartPacket> startPackets = new ArrayList<StartPacket>();
    /** A map of all start packets, keyed by name. Default name is "Initial" */
    private Map<String, StartPacket> startPacketMap
    	= new HashMap<String, StartPacket>();

    private int numberOfPublicCompanies = 0;

    protected static Logger log =
            Logger.getLogger(CompanyManager.class.getPackage().getName());

    protected GameManagerI gameManager;

    /*
     * NOTES: 1. we don't have a map over all companies, because some games have
     * duplicate names, e.g. B&O in 1830. 2. we have both a map and a list of
     * private/public companies to preserve configuration sequence while
     * allowing direct access.
     */
    /**
     * No-args constructor.
     */
    public CompanyManager() {
    // Nothing to do here, everything happens when configured.
    }

    /**
     * @see rails.game.ConfigurableComponentI#configureFromXML(org.w3c.dom.Element)
     */
    public void configureFromXML(Tag tag) throws ConfigurationException {

    	gameManager = GameManager.getInstance();

        /** A map with all company types, by type name */
        // Localised here as it has no permanent use
        Map<String, CompanyTypeI> mCompanyTypes
              = new HashMap<String, CompanyTypeI>();

        for (Tag compTypeTag : tag.getChildren(CompanyTypeI.ELEMENT_ID)) {
            // Extract the attributes of the Component
            String name =
                    compTypeTag.getAttributeAsString(CompanyTypeI.NAME_TAG);
            if (name == null) {
                throw new ConfigurationException(
                        LocalText.getText("UnnamedCompanyType"));
            }
            String className =
                    compTypeTag.getAttributeAsString(CompanyTypeI.CLASS_TAG);
            if (className == null) {
                throw new ConfigurationException(LocalText.getText(
                        "CompanyTypeHasNoClass", name));
            }
            if (mCompanyTypes.get(name) != null) {
                throw new ConfigurationException(LocalText.getText(
                        "CompanyTypeConfiguredTwice", name));
            }

            CompanyTypeI companyType = new CompanyType(name, className);
            mCompanyTypes.put(name, companyType);

            // Further parsing is done within CompanyType
            companyType.configureFromXML(compTypeTag);

        }

        /* Read and configure the companies */
        for (Tag companyTag : tag.getChildren(CompanyI.COMPANY_ELEMENT_ID)) {
            // Extract the attributes of the Component
            String name =
                    companyTag.getAttributeAsString(CompanyI.COMPANY_NAME_TAG);
            if (name == null) {
                throw new ConfigurationException(
                        LocalText.getText("UnnamedCompany"));
            }
            String type =
                    companyTag.getAttributeAsString(CompanyI.COMPANY_TYPE_TAG);
            if (type == null) {
                throw new ConfigurationException(LocalText.getText(
                        "CompanyHasNoType", name));
            }
            CompanyTypeI cType = mCompanyTypes.get(type);
            if (cType == null) {
                throw new ConfigurationException(LocalText.getText(
                        "CompanyHasUnknownType", name, type ));
            }
            try {

                CompanyI company = cType.createCompany(name, companyTag);

                /* Private or public */
                if (company instanceof PrivateCompanyI) {
                    mPrivateCompanies.put(name, (PrivateCompanyI) company);
                    lPrivateCompanies.add((PrivateCompanyI) company);

                } else if (company instanceof PublicCompanyI) {
                    ((PublicCompanyI)company).setIndex (numberOfPublicCompanies++);
                    mPublicCompanies.put(name, (PublicCompanyI) company);
                    lPublicCompanies.add((PublicCompanyI) company);
                }
                /* By type and name */
                if (!mCompaniesByTypeAndName.containsKey(type))
                    mCompaniesByTypeAndName.put(type,
                            new HashMap<String, CompanyI>());
                ((Map<String, CompanyI>) mCompaniesByTypeAndName.get(type)).put(
                        name, company);
            } catch (Exception e) {
                throw new ConfigurationException(LocalText.getText(
                        "ClassCannotBeInstantiated", cType.getClassName()), e);
            }
        }

        /* Read and configure the start packets */
        List<Tag> packetTags = tag.getChildren("StartPacket");

        if (packetTags != null) {
            for (Tag packetTag : tag.getChildren("StartPacket")) {
                // Extract the attributes of the Component
                String name = packetTag.getAttributeAsString("name", StartPacket.DEFAULT_NAME);
                String roundClass =
                        packetTag.getAttributeAsString("roundClass");
                if (roundClass == null) {
                    throw new ConfigurationException(LocalText.getText(
                            "StartPacketHasNoClass", name));
                }

                StartPacket sp = new StartPacket(name, roundClass);
                startPackets.add(sp);
                startPacketMap.put(name, sp);

                sp.configureFromXML(packetTag);
            }
        }

    }

    // Post XML parsing initialisations
    public void finishConfiguration (GameManagerI gameManager)
    throws ConfigurationException {

        for (PublicCompanyI comp : lPublicCompanies) {
            comp.finishConfiguration(gameManager);
        }
        for (PrivateCompanyI comp : lPrivateCompanies) {
            comp.finishConfiguration(gameManager);
        }
    }

    /**
     * @see rails.game.CompanyManagerI#getCompany(java.lang.String)
     *
     */
    public PrivateCompanyI getPrivateCompany(String name) {
        return mPrivateCompanies.get(name);
    }

    public PublicCompanyI getPublicCompany(String name) {
        return mPublicCompanies.get(name);
    }

    public List<PrivateCompanyI> getAllPrivateCompanies() {
        return lPrivateCompanies;
    }

    public List<PublicCompanyI> getAllPublicCompanies() {
        return lPublicCompanies;
    }

    public PublicCompanyI getCompanyByName(String name) {
        for (int i = 0; i < lPublicCompanies.size(); i++) {
            PublicCompany co = (PublicCompany) lPublicCompanies.get(i);
            if (name.equalsIgnoreCase(co.getName())) {
                return lPublicCompanies.get(i);
            }
        }

        return null;
    }

    public CompanyI getCompany(String type, String name) {

        if (mCompaniesByTypeAndName.containsKey(type)) {
            return (mCompaniesByTypeAndName.get(type)).get(name);
        } else {
            return null;
        }
    }

    public void closeAllPrivates() {
        if (lPrivateCompanies == null) return;
        for (PrivateCompanyI priv : lPrivateCompanies) {
            priv.setClosed();
        }
    }

    public List<PrivateCompanyI> getPrivatesOwnedByPlayers() {
        List<PrivateCompanyI> privatesOwnedByPlayers =
                new ArrayList<PrivateCompanyI>();
        for (PrivateCompanyI priv : getAllPrivateCompanies()) {
            if (priv.getPortfolio().getOwner() instanceof Player) {
                privatesOwnedByPlayers.add(priv);
            }
        }
        return privatesOwnedByPlayers;
    }

    public StartPacket getStartPacket (int index) {
    	return startPackets.get(index);
    }

    public StartPacket getStartPacket (String name) {
    	return startPacketMap.get(name);
    }
}
\ No newline at end of file
--- 1 ----
! /* $Header$ */
package rails.game;

import java.util.*;

import org.apache.log4j.Logger;

import rails.util.LocalText;
import rails.util.Tag;

public class CompanyManager implements CompanyManagerI, ConfigurableComponentI {

    /** A List with all private companies */
    private List<PrivateCompanyI> lPrivateCompanies =
            new ArrayList<PrivateCompanyI>();

    /** A List with all public companies */
    private List<PublicCompanyI> lPublicCompanies =
            new ArrayList<PublicCompanyI>();

    /** A map with all private companies by name */
    private Map<String, PrivateCompanyI> mPrivateCompanies =
            new HashMap<String, PrivateCompanyI>();

    /** A map with all public (i.e. non-private) companies by name */
    private Map<String, PublicCompanyI> mPublicCompanies =
            new HashMap<String, PublicCompanyI>();

    /** A map of all type names to maps of companies of that type by name */
    // TODO Redundant, current usage can be replaced.
    private Map<String, HashMap<String, CompanyI>> mCompaniesByTypeAndName =
            new HashMap<String, HashMap<String, CompanyI>>();

    /** A list of all start packets (usually one) */
    private List<StartPacket> startPackets = new ArrayList<StartPacket>();
    /** A map of all start packets, keyed by name. Default name is "Initial" */
    private Map<String, StartPacket> startPacketMap
        = new HashMap<String, StartPacket>();

    private int numberOfPublicCompanies = 0;

    protected static Logger log =
            Logger.getLogger(CompanyManager.class.getPackage().getName());

    protected GameManagerI gameManager;

    /*
     * NOTES: 1. we don't have a map over all companies, because some games have
     * duplicate names, e.g. B&O in 1830. 2. we have both a map and a list of
     * private/public companies to preserve configuration sequence while
     * allowing direct access.
     */
    /**
     * No-args constructor.
     */
    public CompanyManager() {
    // Nothing to do here, everything happens when configured.
    }

    /**
     * @see rails.game.ConfigurableComponentI#configureFromXML(org.w3c.dom.Element)
     */
    public void configureFromXML(Tag tag) throws ConfigurationException {

        gameManager = GameManager.getInstance();

        /** A map with all company types, by type name */
        // Localised here as it has no permanent use
        Map<String, CompanyTypeI> mCompanyTypes
              = new HashMap<String, CompanyTypeI>();

        for (Tag compTypeTag : tag.getChildren(CompanyTypeI.ELEMENT_ID)) {
            // Extract the attributes of the Component
            String name =
                    compTypeTag.getAttributeAsString(CompanyTypeI.NAME_TAG);
            if (name == null) {
                throw new ConfigurationException(
                        LocalText.getText("UnnamedCompanyType"));
            }
            String className =
                    compTypeTag.getAttributeAsString(CompanyTypeI.CLASS_TAG);
            if (className == null) {
                throw new ConfigurationException(LocalText.getText(
                        "CompanyTypeHasNoClass", name));
            }
            if (mCompanyTypes.get(name) != null) {
                throw new ConfigurationException(LocalText.getText(
                        "CompanyTypeConfiguredTwice", name));
            }

            CompanyTypeI companyType = new CompanyType(name, className);
            mCompanyTypes.put(name, companyType);

            // Further parsing is done within CompanyType
            companyType.configureFromXML(compTypeTag);

        }

        /* Read and configure the companies */
        for (Tag companyTag : tag.getChildren(CompanyI.COMPANY_ELEMENT_ID)) {
            // Extract the attributes of the Component
            String name =
                    companyTag.getAttributeAsString(CompanyI.COMPANY_NAME_TAG);
            if (name == null) {
                throw new ConfigurationException(
                        LocalText.getText("UnnamedCompany"));
            }
            String type =
                    companyTag.getAttributeAsString(CompanyI.COMPANY_TYPE_TAG);
            if (type == null) {
                throw new ConfigurationException(LocalText.getText(
                        "CompanyHasNoType", name));
            }
            CompanyTypeI cType = mCompanyTypes.get(type);
            if (cType == null) {
                throw new ConfigurationException(LocalText.getText(
                        "CompanyHasUnknownType", name, type ));
            }
            try {

                CompanyI company = cType.createCompany(name, companyTag);

                /* Private or public */
                if (company instanceof PrivateCompanyI) {
                    mPrivateCompanies.put(name, (PrivateCompanyI) company);
                    lPrivateCompanies.add((PrivateCompanyI) company);

                } else if (company instanceof PublicCompanyI) {
                    ((PublicCompanyI)company).setIndex (numberOfPublicCompanies++);
                    mPublicCompanies.put(name, (PublicCompanyI) company);
                    lPublicCompanies.add((PublicCompanyI) company);
                }
                /* By type and name */
                if (!mCompaniesByTypeAndName.containsKey(type))
                    mCompaniesByTypeAndName.put(type,
                            new HashMap<String, CompanyI>());
                ((Map<String, CompanyI>) mCompaniesByTypeAndName.get(type)).put(
                        name, company);
            } catch (Exception e) {
                throw new ConfigurationException(LocalText.getText(
                        "ClassCannotBeInstantiated", cType.getClassName()), e);
            }
        }

        /* Read and configure the start packets */
        List<Tag> packetTags = tag.getChildren("StartPacket");

        if (packetTags != null) {
            for (Tag packetTag : tag.getChildren("StartPacket")) {
                // Extract the attributes of the Component
                String name = packetTag.getAttributeAsString("name", StartPacket.DEFAULT_NAME);
                String roundClass =
                        packetTag.getAttributeAsString("roundClass");
                if (roundClass == null) {
                    throw new ConfigurationException(LocalText.getText(
                            "StartPacketHasNoClass", name));
                }

                StartPacket sp = new StartPacket(name, roundClass);
                startPackets.add(sp);
                startPacketMap.put(name, sp);

                sp.configureFromXML(packetTag);
            }
        }

    }

    // Post XML parsing initialisations
    public void finishConfiguration (GameManagerI gameManager)
    throws ConfigurationException {

        for (PublicCompanyI comp : lPublicCompanies) {
            comp.finishConfiguration(gameManager);
        }
        for (PrivateCompanyI comp : lPrivateCompanies) {
            comp.finishConfiguration(gameManager);
        }
    }

    /**
     * @see rails.game.CompanyManagerI#getCompany(java.lang.String)
     *
     */
    public PrivateCompanyI getPrivateCompany(String name) {
        return mPrivateCompanies.get(name);
    }

    public PublicCompanyI getPublicCompany(String name) {
        return mPublicCompanies.get(name);
    }

    public List<PrivateCompanyI> getAllPrivateCompanies() {
        return lPrivateCompanies;
    }

    public List<PublicCompanyI> getAllPublicCompanies() {
        return lPublicCompanies;
    }

    public PublicCompanyI getCompanyByName(String name) {
        for (int i = 0; i < lPublicCompanies.size(); i++) {
            PublicCompany co = (PublicCompany) lPublicCompanies.get(i);
            if (name.equalsIgnoreCase(co.getName())) {
                return lPublicCompanies.get(i);
            }
        }

        return null;
    }

    public CompanyI getCompany(String type, String name) {

        if (mCompaniesByTypeAndName.containsKey(type)) {
            return (mCompaniesByTypeAndName.get(type)).get(name);
        } else {
            return null;
        }
    }

    public void closeAllPrivates() {
        if (lPrivateCompanies == null) return;
        for (PrivateCompanyI priv : lPrivateCompanies) {
            priv.setClosed();
        }
    }

    public List<PrivateCompanyI> getPrivatesOwnedByPlayers() {
        List<PrivateCompanyI> privatesOwnedByPlayers =
                new ArrayList<PrivateCompanyI>();
        for (PrivateCompanyI priv : getAllPrivateCompanies()) {
            if (priv.getPortfolio().getOwner() instanceof Player) {
                privatesOwnedByPlayers.add(priv);
            }
        }
        return privatesOwnedByPlayers;
    }

    public StartPacket getStartPacket (int index) {
        return startPackets.get(index);
    }

    public StartPacket getStartPacket (String name) {
        return startPacketMap.get(name);
    }
}
\ No newline at end of file

Index: TrainManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/TrainManager.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** TrainManager.java	15 Jan 2010 19:55:59 -0000	1.25
--- TrainManager.java	31 Jan 2010 22:22:28 -0000	1.26
***************
*** 1 ****
! /* $Header$ */
package rails.game;

import java.util.*;

import rails.game.state.IntegerState;
import rails.util.LocalText;
import rails.util.Tag;

public class TrainManager implements ConfigurableComponentI {
    // Static attributes
    protected List<TrainTypeI> lTrainTypes = new ArrayList<TrainTypeI>();

    protected Map<String, TrainTypeI> mTrainTypes =
            new HashMap<String, TrainTypeI>();

    protected Map<String, TrainI> trainMap =
        new HashMap<String, TrainI>();


    // Dynamic attributes
    protected Portfolio unavailable = null;

    protected IntegerState newTypeIndex;

    protected boolean trainsHaveRusted = false;
    protected boolean phaseHasChanged = false;

    protected boolean trainAvailabilityChanged = false;

    protected List<PublicCompanyI> companiesWithExcessTrains;

    protected GameManagerI gameManager = null;
    protected Bank bank = null;

    // Non-game attributes
    protected Portfolio ipo = null;

    /**
     * No-args constructor.
     */
    public TrainManager() {

        newTypeIndex = new IntegerState("NewTrainTypeIndex", 0);
    }

    /**
     * @see rails.game.ConfigurableComponentI#configureFromXML(org.w3c.dom.Element)
     */
    public void configureFromXML(Tag tag) throws ConfigurationException {
        TrainType defaultType = null;
        TrainType newType;

        Tag defaultsTag = tag.getChild("Defaults");
        if (defaultsTag != null) {
            defaultType = new TrainType(false);
            defaultType.configureFromXML(defaultsTag);
        }

        List<Tag> typeTags = tag.getChildren("Train");

        for (Tag typeTag : typeTags) {
            if (defaultType != null) {
                newType = (TrainType) defaultType.clone();
                if (newType == null) {
                    throw new ConfigurationException("Cannot clone traintype "
                                                     + defaultType.getName());
                }
            } else {
                newType = new TrainType(true);
            }
            lTrainTypes.add(newType);
            newType.configureFromXML(typeTag);
            mTrainTypes.put(newType.getName(), newType);
        }

        // Special train buying rules
        Tag rulesTag = tag.getChild("TrainBuyingRules");
        if (rulesTag != null) {
            // A 1851 special
        	GameManager.getInstance().setGameParameter(GameDef.Parm.FIXED_PRICE_TRAINS_BETWEEN_PRESIDENTS,
        			rulesTag.getChild("FaceValueIfDifferentPresidents") != null);
        }

        // Finish initialisation of the train types
        for (TrainTypeI type : lTrainTypes) {
            if (type.getReleasedTrainTypeName() != null) {
                type.setReleasedTrainType(mTrainTypes.get(type.getReleasedTrainTypeName()));
            }
            if (type.getRustedTrainTypeName() != null) {
                type.setRustedTrainType(mTrainTypes.get(type.getRustedTrainTypeName()));
                mTrainTypes.get(type.getRustedTrainTypeName()).setPermanent(false);
            }
        }
    }

    public void finishConfiguration (GameManagerI gameManager)
    throws ConfigurationException {
    	this.gameManager = gameManager;
        bank = gameManager.getBank();
        ipo = bank.getIpo();
        unavailable = bank.getUnavailable();

        for (TrainTypeI type : lTrainTypes) {
            type.finishConfiguration(gameManager);
        }

        // By default, set the first train type to "available".
        newTypeIndex.set(0);
        lTrainTypes.get(newTypeIndex.intValue()).setAvailable(bank);
    }

    public void addTrain (String uniqueID, TrainI train) {
    	trainMap.put(uniqueID, train);
    }

    public TrainI getTrainByUniqueId(String id) {
        return trainMap.get(id);
    }

    /**
     * This method handles any consequences of new train buying (from the IPO),
     * such as rusting and phase changes. It must be called <b>after</b> the
     * train has been transferred.
     *
     */
    public void checkTrainAvailability(TrainI train, Portfolio from) {

        trainsHaveRusted = false;
        phaseHasChanged = false;
        if (from != ipo) return;

        TrainTypeI boughtType, nextType;
        boughtType = train.getType();
        if (boughtType == (lTrainTypes.get(newTypeIndex.intValue()))
            && ipo.getTrainOfType(boughtType) == null) {
            // Last train bought, make a new type available.
            newTypeIndex.add(1);
            nextType = (lTrainTypes.get(newTypeIndex.intValue()));
            if (nextType != null) {
                if (!nextType.isAvailable()) nextType.setAvailable(bank);
                trainAvailabilityChanged = true;
                ReportBuffer.add("All " + boughtType.getName()
                                 + "-trains are sold out, "
                                 + nextType.getName() + "-trains now available");

            }
        }
        if (boughtType.getNumberBoughtFromIPO() == 1) {
            // First train of a new type bought
            ReportBuffer.add(LocalText.getText("FirstTrainBought",
                    boughtType.getName()));

            String newPhase = boughtType.getStartedPhaseName();
            if (newPhase != null) {
                gameManager.getPhaseManager().setPhase(newPhase);
                phaseHasChanged = true;
            }

            TrainTypeI rustedType = boughtType.getRustedTrainType();
            if (rustedType != null && !rustedType.hasRusted()) {
                rustedType.setRusted(train.getHolder()); // Or obsolete,
                // where applicable
                ReportBuffer.add(LocalText.getText("TrainsRusted",
                        rustedType.getName()));
                trainsHaveRusted = true;
                trainAvailabilityChanged = true;
            }

            TrainTypeI releasedType = boughtType.getReleasedTrainType();
            if (releasedType != null) {
                if (!releasedType.isAvailable()) releasedType.setAvailable(bank);
                ReportBuffer.add(LocalText.getText("TrainsAvailable",
                        releasedType.getName()));
                trainAvailabilityChanged = true;
            }
        }
    }

    public List<TrainI> getAvailableNewTrains() {

        List<TrainI> availableTrains = new ArrayList<TrainI>();
        TrainI train;

        for (TrainTypeI type : lTrainTypes) {
            if (type.isAvailable()) {
                train = ipo.getTrainOfType(type);
                if (train != null) {
                    availableTrains.add(train);
                }
            }
        }
        return availableTrains;
    }

    public String getTrainCostOverview() {
    	StringBuffer b = new StringBuffer();
        for (TrainTypeI type : lTrainTypes) {
            if (b.length() > 1) b.append(" ");
            b.append(type.getName()).append(":").append(Bank.format(type.getCost()));
            if (type.getFirstExchangeCost() > 0) {
            	b.append("(").append(Bank.format(type.getFirstExchangeCost())).append(")");
            }
        }
    	return b.toString();
    }

    public TrainTypeI getTypeByName(String name) {
        return mTrainTypes.get(name);
    }

    public List<TrainTypeI> getTrainTypes() {
        return lTrainTypes;
    }

    public boolean hasAvailabilityChanged() {
        return trainAvailabilityChanged;
    }

    public void resetAvailabilityChanged() {
        trainAvailabilityChanged = false;
    }

    public boolean hasPhaseChanged() {
        return phaseHasChanged;
    }

}
\ No newline at end of file
--- 1 ----
! /* $Header$ */
package rails.game;

import java.util.*;

import rails.game.state.IntegerState;
import rails.util.LocalText;
import rails.util.Tag;

public class TrainManager implements ConfigurableComponentI {
    // Static attributes
    protected List<TrainTypeI> lTrainTypes = new ArrayList<TrainTypeI>();

    protected Map<String, TrainTypeI> mTrainTypes =
            new HashMap<String, TrainTypeI>();

    protected Map<String, TrainI> trainMap =
        new HashMap<String, TrainI>();


    // Dynamic attributes
    protected Portfolio unavailable = null;

    protected IntegerState newTypeIndex;

    protected boolean trainsHaveRusted = false;
    protected boolean phaseHasChanged = false;

    protected boolean trainAvailabilityChanged = false;

    protected List<PublicCompanyI> companiesWithExcessTrains;

    protected GameManagerI gameManager = null;
    protected Bank bank = null;

    // Non-game attributes
    protected Portfolio ipo = null;

    /**
     * No-args constructor.
     */
    public TrainManager() {

        newTypeIndex = new IntegerState("NewTrainTypeIndex", 0);
    }

    /**
     * @see rails.game.ConfigurableComponentI#configureFromXML(org.w3c.dom.Element)
     */
    public void configureFromXML(Tag tag) throws ConfigurationException {
        TrainType defaultType = null;
        TrainType newType;

        Tag defaultsTag = tag.getChild("Defaults");
        if (defaultsTag != null) {
            defaultType = new TrainType(false);
            defaultType.configureFromXML(defaultsTag);
        }

        List<Tag> typeTags = tag.getChildren("Train");

        for (Tag typeTag : typeTags) {
            if (defaultType != null) {
                newType = (TrainType) defaultType.clone();
                if (newType == null) {
                    throw new ConfigurationException("Cannot clone traintype "
                                                     + defaultType.getName());
                }
            } else {
                newType = new TrainType(true);
            }
            lTrainTypes.add(newType);
            newType.configureFromXML(typeTag);
            mTrainTypes.put(newType.getName(), newType);
        }

        // Special train buying rules
        Tag rulesTag = tag.getChild("TrainBuyingRules");
        if (rulesTag != null) {
            // A 1851 special
            GameManager.getInstance().setGameParameter(GameDef.Parm.FIXED_PRICE_TRAINS_BETWEEN_PRESIDENTS,
                    rulesTag.getChild("FaceValueIfDifferentPresidents") != null);
        }

        // Finish initialisation of the train types
        for (TrainTypeI type : lTrainTypes) {
            if (type.getReleasedTrainTypeName() != null) {
                type.setReleasedTrainType(mTrainTypes.get(type.getReleasedTrainTypeName()));
            }
            if (type.getRustedTrainTypeName() != null) {
                type.setRustedTrainType(mTrainTypes.get(type.getRustedTrainTypeName()));
                mTrainTypes.get(type.getRustedTrainTypeName()).setPermanent(false);
            }
        }
    }

    public void finishConfiguration (GameManagerI gameManager)
    throws ConfigurationException {
        this.gameManager = gameManager;
        bank = gameManager.getBank();
        ipo = bank.getIpo();
        unavailable = bank.getUnavailable();

        for (TrainTypeI type : lTrainTypes) {
            type.finishConfiguration(gameManager);
        }

        // By default, set the first train type to "available".
        newTypeIndex.set(0);
        lTrainTypes.get(newTypeIndex.intValue()).setAvailable(bank);
    }

    public void addTrain (String uniqueID, TrainI train) {
        trainMap.put(uniqueID, train);
    }

    public TrainI getTrainByUniqueId(String id) {
        return trainMap.get(id);
    }

    /**
     * This method handles any consequences of new train buying (from the IPO),
     * such as rusting and phase changes. It must be called <b>after</b> the
     * train has been transferred.
     *
     */
    public void checkTrainAvailability(TrainI train, Portfolio from) {

        trainsHaveRusted = false;
        phaseHasChanged = false;
        if (from != ipo) return;

        TrainTypeI boughtType, nextType;
        boughtType = train.getType();
        if (boughtType == (lTrainTypes.get(newTypeIndex.intValue()))
            && ipo.getTrainOfType(boughtType) == null) {
            // Last train bought, make a new type available.
            newTypeIndex.add(1);
            nextType = (lTrainTypes.get(newTypeIndex.intValue()));
            if (nextType != null) {
                if (!nextType.isAvailable()) nextType.setAvailable(bank);
                trainAvailabilityChanged = true;
                ReportBuffer.add("All " + boughtType.getName()
                                 + "-trains are sold out, "
                                 + nextType.getName() + "-trains now available");

            }
        }
        if (boughtType.getNumberBoughtFromIPO() == 1) {
            // First train of a new type bought
            ReportBuffer.add(LocalText.getText("FirstTrainBought",
                    boughtType.getName()));

            String newPhase = boughtType.getStartedPhaseName();
            if (newPhase != null) {
                gameManager.getPhaseManager().setPhase(newPhase);
                phaseHasChanged = true;
            }

            TrainTypeI rustedType = boughtType.getRustedTrainType();
            if (rustedType != null && !rustedType.hasRusted()) {
                rustedType.setRusted(train.getHolder()); // Or obsolete,
                // where applicable
                ReportBuffer.add(LocalText.getText("TrainsRusted",
                        rustedType.getName()));
                trainsHaveRusted = true;
                trainAvailabilityChanged = true;
            }

            TrainTypeI releasedType = boughtType.getReleasedTrainType();
            if (releasedType != null) {
                if (!releasedType.isAvailable()) releasedType.setAvailable(bank);
                ReportBuffer.add(LocalText.getText("TrainsAvailable",
                        releasedType.getName()));
                trainAvailabilityChanged = true;
            }
        }
    }

    public List<TrainI> getAvailableNewTrains() {

        List<TrainI> availableTrains = new ArrayList<TrainI>();
        TrainI train;

        for (TrainTypeI type : lTrainTypes) {
            if (type.isAvailable()) {
                train = ipo.getTrainOfType(type);
                if (train != null) {
                    availableTrains.add(train);
                }
            }
        }
        return availableTrains;
    }

    public String getTrainCostOverview() {
        StringBuffer b = new StringBuffer();
        for (TrainTypeI type : lTrainTypes) {
            if (b.length() > 1) b.append(" ");
            b.append(type.getName()).append(":").append(Bank.format(type.getCost()));
            if (type.getFirstExchangeCost() > 0) {
                b.append("(").append(Bank.format(type.getFirstExchangeCost())).append(")");
            }
        }
        return b.toString();
    }

    public TrainTypeI getTypeByName(String name) {
        return mTrainTypes.get(name);
    }

    public List<TrainTypeI> getTrainTypes() {
        return lTrainTypes;
    }

    public boolean hasAvailabilityChanged() {
        return trainAvailabilityChanged;
    }

    public void resetAvailabilityChanged() {
        trainAvailabilityChanged = false;
    }

    public boolean hasPhaseChanged() {
        return phaseHasChanged;
    }

}
\ No newline at end of file

Index: PrivateCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PrivateCompany.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** PrivateCompany.java	16 Jan 2010 21:16:14 -0000	1.30
--- PrivateCompany.java	31 Jan 2010 22:22:28 -0000	1.31
***************
*** 185,191 ****
      public void setClosed() {
  
!     	if (isClosed()) return;
  
!     	super.setClosed();
          unblockHexes();
          moveTo(GameManager.getInstance().getBank().getScrapHeap());
--- 185,191 ----
      public void setClosed() {
  
!         if (isClosed()) return;
  
!         super.setClosed();
          unblockHexes();
          moveTo(GameManager.getInstance().getBank().getScrapHeap());
***************
*** 198,202 ****
          List<SellBonusToken> moveToGM = new ArrayList<SellBonusToken>(4);
          for (SpecialPropertyI sp : specialProperties) {
!         	if (sp instanceof SellBonusToken) {
                  moveToGM.add((SellBonusToken)sp);
              }
--- 198,202 ----
          List<SellBonusToken> moveToGM = new ArrayList<SellBonusToken>(4);
          for (SpecialPropertyI sp : specialProperties) {
!             if (sp instanceof SellBonusToken) {
                  moveToGM.add((SellBonusToken)sp);
              }

Index: StockSpace.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockSpace.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** StockSpace.java	13 Dec 2009 16:39:49 -0000	1.9
--- StockSpace.java	31 Jan 2010 22:22:28 -0000	1.10
***************
*** 257,266 ****
  
      @Override
! 	public String getText() {
          return Bank.format(price);
      }
  
      @Override
! 	public String toString() {
          return getText();
      }
--- 257,266 ----
  
      @Override
!     public String getText() {
          return Bank.format(price);
      }
  
      @Override
!     public String toString() {
          return getText();
      }

Index: Bonus.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Bonus.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Bonus.java	19 Jan 2010 19:54:53 -0000	1.6
--- Bonus.java	31 Jan 2010 22:22:28 -0000	1.7
***************
*** 18,22 ****
  public class Bonus implements Closeable {
  
! 	private PublicCompanyI owner;
      private List<MapHex> locations = null;
      private String name;
--- 18,22 ----
  public class Bonus implements Closeable {
  
!     private PublicCompanyI owner;
      private List<MapHex> locations = null;
      private String name;
***************
*** 38,45 ****
  
      public PublicCompanyI getOwner() {
! 		return owner;
! 	}
  
! 	public List<MapHex> getLocations() {
          return locations;
      }
--- 38,45 ----
  
      public PublicCompanyI getOwner() {
!         return owner;
!     }
  
!     public List<MapHex> getLocations() {
          return locations;
      }
***************
*** 87,95 ****
  
          if (removingObject == null) {
! 	        String[] spec = removingObjectDesc.split(":");
! 	        if (spec[0].equalsIgnoreCase("Phase")) {
! 	            removingObject =
! 	                    phaseManager.getPhaseByName(spec[1]);
! 	        }
          }
  
--- 87,95 ----
  
          if (removingObject == null) {
!             String[] spec = removingObjectDesc.split(":");
!             if (spec[0].equalsIgnoreCase("Phase")) {
!                 removingObject =
!                         phaseManager.getPhaseByName(spec[1]);
!             }
          }
 ...
 
[truncated message content]

[Rails-commits] 18xx/rails/common GuiDef.java, 1.1, 1.2 GuiHints.java, 1.1, 1.2 ServerToClient.java, 1.1, 1.2

[Freek D. <mac...@us...>]

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

Modified Files:
	GuiDef.java GuiHints.java ServerToClient.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: ServerToClient.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/common/ServerToClient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ServerToClient.java	14 Jan 2010 20:41:20 -0000	1.1
--- ServerToClient.java	31 Jan 2010 22:22:27 -0000	1.2
***************
*** 22,32 ****
      private GuiHints guiHints = null;
  
! 	public GuiHints getUiHints() {
! 		return guiHints;
! 	}
  
! 	public void setUiHints(GuiHints guiHints) {
! 		this.guiHints = guiHints;
! 	}
  
  
--- 22,32 ----
      private GuiHints guiHints = null;
  
!     public GuiHints getUiHints() {
!         return guiHints;
!     }
  
!     public void setUiHints(GuiHints guiHints) {
!         this.guiHints = guiHints;
!     }
  
  

Index: GuiHints.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/common/GuiHints.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiHints.java	14 Jan 2010 20:41:20 -0000	1.1
--- GuiHints.java	31 Jan 2010 22:22:27 -0000	1.2
***************
*** 19,83 ****
      public static final long serialVersionUID = 1L;
  
! 	/** What round type is currently active in the engine? */
! 	private Class<? extends RoundI> currentRoundType = null;
  
! 	/** Which windows should be visible? */
! 	private List<VisibilityHint> visibilityHints;
  
! 	/** Which window type is active and should be on top? */
! 	private GuiDef.Panel activePanel;
  
! 	public Class<? extends RoundI> getCurrentRoundType() {
! 		return currentRoundType;
! 	}
  
! 	public void setCurrentRoundType(Class<? extends RoundI> currentRoundType) {
! 		this.currentRoundType = currentRoundType;
! 	}
  
! 	public List<VisibilityHint> getVisibilityHints() {
! 		return visibilityHints;
! 	}
  
! 	public void setVisibilityHint(GuiDef.Panel type, boolean visibility) {
! 		if (visibilityHints == null) {
! 			visibilityHints = new ArrayList<VisibilityHint>(4);
! 		}
! 		visibilityHints.add (new VisibilityHint(type, visibility));
! 	}
  
! 	public void clearVisibilityHints () {
! 		if (visibilityHints == null) {
! 			visibilityHints = new ArrayList<VisibilityHint>(4);
! 		} else {
! 			visibilityHints.clear();
! 		}
! 	}
  
! 	public GuiDef.Panel getActivePanel() {
! 		return activePanel;
! 	}
  
! 	public void setActivePanel(GuiDef.Panel activePanel) {
! 		this.activePanel = activePanel;
! 	}
  
! 	public class VisibilityHint {
  
! 		GuiDef.Panel type;
! 		boolean visibility;
  
! 		VisibilityHint (GuiDef.Panel type, boolean visibility) {
! 			this.type = type;
! 			this.visibility = visibility;
! 		}
  
! 		public GuiDef.Panel getType() {
! 			return type;
! 		}
  
! 		public boolean getVisibility() {
! 			return visibility;
! 		}
! 	}
  }
--- 19,83 ----
      public static final long serialVersionUID = 1L;
  
!     /** What round type is currently active in the engine? */
!     private Class<? extends RoundI> currentRoundType = null;
  
!     /** Which windows should be visible? */
!     private List<VisibilityHint> visibilityHints;
  
!     /** Which window type is active and should be on top? */
!     private GuiDef.Panel activePanel;
  
!     public Class<? extends RoundI> getCurrentRoundType() {
!         return currentRoundType;
!     }
  
!     public void setCurrentRoundType(Class<? extends RoundI> currentRoundType) {
!         this.currentRoundType = currentRoundType;
!     }
  
!     public List<VisibilityHint> getVisibilityHints() {
!         return visibilityHints;
!     }
  
!     public void setVisibilityHint(GuiDef.Panel type, boolean visibility) {
!         if (visibilityHints == null) {
!             visibilityHints = new ArrayList<VisibilityHint>(4);
!         }
!         visibilityHints.add (new VisibilityHint(type, visibility));
!     }
  
!     public void clearVisibilityHints () {
!         if (visibilityHints == null) {
!             visibilityHints = new ArrayList<VisibilityHint>(4);
!         } else {
!             visibilityHints.clear();
!         }
!     }
  
!     public GuiDef.Panel getActivePanel() {
!         return activePanel;
!     }
  
!     public void setActivePanel(GuiDef.Panel activePanel) {
!         this.activePanel = activePanel;
!     }
  
!     public class VisibilityHint {
  
!         GuiDef.Panel type;
!         boolean visibility;
  
!         VisibilityHint (GuiDef.Panel type, boolean visibility) {
!             this.type = type;
!             this.visibility = visibility;
!         }
  
!         public GuiDef.Panel getType() {
!             return type;
!         }
  
!         public boolean getVisibility() {
!             return visibility;
!         }
!     }
  }

Index: GuiDef.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/common/GuiDef.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GuiDef.java	14 Jan 2010 20:40:26 -0000	1.1
--- GuiDef.java	31 Jan 2010 22:22:27 -0000	1.2
***************
*** 46,53 ****
      public enum Panel {
  
!     	START_ROUND,
!     	STATUS,
!     	MAP,
!     	STOCK_MARKET
      }
  }
--- 46,53 ----
      public enum Panel {
  
!         START_ROUND,
!         STATUS,
!         MAP,
!         STOCK_MARKET
      }
  }

[Rails-commits] 18xx/rails/util BuildInfo.java, 1.1, 1.2 MakeGameTileSets.java, 1.8, 1.9 RunGame.java, 1.2, 1.3 Tag.java, 1.14, 1.15 Util.java, 1.19, 1.20

[Freek D. <mac...@us...>]

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

Modified Files:
	BuildInfo.java MakeGameTileSets.java RunGame.java Tag.java 
	Util.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: MakeGameTileSets.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/util/MakeGameTileSets.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MakeGameTileSets.java	18 Dec 2009 20:03:52 -0000	1.8
--- MakeGameTileSets.java	31 Jan 2010 22:22:37 -0000	1.9
***************
*** 79,83 ****
  
          for (int i = 0; i < games.length; i++) {
!         	System.out.println("Preparing "+games[i]);
              makeTileSet(games[i], tileMap);
  
--- 79,83 ----
  
          for (int i = 0; i < games.length; i++) {
!             System.out.println("Preparing "+games[i]);
              makeTileSet(games[i], tileMap);
  
***************
*** 89,93 ****
              throws ConfigurationException {
  
!     	directories.clear();
          directories.add("data/" + gameName);
  
--- 89,93 ----
              throws ConfigurationException {
  
!         directories.clear();
          directories.add("data/" + gameName);
  

Index: Util.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/util/Util.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Util.java	19 Jan 2010 19:50:03 -0000	1.19
--- Util.java	31 Jan 2010 22:22:37 -0000	1.20
***************
*** 37,42 ****
          StringBuffer b = new StringBuffer();
          for (String s : sa) {
!         	if (b.length() > 0) b.append(delimiter);
!         	b.append(s);
          }
          return b.toString();
--- 37,42 ----
          StringBuffer b = new StringBuffer();
          for (String s : sa) {
!             if (b.length() > 0) b.append(delimiter);
!             b.append(s);
          }
          return b.toString();
***************
*** 103,128 ****
       */
      public static Color parseColour (String s) throws ConfigurationException{
!     	Color c = null;
!     	if (s.indexOf(',') == -1) {
!     		// Assume hexadecimal RRGGBB
!     		try {
!     			c = new Color (Integer.parseInt(s, 16));
!     		} catch (NumberFormatException e) {
!     			getLogger().error ("Invalid hex RGB colour: "+s, e);
!     			throw new ConfigurationException (e);
!     		}
!     	} else {
!     		// Assume decimal r,g,b
!     		try {
!     	    	String[] parts = s.split(",");
!     			c = new Color (Integer.parseInt(parts[0]),
!     						   Integer.parseInt(parts[1]),
!     						   Integer.parseInt(parts[2]));
!     		} catch (NumberFormatException e) {
!     			getLogger().error ("Invalid nummeric RGB colour: "+s, e);
!     			throw new ConfigurationException (e);
!     		}
!     	}
!     	return c;
      }
  
--- 103,128 ----
       */
      public static Color parseColour (String s) throws ConfigurationException{
!         Color c = null;
!         if (s.indexOf(',') == -1) {
!             // Assume hexadecimal RRGGBB
!             try {
!                 c = new Color (Integer.parseInt(s, 16));
!             } catch (NumberFormatException e) {
!                 getLogger().error ("Invalid hex RGB colour: "+s, e);
!                 throw new ConfigurationException (e);
!             }
!         } else {
!             // Assume decimal r,g,b
!             try {
!                 String[] parts = s.split(",");
!                 c = new Color (Integer.parseInt(parts[0]),
!                                Integer.parseInt(parts[1]),
!                                Integer.parseInt(parts[2]));
!             } catch (NumberFormatException e) {
!                 getLogger().error ("Invalid nummeric RGB colour: "+s, e);
!                 throw new ConfigurationException (e);
!             }
!         }
!         return c;
      }
  
***************
*** 131,150 ****
       */
      public static boolean isDark(Color c) {
!     	if (c == null) return false;
!     	return Math.sqrt(0.241*c.getRed()*c.getRed()
!     					+ 0.691*c.getBlue()*c.getBlue()
!     					+ 0.068*c.getGreen()*c.getGreen()) < 128;
!     	// Copied this formula from
!     	// http://www.nbdtech.com/blog/archive/2008/04/27/Calculating-the-Perceived-Brightness-of-a-Color.aspx
      }
  
      public static Logger getLogger () {
!     	if (log == null) log = Logger.getLogger(Util.class.getPackage().getName());
!     	return log;
  
      }
  
      public static String lowerCaseFirst (String text) {
!     	return text.substring(0, 1).toLowerCase() + text.substring(1);
      }
  }
--- 131,150 ----
       */
      public static boolean isDark(Color c) {
!         if (c == null) return false;
!         return Math.sqrt(0.241*c.getRed()*c.getRed()
!                         + 0.691*c.getBlue()*c.getBlue()
!                         + 0.068*c.getGreen()*c.getGreen()) < 128;
!         // Copied this formula from
!         // http://www.nbdtech.com/blog/archive/2008/04/27/Calculating-the-Perceived-Brightness-of-a-Color.aspx
      }
  
      public static Logger getLogger () {
!         if (log == null) log = Logger.getLogger(Util.class.getPackage().getName());
!         return log;
  
      }
  
      public static String lowerCaseFirst (String text) {
!         return text.substring(0, 1).toLowerCase() + text.substring(1);
      }
  }

Index: BuildInfo.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/util/BuildInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BuildInfo.java	6 Nov 2009 20:20:36 -0000	1.1
--- BuildInfo.java	31 Jan 2010 22:22:36 -0000	1.2
***************
*** 3,7 ****
  
  public class BuildInfo {
! 	public static final String buildDate = "2009-11-06";
  }
! 		
\ No newline at end of file
--- 3,7 ----
  
  public class BuildInfo {
!     public static final String buildDate = "2009-11-06";
  }
!         
\ No newline at end of file

Index: RunGame.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/util/RunGame.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RunGame.java	14 Jan 2010 20:50:34 -0000	1.2
--- RunGame.java	31 Jan 2010 22:22:37 -0000	1.3
***************
*** 34,79 ****
          System.out.println("Configuration file = " + myConfigFile);
  
!     	int nargs = 0;
!     	if (args != null && args.length > 0) {
!     		nargs = args.length;
!     		System.out.println("Number of args: "+nargs);
!     		for (String arg : args) {
!     			System.out.println ("Arg: "+arg);
!     		}
!     	}
  
!     	if (nargs >= 1) {
!     		loadGame (args);
!     	} else {
!     		/* Start the rails.game selector, which will do all the rest. */
!     		new GameSetupWindow();
!     	}
      }
  
      static void loadGame (String[] args) {
  
!     	Game game = null;
!     	String filepath = args[0];
!     	System.out.println("Starting game from saved file "+filepath);
          if ((game = Game.load(filepath)) == null) {
!         	System.err.println("Loading file "+filepath+" was unsuccessful");
              return;
          }
  
!     	GameManagerI gameManager = game.getGameManager();
!     	GameUIManager gameUIManager;
!     	String gameUIManagerClassName = gameManager.getClassName(GuiDef.ClassName.GAME_UI_MANAGER);
! 	    try {
! 	        Class<? extends GameUIManager> gameUIManagerClass =
! 	            Class.forName(gameUIManagerClassName).asSubclass(GameUIManager.class);
! 	        gameUIManager = gameUIManagerClass.newInstance();
! 	        gameUIManager.init(gameManager);
! 	        gameUIManager.startLoadedGame();
  
! 	    } catch (Exception e) {
! 	        System.err.println("Cannot instantiate class " + gameUIManagerClassName + ": "+e.getMessage());
! 	        e.printStackTrace(System.err);
! 	        System.exit(1);
! 	    }
  
      }
--- 34,79 ----
          System.out.println("Configuration file = " + myConfigFile);
  
!         int nargs = 0;
!         if (args != null && args.length > 0) {
!             nargs = args.length;
!             System.out.println("Number of args: "+nargs);
!             for (String arg : args) {
!                 System.out.println ("Arg: "+arg);
!             }
!         }
  
!         if (nargs >= 1) {
!             loadGame (args);
!         } else {
!             /* Start the rails.game selector, which will do all the rest. */
!             new GameSetupWindow();
!         }
      }
  
      static void loadGame (String[] args) {
  
!         Game game = null;
!         String filepath = args[0];
!         System.out.println("Starting game from saved file "+filepath);
          if ((game = Game.load(filepath)) == null) {
!             System.err.println("Loading file "+filepath+" was unsuccessful");
              return;
          }
  
!         GameManagerI gameManager = game.getGameManager();
!         GameUIManager gameUIManager;
!         String gameUIManagerClassName = gameManager.getClassName(GuiDef.ClassName.GAME_UI_MANAGER);
!         try {
!             Class<? extends GameUIManager> gameUIManagerClass =
!                 Class.forName(gameUIManagerClassName).asSubclass(GameUIManager.class);
!             gameUIManager = gameUIManagerClass.newInstance();
!             gameUIManager.init(gameManager);
!             gameUIManager.startLoadedGame();
  
!         } catch (Exception e) {
!             System.err.println("Cannot instantiate class " + gameUIManagerClassName + ": "+e.getMessage());
!             e.printStackTrace(System.err);
!             System.exit(1);
!         }
  
      }

Index: Tag.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/util/Tag.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Tag.java	22 Jan 2010 21:44:34 -0000	1.14
--- Tag.java	31 Jan 2010 22:22:37 -0000	1.15
***************
*** 43,56 ****
  
      public Tag (Element element, Map<String, String> gameOptions) {
!     	this (element);
!     	this.gameOptions = gameOptions;
      }
  
      public void setGameOptions (Map<String, String> gameOptions) {
!     	this.gameOptions = gameOptions;
      }
  
      public Map<String, String> getGameOptions () {
!     	return gameOptions;
      }
  
--- 43,56 ----
  
      public Tag (Element element, Map<String, String> gameOptions) {
!         this (element);
!         this.gameOptions = gameOptions;
      }
  
      public void setGameOptions (Map<String, String> gameOptions) {
!         this.gameOptions = gameOptions;
      }
  
      public Map<String, String> getGameOptions () {
!         return gameOptions;
      }
  
***************
*** 297,302 ****
                      // rest
                      if (gameOptions == null) {
!                     	throw new ConfigurationException (
!                     			"No GameOptions available in tag "+element.getNodeName());
                      }
  
--- 297,302 ----
                      // rest
                      if (gameOptions == null) {
!                         throw new ConfigurationException (
!                                 "No GameOptions available in tag "+element.getNodeName());
                      }
  

[Rails-commits] 18xx/rails/ui/swing/gamespecific/_1856 StatusWindow_1856.java, 1.5, 1.6

[Freek D. <mac...@us...>]

Update of /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_1856
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv382/rails/ui/swing/gamespecific/_1856

Modified Files:
	StatusWindow_1856.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: StatusWindow_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_1856/StatusWindow_1856.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StatusWindow_1856.java	11 Jan 2010 23:06:05 -0000	1.5
--- StatusWindow_1856.java	31 Jan 2010 22:22:34 -0000	1.6
***************
*** 89,101 ****
          String[] waitingMessages = DisplayBuffer.get();
          if (waitingMessages != null) {
!         	message = "<html>" + Util.joinWithDelimiter(waitingMessages, "<br>")
!         		+ "<br>" + message;
          }
  
         RadioButtonDialog currentDialog = new RadioButtonDialog (gameUIManager,
!         		LocalText.getText("Select"),
!         		message,
!         		options,
!         		0);
         gameUIManager.setCurrentDialog (currentDialog, action);
      }
--- 89,101 ----
          String[] waitingMessages = DisplayBuffer.get();
          if (waitingMessages != null) {
!             message = "<html>" + Util.joinWithDelimiter(waitingMessages, "<br>")
!                 + "<br>" + message;
          }
  
         RadioButtonDialog currentDialog = new RadioButtonDialog (gameUIManager,
!                 LocalText.getText("Select"),
!                 message,
!                 options,
!                 0);
         gameUIManager.setCurrentDialog (currentDialog, action);
      }

[Rails-commits] 18xx/rails/ui/swing/hexmap EWHexMap.java, 1.12, 1.13 GUIHex.java, 1.35, 1.36 GUITile.java, 1.21, 1.22 HexMap.java, 1.20, 1.21 NSHexMap.java, 1.11, 1.12

[Freek D. <mac...@us...>]

Update of /cvsroot/rails/18xx/rails/ui/swing/hexmap
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv382/rails/ui/swing/hexmap

Modified Files:
	EWHexMap.java GUIHex.java GUITile.java HexMap.java 
	NSHexMap.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: NSHexMap.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/NSHexMap.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** NSHexMap.java	15 Dec 2009 18:56:11 -0000	1.11
--- NSHexMap.java	31 Jan 2010 22:22:36 -0000	1.12
***************
*** 23,27 ****
  
      @Override
! 	protected void setupHexesGUI() {
          hexes = new ArrayList<GUIHex>();
  
--- 23,27 ----
  
      @Override
!     protected void setupHexesGUI() {
          hexes = new ArrayList<GUIHex>();
  
***************
*** 55,65 ****
          preferredSize =
                  new Dimension(
!                 		(int) Math.round((hexArray.length + 1) * 3 * scale * zoomFactor),
                          (int) Math.round((hexArray[0].length + 1) * 2
                                           * GUIHex.SQRT3 * scale * zoomFactor));
      }
  
! 	@Override
! 	protected void scaleHexesGUI() {
  
          hexArray = mapManager.getHexes();
--- 55,65 ----
          preferredSize =
                  new Dimension(
!                         (int) Math.round((hexArray.length + 1) * 3 * scale * zoomFactor),
                          (int) Math.round((hexArray[0].length + 1) * 2
                                           * GUIHex.SQRT3 * scale * zoomFactor));
      }
  
!     @Override
!     protected void scaleHexesGUI() {
  
          hexArray = mapManager.getHexes();
***************
*** 79,85 ****
  
      @Override
! 	public void paint(Graphics g) {
  
!     	super.paint(g);
          Graphics2D g2 = (Graphics2D) g;
          String label;
--- 79,85 ----
  
      @Override
!     public void paint(Graphics g) {
  
!         super.paint(g);
          Graphics2D g2 = (Graphics2D) g;
          String label;
***************
*** 93,117 ****
  
          for (int i = 1; i < hexArray.length; i++) {
!         	label = lettersGoHorizontal
!         			? String.valueOf((char)('@'+i))
!         			: String.valueOf(i);
!         	g2.drawString(label,
!         			(cx - 30 -3*label.length() + 3 * scale * (i + xOffset)),
!         			yTop);
!         	g2.drawString(label,
!         			(cx - 30 -3*label.length() + 3 * scale * (i + xOffset)),
!         			yBottom);
          }
  
          for (int j = 1; j < 2 * hexArray[0].length; j++) {
!         	label = lettersGoHorizontal
! 					? String.valueOf(j)
! 					: String.valueOf((char)('@'+j));
!         	g2.drawString(label,
!         			xLeft,
!         			(int)(cy + 56 + j * GUIHex.SQRT3 * scale));
!         	g2.drawString(label,
!         			xRight,
!         			(int)(cy + 56 + j * GUIHex.SQRT3 * scale));
          }
      }
--- 93,117 ----
  
          for (int i = 1; i < hexArray.length; i++) {
!             label = lettersGoHorizontal
!                     ? String.valueOf((char)('@'+i))
!                     : String.valueOf(i);
!             g2.drawString(label,
!                     (cx - 30 -3*label.length() + 3 * scale * (i + xOffset)),
!                     yTop);
!             g2.drawString(label,
!                     (cx - 30 -3*label.length() + 3 * scale * (i + xOffset)),
!                     yBottom);
          }
  
          for (int j = 1; j < 2 * hexArray[0].length; j++) {
!             label = lettersGoHorizontal
!                     ? String.valueOf(j)
!                     : String.valueOf((char)('@'+j));
!             g2.drawString(label,
!                     xLeft,
!                     (int)(cy + 56 + j * GUIHex.SQRT3 * scale));
!             g2.drawString(label,
!                     xRight,
!                     (int)(cy + 56 + j * GUIHex.SQRT3 * scale));
          }
      }

Index: EWHexMap.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/EWHexMap.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** EWHexMap.java	15 Dec 2009 18:56:11 -0000	1.12
--- EWHexMap.java	31 Jan 2010 22:22:36 -0000	1.13
***************
*** 16,20 ****
  
      public EWHexMap() {
!     	scale = defaultScale = 2 * Scale.get();
          cx = scale / 2;
          cy = 0;
--- 16,20 ----
  
      public EWHexMap() {
!         scale = defaultScale = 2 * Scale.get();
          cx = scale / 2;
          cy = 0;
***************
*** 22,26 ****
  
      @Override
! 	protected void setupHexesGUI() {
  
          hexes = new ArrayList<GUIHex>();
--- 22,26 ----
  
      @Override
!     protected void setupHexesGUI() {
  
          hexes = new ArrayList<GUIHex>();
***************
*** 61,66 ****
  
  
! 	@Override
! 	protected void scaleHexesGUI  () {
  
          hexArray = mapManager.getHexes();
--- 61,66 ----
  
  
!     @Override
!     protected void scaleHexesGUI  () {
  
          hexArray = mapManager.getHexes();
***************
*** 79,88 ****
  
          setSize();
! 	}
  
      @Override
! 	public void paint(Graphics g) {
  
!     	super.paint(g);
          Graphics2D g2 = (Graphics2D) g;
          String label;
--- 79,88 ----
  
          setSize();
!     }
  
      @Override
!     public void paint(Graphics g) {
  
!         super.paint(g);
          Graphics2D g2 = (Graphics2D) g;
          String label;
***************
*** 96,120 ****
  
          for (int i = 1; i < 2*hexArray.length; i++) {
!         	label = lettersGoHorizontal
!         			? String.valueOf((char)('@'+i))
!         			: String.valueOf(i);
!         	g2.drawString(label,
!         			(int) (cx + (26-3*label.length()) + scale * (GUIHex.SQRT3/2 * (i + xOffset))),
!         			yTop);
!         	g2.drawString(label,
!         			(int) (cx + (26-3*label.length()) + scale * (GUIHex.SQRT3/2 * (i + xOffset))),
!         			yBottom);
          }
  
          for (int j = 1; j < hexArray[0].length; j++) {
!         	label = lettersGoHorizontal
! 					? String.valueOf(j)
! 					: String.valueOf((char)('@'+j));
!         	g2.drawString(label,
!         			xLeft,
!         			(int)(cy - 10 + j * 1.5 * scale));
!         	g2.drawString(label,
!         			xRight,
!         			(int)(cy - 10 + j * 1.5 * scale));
          }
  
--- 96,120 ----
  
          for (int i = 1; i < 2*hexArray.length; i++) {
!             label = lettersGoHorizontal
!                     ? String.valueOf((char)('@'+i))
!                     : String.valueOf(i);
!             g2.drawString(label,
!                     (int) (cx + (26-3*label.length()) + scale * (GUIHex.SQRT3/2 * (i + xOffset))),
!                     yTop);
!             g2.drawString(label,
!                     (int) (cx + (26-3*label.length()) + scale * (GUIHex.SQRT3/2 * (i + xOffset))),
!                     yBottom);
          }
  
          for (int j = 1; j < hexArray[0].length; j++) {
!             label = lettersGoHorizontal
!                     ? String.valueOf(j)
!                     : String.valueOf((char)('@'+j));
!             g2.drawString(label,
!                     xLeft,
!                     (int)(cy - 10 + j * 1.5 * scale));
!             g2.drawString(label,
!                     xRight,
!                     (int)(cy - 10 + j * 1.5 * scale));
          }
  

Index: HexMap.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/HexMap.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** HexMap.java	15 Dec 2009 18:56:11 -0000	1.20
--- HexMap.java	31 Jan 2010 22:22:36 -0000	1.21
***************
*** 78,90 ****
  
      public void setupBars() {
!     	List<Integer> barSides;
!     	for (GUIHex hex : hexes) {
!     		barSides = hex.getHexModel().getImpassableSides();
!     		if (barSides != null) {
!     			for (int k : barSides) {
!     				if (k < 3) hex.addBar (k);
!     			}
!     		}
!     	}
      }
  
--- 78,90 ----
  
      public void setupBars() {
!         List<Integer> barSides;
!         for (GUIHex hex : hexes) {
!             barSides = hex.getHexModel().getImpassableSides();
!             if (barSides != null) {
!                 for (int k : barSides) {
!                     if (k < 3) hex.addBar (k);
!                 }
!             }
!         }
      }
  
***************
*** 104,108 ****
  
      @Override
! 	public void paintComponent(Graphics g) {
          super.paintComponent(g);
  
--- 104,108 ----
  
      @Override
!     public void paintComponent(Graphics g) {
          super.paintComponent(g);
  
***************
*** 139,167 ****
  
      public void zoomIn () {
!     	zoomStep++;
!     	zoom();
      }
      public void zoomOut() {
!     	zoomStep--;
!     	zoom();
      }
  
      protected void zoom() {
!     	zoomFactor = GameUIManager.getImageLoader().getZoomFactor(zoomStep);
!     	setScale();
!     	scaleHexesGUI();
!     	revalidate();
      }
  
      protected void setScale() {
!     	scale = (int)(defaultScale * zoomFactor);
      }
  
      public int getZoomStep () {
!     	return zoomStep;
      }
  
      @Override
! 	public Dimension getMinimumSize() {
          Dimension dim = new Dimension();
          Rectangle r = (h[h.length][h[0].length]).getBounds();
--- 139,167 ----
  
      public void zoomIn () {
!         zoomStep++;
!         zoom();
      }
      public void zoomOut() {
!         zoomStep--;
!         zoom();
      }
  
      protected void zoom() {
!         zoomFactor = GameUIManager.getImageLoader().getZoomFactor(zoomStep);
!         setScale();
!         scaleHexesGUI();
!         revalidate();
      }
  
      protected void setScale() {
!         scale = (int)(defaultScale * zoomFactor);
      }
  
      public int getZoomStep () {
!         return zoomStep;
      }
  
      @Override
!     public Dimension getMinimumSize() {
          Dimension dim = new Dimension();
          Rectangle r = (h[h.length][h[0].length]).getBounds();
***************
*** 172,176 ****
  
      @Override
! 	public Dimension getPreferredSize() {
          return preferredSize;
      }
--- 172,176 ----
  
      @Override
!     public Dimension getPreferredSize() {
          return preferredSize;
      }
***************
*** 328,346 ****
       */
      public PhaseI getPhase () {
!     	if (orUIManager != null) {
!     		//return orUIManager.getGameUIManager().getGameManager().getPhaseManager().getCurrentPhase();
!     		GameUIManager u = orUIManager.getGameUIManager();
!     		GameManagerI g = u.getGameManager();
!     		PhaseManager p = g.getPhaseManager();
!     		return p.getCurrentPhase();
!     	}
!     	return null;
      }
  
      public MapManager getMapManager() {
! 		return mapManager;
! 	}
  
! 	public void mouseClicked(MouseEvent arg0) {
          Point point = arg0.getPoint();
          GUIHex clickedHex = getHexContainingPoint(point);
--- 328,346 ----
       */
      public PhaseI getPhase () {
!         if (orUIManager != null) {
!             //return orUIManager.getGameUIManager().getGameManager().getPhaseManager().getCurrentPhase();
!             GameUIManager u = orUIManager.getGameUIManager();
!             GameManagerI g = u.getGameManager();
!             PhaseManager p = g.getPhaseManager();
!             return p.getCurrentPhase();
!         }
!         return null;
      }
  
      public MapManager getMapManager() {
!         return mapManager;
!     }
  
!     public void mouseClicked(MouseEvent arg0) {
          Point point = arg0.getPoint();
          GUIHex clickedHex = getHexContainingPoint(point);

Index: GUITile.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/GUITile.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** GUITile.java	19 Dec 2009 16:48:32 -0000	1.21
--- GUITile.java	31 Jan 2010 22:22:36 -0000	1.22
***************
*** 49,53 ****
  
      public GUITile(int tileId, GUIHex guiHex) {
!     	this.guiHex = guiHex;
          this.tileId = tileId;
          this.hex = (MapHex)guiHex.getModel();
--- 49,53 ----
  
      public GUITile(int tileId, GUIHex guiHex) {
!         this.guiHex = guiHex;
          this.tileId = tileId;
          this.hex = (MapHex)guiHex.getModel();
***************
*** 239,246 ****
      public void paintTile(Graphics2D g2, int x, int y) {
  
!     	int zoomStep = guiHex.getHexMap().getZoomStep();
          tileImage = imageLoader.getTile(tileId, zoomStep);
  
!     	if (tileImage != null) {
  
              double radians = baseRotation + rotation * DEG60;
--- 239,246 ----
      public void paintTile(Graphics2D g2, int x, int y) {
  
!         int zoomStep = guiHex.getHexMap().getZoomStep();
          tileImage = imageLoader.getTile(tileId, zoomStep);
  
!         if (tileImage != null) {
  
              double radians = baseRotation + rotation * DEG60;
***************
*** 248,252 ****
                      * SVG_X_CENTER_LOC * tileScale);
              int yCenter = (int) Math.round(tileImage.getHeight()
!             		* SVG_Y_CENTER_LOC * tileScale);
  
              af = AffineTransform.getRotateInstance(radians, xCenter, yCenter);
--- 248,252 ----
                      * SVG_X_CENTER_LOC * tileScale);
              int yCenter = (int) Math.round(tileImage.getHeight()
!                     * SVG_Y_CENTER_LOC * tileScale);
  
              af = AffineTransform.getRotateInstance(radians, xCenter, yCenter);

Index: GUIHex.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/GUIHex.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** GUIHex.java	9 Jan 2010 13:30:24 -0000	1.35
--- GUIHex.java	31 Jan 2010 22:22:36 -0000	1.36
***************
*** 105,110 ****
      public void scaleHex (double cx, double cy, int scale, double zoomFactor) {
  
!     	this.zoomFactor = zoomFactor;
!     	tokenDiameter = (int)Math.round(NORMAL_TOKEN_SIZE * zoomFactor);
  
          if (hexMap.getMapManager().getTileOrientation() == MapHex.EW) {
--- 105,110 ----
      public void scaleHex (double cx, double cy, int scale, double zoomFactor) {
  
!         this.zoomFactor = zoomFactor;
!         tokenDiameter = (int)Math.round(NORMAL_TOKEN_SIZE * zoomFactor);
  
          if (hexMap.getMapManager().getTileOrientation() == MapHex.EW) {
***************
*** 176,180 ****
  
      public HexMap getHexMap() {
!     	return hexMap;
      }
  
--- 176,180 ----
  
      public HexMap getHexMap() {
!         return hexMap;
      }
  
***************
*** 194,199 ****
  
      public void addBar (int orientation) {
!     	orientation %= 6;
!     	if (barStartPoints == null) barStartPoints = new ArrayList<Integer>(2);
          int offset = hexMap.getMapManager().getTileOrientation() == MapHex.EW ? 0 : 4;
          barStartPoints.add((offset+5-orientation)%6);
--- 194,199 ----
  
      public void addBar (int orientation) {
!         orientation %= 6;
!         if (barStartPoints == null) barStartPoints = new ArrayList<Integer>(2);
          int offset = hexMap.getMapManager().getTileOrientation() == MapHex.EW ? 0 : 4;
          barStartPoints.add((offset+5-orientation)%6);
***************
*** 351,369 ****
              for (PrivateCompanyI p : privates) {
                  List<MapHex> blocked = p.getBlockedHexes();
! 				if (blocked != null) {
! 					for (MapHex hex : blocked) {
! 						if (getHexModel().equals(hex)) {
! 							g2.drawString(
! 								  "(" + p.getName() + ")",
! 								  rectBound.x
! 								  + (rectBound.width - fontMetrics.stringWidth("("
! 										   + p.getName()
! 										   + ")"))
! 								  * 1 / 2,
! 								  rectBound.y
! 								  + ((fontMetrics.getHeight() + rectBound.height) * 5 / 15));
! 						}
! 					}
! 				}
              }
          }
--- 351,369 ----
              for (PrivateCompanyI p : privates) {
                  List<MapHex> blocked = p.getBlockedHexes();
!                 if (blocked != null) {
!                     for (MapHex hex : blocked) {
!                         if (getHexModel().equals(hex)) {
!                             g2.drawString(
!                                   "(" + p.getName() + ")",
!                                   rectBound.x
!                                   + (rectBound.width - fontMetrics.stringWidth("("
!                                            + p.getName()
!                                            + ")"))
!                                   * 1 / 2,
!                                   rectBound.y
!                                   + ((fontMetrics.getHeight() + rectBound.height) * 5 / 15));
!                         }
!                     }
!                 }
              }
          }
***************
*** 380,392 ****
  
      public void paintBars(Graphics g) {
!     	if (barStartPoints == null) return;
          Graphics2D g2 = (Graphics2D) g;
!     	for (int startPoint : barStartPoints) {
!     		drawBar(g2,
!     				(int)Math.round(xVertex[startPoint]),
!     				(int)Math.round(yVertex[startPoint]),
!     				(int)Math.round(xVertex[(startPoint+1)%6]),
!     				(int)Math.round(yVertex[(startPoint+1)%6]));
!     	}
      }
  
--- 380,392 ----
  
      public void paintBars(Graphics g) {
!         if (barStartPoints == null) return;
          Graphics2D g2 = (Graphics2D) g;
!         for (int startPoint : barStartPoints) {
!             drawBar(g2,
!                     (int)Math.round(xVertex[startPoint]),
!                     (int)Math.round(yVertex[startPoint]),
!                     (int)Math.round(xVertex[(startPoint+1)%6]),
!                     (int)Math.round(yVertex[(startPoint+1)%6]));
!         }
      }
  
***************
*** 470,474 ****
                          center.x, center.y, diameter);
          token.setBounds(center.x-(int)(0.5*diameter), center.y-(int)(0.5*diameter),
!         		diameter, diameter);
  
          token.drawToken(g2);
--- 470,474 ----
                          center.x, center.y, diameter);
          token.setBounds(center.x-(int)(0.5*diameter), center.y-(int)(0.5*diameter),
!                 diameter, diameter);
  
          token.drawToken(g2);

[Rails-commits] 18xx/rails/ui/swing/gamespecific/_18EU GameStatus_18EU.java, 1.10, 1.11 GameUIManager_18EU.java, 1.2, 1.3

[Freek D. <mac...@us...>]

Update of /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_18EU
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv382/rails/ui/swing/gamespecific/_18EU

Modified Files:
	GameStatus_18EU.java GameUIManager_18EU.java 
Log Message:
Fix indentation: Java files contain 4 spaces, not tabs

Index: GameStatus_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_18EU/GameStatus_18EU.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** GameStatus_18EU.java	14 Jan 2010 20:44:04 -0000	1.10
--- GameStatus_18EU.java	31 Jan 2010 22:22:35 -0000	1.11
***************
*** 71,76 ****
  
              RadioButtonDialog dialog = new RadioButtonDialog (gameUIManager,
!             		LocalText.getText("PleaseSelect"),
!             		LocalText.getText("SelectCompanyToMergeMinorInto",
                              minor.getName()),
                              options, -1);
--- 71,76 ----
  
              RadioButtonDialog dialog = new RadioButtonDialog (gameUIManager,
!                     LocalText.getText("PleaseSelect"),
!                     LocalText.getText("SelectCompanyToMergeMinorInto",
                              minor.getName()),
                              options, -1);

Index: GameUIManager_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_18EU/GameUIManager_18EU.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GameUIManager_18EU.java	14 Jan 2010 20:43:18 -0000	1.2
--- GameUIManager_18EU.java	31 Jan 2010 22:22:36 -0000	1.3
***************
*** 15,122 ****
  public class GameUIManager_18EU extends GameUIManager {
  
! 	@Override
! 	public void dialogActionPerformed () {
  
!     	if (currentDialog instanceof RadioButtonDialog
!     			&& currentDialogAction instanceof MergeCompanies) {
  
!     		RadioButtonDialog dialog = (RadioButtonDialog) currentDialog;
!     		MergeCompanies action = (MergeCompanies) currentDialogAction;
              PublicCompanyI minor = action.getMergingCompany();
  
              if (action.getSelectedTargetCompany() == null) {
!             	// Step 1: selection of the major company to merge into
! 	            int choice = dialog.getSelectedOption();
! 	            if (choice < 0) return;
  
! 	            PublicCompanyI major = action.getTargetCompanies().get(choice);
! 	            action.setSelectedTargetCompany(major);
  
! 	            if (major != null && action.canReplaceToken(choice)) {
  
! 	                boolean replaceToken =
! 	                        JOptionPane.showConfirmDialog(statusWindow, LocalText.getText(
! 	                                    "WantToReplaceToken",
! 	                                    minor.getName(),
! 	                                    major.getName() ),
! 	                                LocalText.getText("PleaseSelect"),
! 	                                JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
! 	                action.setReplaceToken(replaceToken);
! 	            }
              } else {
!             	// To be added later when ReplaceToken dialog is modeless
              }
  
!      	} else if (currentDialog instanceof RadioButtonDialog
!         			&& currentDialogAction instanceof StartCompany_18EU) {
  
!     		RadioButtonDialog dialog = (RadioButtonDialog) currentDialog;
!     		StartCompany_18EU action = (StartCompany_18EU) currentDialogAction;
  
!     		if (action.getPrice() == 0) {
  
!     			// The price will be set first
!     			int index = dialog.getSelectedOption();
!     			if (index < 0) return;
!    				action.setStartPrice(action.getStartPrices()[index]);
  
!    				// Set up another dialog for the next step
!    	            List<PublicCompanyI> minors = action.getMinorsToMerge();
  
!    	            if (minors != null && !minors.isEmpty()) {
!    	            	// Up to phase 6, a minor must be exchanged
!    	                String[] options = new String[minors.size()];
!    	                int i = 0;
!    	                for (PublicCompanyI minor : minors) {
!    	                    options[i++] =
!    	                            "Minor " + minor.getName() + " "
!    	                                    + minor.getLongName();
!    	                }
!    	                dialog = new RadioButtonDialog (this,
!    	                		LocalText.getText("PleaseSelect"),
!    	                		LocalText.getText(
!    	                                "SelectMinorToMerge",
!    	                                action.getCertificate().getCompany().getName()),
!    	                                options, -1);
!    	            	setCurrentDialog(dialog, action);
!    	            	return;
!    	            } else {
  
!    		            // From phase 6, no minors are involved, but a home station must be chosen
!    		            List<City> cities = action.getAvailableHomeStations();
!    		            if (cities != null && !cities.isEmpty()) {
!    		                String[] options = new String[cities.size()];
!    		                for (int i = 0; i < options.length; i++) {
!    		                    options[i] = cities.get(i).toString();
!    		                }
!    		                dialog = new RadioButtonDialog (this,
!    		                		LocalText.getText("PleaseSelect"),
!    		                		LocalText.getText(
!    		                                "SelectHomeStation",
!    		                                action.getCertificate().getCompany().getName()),
!    		                                options, -1);
!    		            	setCurrentDialog(dialog, action);
!    		            	return;
  
!    		            }
!    	            }
!     		} else if (action.getMinorsToMerge() != null) {
!     			// Up to phase 5: a minor to merge has been selected (or not)
                  int choice = dialog.getSelectedOption();
! 	            if (choice < 0) {
! 	            	// Also reset price
! 	            	action.setStartPrice(0);
! 	            	return;
! 	            }
! 	            action.setChosenMinor(action.getMinorsToMerge().get(choice));
  
!     		} else if (action.getAvailableHomeStations() != null) {
!     			// From phase 6: a home station has been selected (or not)
  
                  int index = dialog.getSelectedOption();
                  if (index < 0) {
! 	            	// Also reset price
! 	            	action.setStartPrice(0);
!                	return;
                  }
                  action.setHomeStation(action.getAvailableHomeStations().get(index));
--- 15,122 ----
  public class GameUIManager_18EU extends GameUIManager {
  
!     @Override
!     public void dialogActionPerformed () {
  
!         if (currentDialog instanceof RadioButtonDialog
!                 && currentDialogAction instanceof MergeCompanies) {
  
!             RadioButtonDialog dialog = (RadioButtonDialog) currentDialog;
!             MergeCompanies action = (MergeCompanies) currentDialogAction;
              PublicCompanyI minor = action.getMergingCompany();
  
              if (action.getSelectedTargetCompany() == null) {
!                 // Step 1: selection of the major company to merge into
!                 int choice = dialog.getSelectedOption();
!                 if (choice < 0) return;
  
!                 PublicCompanyI major = action.getTargetCompanies().get(choice);
!                 action.setSelectedTargetCompany(major);
  
!                 if (major != null && action.canReplaceToken(choice)) {
  
!                     boolean replaceToken =
!                             JOptionPane.showConfirmDialog(statusWindow, LocalText.getText(
!                                         "WantToReplaceToken",
!                                         minor.getName(),
!                                         major.getName() ),
!                                     LocalText.getText("PleaseSelect"),
!                                     JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
!                     action.setReplaceToken(replaceToken);
!                 }
              } else {
!                 // To be added later when ReplaceToken dialog is modeless
              }
  
!          } else if (currentDialog instanceof RadioButtonDialog
!                     && currentDialogAction instanceof StartCompany_18EU) {
  
!             RadioButtonDialog dialog = (RadioButtonDialog) currentDialog;
!             StartCompany_18EU action = (StartCompany_18EU) currentDialogAction;
  
!             if (action.getPrice() == 0) {
  
!                 // The price will be set first
!                 int index = dialog.getSelectedOption();
!                 if (index < 0) return;
!                    action.setStartPrice(action.getStartPrices()[index]);
  
!                    // Set up another dialog for the next step
!                    List<PublicCompanyI> minors = action.getMinorsToMerge();
  
!                    if (minors != null && !minors.isEmpty()) {
!                        // Up to phase 6, a minor must be exchanged
!                        String[] options = new String[minors.size()];
!                        int i = 0;
!                        for (PublicCompanyI minor : minors) {
!                            options[i++] =
!                                    "Minor " + minor.getName() + " "
!                                            + minor.getLongName();
!                        }
!                        dialog = new RadioButtonDialog (this,
!                                LocalText.getText("PleaseSelect"),
!                                LocalText.getText(
!                                        "SelectMinorToMerge",
!                                        action.getCertificate().getCompany().getName()),
!                                        options, -1);
!                        setCurrentDialog(dialog, action);
!                        return;
!                    } else {
  
!                        // From phase 6, no minors are involved, but a home station must be chosen
!                        List<City> cities = action.getAvailableHomeStations();
!                        if (cities != null && !cities.isEmpty()) {
!                            String[] options = new String[cities.size()];
!                            for (int i = 0; i < options.length; i++) {
!                                options[i] = cities.get(i).toString();
!                            }
!                            dialog = new RadioButtonDialog (this,
!                                    LocalText.getText("PleaseSelect"),
!                                    LocalText.getText(
!                                            "SelectHomeStation",
!                                            action.getCertificate().getCompany().getName()),
!                                            options, -1);
!                            setCurrentDialog(dialog, action);
!                            return;
  
!                        }
!                    }
!             } else if (action.getMinorsToMerge() != null) {
!                 // Up to phase 5: a minor to merge has been selected (or not)
                  int choice = dialog.getSelectedOption();
!                 if (choice < 0) {
!                     // Also reset price
!                     action.setStartPrice(0);
!                     return;
!                 }
!                 action.setChosenMinor(action.getMinorsToMerge().get(choice));
  
!             } else if (action.getAvailableHomeStations() != null) {
!                 // From phase 6: a home station has been selected (or not)
  
                  int index = dialog.getSelectedOption();
                  if (index < 0) {
!                     // Also reset price
!                     action.setStartPrice(0);
!                    return;
                  }
                  action.setHomeStation(action.getAvailableHomeStations().get(index));
***************
*** 126,131 ****
          }
  
!     	super.dialogActionPerformed(true);
! 	}
  
  }
--- 126,131 ----
          }
  
!         super.dialogActionPerformed(true);
!     }
  
  }

[Rails-commits] 18xx/data/1856 CompanyManager.xml, 1.32, 1.33 Game.xml, 1.33, 1.34 StockMarket.xml, 1.5, 1.6

[Freek D. <mac...@us...>]

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

Modified Files:
	CompanyManager.xml Game.xml StockMarket.xml 
Log Message:
Fix indentation: XML files contain tabs

Index: CompanyManager.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1856/CompanyManager.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** CompanyManager.xml	17 Jan 2010 14:05:48 -0000	1.32
--- CompanyManager.xml	31 Jan 2010 22:15:58 -0000	1.33
***************
*** 1,166 ****
  <?xml version="1.0"?>
  <CompanyManager>
!   <CompanyType name="Private" class="rails.game.PrivateCompany">
!   </CompanyType>
!   <CompanyType name="Public" class="rails.game.specific._1856.PublicCompany_1856">
!     <CanBuyPrivates lowerPriceFactor="0.5" upperPriceFactor="2.0"/>
!     <PoolPaysOut/>
!     <ShareUnit percentage="10"/>
!     <Certificate type="President" shares="2"/>
!     <Certificate shares="1" number="8"/>
! 	<Capitalisation type="whenBought"/>
! 	<BaseTokens>
! 		<LayCost method="sequence" cost="0,40,100"/>
! 	</BaseTokens>
! 	<Trains number="4,4,3,2"/>
! 	<Loans value="100" perRound="1" interest="10"/>
! 	<!-- Number of loans is undefined and handled in the code -->
!   </CompanyType>
!   <CompanyType name="State" class="rails.game.specific._1856.PublicCompany_CGR">
!     <PoolPaysOut/>
!     <ShareUnit percentage="5"/>
!     <Certificate type="President" shares="2" certificateCount="1"/>
!     <Certificate shares="1" number="18" certificateCount="0.5"/>
! 	<BaseTokens>
! 		<LayCost method="sequence" cost="0,40,100"/>
! 	</BaseTokens>
! 	<Trains number="0,0,0,3"/>
! 	<Options mustTradeTrainsAtFixedPrice="yes" canClose="no"/>
!   </CompanyType>
!   
!   <Company name="Flos" type="Private" basePrice="20" revenue="5">
!     <Blocking hex="L3"/>
!   </Company>
!   <Company name="W&amp;SR" type="Private" basePrice="40" revenue="10">
!     <Blocking hex="I12"/>
! 	<SpecialProperties>
! 		<SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
! 			<SpecialTileLay tile="59" location="I12" connected="no" extra="no"/>
! 		</SpecialProperty>
! 		<SpecialProperty condition="ifOwnedByCompany" when="tokenLayingStep" class="rails.game.special.SpecialTokenLay">
! 			<SpecialTokenLay location="I12" connected="no" extra="no" free="yes"/>
! 		</SpecialProperty>
! 	</SpecialProperties>
! 	<ClosingConditions>
! 		<SpecialProperties condition="ifAnyExercised" when="endOfORTurn"/>
! 	</ClosingConditions>
!   </Company>
!   <Company name="TCC" type="Private" basePrice="50" revenue="10">
!     <Blocking hex="H11"/>
! 	<SpecialProperties>
! 		<SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
! 			<SpecialTileLay location="H11" connected="no" extra="yes"/>
! 		</SpecialProperty>
! 	</SpecialProperties>
!   </Company>
!   <Company name="Ship" type="Private" basePrice="70" revenue="15">
! 	<SpecialProperties>
! 		<SpecialProperty condition="ifOwnedByCompany" 
! 			when="anyTimeDuringORTurn" 
! 			class="rails.game.special.SpecialTokenLay">
! 			<SpecialTokenLay class="rails.game.BonusToken" 
! 					location="C14,D19,E18,F9,F17,H5,H7,H17,J5,J17,K2,M18,O18" connected="yes" extra="yes">
! 				<BonusToken name="Port" value="20" removed="Phase:6"/>
! 			</SpecialTokenLay>
! 		</SpecialProperty>
! 	</SpecialProperties>
! 	<ClosingConditions>
! 		<SpecialProperties condition="ifExercised"/>
! 	</ClosingConditions>
!   </Company>
!   <Company name="Brdg" type="Private" basePrice="100" revenue="20">
! 	<SpecialProperties>
! 	  <SpecialProperty condition="ifOwnedByCompany"	when="revenueStep" 
! 			class="rails.game.special.LocatedBonus" transfer="toCompany">
! 		<LocatedBonus name="Bridge" location="P17,P19" value="10"/>
! 	  </SpecialProperty>
! 	  <SpecialProperty condition="ifOwnedByCompany"	when="anyTimeDuringOR" 
! 		  class="rails.game.special.SellBonusToken" transfer="toGameManager">
! 		<SellBonusToken name="Bridge" location="P17,P19" price="50" value="10">
! 			<IfOption name="UnlimitedBonusTokens" value="yes">
! 				<Attributes amount="-1"/>
! 			</IfOption>
! 			<IfOption name="UnlimitedBonusTokens" value="no">
! 				<Attributes amount="3"/>
! 			</IfOption>
! 		</SellBonusToken>
! 	  </SpecialProperty>
! 	</SpecialProperties>
!   </Company>
!   <Company name="Tunn" type="Private" basePrice="100" revenue="20">
! 	<SpecialProperties>
! 	  <SpecialProperty condition="ifOwnedByCompany"	when="revenueStep" 
! 			class="rails.game.special.LocatedBonus" transfer="toCompany">
! 		<LocatedBonus name="Tunnel" location="B13" value="10"/>
! 	  </SpecialProperty>
! 	  <SpecialProperty condition="ifOwnedByCompany"	when="anyTimeDuringOR" 
! 		  class="rails.game.special.SellBonusToken" transfer="toGameManager">
! 		<SellBonusToken name="Tunnel" location="B13" price="50" value="10">
! 			<IfOption name="UnlimitedBonusTokens" value="yes">
! 				<Attributes amount="-1"/>
! 			</IfOption>
! 			<IfOption name="UnlimitedBonusTokens" value="no">
! 				<Attributes amount="3"/>
! 			</IfOption>
! 		</SellBonusToken>
! 	  </SpecialProperty>
! 	</SpecialProperties>
!   </Company>
!   
!   <Company name="GT"  type="Public" tokens="4" fgColour="000000" bgColour="40B0A0">
!     <Home hex="P9"/>
!     <Destination hex="K8"/>
!   </Company>
!   <Company name="THB" type="Public" tokens="2" fgColour="000000" bgColour="B0B040">
!     <Home hex="L15"/>
!     <Destination hex="J11"/>
!   </Company>
!   <Company name="BBG" type="Public" tokens="3" fgColour="000000" bgColour="FF8080">
!     <Home hex="J15"/>
!     <Destination hex="N17"/>
!   </Company>
!   <Company name="LPS" type="Public" tokens="2" fgColour="000000" bgColour="A0A0F0">
!     <Home hex="C14"/>
!     <Destination hex="F17"/>
!   </Company>
!   <Company name="WGB" type="Public" tokens="2" fgColour="FFFFFF" bgColour="0000FF">
!     <Home hex="J11"/>
!     <Destination hex="F9"/>
!   </Company>
!   <Company name="WR"  type="Public" tokens="3" fgColour="FFFFFF" bgColour="808030">
!     <Home hex="O16"/>
!     <Destination hex="L15"/>
!   </Company>
!   <Company name="CV"  type="Public" tokens="3" fgColour="FFFFFF" bgColour="800080">
!     <Home hex="N11"/>
!     <Destination hex="I14"/>
!   </Company>
!   <Company name="CPR" type="Public" tokens="4" fgColour="000000" bgColour="ffa0ff">
!     <Home hex="M4"/>
!     <Destination hex="N11"/>
!   </Company>
!   <Company name="CA"  type="Public" tokens="3" fgColour="FFFFFF" bgColour="FF0000">
!     <Home hex="D17"/>
!     <Destination hex="H15"/>
!   </Company>
!   <Company name="CGR" type="State" available="no" tokens="10" fgColour="FFFFFF" bgColour="000000">
!   </Company>
!   <Company name="TGB" type="Public" tokens="2" fgColour="FFFFFF" bgColour="FF8000">
!     <Home hex="K8"/>
!     <Destination hex="H5"/>
!   </Company>
!   <Company name="GW"  type="Public" tokens="4" fgColour="000000" bgColour="b090b0">
!     <Home hex="F15"/>
!     <Destination hex="A20"/>
!   </Company>
  
!   <StartPacket roundClass="rails.game.StartRound_1830">
! 	<Bidding initial="5" minimum="5" increment="1"/>
!     <Item name="Flos"      type="Private" basePrice="20"/>
!     <Item name="W&amp;SR" type="Private" basePrice="40"/>
!     <Item name="TCC"   type="Private" basePrice="50"/>
!     <Item name="Ship"   type="Private" basePrice="70"/>
!     <Item name="Brdg"   type="Private" basePrice="100"/>
!     <Item name="Tunn"   type="Private" basePrice="100"/>
!   </StartPacket>
  </CompanyManager>
--- 1,166 ----
  <?xml version="1.0"?>
  <CompanyManager>
! 	<CompanyType name="Private" class="rails.game.PrivateCompany">
! 	</CompanyType>
! 	<CompanyType name="Public" class="rails.game.specific._1856.PublicCompany_1856">
! 		<CanBuyPrivates lowerPriceFactor="0.5" upperPriceFactor="2.0"/>
! 		<PoolPaysOut/>
! 		<ShareUnit percentage="10"/>
! 		<Certificate type="President" shares="2"/>
! 		<Certificate shares="1" number="8"/>
! 		<Capitalisation type="whenBought"/>
! 		<BaseTokens>
! 			<LayCost method="sequence" cost="0,40,100"/>
! 		</BaseTokens>
! 		<Trains number="4,4,3,2"/>
! 		<Loans value="100" perRound="1" interest="10"/>
! 		<!-- Number of loans is undefined and handled in the code -->
! 	</CompanyType>
! 	<CompanyType name="State" class="rails.game.specific._1856.PublicCompany_CGR">
! 		<PoolPaysOut/>
! 		<ShareUnit percentage="5"/>
! 		<Certificate type="President" shares="2" certificateCount="1"/>
! 		<Certificate shares="1" number="18" certificateCount="0.5"/>
! 		<BaseTokens>
! 			<LayCost method="sequence" cost="0,40,100"/>
! 		</BaseTokens>
! 		<Trains number="0,0,0,3"/>
! 		<Options mustTradeTrainsAtFixedPrice="yes" canClose="no"/>
! 	</CompanyType>
! 	
! 	<Company name="Flos" type="Private" basePrice="20" revenue="5">
! 		<Blocking hex="L3"/>
! 	</Company>
! 	<Company name="W&amp;SR" type="Private" basePrice="40" revenue="10">
! 		<Blocking hex="I12"/>
! 		<SpecialProperties>
! 			<SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
! 				<SpecialTileLay tile="59" location="I12" connected="no" extra="no"/>
! 			</SpecialProperty>
! 			<SpecialProperty condition="ifOwnedByCompany" when="tokenLayingStep" class="rails.game.special.SpecialTokenLay">
! 				<SpecialTokenLay location="I12" connected="no" extra="no" free="yes"/>
! 			</SpecialProperty>
! 		</SpecialProperties>
! 		<ClosingConditions>
! 			<SpecialProperties condition="ifAnyExercised" when="endOfORTurn"/>
! 		</ClosingConditions>
! 	</Company>
! 	<Company name="TCC" type="Private" basePrice="50" revenue="10">
! 		<Blocking hex="H11"/>
! 		<SpecialProperties>
! 			<SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
! 				<SpecialTileLay location="H11" connected="no" extra="yes"/>
! 			</SpecialProperty>
! 		</SpecialProperties>
! 	</Company>
! 	<Company name="Ship" type="Private" basePrice="70" revenue="15">
! 		<SpecialProperties>
! 			<SpecialProperty condition="ifOwnedByCompany" 
! 				when="anyTimeDuringORTurn" 
! 				class="rails.game.special.SpecialTokenLay">
! 				<SpecialTokenLay class="rails.game.BonusToken" 
! 						location="C14,D19,E18,F9,F17,H5,H7,H17,J5,J17,K2,M18,O18" connected="yes" extra="yes">
! 					<BonusToken name="Port" value="20" removed="Phase:6"/>
! 				</SpecialTokenLay>
! 			</SpecialProperty>
! 		</SpecialProperties>
! 		<ClosingConditions>
! 			<SpecialProperties condition="ifExercised"/>
! 		</ClosingConditions>
! 	</Company>
! 	<Company name="Brdg" type="Private" basePrice="100" revenue="20">
! 		<SpecialProperties>
! 			<SpecialProperty condition="ifOwnedByCompany" when="revenueStep" 
! 				class="rails.game.special.LocatedBonus" transfer="toCompany">
! 			<LocatedBonus name="Bridge" location="P17,P19" value="10"/>
! 			</SpecialProperty>
! 			<SpecialProperty condition="ifOwnedByCompany" when="anyTimeDuringOR" 
! 				class="rails.game.special.SellBonusToken" transfer="toGameManager">
! 			<SellBonusToken name="Bridge" location="P17,P19" price="50" value="10">
! 				<IfOption name="UnlimitedBonusTokens" value="yes">
! 					<Attributes amount="-1"/>
! 				</IfOption>
! 				<IfOption name="UnlimitedBonusTokens" value="no">
! 					<Attributes amount="3"/>
! 				</IfOption>
! 			</SellBonusToken>
! 			</SpecialProperty>
! 		</SpecialProperties>
! 	</Company>
! 	<Company name="Tunn" type="Private" basePrice="100" revenue="20">
! 		<SpecialProperties>
! 			<SpecialProperty condition="ifOwnedByCompany" when="revenueStep" 
! 				class="rails.game.special.LocatedBonus" transfer="toCompany">
! 			<LocatedBonus name="Tunnel" location="B13" value="10"/>
! 			</SpecialProperty>
! 			<SpecialProperty condition="ifOwnedByCompany" when="anyTimeDuringOR" 
! 				class="rails.game.special.SellBonusToken" transfer="toGameManager">
! 			<SellBonusToken name="Tunnel" location="B13" price="50" value="10">
! 				<IfOption name="UnlimitedBonusTokens" value="yes">
! 					<Attributes amount="-1"/>
! 				</IfOption>
! 				<IfOption name="UnlimitedBonusTokens" value="no">
! 					<Attributes amount="3"/>
! 				</IfOption>
! 			</SellBonusToken>
! 			</SpecialProperty>
! 		</SpecialProperties>
! 	</Company>
! 	
! 	<Company name="GT"	type="Public" tokens="4" fgColour="000000" bgColour="40B0A0">
! 		<Home hex="P9"/>
! 		<Destination hex="K8"/>
! 	</Company>
! 	<Company name="THB" type="Public" tokens="2" fgColour="000000" bgColour="B0B040">
! 		<Home hex="L15"/>
! 		<Destination hex="J11"/>
! 	</Company>
! 	<Company name="BBG" type="Public" tokens="3" fgColour="000000" bgColour="FF8080">
! 		<Home hex="J15"/>
! 		<Destination hex="N17"/>
! 	</Company>
! 	<Company name="LPS" type="Public" tokens="2" fgColour="000000" bgColour="A0A0F0">
! 		<Home hex="C14"/>
! 		<Destination hex="F17"/>
! 	</Company>
! 	<Company name="WGB" type="Public" tokens="2" fgColour="FFFFFF" bgColour="0000FF">
! 		<Home hex="J11"/>
! 		<Destination hex="F9"/>
! 	</Company>
! 	<Company name="WR"	type="Public" tokens="3" fgColour="FFFFFF" bgColour="808030">
! 		<Home hex="O16"/>
! 		<Destination hex="L15"/>
! 	</Company>
! 	<Company name="CV"	type="Public" tokens="3" fgColour="FFFFFF" bgColour="800080">
! 		<Home hex="N11"/>
! 		<Destination hex="I14"/>
! 	</Company>
! 	<Company name="CPR" type="Public" tokens="4" fgColour="000000" bgColour="ffa0ff">
! 		<Home hex="M4"/>
! 		<Destination hex="N11"/>
! 	</Company>
! 	<Company name="CA"	type="Public" tokens="3" fgColour="FFFFFF" bgColour="FF0000">
! 		<Home hex="D17"/>
! 		<Destination hex="H15"/>
! 	</Company>
! 	<Company name="CGR" type="State" available="no" tokens="10" fgColour="FFFFFF" bgColour="000000">
! 	</Company>
! 	<Company name="TGB" type="Public" tokens="2" fgColour="FFFFFF" bgColour="FF8000">
! 		<Home hex="K8"/>
! 		<Destination hex="H5"/>
! 	</Company>
! 	<Company name="GW"	type="Public" tokens="4" fgColour="000000" bgColour="b090b0">
! 		<Home hex="F15"/>
! 		<Destination hex="A20"/>
! 	</Company>
  
! 	<StartPacket roundClass="rails.game.StartRound_1830">
! 		<Bidding initial="5" minimum="5" increment="1"/>
! 		<Item name="Flos"     type="Private" basePrice="20"/>
! 		<Item name="W&amp;SR" type="Private" basePrice="40"/>
! 		<Item name="TCC"      type="Private" basePrice="50"/>
! 		<Item name="Ship"     type="Private" basePrice="70"/>
! 		<Item name="Brdg"     type="Private" basePrice="100"/>
! 		<Item name="Tunn"     type="Private" basePrice="100"/>
! 	</StartPacket>
  </CompanyManager>

Index: StockMarket.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1856/StockMarket.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StockMarket.xml	14 Jan 2010 22:12:36 -0000	1.5
--- StockMarket.xml	31 Jan 2010 22:15:59 -0000	1.6
***************
*** 1,144 ****
  <StockMarket type="rectangular">
!   <StockSpaceType name="yellow" colour="FFFF00">
!     <NoCertLimit/>
!   </StockSpaceType>
!   <StockSpaceType name="orange" colour="884000">
!     <NoCertLimit/>
!     <NoHoldLimit/>
!   </StockSpaceType>
!   
!   <StockSpace name="A1" price="70" />
!   <StockSpace name="A2" price="65" />
!   <StockSpace name="A3" price="60" />
!   <StockSpace name="A4" price="55" />
!   <StockSpace name="A5" price="50" type="yellow"/>
!   <StockSpace name="A6" price="45" type="yellow"/>
!   <StockSpace name="A7" price="40" type="orange"/>
!   <StockSpace name="A8" price="35" type="orange"/>
!   <StockSpace name="A9" price="30" type="orange"/>
!   <StockSpace name="A10" price="0">
!     <ClosesCompany/>
!   </StockSpace>
!   <StockSpace name="A11" price="0">
!     <ClosesCompany/>
!   </StockSpace>
!   <StockSpace name="B1" price="75" />
!   <StockSpace name="B2" price="70" />
!   <StockSpace name="B3" price="65" />
!   <StockSpace name="B4" price="60" />
!   <StockSpace name="B5" price="55" />
!   <StockSpace name="B6" price="50" type="yellow"/>
!   <StockSpace name="B7" price="45" type="yellow"/>
!   <StockSpace name="B8" price="40" type="orange"/>
!   <StockSpace name="B9" price="35" type="orange"/>
!   <StockSpace name="B10" price="30" type="orange"/>
!   <StockSpace name="B11" price="0">
!     <closesCompany/>
!   </StockSpace>
!   <StockSpace name="C1" price="80" />
!   <StockSpace name="C2" price="75" />
!   <StockSpace name="C3" price="70" />
!   <StockSpace name="C4" price="65" />
!   <StockSpace name="C5" price="60" />
!   <StockSpace name="C6" price="55" />
!   <StockSpace name="C7" price="50" type="yellow"/>
!   <StockSpace name="C8" price="45" type="yellow"/>
!   <StockSpace name="C9" price="40" type="orange"/>
!   <StockSpace name="C10" price="35" type="orange"/>
!   <StockSpace name="C11" price="30" type="orange"/>
!   <StockSpace name="D1" price="90" />
!   <StockSpace name="D2" price="80" />
!   <StockSpace name="D3" price="75" />
!   <StockSpace name="D4" price="70" />
!   <StockSpace name="D5" price="65" />
!   <StockSpace name="D6" price="60" />
!   <StockSpace name="D7" price="55" />
!   <StockSpace name="D8" price="50" type="yellow"/>
!   <StockSpace name="D9" price="45" type="yellow"/>
!   <StockSpace name="D10" price="40" type="orange"/>
!   <StockSpace name="D11" price="35" type="orange"/>
!   <StockSpace name="E1" price="100" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="E2" price="90" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="E3" price="80" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="E4" price="75" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="E5" price="70" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="E6" price="65" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="E7" price="60" />
!   <StockSpace name="E8" price="55" />
!   <StockSpace name="E9" price="50" type="yellow"/>
!   <StockSpace name="E10" price="45" type="yellow"/>
!   <StockSpace name="E11" price="40" type="orange"/>
!   <StockSpace name="F1" price="110" />
!   <StockSpace name="F2" price="100" />
!   <StockSpace name="F3" price="90" />
!   <StockSpace name="F4" price="80" />
!   <StockSpace name="F5" price="75" />
!   <StockSpace name="F6" price="70" />
!   <StockSpace name="F7" price="65" />
!   <StockSpace name="F8" price="60" />
!   <StockSpace name="G1" price="125" />
!   <StockSpace name="G2" price="110" />
!   <StockSpace name="G3" price="100" />
!   <StockSpace name="G4" price="90" />
!   <StockSpace name="G5" price="80" />
!   <StockSpace name="G6" price="75" />
!   <StockSpace name="G7" price="70" />
!   <StockSpace name="H1" price="150" />
!   <StockSpace name="H2" price="125" />
!   <StockSpace name="H3" price="110" />
!   <StockSpace name="H4" price="100" />
!   <StockSpace name="H5" price="90" />
!   <StockSpace name="H6" price="80" />
!   <StockSpace name="I1" price="175" />
!   <StockSpace name="I2" price="150" />
!   <StockSpace name="I3" price="125" />
!   <StockSpace name="I4" price="110" />
!   <StockSpace name="I5" price="100" />
!   <StockSpace name="I6" price="90" />
!   <StockSpace name="J1" price="200" />
!   <StockSpace name="J2" price="175" />
!   <StockSpace name="J3" price="150" />
!   <StockSpace name="J4" price="125" />
!   <StockSpace name="J5" price="110" />
!   <StockSpace name="K1" price="225" />
!   <StockSpace name="K2" price="200" />
!   <StockSpace name="K3" price="175" />
!   <StockSpace name="K4" price="150" />
!   <StockSpace name="K5" price="125" />
!   <StockSpace name="L1" price="250" />
!   <StockSpace name="L2" price="225" />
!   <StockSpace name="L3" price="200" />
!   <StockSpace name="L4" price="175" />
!   <StockSpace name="M1" price="275" />
!   <StockSpace name="M2" price="250" />
!   <StockSpace name="M3" price="225" />
!   <StockSpace name="M4" price="200" />
!   <StockSpace name="N1" price="300" />
!   <StockSpace name="N2" price="275" />
!   <StockSpace name="N3" price="250" />
!   <StockSpace name="O1" price="325" />
!   <StockSpace name="O2" price="300" />
!   <StockSpace name="O3" price="275" />
!   <StockSpace name="P1" price="350" />
!   <StockSpace name="P2" price="325" />
!   <StockSpace name="Q1" price="375" />
!   <StockSpace name="Q2" price="350" />
!   <StockSpace name="R1" price="400" />
!   <StockSpace name="R2" price="375" />
!   <StockSpace name="S1" price="425" />
!   <StockSpace name="S2" price="400" />
!   <StockSpace name="T1" price="450" />
!   <StockSpace name="T2" price="425" />
  </StockMarket>
--- 1,144 ----
  <StockMarket type="rectangular">
! 	<StockSpaceType name="yellow" colour="FFFF00">
! 		<NoCertLimit/>
! 	</StockSpaceType>
! 	<StockSpaceType name="orange" colour="884000">
! 		<NoCertLimit/>
! 		<NoHoldLimit/>
! 	</StockSpaceType>
! 	
! 	<StockSpace name="A1" price="70" />
! 	<StockSpace name="A2" price="65" />
! 	<StockSpace name="A3" price="60" />
! 	<StockSpace name="A4" price="55" />
! 	<StockSpace name="A5" price="50" type="yellow"/>
! 	<StockSpace name="A6" price="45" type="yellow"/>
! 	<StockSpace name="A7" price="40" type="orange"/>
! 	<StockSpace name="A8" price="35" type="orange"/>
! 	<StockSpace name="A9" price="30" type="orange"/>
! 	<StockSpace name="A10" price="0">
! 		<ClosesCompany/>
! 	</StockSpace>
! 	<StockSpace name="A11" price="0">
! 		<ClosesCompany/>
! 	</StockSpace>
! 	<StockSpace name="B1" price="75" />
! 	<StockSpace name="B2" price="70" />
! 	<StockSpace name="B3" price="65" />
! 	<StockSpace name="B4" price="60" />
! 	<StockSpace name="B5" price="55" />
! 	<StockSpace name="B6" price="50" type="yellow"/>
! 	<StockSpace name="B7" price="45" type="yellow"/>
! 	<StockSpace name="B8" price="40" type="orange"/>
! 	<StockSpace name="B9" price="35" type="orange"/>
! 	<StockSpace name="B10" price="30" type="orange"/>
! 	<StockSpace name="B11" price="0">
! 		<closesCompany/>
! 	</StockSpace>
! 	<StockSpace name="C1" price="80" />
! 	<StockSpace name="C2" price="75" />
! 	<StockSpace name="C3" price="70" />
! 	<StockSpace name="C4" price="65" />
! 	<StockSpace name="C5" price="60" />
! 	<StockSpace name="C6" price="55" />
! 	<StockSpace name="C7" price="50" type="yellow"/>
! 	<StockSpace name="C8" price="45" type="yellow"/>
! 	<StockSpace name="C9" price="40" type="orange"/>
! 	<StockSpace name="C10" price="35" type="orange"/>
! 	<StockSpace name="C11" price="30" type="orange"/>
! 	<StockSpace name="D1" price="90" />
! 	<StockSpace name="D2" price="80" />
! 	<StockSpace name="D3" price="75" />
! 	<StockSpace name="D4" price="70" />
! 	<StockSpace name="D5" price="65" />
! 	<StockSpace name="D6" price="60" />
! 	<StockSpace name="D7" price="55" />
! 	<StockSpace name="D8" price="50" type="yellow"/>
! 	<StockSpace name="D9" price="45" type="yellow"/>
! 	<StockSpace name="D10" price="40" type="orange"/>
! 	<StockSpace name="D11" price="35" type="orange"/>
! 	<StockSpace name="E1" price="100" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="E2" price="90" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="E3" price="80" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="E4" price="75" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="E5" price="70" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="E6" price="65" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="E7" price="60" />
! 	<StockSpace name="E8" price="55" />
! 	<StockSpace name="E9" price="50" type="yellow"/>
! 	<StockSpace name="E10" price="45" type="yellow"/>
! 	<StockSpace name="E11" price="40" type="orange"/>
! 	<StockSpace name="F1" price="110" />
! 	<StockSpace name="F2" price="100" />
! 	<StockSpace name="F3" price="90" />
! 	<StockSpace name="F4" price="80" />
! 	<StockSpace name="F5" price="75" />
! 	<StockSpace name="F6" price="70" />
! 	<StockSpace name="F7" price="65" />
! 	<StockSpace name="F8" price="60" />
! 	<StockSpace name="G1" price="125" />
! 	<StockSpace name="G2" price="110" />
! 	<StockSpace name="G3" price="100" />
! 	<StockSpace name="G4" price="90" />
! 	<StockSpace name="G5" price="80" />
! 	<StockSpace name="G6" price="75" />
! 	<StockSpace name="G7" price="70" />
! 	<StockSpace name="H1" price="150" />
! 	<StockSpace name="H2" price="125" />
! 	<StockSpace name="H3" price="110" />
! 	<StockSpace name="H4" price="100" />
! 	<StockSpace name="H5" price="90" />
! 	<StockSpace name="H6" price="80" />
! 	<StockSpace name="I1" price="175" />
! 	<StockSpace name="I2" price="150" />
! 	<StockSpace name="I3" price="125" />
! 	<StockSpace name="I4" price="110" />
! 	<StockSpace name="I5" price="100" />
! 	<StockSpace name="I6" price="90" />
! 	<StockSpace name="J1" price="200" />
! 	<StockSpace name="J2" price="175" />
! 	<StockSpace name="J3" price="150" />
! 	<StockSpace name="J4" price="125" />
! 	<StockSpace name="J5" price="110" />
! 	<StockSpace name="K1" price="225" />
! 	<StockSpace name="K2" price="200" />
! 	<StockSpace name="K3" price="175" />
! 	<StockSpace name="K4" price="150" />
! 	<StockSpace name="K5" price="125" />
! 	<StockSpace name="L1" price="250" />
! 	<StockSpace name="L2" price="225" />
! 	<StockSpace name="L3" price="200" />
! 	<StockSpace name="L4" price="175" />
! 	<StockSpace name="M1" price="275" />
! 	<StockSpace name="M2" price="250" />
! 	<StockSpace name="M3" price="225" />
! 	<StockSpace name="M4" price="200" />
! 	<StockSpace name="N1" price="300" />
! 	<StockSpace name="N2" price="275" />
! 	<StockSpace name="N3" price="250" />
! 	<StockSpace name="O1" price="325" />
! 	<StockSpace name="O2" price="300" />
! 	<StockSpace name="O3" price="275" />
! 	<StockSpace name="P1" price="350" />
! 	<StockSpace name="P2" price="325" />
! 	<StockSpace name="Q1" price="375" />
! 	<StockSpace name="Q2" price="350" />
! 	<StockSpace name="R1" price="400" />
! 	<StockSpace name="R2" price="375" />
! 	<StockSpace name="S1" price="425" />
! 	<StockSpace name="S2" price="400" />
! 	<StockSpace name="T1" price="450" />
! 	<StockSpace name="T2" price="425" />
  </StockMarket>

Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1856/Game.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Game.xml	23 Jan 2010 23:02:05 -0000	1.33
--- Game.xml	31 Jan 2010 22:15:58 -0000	1.34
***************
*** 9,13 ****
  			<StockRound class="rails.game.specific._1856.StockRound_1856" 
  				sequence="SellBuyOrBuySell">
! 		        <NoSaleInFirstSR/>
  			</StockRound>
  			<OperatingRound class="rails.game.specific._1856.OperatingRound_1856"/>
--- 9,13 ----
  			<StockRound class="rails.game.specific._1856.StockRound_1856" 
  				sequence="SellBuyOrBuySell">
! 				<NoSaleInFirstSR/>
  			</StockRound>
  			<OperatingRound class="rails.game.specific._1856.OperatingRound_1856"/>

[Rails-commits] 18xx/data/1870 CompanyManager.xml, 1.22, 1.23 Game.xml, 1.25, 1.26 StockMarket.xml, 1.4, 1.5

[Freek D. <mac...@us...>]

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

Modified Files:
	CompanyManager.xml Game.xml StockMarket.xml 
Log Message:
Fix indentation: XML files contain tabs

Index: CompanyManager.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1870/CompanyManager.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** CompanyManager.xml	17 Jan 2010 14:05:48 -0000	1.22
--- CompanyManager.xml	31 Jan 2010 22:15:59 -0000	1.23
***************
*** 1,79 ****
  <?xml version="1.0"?>
  <CompanyManager>
!   <CompanyType name="Private" class="rails.game.PrivateCompany">
!   </CompanyType>
!   <CompanyType name="Public" class="rails.game.PublicCompany">
!     <CanBuyPrivates lowerPriceFactor="0.5" upperPriceFactor="2.0"/>
!     <IPOPaysOut/>
!     <Float percentage="60"/>
!     <CanSplitDividend/>
!     <ShareUnit percentage="10"/>
!     <Certificate type="President" shares="2"/>
!     <Certificate shares="1" number="8"/>
!     <!--NumberOfTileLays colour="yellow" phase="1,2,3,4,5,6,7,8" number="2"/-->
!     <TileLays>
! 		<Number colour="yellow" phase="1,2,3,4,5,6,7,8" number="2"/>
!     </TileLays>
! 	<BaseTokens>
! 	    <LayCost method="sequence" cost="0,40,100"/>
! 	</BaseTokens>
!     <Trains number="4,4,3,2"/>
!   </CompanyType>
!   
!   <Company name="GRSC"  type="Private" basePrice="20" revenue="5"/>
!   <Company name="Brdg"  type="Private" basePrice="40" revenue="10"/>
!   <Company name="Cattl" type="Private" tokens="1" basePrice="50" revenue="10"/>
!   <Company name="Gulf"  type="Private" tokens="2" tokenValue="20/10,10" basePrice="80" revenue="15"/>
!   <Company name="MKT"   type="Private" basePrice="160" revenue="20"/>
!   
!   <Company name="KATY" type="Public" tokens="4" fgColour="FFFFFF" bgColour="00FF00">
!     <Home hex="B11"/>
!     <Destination hex="N1"/>
!   </Company>
!   <Company name="MP"   type="Public" tokens="4" fgColour="FFFFFF" bgColour="FF0000">
!     <Home hex="C18"/>
!     <Destination hex="J5"/>
!   </Company>
!   <Company name="ATSF" type="Public" tokens="4" fgColour="FFFFFF" bgColour="0000FF">
!     <Home hex="B9"/>
!     <Destination hex="N1"/>
!   </Company>
!   <Company name="SP"   type="Public" tokens="4" fgColour="FF8000" bgColour="000000">
!     <Home hex="N1"/>
!     <Destination hex="N17"/>
!   </Company>
!   <Company name="GMO"  type="Public" tokens="3" fgColour="FFFFFF" bgColour="ff0040">
!     <Home hex="M20"/>
!     <Destination hex="C18"/>
!   </Company>
!   <Company name="SLSF" type="Public" tokens="4" fgColour="FFFFFF" bgColour="d04000" floatPerc="20">
!     <Home hex="E12"/>
!     <Destination hex="M22"/>
!   </Company>
!   <Company name="TP"   type="Public" tokens="3" fgColour="FFFFFF" bgColour="000000">
!     <Home hex="J5"/>
!     <Destination hex="N17"/>
!   </Company>
!   <Company name="FW"   type="Public" tokens="3" fgColour="FF0000" bgColour="000000">
!     <Home hex="J3"/>
!     <Destination hex="A2"/>
!   </Company>
!   <Company name="SSW"  type="Public" tokens="3" fgColour="FFFFFF" bgColour="6000ff">
!     <Home hex="H17"/>
!     <Destination hex="J3"/>
!   </Company>
!   <Company name="IC"   type="Public" tokens="3" fgColour="000000" bgColour="c0ff40">
!     <Home hex="K16"/>
!     <Destination hex="A22"/>
!   </Company>
! 
!   <StartPacket roundClass="rails.game.StartRound_1830">
! 	<Bidding initial="5" minimum="5" increment="1"/>
!     <Item name="GRSC"  type="Private" basePrice="20"/>
!     <Item name="Brdg"  type="Private" basePrice="40"/>
!     <Item name="Cattl" type="Private" basePrice="50"/>
!     <Item name="Gulf"  type="Private" basePrice="80"/>
!     <Item name="SLSF"  type="Public"  president="yes" basePrice="140"/>
!     <Item name="MKT"   type="Private" basePrice="160"/>
!   </StartPacket>
  </CompanyManager>
--- 1,79 ----
  <?xml version="1.0"?>
  <CompanyManager>
! 	<CompanyType name="Private" class="rails.game.PrivateCompany">
! 	</CompanyType>
! 	<CompanyType name="Public" class="rails.game.PublicCompany">
! 		<CanBuyPrivates lowerPriceFactor="0.5" upperPriceFactor="2.0"/>
! 		<IPOPaysOut/>
! 		<Float percentage="60"/>
! 		<CanSplitDividend/>
! 		<ShareUnit percentage="10"/>
! 		<Certificate type="President" shares="2"/>
! 		<Certificate shares="1" number="8"/>
! 		<!--NumberOfTileLays colour="yellow" phase="1,2,3,4,5,6,7,8" number="2"/-->
! 		<TileLays>
! 			<Number colour="yellow" phase="1,2,3,4,5,6,7,8" number="2"/>
! 		</TileLays>
! 		<BaseTokens>
! 				<LayCost method="sequence" cost="0,40,100"/>
! 		</BaseTokens>
! 		<Trains number="4,4,3,2"/>
! 	</CompanyType>
! 	
! 	<Company name="GRSC"  type="Private" basePrice="20" revenue="5"/>
! 	<Company name="Brdg"  type="Private" basePrice="40" revenue="10"/>
! 	<Company name="Cattl" type="Private" tokens="1" basePrice="50" revenue="10"/>
! 	<Company name="Gulf"  type="Private" tokens="2" tokenValue="20/10,10" basePrice="80" revenue="15"/>
! 	<Company name="MKT"   type="Private" basePrice="160" revenue="20"/>
! 	
! 	<Company name="KATY" type="Public" tokens="4" fgColour="FFFFFF" bgColour="00FF00">
! 		<Home hex="B11"/>
! 		<Destination hex="N1"/>
! 	</Company>
! 	<Company name="MP"   type="Public" tokens="4" fgColour="FFFFFF" bgColour="FF0000">
! 		<Home hex="C18"/>
! 		<Destination hex="J5"/>
! 	</Company>
! 	<Company name="ATSF" type="Public" tokens="4" fgColour="FFFFFF" bgColour="0000FF">
! 		<Home hex="B9"/>
! 		<Destination hex="N1"/>
! 	</Company>
! 	<Company name="SP"   type="Public" tokens="4" fgColour="FF8000" bgColour="000000">
! 		<Home hex="N1"/>
! 		<Destination hex="N17"/>
! 	</Company>
! 	<Company name="GMO"  type="Public" tokens="3" fgColour="FFFFFF" bgColour="ff0040">
! 		<Home hex="M20"/>
! 		<Destination hex="C18"/>
! 	</Company>
! 	<Company name="SLSF" type="Public" tokens="4" fgColour="FFFFFF" bgColour="d04000" floatPerc="20">
! 		<Home hex="E12"/>
! 		<Destination hex="M22"/>
! 	</Company>
! 	<Company name="TP"   type="Public" tokens="3" fgColour="FFFFFF" bgColour="000000">
! 		<Home hex="J5"/>
! 		<Destination hex="N17"/>
! 	</Company>
! 	<Company name="FW"   type="Public" tokens="3" fgColour="FF0000" bgColour="000000">
! 		<Home hex="J3"/>
! 		<Destination hex="A2"/>
! 	</Company>
! 	<Company name="SSW"  type="Public" tokens="3" fgColour="FFFFFF" bgColour="6000ff">
! 		<Home hex="H17"/>
! 		<Destination hex="J3"/>
! 	</Company>
! 	<Company name="IC"   type="Public" tokens="3" fgColour="000000" bgColour="c0ff40">
! 		<Home hex="K16"/>
! 		<Destination hex="A22"/>
! 	</Company>
! 	
! 	<StartPacket roundClass="rails.game.StartRound_1830">
! 		<Bidding initial="5" minimum="5" increment="1"/>
! 		<Item name="GRSC"  type="Private" basePrice="20"/>
! 		<Item name="Brdg"  type="Private" basePrice="40"/>
! 		<Item name="Cattl" type="Private" basePrice="50"/>
! 		<Item name="Gulf"  type="Private" basePrice="80"/>
! 		<Item name="SLSF"  type="Public"	president="yes" basePrice="140"/>
! 		<Item name="MKT"   type="Private" basePrice="160"/>
! 	</StartPacket>
  </CompanyManager>

Index: StockMarket.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1870/StockMarket.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StockMarket.xml	13 Dec 2009 16:39:48 -0000	1.4
--- StockMarket.xml	31 Jan 2010 22:15:59 -0000	1.5
***************
*** 1,239 ****
  <StockMarket type="rectangular">
!   <UpOrDownRight/>
!   <StockSpaceType name="yellow" colour="FFFF00">
!     <NoCertLimit/>
!   </StockSpaceType>
!   <StockSpaceType name="orange" colour="00AA00">
!     <NoCertLimit/>
!     <NoHoldLimit/>
!   </StockSpaceType>
!   <StockSpaceType name="brown" colour="884000">
!     <NoCertLimit/>
!     <NoHoldLimit/>
!     <NoBuyLimit/>
!   </StockSpaceType>
!   
!   <StockSpace name="A1" price="64" type="yellow"/>
!   <StockSpace name="A2" price="60" type="yellow"/>
!   <StockSpace name="A3" price="55" type="yellow"/>
!   <StockSpace name="A4" price="50" type="orange"/>
!   <StockSpace name="A5" price="40" type="brown"/>
!   <StockSpace name="A6" price="30" type="brown"/>
!   <StockSpace name="A7" price="20" type="brown"/>
!   <StockSpace name="A8" price="10" type="brown"/>
!   <StockSpace name="A9" price="0">
!     <ClosesCompany/>
!   </StockSpace>
!   <StockSpace name="A10" price="0">
!     <ClosesCompany/>
!   </StockSpace>
!   <StockSpace name="A11" price="0">
!     <ClosesCompany/>
!   </StockSpace>
!   <StockSpace name="B1" price="68" />
!   <StockSpace name="B2" price="64" type="yellow"/>
!   <StockSpace name="B3" price="60" type="yellow"/>
!   <StockSpace name="B4" price="55" type="yellow"/>
!   <StockSpace name="B5" price="50" type="orange"/>
!   <StockSpace name="B6" price="40" type="orange"/>
!   <StockSpace name="B7" price="30" type="brown"/>
!   <StockSpace name="B8" price="20" type="brown"/>
!   <StockSpace name="B9" price="10" type="brown"/>
!   <StockSpace name="B10" price="0">
!     <ClosesCompany/>
!   </StockSpace>
!   <StockSpace name="B11" price="0">
!     <ClosesCompany/>
!   </StockSpace>
!   <StockSpace name="C1" price="72" />
!   <StockSpace name="C2" price="68" />
!   <StockSpace name="C3" price="64" type="yellow"/>
!   <StockSpace name="C4" price="60" type="yellow"/>
!   <StockSpace name="C5" price="55" type="yellow"/>
!   <StockSpace name="C6" price="50" type="orange"/>
!   <StockSpace name="C7" price="40" type="orange"/>
!   <StockSpace name="C8" price="30" type="brown"/>
!   <StockSpace name="C9" price="20" type="brown"/>
!   <StockSpace name="C10" price="10" type="brown"/>
!   <StockSpace name="C11" price="0">
!     <ClosesCompany/>
!   </StockSpace>
!   <StockSpace name="D1" price="76" />
!   <StockSpace name="D2" price="72" />
!   <StockSpace name="D3" price="68" />
!   <StockSpace name="D4" price="64" type="yellow"/>
!   <StockSpace name="D5" price="60" type="yellow"/>
!   <StockSpace name="D6" price="55" type="yellow"/>
!   <StockSpace name="D7" price="50" type="orange"/>
!   <StockSpace name="D8" price="40" type="orange"/>
!   <StockSpace name="D9" price="30" type="brown"/>
!   <StockSpace name="D10" price="20" type="brown"/>
!   <StockSpace name="D11" price="10" type="brown"/>
!   <StockSpace name="E1" price="82" />
!   <StockSpace name="E2" price="76" />
!   <StockSpace name="E3" price="72" />
!   <StockSpace name="E4" price="68" />
!   <StockSpace name="E5" price="64" />
!   <StockSpace name="E6" price="60" type="yellow"/>
!   <StockSpace name="E7" price="55" type="yellow"/>
!   <StockSpace name="E8" price="50" type="yellow"/>
!   <StockSpace name="E9" price="40" type="orange"/>
!   <StockSpace name="E10" price="30" type="brown"/>
!   <StockSpace name="E11" price="20" type="brown"/>
!   <StockSpace name="F1" price="90" />
!   <StockSpace name="F2" price="82" />
!   <StockSpace name="F3" price="76" />
!   <StockSpace name="F4" price="72" />
!   <StockSpace name="F5" price="68" />
!   <StockSpace name="F6" price="64" />
!   <StockSpace name="F7" price="60" type="yellow"/>
!   <StockSpace name="F8" price="55" type="yellow"/>
!   <StockSpace name="F9" price="50" type="yellow"/>
!   <StockSpace name="F10" price="40" type="orange"/>
!   <StockSpace name="F11" price="30" type="brown"/>
!   <StockSpace name="G1" price="100">
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G2" price="90">
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G3" price="82">
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G4" price="76">
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G5" price="72">
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G6" price="68">
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G7" price="64" />
!   <StockSpace name="G8" price="60" type="yellow"/>
!   <StockSpace name="G9" price="55" type="yellow">
!     <LeftOfLedge/>
!   </StockSpace>
!   <StockSpace name="G10" price="50" type="yellow"/>
!   <StockSpace name="G11" price="40" type="orange"/>
!   <StockSpace name="H1" price="110" />
!   <StockSpace name="H2" price="100" />
!   <StockSpace name="H3" price="90" />
!   <StockSpace name="H4" price="82" />
!   <StockSpace name="H5" price="76" />
!   <StockSpace name="H6" price="72" />
!   <StockSpace name="H7" price="68" />
!   <StockSpace name="H8" price="64">
!     <LeftOfLedge/>
!   </StockSpace>
!   <StockSpace name="H9" price="60">
!     <BelowLedge/>
!   </StockSpace>
!   <StockSpace name="I1" price="120" />
!   <StockSpace name="I2" price="110" />
!   <StockSpace name="I3" price="100" />
!   <StockSpace name="I4" price="90" />
!   <StockSpace name="I5" price="82" />
!   <StockSpace name="I6" price="76" />
!   <StockSpace name="I7" price="72">
!     <LeftOfLedge/>
!   </StockSpace>
!   <StockSpace name="I8" price="68">
!     <BelowLedge/>
!   </StockSpace>
!   <StockSpace name="I9" price="64" />
!   <StockSpace name="J1" price="140" />
!   <StockSpace name="J2" price="120" />
!   <StockSpace name="J3" price="110" />
!   <StockSpace name="J4" price="100" />
!   <StockSpace name="J5" price="90" />
!   <StockSpace name="J6" price="82">
!     <LeftOfLedge/>
!   </StockSpace>
!   <StockSpace name="J7" price="76">
!     <BelowLedge/>
!   </StockSpace>
!   <StockSpace name="J8" price="72" />
!   <StockSpace name="K1" price="160" />
!   <StockSpace name="K2" price="140" />
!   <StockSpace name="K3" price="120" />
!   <StockSpace name="K4" price="110" />
!   <StockSpace name="K5" price="100">
!     <LeftOfLedge/>
!   </StockSpace>
!   <StockSpace name="K6" price="90">
!     <BelowLedge/>
!   </StockSpace>
!   <StockSpace name="K7" price="82" />
!   <StockSpace name="L1" price="180" />
!   <StockSpace name="L2" price="160" />
!   <StockSpace name="L3" price="140" />
!   <StockSpace name="L4" price="120" />
!   <StockSpace name="L5" price="110">
!     <BelowLedge/>
!   </StockSpace>
!   <StockSpace name="L6" price="100" />
!   <StockSpace name="M1" price="200" />
!   <StockSpace name="M2" price="180" />
!   <StockSpace name="M3" price="160" />
!   <StockSpace name="M4" price="140">
!     <LeftOfLedge/>
!   </StockSpace>
!   <StockSpace name="M5" price="120">
!     <BelowLedge/>
!   </StockSpace>
!   <StockSpace name="M6" price="110" />
!   <StockSpace name="N1" price="225" />
!   <StockSpace name="N2" price="200" />
!   <StockSpace name="N3" price="180" />
!   <StockSpace name="N4" price="160">
!     <BelowLedge/>
!   </StockSpace>
!   <StockSpace name="N5" price="140" />
!   <StockSpace name="O1" price="250" />
!   <StockSpace name="O2" price="225" />
!   <StockSpace name="O3" price="200" />
!   <StockSpace name="O4" price="180">
!     <BelowLedge/>
!   </StockSpace>
!   <StockSpace name="O5" price="160" />
!   <StockSpace name="P1" price="275" />
!   <StockSpace name="P2" price="250" />
!   <StockSpace name="P3" price="225">
!     <LeftOfLedge/>
!   </StockSpace>
!   <StockSpace name="P4" price="200">
!     <BelowLedge/>
!   </StockSpace>
!   <StockSpace name="P5" price="180" />
!   <StockSpace name="Q1" price="300" />
!   <StockSpace name="Q2" price="175" />
!   <StockSpace name="Q3" price="250">
!     <BelowLedge/>
!   </StockSpace>
!   <StockSpace name="Q4" price="225" />
!   <StockSpace name="R1" price="325" />
!   <StockSpace name="R2" price="300" />
!   <StockSpace name="R3" price="275">
!     <BelowLedge/>
!   </StockSpace>
!   <StockSpace name="R4" price="250" />
!   <StockSpace name="S1" price="350" />
!   <StockSpace name="S2" price="325" />
!   <StockSpace name="S3" price="300">
!     <BelowLedge/>
!   </StockSpace>
!   <StockSpace name="S4" price="275" />
!   <StockSpace name="T1" price="375" />
!   <StockSpace name="T2" price="350" />
!   <StockSpace name="T3" price="325">
!     <BelowLedge/>
!   </StockSpace>
!   <StockSpace name="T4" price="300" />
!   <StockSpace name="U1" price="400" />
!   <StockSpace name="U2" price="375" />
!   <StockSpace name="U3" price="350">
!     <BelowLedge/>
!   </StockSpace>
!   <StockSpace name="U4" price="325" />
  </StockMarket>
--- 1,239 ----
  <StockMarket type="rectangular">
! 	<UpOrDownRight/>
! 	<StockSpaceType name="yellow" colour="FFFF00">
! 		<NoCertLimit/>
! 	</StockSpaceType>
! 	<StockSpaceType name="orange" colour="00AA00">
! 		<NoCertLimit/>
! 		<NoHoldLimit/>
! 	</StockSpaceType>
! 	<StockSpaceType name="brown" colour="884000">
! 		<NoCertLimit/>
! 		<NoHoldLimit/>
! 		<NoBuyLimit/>
! 	</StockSpaceType>
! 	
! 	<StockSpace name="A1" price="64" type="yellow"/>
! 	<StockSpace name="A2" price="60" type="yellow"/>
! 	<StockSpace name="A3" price="55" type="yellow"/>
! 	<StockSpace name="A4" price="50" type="orange"/>
! 	<StockSpace name="A5" price="40" type="brown"/>
! 	<StockSpace name="A6" price="30" type="brown"/>
! 	<StockSpace name="A7" price="20" type="brown"/>
! 	<StockSpace name="A8" price="10" type="brown"/>
! 	<StockSpace name="A9" price="0">
! 		<ClosesCompany/>
! 	</StockSpace>
! 	<StockSpace name="A10" price="0">
! 		<ClosesCompany/>
! 	</StockSpace>
! 	<StockSpace name="A11" price="0">
! 		<ClosesCompany/>
! 	</StockSpace>
! 	<StockSpace name="B1" price="68" />
! 	<StockSpace name="B2" price="64" type="yellow"/>
! 	<StockSpace name="B3" price="60" type="yellow"/>
! 	<StockSpace name="B4" price="55" type="yellow"/>
! 	<StockSpace name="B5" price="50" type="orange"/>
! 	<StockSpace name="B6" price="40" type="orange"/>
! 	<StockSpace name="B7" price="30" type="brown"/>
! 	<StockSpace name="B8" price="20" type="brown"/>
! 	<StockSpace name="B9" price="10" type="brown"/>
! 	<StockSpace name="B10" price="0">
! 		<ClosesCompany/>
! 	</StockSpace>
! 	<StockSpace name="B11" price="0">
! 		<ClosesCompany/>
! 	</StockSpace>
! 	<StockSpace name="C1" price="72" />
! 	<StockSpace name="C2" price="68" />
! 	<StockSpace name="C3" price="64" type="yellow"/>
! 	<StockSpace name="C4" price="60" type="yellow"/>
! 	<StockSpace name="C5" price="55" type="yellow"/>
! 	<StockSpace name="C6" price="50" type="orange"/>
! 	<StockSpace name="C7" price="40" type="orange"/>
! 	<StockSpace name="C8" price="30" type="brown"/>
! 	<StockSpace name="C9" price="20" type="brown"/>
! 	<StockSpace name="C10" price="10" type="brown"/>
! 	<StockSpace name="C11" price="0">
! 		<ClosesCompany/>
! 	</StockSpace>
! 	<StockSpace name="D1" price="76" />
! 	<StockSpace name="D2" price="72" />
! 	<StockSpace name="D3" price="68" />
! 	<StockSpace name="D4" price="64" type="yellow"/>
! 	<StockSpace name="D5" price="60" type="yellow"/>
! 	<StockSpace name="D6" price="55" type="yellow"/>
! 	<StockSpace name="D7" price="50" type="orange"/>
! 	<StockSpace name="D8" price="40" type="orange"/>
! 	<StockSpace name="D9" price="30" type="brown"/>
! 	<StockSpace name="D10" price="20" type="brown"/>
! 	<StockSpace name="D11" price="10" type="brown"/>
! 	<StockSpace name="E1" price="82" />
! 	<StockSpace name="E2" price="76" />
! 	<StockSpace name="E3" price="72" />
! 	<StockSpace name="E4" price="68" />
! 	<StockSpace name="E5" price="64" />
! 	<StockSpace name="E6" price="60" type="yellow"/>
! 	<StockSpace name="E7" price="55" type="yellow"/>
! 	<StockSpace name="E8" price="50" type="yellow"/>
! 	<StockSpace name="E9" price="40" type="orange"/>
! 	<StockSpace name="E10" price="30" type="brown"/>
! 	<StockSpace name="E11" price="20" type="brown"/>
! 	<StockSpace name="F1" price="90" />
! 	<StockSpace name="F2" price="82" />
! 	<StockSpace name="F3" price="76" />
! 	<StockSpace name="F4" price="72" />
! 	<StockSpace name="F5" price="68" />
! 	<StockSpace name="F6" price="64" />
! 	<StockSpace name="F7" price="60" type="yellow"/>
! 	<StockSpace name="F8" price="55" type="yellow"/>
! 	<StockSpace name="F9" price="50" type="yellow"/>
! 	<StockSpace name="F10" price="40" type="orange"/>
! 	<StockSpace name="F11" price="30" type="brown"/>
! 	<StockSpace name="G1" price="100">
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G2" price="90">
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G3" price="82">
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G4" price="76">
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G5" price="72">
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G6" price="68">
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G7" price="64" />
! 	<StockSpace name="G8" price="60" type="yellow"/>
! 	<StockSpace name="G9" price="55" type="yellow">
! 		<LeftOfLedge/>
! 	</StockSpace>
! 	<StockSpace name="G10" price="50" type="yellow"/>
! 	<StockSpace name="G11" price="40" type="orange"/>
! 	<StockSpace name="H1" price="110" />
! 	<StockSpace name="H2" price="100" />
! 	<StockSpace name="H3" price="90" />
! 	<StockSpace name="H4" price="82" />
! 	<StockSpace name="H5" price="76" />
! 	<StockSpace name="H6" price="72" />
! 	<StockSpace name="H7" price="68" />
! 	<StockSpace name="H8" price="64">
! 		<LeftOfLedge/>
! 	</StockSpace>
! 	<StockSpace name="H9" price="60">
! 		<BelowLedge/>
! 	</StockSpace>
! 	<StockSpace name="I1" price="120" />
! 	<StockSpace name="I2" price="110" />
! 	<StockSpace name="I3" price="100" />
! 	<StockSpace name="I4" price="90" />
! 	<StockSpace name="I5" price="82" />
! 	<StockSpace name="I6" price="76" />
! 	<StockSpace name="I7" price="72">
! 		<LeftOfLedge/>
! 	</StockSpace>
! 	<StockSpace name="I8" price="68">
! 		<BelowLedge/>
! 	</StockSpace>
! 	<StockSpace name="I9" price="64" />
! 	<StockSpace name="J1" price="140" />
! 	<StockSpace name="J2" price="120" />
! 	<StockSpace name="J3" price="110" />
! 	<StockSpace name="J4" price="100" />
! 	<StockSpace name="J5" price="90" />
! 	<StockSpace name="J6" price="82">
! 		<LeftOfLedge/>
! 	</StockSpace>
! 	<StockSpace name="J7" price="76">
! 		<BelowLedge/>
! 	</StockSpace>
! 	<StockSpace name="J8" price="72" />
! 	<StockSpace name="K1" price="160" />
! 	<StockSpace name="K2" price="140" />
! 	<StockSpace name="K3" price="120" />
! 	<StockSpace name="K4" price="110" />
! 	<StockSpace name="K5" price="100">
! 		<LeftOfLedge/>
! 	</StockSpace>
! 	<StockSpace name="K6" price="90">
! 		<BelowLedge/>
! 	</StockSpace>
! 	<StockSpace name="K7" price="82" />
! 	<StockSpace name="L1" price="180" />
! 	<StockSpace name="L2" price="160" />
! 	<StockSpace name="L3" price="140" />
! 	<StockSpace name="L4" price="120" />
! 	<StockSpace name="L5" price="110">
! 		<BelowLedge/>
! 	</StockSpace>
! 	<StockSpace name="L6" price="100" />
! 	<StockSpace name="M1" price="200" />
! 	<StockSpace name="M2" price="180" />
! 	<StockSpace name="M3" price="160" />
! 	<StockSpace name="M4" price="140">
! 		<LeftOfLedge/>
! 	</StockSpace>
! 	<StockSpace name="M5" price="120">
! 		<BelowLedge/>
! 	</StockSpace>
! 	<StockSpace name="M6" price="110" />
! 	<StockSpace name="N1" price="225" />
! 	<StockSpace name="N2" price="200" />
! 	<StockSpace name="N3" price="180" />
! 	<StockSpace name="N4" price="160">
! 		<BelowLedge/>
! 	</StockSpace>
! 	<StockSpace name="N5" price="140" />
! 	<StockSpace name="O1" price="250" />
! 	<StockSpace name="O2" price="225" />
! 	<StockSpace name="O3" price="200" />
! 	<StockSpace name="O4" price="180">
! 		<BelowLedge/>
! 	</StockSpace>
! 	<StockSpace name="O5" price="160" />
! 	<StockSpace name="P1" price="275" />
! 	<StockSpace name="P2" price="250" />
! 	<StockSpace name="P3" price="225">
! 		<LeftOfLedge/>
! 	</StockSpace>
! 	<StockSpace name="P4" price="200">
! 		<BelowLedge/>
! 	</StockSpace>
! 	<StockSpace name="P5" price="180" />
! 	<StockSpace name="Q1" price="300" />
! 	<StockSpace name="Q2" price="175" />
! 	<StockSpace name="Q3" price="250">
! 		<BelowLedge/>
! 	</StockSpace>
! 	<StockSpace name="Q4" price="225" />
! 	<StockSpace name="R1" price="325" />
! 	<StockSpace name="R2" price="300" />
! 	<StockSpace name="R3" price="275">
! 		<BelowLedge/>
! 	</StockSpace>
! 	<StockSpace name="R4" price="250" />
! 	<StockSpace name="S1" price="350" />
! 	<StockSpace name="S2" price="325" />
! 	<StockSpace name="S3" price="300">
! 		<BelowLedge/>
! 	</StockSpace>
! 	<StockSpace name="S4" price="275" />
! 	<StockSpace name="T1" price="375" />
! 	<StockSpace name="T2" price="350" />
! 	<StockSpace name="T3" price="325">
! 		<BelowLedge/>
! 	</StockSpace>
! 	<StockSpace name="T4" price="300" />
! 	<StockSpace name="U1" price="400" />
! 	<StockSpace name="U2" price="375" />
! 	<StockSpace name="U3" price="350">
! 		<BelowLedge/>
! 	</StockSpace>
! 	<StockSpace name="U4" price="325" />
  </StockMarket>

Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1870/Game.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Game.xml	23 Jan 2010 23:02:05 -0000	1.25
--- Game.xml	31 Jan 2010 22:15:59 -0000	1.26
***************
*** 10,16 ****
  			</PlayerShareLimit>
  			<BankPoolLimit percentage="50"/>
! 	        <StockRound>
! 		        <NoSaleInFirstSR/>
! 	        </StockRound>
  		</GameParameters>
  		<EndOfGame>
--- 10,16 ----
  			</PlayerShareLimit>
  			<BankPoolLimit percentage="50"/>
! 			<StockRound>
! 				<NoSaleInFirstSR/>
! 			</StockRound>
  		</GameParameters>
  		<EndOfGame>

[Rails-commits] 18xx/data/1835 CompanyManager.xml, 1.22, 1.23 Game.xml, 1.24, 1.25 Map.xml, 1.8, 1.9 StockMarket.xml, 1.1, 1.2 TileSet.xml, 1.11, 1.12

[Freek D. <mac...@us...>]

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

Modified Files:
	CompanyManager.xml Game.xml Map.xml StockMarket.xml 
	TileSet.xml 
Log Message:
Fix indentation: XML files contain tabs

Index: CompanyManager.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1835/CompanyManager.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** CompanyManager.xml	17 Jan 2010 14:05:48 -0000	1.22
--- CompanyManager.xml	31 Jan 2010 22:15:57 -0000	1.23
***************
*** 1,9 ****
  <?xml version="1.0"?>
  <CompanyManager>
!   <CompanyType name="Private" class="rails.game.PrivateCompany">
!   </CompanyType>
!   <CompanyType name="Minor" class="rails.game.PublicCompany">
!     <ShareUnit percentage="100"/>
!     <Certificate type="President" shares="1"/>
  	<StockPrice market="no"/>
  	<BaseTokens>
--- 1,9 ----
  <?xml version="1.0"?>
  <CompanyManager>
! 	<CompanyType name="Private" class="rails.game.PrivateCompany">
! 	</CompanyType>
! 	<CompanyType name="Minor" class="rails.game.PublicCompany">
! 		<ShareUnit percentage="100"/>
! 		<Certificate type="President" shares="1"/>
  	<StockPrice market="no"/>
  	<BaseTokens>
***************
*** 12,32 ****
  	<Payout split="always"/>
  	<Trains number="2,2,1" mandatory="no"/>
!   </CompanyType>
!   <CompanyType name="Major" class="rails.game.PublicCompany" capitalisation="incremental">
!     <PoolPaysOut/>
!     <Float percentage="50"/>
!     <StockPrice par="yes"/>
!     <ShareUnit percentage="10"/>
!     <Certificate type="President" shares="2"/>
!     <Certificate shares="1" number="8"/>
!     <!--NumberOfTileLays colour="yellow" phase="2" number="2"/-->
!     <TileLays>
  		<Number colour="yellow" phase="2" number="2"/>
!     </TileLays>
  	<Capitalisation type="incremental"/>
  	<Trains number="4,4,3,2"/>
!   </CompanyType>
!   
!   <Company name="NF"  longname="N&#252;rnberg-F&#252;rth" type="Private" basePrice="100" revenue="5">
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByPlayer" when="tokenLayingStep" class="rails.game.special.SpecialTokenLay">
--- 12,32 ----
  	<Payout split="always"/>
  	<Trains number="2,2,1" mandatory="no"/>
! 	</CompanyType>
! 	<CompanyType name="Major" class="rails.game.PublicCompany" capitalisation="incremental">
! 		<PoolPaysOut/>
! 		<Float percentage="50"/>
! 		<StockPrice par="yes"/>
! 		<ShareUnit percentage="10"/>
! 		<Certificate type="President" shares="2"/>
! 		<Certificate shares="1" number="8"/>
! 		<!--NumberOfTileLays colour="yellow" phase="2" number="2"/-->
! 		<TileLays>
  		<Number colour="yellow" phase="2" number="2"/>
! 		</TileLays>
  	<Capitalisation type="incremental"/>
  	<Trains number="4,4,3,2"/>
! 	</CompanyType>
! 	
! 	<Company name="NF"	longname="N&#252;rnberg-F&#252;rth" type="Private" basePrice="100" revenue="5">
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByPlayer" when="tokenLayingStep" class="rails.game.special.SpecialTokenLay">
***************
*** 34,42 ****
  			</SpecialProperty>
  		</SpecialProperties>
!     <ClosingConditions>
! 		<SpecialProperties condition="ifExercised"/>
!     </ClosingConditions>
!   </Company>
!   <Company name="OBB" longname="Ostbayerische Bahn" type="Private" basePrice="120" revenue="10">
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByPlayer" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
--- 34,42 ----
  			</SpecialProperty>
  		</SpecialProperties>
! 		<ClosingConditions>
! 			<SpecialProperties condition="ifExercised"/>
! 		</ClosingConditions>
! 	</Company>
! 	<Company name="OBB" longname="Ostbayerische Bahn" type="Private" basePrice="120" revenue="10">
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByPlayer" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
***************
*** 47,55 ****
  			</SpecialProperty>
  		</SpecialProperties>
!     <ClosingConditions>
! 		<SpecialProperties condition="ifAllExercised"/>
!     </ClosingConditions>
!   </Company>
!   <Company name="PfB" longname="Pfalzbahnen" type="Private" basePrice="150" revenue="15">
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByPlayer" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
--- 47,55 ----
  			</SpecialProperty>
  		</SpecialProperties>
! 		<ClosingConditions>
! 			<SpecialProperties condition="ifAllExercised"/>
! 		</ClosingConditions>
! 	</Company>
! 	<Company name="PfB" longname="Pfalzbahnen" type="Private" basePrice="150" revenue="15">
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByPlayer" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
***************
*** 60,92 ****
  			</SpecialProperty>
  		</SpecialProperties>
!     <ClosingConditions>
! 		<SpecialProperties condition="ifAllExercised"/>
!     </ClosingConditions>
!   </Company>
!   <Company name="LD"  longname="Leipzig-Dresdner Bahn" type="Private" basePrice="190" revenue="20"/>
!   <Company name="BB"  longname="Braunschweigische Bahn" type="Private" basePrice="130" revenue="25">
!  		<SpecialProperties>
  			<SpecialProperty condition="ifStarted" when="exchangeRound" class="rails.game.special.ExchangeForShare">
  				<ExchangeForShare company="Pr" share="10"/>
  			</SpecialProperty>
  		</SpecialProperties>
!   </Company>
!   <Company name="HB"  longname="Hannoversche Bahn" type="Private" basePrice="160" revenue="30">
!  		<SpecialProperties>
  			<SpecialProperty condition="ifStarted" when="exchangeRound" class="rails.game.special.ExchangeForShare">
  				<ExchangeForShare company="Pr" share="10"/>
  			</SpecialProperty>
  		</SpecialProperties>
!   </Company>
!   <Company name="M1" longname="Bergisch-M&#228;rkische Bahn" type="Minor" price="80" tokens="1">
!     <Home hex="H2"/>
!     <SpecialProperties>
  			<SpecialProperty condition="ifStarted" when="exchangeRound" class="rails.game.special.ExchangeForShare">
  				<ExchangeForShare company="Pr" share="5"/>
  			</SpecialProperty>
  		</SpecialProperties>
!   </Company>
!   <Company name="M2" longname="Berlin-Potsdamer Bahn" type="Minor" price="170" tokens="1">
!     <Home hex="E19" city="1"/>
  		<SpecialProperties>
  			<SpecialProperty condition="phase=4" when="exchangeRound" class="rails.game.special.ExchangeForShare">
--- 60,92 ----
  			</SpecialProperty>
  		</SpecialProperties>
! 		<ClosingConditions>
! 			<SpecialProperties condition="ifAllExercised"/>
! 		</ClosingConditions>
! 	</Company>
! 	<Company name="LD"	longname="Leipzig-Dresdner Bahn" type="Private" basePrice="190" revenue="20"/>
! 	<Company name="BB"	longname="Braunschweigische Bahn" type="Private" basePrice="130" revenue="25">
! 		<SpecialProperties>
  			<SpecialProperty condition="ifStarted" when="exchangeRound" class="rails.game.special.ExchangeForShare">
  				<ExchangeForShare company="Pr" share="10"/>
  			</SpecialProperty>
  		</SpecialProperties>
! 	</Company>
! 	<Company name="HB"	longname="Hannoversche Bahn" type="Private" basePrice="160" revenue="30">
! 		<SpecialProperties>
  			<SpecialProperty condition="ifStarted" when="exchangeRound" class="rails.game.special.ExchangeForShare">
  				<ExchangeForShare company="Pr" share="10"/>
  			</SpecialProperty>
  		</SpecialProperties>
! 	</Company>
! 	<Company name="M1" longname="Bergisch-M&#228;rkische Bahn" type="Minor" price="80" tokens="1">
! 		<Home hex="H2"/>
! 		<SpecialProperties>
  			<SpecialProperty condition="ifStarted" when="exchangeRound" class="rails.game.special.ExchangeForShare">
  				<ExchangeForShare company="Pr" share="5"/>
  			</SpecialProperty>
  		</SpecialProperties>
! 	</Company>
! 	<Company name="M2" longname="Berlin-Potsdamer Bahn" type="Minor" price="170" tokens="1">
! 		<Home hex="E19" city="1"/>
  		<SpecialProperties>
  			<SpecialProperty condition="phase=4" when="exchangeRound" class="rails.game.special.ExchangeForShare">
***************
*** 94,100 ****
  			</SpecialProperty>
  		</SpecialProperties>
!   </Company>
!   <Company name="M3" longname="Magdeburger Bahn" type="Minor" price="80" tokens="1">
!     <Home hex="F14"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifStarted" when="exchangeRound" class="rails.game.special.ExchangeForShare">
--- 94,100 ----
  			</SpecialProperty>
  		</SpecialProperties>
! 	</Company>
! 	<Company name="M3" longname="Magdeburger Bahn" type="Minor" price="80" tokens="1">
! 		<Home hex="F14"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifStarted" when="exchangeRound" class="rails.game.special.ExchangeForShare">
***************
*** 102,108 ****
  			</SpecialProperty>
  		</SpecialProperties>
!   </Company>
!   <Company name="M4" longname="K&#246;ln-Mindener Bahn" type="Minor" price="160" tokens="1">
!     <Home hex="G5"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifStarted" when="exchangeRound" class="rails.game.special.ExchangeForShare">
--- 102,108 ----
  			</SpecialProperty>
  		</SpecialProperties>
! 	</Company>
! 	<Company name="M4" longname="K&#246;ln-Mindener Bahn" type="Minor" price="160" tokens="1">
! 		<Home hex="G5"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifStarted" when="exchangeRound" class="rails.game.special.ExchangeForShare">
***************
*** 110,116 ****
  			</SpecialProperty>
  		</SpecialProperties>
!   </Company>
!   <Company name="M5" longname="Berlin-Stettiner Bahn" type="Minor" price="80" tokens="1">
!     <Home hex="E19" city="2"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifStarted" when="exchangeRound" class="rails.game.special.ExchangeForShare">
--- 110,116 ----
  			</SpecialProperty>
  		</SpecialProperties>
! 	</Company>
! 	<Company name="M5" longname="Berlin-Stettiner Bahn" type="Minor" price="80" tokens="1">
! 		<Home hex="E19" city="2"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifStarted" when="exchangeRound" class="rails.game.special.ExchangeForShare">
***************
*** 118,124 ****
  			</SpecialProperty>
  		</SpecialProperties>
!   </Company>
!   <Company name="M6" longname="Altona-Kiel Bahn" type="Minor" price="80" tokens="1">
!     <Home hex="C11" city="1"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifStarted" when="exchangeRound" class="rails.game.special.ExchangeForShare">
--- 118,124 ----
  			</SpecialProperty>
  		</SpecialProperties>
! 	</Company>
! 	<Company name="M6" longname="Altona-Kiel Bahn" type="Minor" price="80" tokens="1">
! 		<Home hex="C11" city="1"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifStarted" when="exchangeRound" class="rails.game.special.ExchangeForShare">
***************
*** 126,201 ****
  			</SpecialProperty>
  		</SpecialProperties>
!   </Company>
  
!   <Company name="Bay" longname="Bayerische Eisenbahn" type="Major" startspace="C3" tokens="5" fgColour="FFFFFF" bgColour="0000FF">
!     <Home hex="O15"/>
!   </Company>
!   <Company name="Sax" longname="S&#228;chsische Eisenbahn" type="Major" startspace="C4" tokens="3" fgColour="FFFFFF" bgColour="FF0000">
!     <Home hex="H16"/>
! 	  <FirstTrainCloses type="Private" name="LD"/>
!   </Company>
!   <Company name="Bad" longname="Badische Eisenbahn" type="Major" startspace="B4" available="no" tokens="2" fgColour="FFFFFF" bgColour="808000">
!     <Home hex="L6"/>
!     <Certificate type="President" shares="2"/>
!     <Certificate shares="1" number="6"/>
!     <Certificate shares="2" number="1"/>
!   </Company>
!   <Company name="Wrt" longname="W&#252;rttembergische Eisenbahn" type="Major" startspace="B4" available="no" tokens="2" fgColour="000000" bgColour="FFFF00">
!     <Home hex="M9"/>
!     <Certificate type="President" shares="2"/>
!     <Certificate shares="1" number="6"/>
!     <Certificate shares="2" number="1"/>
!   </Company>
!   <Company name="Hes" longname="Hessische Eisenbahn" type="Major" startspace="B4" available="no" tokens="2" fgColour="000000" bgColour="00CC00">
!     <Home hex="J8"/>
!     <Certificate type="President" shares="2"/>
!     <Certificate shares="1" number="6"/>
!     <Certificate shares="2" number="1"/>
!   </Company>
!   <Company name="MS" longname="Eisenbahn Mecklenburg-Schwerin" type="Major" startspace="B5" available="no" tokens="2" fgColour="FFFFFF" bgColour="800080">
!     <Home hex="C13"/>
!     <Certificate type="President" shares="2"/>
!     <Certificate shares="2" number="2"/>
!     <Certificate shares="1" number="4"/>
!   </Company>
!   <Company name="Old" longname="Oldenburgische Eisenbahn" type="Major" startspace="B5" available="no" tokens="2" fgColour="000000" bgColour="C0C0C0">
!     <Home hex="D6"/>
!     <Certificate type="President" shares="2"/>
!     <Certificate shares="2" number="2"/>
!     <Certificate shares="1" number="4"/>
!   </Company>
!   <Company name="Pr" longname="Preu&#223;ische Eisenbahn" type="Major" startspace="I4" available="no" tokens="7" fgColour="FFFFFF" bgColour="000000">
!     <ShareUnit percentage="5"/>
!     <Float percentage="10"/>
!     <Certificate type="President" shares="2"/>
!     <Certificate shares="2" number="3"/>
!     <Certificate shares="2" number="4" status="reserved"/>
!     <Certificate shares="1" number="4" status="reserved"/>
  	<TrainLimit number="0,0,4,3"/>
!   </Company>
!   
!   <StartPacket roundClass="rails.game.StartRound_1835" variant="Snake">
!     <Item name="NF"   type="Private" basePrice="100" row="1">
!       <SubItem name="Bay" type="Major"/>
!     </Item>
!     <Item name="M1"   type="Minor" basePrice="80" row="2"/>
!     <Item name="LD"   type="Private" basePrice="190" row="2">
!       <SubItem name="Sax" type="Major" president="yes"/>
!     </Item>
!     <Item name="M2"   type="Minor" basePrice="170" row="2"/>
!     <Item name="M3"   type="Minor" basePrice="80" row="3"/>
!     <Item name="M4"   type="Minor" basePrice="160" row="3"/>
!     <Item name="Bay"  type="Major" president="yes" basePrice="184" row="3"/>
!     <Item name="BB"   type="Private" basePrice="130" row="3"/>
!     <Item name="HB"   type="Private" basePrice="160" row="4"/>
!     <Item name="M5"   type="Minor" basePrice="80" row="4"/>
!     <Item name="M6"   type="Minor" basePrice="80" row="4"/>
!     <Item name="OBB"  type="Private" basePrice="120" row="4">
!       <SubItem name="Bay" type="Major"/>
!     </Item>
!     <Item name="PfB"  type="Private" basePrice="150" row="4">
!       <SubItem name="Bay" type="Major"/>
!     </Item>
!   </StartPacket>
  	<BaseTokens>
  		<!-- Not sure if this belongs here -->
--- 126,201 ----
  			</SpecialProperty>
  		</SpecialProperties>
! 	</Company>
  
! 	<Company name="Bay" longname="Bayerische Eisenbahn" type="Major" startspace="C3" tokens="5" fgColour="FFFFFF" bgColour="0000FF">
! 		<Home hex="O15"/>
! 	</Company>
! 	<Company name="Sax" longname="S&#228;chsische Eisenbahn" type="Major" startspace="C4" tokens="3" fgColour="FFFFFF" bgColour="FF0000">
! 		<Home hex="H16"/>
! 		<FirstTrainCloses type="Private" name="LD"/>
! 	</Company>
! 	<Company name="Bad" longname="Badische Eisenbahn" type="Major" startspace="B4" available="no" tokens="2" fgColour="FFFFFF" bgColour="808000">
! 		<Home hex="L6"/>
! 		<Certificate type="President" shares="2"/>
! 		<Certificate shares="1" number="6"/>
! 		<Certificate shares="2" number="1"/>
! 	</Company>
! 	<Company name="Wrt" longname="W&#252;rttembergische Eisenbahn" type="Major" startspace="B4" available="no" tokens="2" fgColour="000000" bgColour="FFFF00">
! 		<Home hex="M9"/>
! 		<Certificate type="President" shares="2"/>
! 		<Certificate shares="1" number="6"/>
! 		<Certificate shares="2" number="1"/>
! 	</Company>
! 	<Company name="Hes" longname="Hessische Eisenbahn" type="Major" startspace="B4" available="no" tokens="2" fgColour="000000" bgColour="00CC00">
! 		<Home hex="J8"/>
! 		<Certificate type="President" shares="2"/>
! 		<Certificate shares="1" number="6"/>
! 		<Certificate shares="2" number="1"/>
! 	</Company>
! 	<Company name="MS" longname="Eisenbahn Mecklenburg-Schwerin" type="Major" startspace="B5" available="no" tokens="2" fgColour="FFFFFF" bgColour="800080">
! 		<Home hex="C13"/>
! 		<Certificate type="President" shares="2"/>
! 		<Certificate shares="2" number="2"/>
! 		<Certificate shares="1" number="4"/>
! 	</Company>
! 	<Company name="Old" longname="Oldenburgische Eisenbahn" type="Major" startspace="B5" available="no" tokens="2" fgColour="000000" bgColour="C0C0C0">
! 		<Home hex="D6"/>
! 		<Certificate type="President" shares="2"/>
! 		<Certificate shares="2" number="2"/>
! 		<Certificate shares="1" number="4"/>
! 	</Company>
! 	<Company name="Pr" longname="Preu&#223;ische Eisenbahn" type="Major" startspace="I4" available="no" tokens="7" fgColour="FFFFFF" bgColour="000000">
! 		<ShareUnit percentage="5"/>
! 		<Float percentage="10"/>
! 		<Certificate type="President" shares="2"/>
! 		<Certificate shares="2" number="3"/>
! 		<Certificate shares="2" number="4" status="reserved"/>
! 		<Certificate shares="1" number="4" status="reserved"/>
  	<TrainLimit number="0,0,4,3"/>
! 	</Company>
! 	
! 	<StartPacket roundClass="rails.game.StartRound_1835" variant="Snake">
! 		<Item name="NF"		type="Private" basePrice="100" row="1">
! 			<SubItem name="Bay" type="Major"/>
! 		</Item>
! 		<Item name="M1"		type="Minor" basePrice="80" row="2"/>
! 		<Item name="LD"		type="Private" basePrice="190" row="2">
! 			<SubItem name="Sax" type="Major" president="yes"/>
! 		</Item>
! 		<Item name="M2"		type="Minor" basePrice="170" row="2"/>
! 		<Item name="M3"		type="Minor" basePrice="80" row="3"/>
! 		<Item name="M4"		type="Minor" basePrice="160" row="3"/>
! 		<Item name="Bay"	type="Major" president="yes" basePrice="184" row="3"/>
! 		<Item name="BB"		type="Private" basePrice="130" row="3"/>
! 		<Item name="HB"		type="Private" basePrice="160" row="4"/>
! 		<Item name="M5"		type="Minor" basePrice="80" row="4"/>
! 		<Item name="M6"		type="Minor" basePrice="80" row="4"/>
! 		<Item name="OBB"	type="Private" basePrice="120" row="4">
! 			<SubItem name="Bay" type="Major"/>
! 		</Item>
! 		<Item name="PfB"	type="Private" basePrice="150" row="4">
! 			<SubItem name="Bay" type="Major"/>
! 		</Item>
! 	</StartPacket>
  	<BaseTokens>
  		<!-- Not sure if this belongs here -->

Index: Map.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1835/Map.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Map.xml	5 Mar 2008 19:55:16 -0000	1.8
--- Map.xml	31 Jan 2010 22:15:58 -0000	1.9
***************
*** 1,127 ****
  <Map mapClass="rails.ui.swing.hexmap.EWHexMap" tileOrientation="EW" letterOrientation="vertical" even="B">
!   <Hex name="A9" tile="-7"/>
!   <Hex name="A11" tile="-10" city="Kiel"/>
!   <Hex name="A17" tile="-800" orientation="5"/>
!   <Hex name="B8" tile="-7" orientation="1"/>
!   <Hex name="B10" tile="0" impassable="C9"/>
!   <Hex name="B12" tile="-1"/>
!   <Hex name="B14" tile="-1"/>
!   <Hex name="B16" tile="-1"/>
!   <Hex name="B18" tile="0"/>
!   <Hex name="C5" tile="-801" orientation="5"/>
!   <Hex name="C7" tile="-802"/>
!   <Hex name="C9" tile="0"/>
!   <Hex name="C11" tile="-803" cost="50" city="Hamburg"/>
!   <Hex name="C13" tile="-804" city="Schwerin"/>
!   <Hex name="C15" tile="0"/>
!   <Hex name="C17" tile="0"/>
!   <Hex name="C19" tile="0"/>
!   <Hex name="C21" tile="-901" orientation="2" value="20,20,40" city="Ostpreu&#223;en"/>
!   <Hex name="D4" tile="-8"/>
!   <Hex name="D6" tile="-805" city="Oldenburg"/>
!   <Hex name="D8" tile="-10" cost="50" city="Bremen"/>
!   <Hex name="D10" tile="0"/>
!   <Hex name="D12" tile="0"/>
!   <Hex name="D14" tile="0" cost="50"/>
!   <Hex name="D16" tile="0"/>
!   <Hex name="D18" tile="0"/>
!   <Hex name="D20" tile="0"/>
!   <Hex name="E5" tile="0"/>
!   <Hex name="E7" tile="0"/>
!   <Hex name="E9" tile="0"/>
!   <Hex name="E11" tile="0"/>
!   <Hex name="E13" tile="0"/>
!   <Hex name="E15" tile="0" cost="50"/>
!   <Hex name="E17" tile="0"/>
!   <Hex name="E19" tile="-806" city="Berlin"/>
!   <Hex name="E21" tile="-143" orientation="3"/>
!   <Hex name="F4" tile="-1"/>
!   <Hex name="F6" tile="-1"/>
!   <Hex name="F8" tile="0"/>
!   <Hex name="F10" tile="-10" city="Hannover"/>
!   <Hex name="F12" tile="-114" city="Braunschweig"/>
!   <Hex name="F14" tile="-10" city="Magdeburg"/>
!   <Hex name="F16" tile="0"/>
!   <Hex name="F18" tile="0"/>
!   <Hex name="F20" tile="0"/>
!   <Hex name="G3" tile="-807" cost="50" city="Essen/Duisburg"/>
!   <Hex name="G5" tile="-10" city="Dortmund"/>
!   <Hex name="G7" tile="0"/>
!   <Hex name="G9" tile="0"/>
!   <Hex name="G11" tile="-1"/>
!   <Hex name="G13" tile="0" cost="70"/>
!   <Hex name="G15" tile="-1"/>
!   <Hex name="G17" tile="0"/>
!   <Hex name="G19" tile="0"/>
!   <Hex name="G21" tile="-8" orientation="3"/>
!   <Hex name="H2" tile="-10" city="D&#252;sseldorf"/>
!   <Hex name="H4" tile="-2"/>
!   <Hex name="H6" tile="0" cost="70"/>
!   <Hex name="H8" tile="0" cost="70"/>
!   <Hex name="H10" tile="-1"/>
!   <Hex name="H12" tile="0" cost="70"/>
!   <Hex name="H14" tile="0"/>
!   <Hex name="H16" tile="-10" city="Leipzig"/>
!   <Hex name="H18" tile="0"/>
!   <Hex name="H20" tile="-10" city="Dresden"/>
!   <Hex name="H22" tile="-901" orientation="2" value="20,30,40" city="Oberschlesien"/>
!   <Hex name="I1" tile="-143"/>
!   <Hex name="I3" tile="-10" cost="50" city="K&#246;ln"/>
!   <Hex name="I5" tile="0"/>
!   <Hex name="I7" tile="0" cost="70"/>
!   <Hex name="I9" tile="0" cost="70"/>
!   <Hex name="I11" tile="0"/>
!   <Hex name="I13" tile="-1" cost="70"/>
!   <Hex name="I15" tile="-1"/>
!   <Hex name="I17" tile="-2"/>
!   <Hex name="I19" tile="-39" orientation="3"/>
!   <Hex name="J2" tile="0"/>
!   <Hex name="J4" tile="-808" orientation="5"/>
!   <Hex name="J6" tile="-807" cost="50" city="Mainz/Wiesbaden"/>
!   <Hex name="J8" tile="-809" cost="50" city="Frankfurt"/>
!   <Hex name="J10" tile="0"/>
!   <Hex name="J12" tile="0"/>
!   <Hex name="J14" tile="0" cost="70"/>
!   <Hex name="J16" tile="-41"/>
!   <Hex name="K3" tile="-1"/>
!   <Hex name="K5" tile="0"/>
!   <Hex name="K7" tile="0" cost="50"/>
!   <Hex name="K9" tile="0" cost="50"/>
!   <Hex name="K11" tile="-1"/>
!   <Hex name="K13" tile="0"/>
!   <Hex name="K15" tile="0" cost="70"/>
!   <Hex name="L2" tile="-1"/>
!   <Hex name="L4" tile="0"/>
!   <Hex name="L6" tile="-807" city="Ludwigshafen/Mannheim"/>
!   <Hex name="L8" tile="-2"/>
!   <Hex name="L10" tile="0"/>
!   <Hex name="L12" tile="0"/>
!   <Hex name="L14" tile="-810" city="N&#252;rnberg/F&#252;rth"/>
!   <Hex name="L16" tile="0"/>
!   <Hex name="M5" tile="-901" orientation="4" value="0,50,0" city="Elsas/Lothringen"/>
!   <Hex name="M7" tile="-2"/>
!   <Hex name="M9" tile="-10" city="Stuttgart"/>
!   <Hex name="M11" tile="0"/>
!   <Hex name="M13" tile="0" cost="50"/>
!   <Hex name="M15" tile="-1" cost="50"/>
!   <Hex name="M17" tile="0" cost="50"/>
!   <Hex name="M19" tile="-3" orientation="1"/>
!   <Hex name="N4" tile="-901" orientation="5" value="0,50,0"/>
!   <Hex name="N6" tile="-41"/>
!   <Hex name="N8" tile="0" cost="70"/>
!   <Hex name="N10" tile="-2"/>
!   <Hex name="N12" tile="-10" city="Augsburg"/>
!   <Hex name="N14" tile="0"/>
!   <Hex name="N16" tile="0"/>
!   <Hex name="N18" tile="0"/>
!   <Hex name="O5" tile="-10" city="Freiburg"/>
!   <Hex name="O7" tile="0" cost="70"/>
!   <Hex name="O9" tile="0"/>
!   <Hex name="O11" tile="0"/>
!   <Hex name="O13" tile="0"/>
!   <Hex name="O15" tile="-10" city="M&#252;nchen"/>
!   <Hex name="O17" tile="0"/>
!   <Hex name="P6" tile="-7" orientation="4"/>
!   <Hex name="P10" tile="-3" orientation="3"/>
!   <Hex name="P14" tile="-7" orientation="4"/>
  </Map>
\ No newline at end of file
--- 1,127 ----
  <Map mapClass="rails.ui.swing.hexmap.EWHexMap" tileOrientation="EW" letterOrientation="vertical" even="B">
! 	<Hex name="A9" tile="-7"/>
! 	<Hex name="A11" tile="-10" city="Kiel"/>
! 	<Hex name="A17" tile="-800" orientation="5"/>
! 	<Hex name="B8" tile="-7" orientation="1"/>
! 	<Hex name="B10" tile="0" impassable="C9"/>
! 	<Hex name="B12" tile="-1"/>
! 	<Hex name="B14" tile="-1"/>
! 	<Hex name="B16" tile="-1"/>
! 	<Hex name="B18" tile="0"/>
! 	<Hex name="C5" tile="-801" orientation="5"/>
! 	<Hex name="C7" tile="-802"/>
! 	<Hex name="C9" tile="0"/>
! 	<Hex name="C11" tile="-803" cost="50" city="Hamburg"/>
! 	<Hex name="C13" tile="-804" city="Schwerin"/>
! 	<Hex name="C15" tile="0"/>
! 	<Hex name="C17" tile="0"/>
! 	<Hex name="C19" tile="0"/>
! 	<Hex name="C21" tile="-901" orientation="2" value="20,20,40" city="Ostpreu&#223;en"/>
! 	<Hex name="D4" tile="-8"/>
! 	<Hex name="D6" tile="-805" city="Oldenburg"/>
! 	<Hex name="D8" tile="-10" cost="50" city="Bremen"/>
! 	<Hex name="D10" tile="0"/>
! 	<Hex name="D12" tile="0"/>
! 	<Hex name="D14" tile="0" cost="50"/>
! 	<Hex name="D16" tile="0"/>
! 	<Hex name="D18" tile="0"/>
! 	<Hex name="D20" tile="0"/>
! 	<Hex name="E5" tile="0"/>
! 	<Hex name="E7" tile="0"/>
! 	<Hex name="E9" tile="0"/>
! 	<Hex name="E11" tile="0"/>
! 	<Hex name="E13" tile="0"/>
! 	<Hex name="E15" tile="0" cost="50"/>
! 	<Hex name="E17" tile="0"/>
! 	<Hex name="E19" tile="-806" city="Berlin"/>
! 	<Hex name="E21" tile="-143" orientation="3"/>
! 	<Hex name="F4" tile="-1"/>
! 	<Hex name="F6" tile="-1"/>
! 	<Hex name="F8" tile="0"/>
! 	<Hex name="F10" tile="-10" city="Hannover"/>
! 	<Hex name="F12" tile="-114" city="Braunschweig"/>
! 	<Hex name="F14" tile="-10" city="Magdeburg"/>
! 	<Hex name="F16" tile="0"/>
! 	<Hex name="F18" tile="0"/>
! 	<Hex name="F20" tile="0"/>
! 	<Hex name="G3" tile="-807" cost="50" city="Essen/Duisburg"/>
! 	<Hex name="G5" tile="-10" city="Dortmund"/>
! 	<Hex name="G7" tile="0"/>
! 	<Hex name="G9" tile="0"/>
! 	<Hex name="G11" tile="-1"/>
! 	<Hex name="G13" tile="0" cost="70"/>
! 	<Hex name="G15" tile="-1"/>
! 	<Hex name="G17" tile="0"/>
! 	<Hex name="G19" tile="0"/>
! 	<Hex name="G21" tile="-8" orientation="3"/>
! 	<Hex name="H2" tile="-10" city="D&#252;sseldorf"/>
! 	<Hex name="H4" tile="-2"/>
! 	<Hex name="H6" tile="0" cost="70"/>
! 	<Hex name="H8" tile="0" cost="70"/>
! 	<Hex name="H10" tile="-1"/>
! 	<Hex name="H12" tile="0" cost="70"/>
! 	<Hex name="H14" tile="0"/>
! 	<Hex name="H16" tile="-10" city="Leipzig"/>
! 	<Hex name="H18" tile="0"/>
! 	<Hex name="H20" tile="-10" city="Dresden"/>
! 	<Hex name="H22" tile="-901" orientation="2" value="20,30,40" city="Oberschlesien"/>
! 	<Hex name="I1" tile="-143"/>
! 	<Hex name="I3" tile="-10" cost="50" city="K&#246;ln"/>
! 	<Hex name="I5" tile="0"/>
! 	<Hex name="I7" tile="0" cost="70"/>
! 	<Hex name="I9" tile="0" cost="70"/>
! 	<Hex name="I11" tile="0"/>
! 	<Hex name="I13" tile="-1" cost="70"/>
! 	<Hex name="I15" tile="-1"/>
! 	<Hex name="I17" tile="-2"/>
! 	<Hex name="I19" tile="-39" orientation="3"/>
! 	<Hex name="J2" tile="0"/>
! 	<Hex name="J4" tile="-808" orientation="5"/>
! 	<Hex name="J6" tile="-807" cost="50" city="Mainz/Wiesbaden"/>
! 	<Hex name="J8" tile="-809" cost="50" city="Frankfurt"/>
! 	<Hex name="J10" tile="0"/>
! 	<Hex name="J12" tile="0"/>
! 	<Hex name="J14" tile="0" cost="70"/>
! 	<Hex name="J16" tile="-41"/>
! 	<Hex name="K3" tile="-1"/>
! 	<Hex name="K5" tile="0"/>
! 	<Hex name="K7" tile="0" cost="50"/>
! 	<Hex name="K9" tile="0" cost="50"/>
! 	<Hex name="K11" tile="-1"/>
! 	<Hex name="K13" tile="0"/>
! 	<Hex name="K15" tile="0" cost="70"/>
! 	<Hex name="L2" tile="-1"/>
! 	<Hex name="L4" tile="0"/>
! 	<Hex name="L6" tile="-807" city="Ludwigshafen/Mannheim"/>
! 	<Hex name="L8" tile="-2"/>
! 	<Hex name="L10" tile="0"/>
! 	<Hex name="L12" tile="0"/>
! 	<Hex name="L14" tile="-810" city="N&#252;rnberg/F&#252;rth"/>
! 	<Hex name="L16" tile="0"/>
! 	<Hex name="M5" tile="-901" orientation="4" value="0,50,0" city="Elsas/Lothringen"/>
! 	<Hex name="M7" tile="-2"/>
! 	<Hex name="M9" tile="-10" city="Stuttgart"/>
! 	<Hex name="M11" tile="0"/>
! 	<Hex name="M13" tile="0" cost="50"/>
! 	<Hex name="M15" tile="-1" cost="50"/>
! 	<Hex name="M17" tile="0" cost="50"/>
! 	<Hex name="M19" tile="-3" orientation="1"/>
! 	<Hex name="N4" tile="-901" orientation="5" value="0,50,0"/>
! 	<Hex name="N6" tile="-41"/>
! 	<Hex name="N8" tile="0" cost="70"/>
! 	<Hex name="N10" tile="-2"/>
! 	<Hex name="N12" tile="-10" city="Augsburg"/>
! 	<Hex name="N14" tile="0"/>
! 	<Hex name="N16" tile="0"/>
! 	<Hex name="N18" tile="0"/>
! 	<Hex name="O5" tile="-10" city="Freiburg"/>
! 	<Hex name="O7" tile="0" cost="70"/>
! 	<Hex name="O9" tile="0"/>
! 	<Hex name="O11" tile="0"/>
! 	<Hex name="O13" tile="0"/>
! 	<Hex name="O15" tile="-10" city="M&#252;nchen"/>
! 	<Hex name="O17" tile="0"/>
! 	<Hex name="P6" tile="-7" orientation="4"/>
! 	<Hex name="P10" tile="-3" orientation="3"/>
! 	<Hex name="P14" tile="-7" orientation="4"/>
  </Map>
\ No newline at end of file

Index: TileSet.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1835/TileSet.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TileSet.xml	23 Jan 2010 17:04:54 -0000	1.11
--- TileSet.xml	31 Jan 2010 22:15:58 -0000	1.12
***************
*** 1,3 ****
! <TileManager  tiles="Tiles.xml">
  	<!-- Preprinted tiles -->
  	<Tile id="0"><!-- Empty space -->
--- 1,3 ----
! <TileManager	tiles="Tiles.xml">
  	<!-- Preprinted tiles -->
  	<Tile id="0"><!-- Empty space -->
***************
*** 15,19 ****
  	<Tile id="-10"><!-- 1 city -->
  		<Upgrade id="5,6,57" hex="-H2,H20,I3,O15"/>
!     <Upgrade id="201,202" hex="H2,H20,I3,O15"/>
  	</Tile>
  	<Tile id="-39"/>
--- 15,19 ----
  	<Tile id="-10"><!-- 1 city -->
  		<Upgrade id="5,6,57" hex="-H2,H20,I3,O15"/>
! 		<Upgrade id="201,202" hex="H2,H20,I3,O15"/>
  	</Tile>
  	<Tile id="-39"/>
***************
*** 26,43 ****
  	<Tile id="-802"/>
  	<Tile id="-803"><!--Hamburg-->
!     <Upgrade id="221"/>
  	</Tile>
  	<Tile id="-804"/>
  	<Tile id="-805"/>
  	<Tile id="-806"><!--Berlin-->
!     <Upgrade id="209"/>
!   </Tile>
  	<Tile id="-807"><!--XX-->
!     <Upgrade id="210,211,212,213,214,215" relayBaseTokens="yes"/>
!   </Tile>
  	<Tile id="-808"/>
  	<Tile id="-809"><!--Frankfurt (Y)-->
!     <Upgrade id="216"/>
!   </Tile>
  	<Tile id="-810"/>
  	<Tile id="-901"/>
--- 26,43 ----
  	<Tile id="-802"/>
  	<Tile id="-803"><!--Hamburg-->
! 		<Upgrade id="221"/>
  	</Tile>
  	<Tile id="-804"/>
  	<Tile id="-805"/>
  	<Tile id="-806"><!--Berlin-->
! 		<Upgrade id="209"/>
! 	</Tile>
  	<Tile id="-807"><!--XX-->
! 		<Upgrade id="210,211,212,213,214,215" relayBaseTokens="yes"/>
! 	</Tile>
  	<Tile id="-808"/>
  	<Tile id="-809"><!--Frankfurt (Y)-->
! 		<Upgrade id="216"/>
! 	</Tile>
  	<Tile id="-810"/>
  	<Tile id="-901"/>

Index: StockMarket.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1835/StockMarket.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StockMarket.xml	24 May 2005 21:38:03 -0000	1.1
--- StockMarket.xml	31 Jan 2010 22:15:58 -0000	1.2
***************
*** 1,76 ****
  <StockMarket>
!   <StockSpace name="A3" price="82"/>
!   <StockSpace name="A4" price="78"/>
!   <StockSpace name="A5" price="72"/>
!   <StockSpace name="A6" price="64"/>
!   <StockSpace name="A7" price="54"/>
!   <StockSpace name="B3" price="86"/>
!   <StockSpace name="B4" price="84"/>
!   <StockSpace name="B5" price="80"/>
!   <StockSpace name="B6" price="74"/>
!   <StockSpace name="B7" price="66"/>
!   <StockSpace name="C2" price="98"/>
!   <StockSpace name="C3" price="92"/>
!   <StockSpace name="C4" price="88"/>
!   <StockSpace name="C5" price="86"/>
!   <StockSpace name="C6" price="82"/>
!   <StockSpace name="C7" price="76"/>
!   <StockSpace name="D2" price="108"/>
!   <StockSpace name="D3" price="100"/>
!   <StockSpace name="D4" price="94"/>
!   <StockSpace name="D5" price="90"/>
!   <StockSpace name="D6" price="88"/>
!   <StockSpace name="D7" price="84"/>
!   <StockSpace name="E1" price="132"/>
!   <StockSpace name="E2" price="120"/>
!   <StockSpace name="E3" price="110"/>
!   <StockSpace name="E4" price="102"/>
!   <StockSpace name="E5" price="96"/>
!   <StockSpace name="E6" price="92"/>
!   <StockSpace name="E7" price="90"/>
!   <StockSpace name="F1" price="148"/>
!   <StockSpace name="F2" price="134"/>
!   <StockSpace name="F3" price="122"/>
!   <StockSpace name="F4" price="112"/>
!   <StockSpace name="F5" price="104"/>
!   <StockSpace name="F6" price="98"/>
!   <StockSpace name="G1" price="166"/>
!   <StockSpace name="G2" price="150"/>
!   <StockSpace name="G3" price="136"/>
!   <StockSpace name="G4" price="124"/>
!   <StockSpace name="G5" price="114"/>
!   <StockSpace name="G6" price="106"/>
!   <StockSpace name="H1" price="186"/>
!   <StockSpace name="H2" price="168"/>
!   <StockSpace name="H3" price="152"/>
!   <StockSpace name="H4" price="138"/>
!   <StockSpace name="H5" price="126"/>
!   <StockSpace name="I1" price="208"/>
!   <StockSpace name="I2" price="188"/>
!   <StockSpace name="I3" price="170"/>
!   <StockSpace name="I4" price="154"/>
!   <StockSpace name="I5" price="140"/>
!   <StockSpace name="J1" price="232"/>
!   <StockSpace name="J2" price="210"/>
!   <StockSpace name="J3" price="190"/>
!   <StockSpace name="J4" price="172"/>
!   <StockSpace name="K1" price="258"/>
!   <StockSpace name="K2" price="234"/>
!   <StockSpace name="K3" price="212"/>
!   <StockSpace name="K4" price="192"/>
!   <StockSpace name="L1" price="286"/>
!   <StockSpace name="L2" price="260"/>
!   <StockSpace name="L3" price="236"/>
!   <StockSpace name="L4" price="214"/>
!   <StockSpace name="M1" price="316"/>
!   <StockSpace name="M2" price="288"/>
!   <StockSpace name="M3" price="262"/>
!   <StockSpace name="N1" price="348"/>
!   <StockSpace name="N2" price="318"/>
!   <StockSpace name="N3" price="290"/>
!   <StockSpace name="O1" price="382"/>
!   <StockSpace name="O2" price="350"/>
!   <StockSpace name="O3" price="320"/>
!   <StockSpace name="P1" price="418"/>
!   <StockSpace name="P2" price="384"/>
  </StockMarket>
--- 1,76 ----
  <StockMarket>
! 	<StockSpace name="A3" price="82"/>
! 	<StockSpace name="A4" price="78"/>
! 	<StockSpace name="A5" price="72"/>
! 	<StockSpace name="A6" price="64"/>
! 	<StockSpace name="A7" price="54"/>
! 	<StockSpace name="B3" price="86"/>
! 	<StockSpace name="B4" price="84"/>
! 	<StockSpace name="B5" price="80"/>
! 	<StockSpace name="B6" price="74"/>
! 	<StockSpace name="B7" price="66"/>
! 	<StockSpace name="C2" price="98"/>
! 	<StockSpace name="C3" price="92"/>
! 	<StockSpace name="C4" price="88"/>
! 	<StockSpace name="C5" price="86"/>
! 	<StockSpace name="C6" price="82"/>
! 	<StockSpace name="C7" price="76"/>
! 	<StockSpace name="D2" price="108"/>
! 	<StockSpace name="D3" price="100"/>
! 	<StockSpace name="D4" price="94"/>
! 	<StockSpace name="D5" price="90"/>
! 	<StockSpace name="D6" price="88"/>
! 	<StockSpace name="D7" price="84"/>
! 	<StockSpace name="E1" price="132"/>
! 	<StockSpace name="E2" price="120"/>
! 	<StockSpace name="E3" price="110"/>
! 	<StockSpace name="E4" price="102"/>
! 	<StockSpace name="E5" price="96"/>
! 	<StockSpace name="E6" price="92"/>
! 	<StockSpace name="E7" price="90"/>
! 	<StockSpace name="F1" price="148"/>
! 	<StockSpace name="F2" price="134"/>
! 	<StockSpace name="F3" price="122"/>
! 	<StockSpace name="F4" price="112"/>
! 	<StockSpace name="F5" price="104"/>
! 	<StockSpace name="F6" price="98"/>
! 	<StockSpace name="G1" price="166"/>
! 	<StockSpace name="G2" price="150"/>
! 	<StockSpace name="G3" price="136"/>
! 	<StockSpace name="G4" price="124"/>
! 	<StockSpace name="G5" price="114"/>
! 	<StockSpace name="G6" price="106"/>
! 	<StockSpace name="H1" price="186"/>
! 	<StockSpace name="H2" price="168"/>
! 	<StockSpace name="H3" price="152"/>
! 	<StockSpace name="H4" price="138"/>
! 	<StockSpace name="H5" price="126"/>
! 	<StockSpace name="I1" price="208"/>
! 	<StockSpace name="I2" price="188"/>
! 	<StockSpace name="I3" price="170"/>
! 	<StockSpace name="I4" price="154"/>
! 	<StockSpace name="I5" price="140"/>
! 	<StockSpace name="J1" price="232"/>
! 	<StockSpace name="J2" price="210"/>
! 	<StockSpace name="J3" price="190"/>
! 	<StockSpace name="J4" price="172"/>
! 	<StockSpace name="K1" price="258"/>
! 	<StockSpace name="K2" price="234"/>
! 	<StockSpace name="K3" price="212"/>
! 	<StockSpace name="K4" price="192"/>
! 	<StockSpace name="L1" price="286"/>
! 	<StockSpace name="L2" price="260"/>
! 	<StockSpace name="L3" price="236"/>
! 	<StockSpace name="L4" price="214"/>
! 	<StockSpace name="M1" price="316"/>
! 	<StockSpace name="M2" price="288"/>
! 	<StockSpace name="M3" price="262"/>
! 	<StockSpace name="N1" price="348"/>
! 	<StockSpace name="N2" price="318"/>
! 	<StockSpace name="N3" price="290"/>
! 	<StockSpace name="O1" price="382"/>
! 	<StockSpace name="O2" price="350"/>
! 	<StockSpace name="O3" price="320"/>
! 	<StockSpace name="P1" price="418"/>
! 	<StockSpace name="P2" price="384"/>
  </StockMarket>

Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1835/Game.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Game.xml	23 Jan 2010 23:02:05 -0000	1.24
--- Game.xml	31 Jan 2010 22:15:57 -0000	1.25
***************
*** 10,15 ****
  			<StockRound class="rails.game.specific._1835.StockRound_1835" 
  				sequence="SellBuySell">
! 		        <NoSaleInFirstSR/>
! 		        <NoSaleIfNotOperated/>
  			</StockRound>
  		</GameParameters>
--- 10,15 ----
  			<StockRound class="rails.game.specific._1835.StockRound_1835" 
  				sequence="SellBuySell">
! 				<NoSaleInFirstSR/>
! 				<NoSaleIfNotOperated/>
  			</StockRound>
  		</GameParameters>

[Rails-commits] 18xx/data/1851 CompanyManager.xml, 1.7, 1.8 Game.xml, 1.10, 1.11 StockMarket.xml, 1.1, 1.2

[Freek D. <mac...@us...>]

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

Modified Files:
	CompanyManager.xml Game.xml StockMarket.xml 
Log Message:
Fix indentation: XML files contain tabs

Index: CompanyManager.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1851/CompanyManager.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CompanyManager.xml	18 Jan 2010 21:57:29 -0000	1.7
--- CompanyManager.xml	31 Jan 2010 22:15:58 -0000	1.8
***************
*** 14,21 ****
  		<BaseTokens>
  			<BuyCost initialTokenCost="100"/>
! 		    <HomeBase lay="whenFloated"/>
  		</BaseTokens>
  		<Payout split="allowed" mustExceedPriceToMove="yes"/>
! 	    <!--NumberOfTileLays colour="yellow" phase="3,4,5,6,8" number="2"/-->
  		<TileLays>
  			<Number colour="yellow" phase="3,4,5,6,8" number="2"/>
--- 14,21 ----
  		<BaseTokens>
  			<BuyCost initialTokenCost="100"/>
! 			<HomeBase lay="whenFloated"/>
  		</BaseTokens>
  		<Payout split="allowed" mustExceedPriceToMove="yes"/>
! 		<!--NumberOfTileLays colour="yellow" phase="3,4,5,6,8" number="2"/-->
  		<TileLays>
  			<Number colour="yellow" phase="3,4,5,6,8" number="2"/>

Index: StockMarket.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1851/StockMarket.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StockMarket.xml	8 Jan 2008 20:23:55 -0000	1.1
--- StockMarket.xml	31 Jan 2010 22:15:58 -0000	1.2
***************
*** 1,77 ****
  <StockMarket type="rectangular">
!   <StockSpace name="A1" price="82"/>
!   <StockSpace name="A2" price="75"/>
!   <StockSpace name="A3" price="70"/>
!   <StockSpace name="A4" price="65"/>
!   <StockSpace name="A5" price="60"/>
!   <StockSpace name="A6" price="50"/>
!   <StockSpace name="A7" price="40"/>
!   <StockSpace name="B1" price="90"/>
!   <StockSpace name="B2" price="82"/>
!   <StockSpace name="B3" price="75"/>
!   <StockSpace name="B4" price="70"/>
!   <StockSpace name="B5" price="65"/>
!   <StockSpace name="B6" price="60"/>
!   <StockSpace name="B7" price="50"/>
!   <StockSpace name="C1" price="100"/>
!   <StockSpace name="C2" price="90"/>
!   <StockSpace name="C3" price="82"/>
!   <StockSpace name="C4" price="75"/>
!   <StockSpace name="C5" price="70">
! 	<StartSpace/>
!   </StockSpace>	
!   <StockSpace name="C6" price="65"/>
!   <StockSpace name="C7" price="60"/>
!   <StockSpace name="D1" price="110"/>
!   <StockSpace name="D2" price="100"/>
!   <StockSpace name="D3" price="90"/>
!   <StockSpace name="D4" price="82">
! 	<StartSpace/>
!   </StockSpace>	
!   <StockSpace name="D5" price="75">
! 	<StartSpace/>
!   </StockSpace>	
!   <StockSpace name="D6" price="70"/>
!   <StockSpace name="D7" price="65"/>
!   <StockSpace name="E1" price="122"/>
!   <StockSpace name="E2" price="110"/>
!   <StockSpace name="E3" price="100">
! 	<StartSpace/>
!   </StockSpace>	
!   <StockSpace name="E4" price="90">
! 	<StartSpace/>
!   </StockSpace>	
!   <StockSpace name="E5" price="82"/>
!   <StockSpace name="E6" price="75"/>
!   <StockSpace name="F1" price="135" />
!   <StockSpace name="F2" price="122" />
!   <StockSpace name="F3" price="110" />
!   <StockSpace name="F4" price="100" />
!   <StockSpace name="F5" price="90" />
!   <StockSpace name="G1" price="150"/>
!   <StockSpace name="G2" price="135"/>
!   <StockSpace name="G3" price="122"/>
!   <StockSpace name="G4" price="110"/>
!   <StockSpace name="H1" price="165" />
!   <StockSpace name="H2" price="150" />
!   <StockSpace name="H3" price="135" />
!   <StockSpace name="H4" price="122" />
!   <StockSpace name="I1" price="180" />
!   <StockSpace name="I2" price="165" />
!   <StockSpace name="I3" price="150" />
!   <StockSpace name="J1" price="200" />
!   <StockSpace name="J2" price="180" />
!   <StockSpace name="J3" price="165" />
!   <StockSpace name="K1" price="220" />
!   <StockSpace name="K2" price="200" />
!   <StockSpace name="K3" price="280" />
!   <StockSpace name="L1" price="245" />
!   <StockSpace name="L2" price="220" />
!   <StockSpace name="M1" price="270" />
!   <StockSpace name="M2" price="245" />
!   <StockSpace name="N1" price="300" />
!   <StockSpace name="N2" price="270" />
!   <StockSpace name="O1" price="330" />
!   <StockSpace name="P1" price="360" />
!   <StockSpace name="Q1" price="400" />
  </StockMarket>
--- 1,77 ----
  <StockMarket type="rectangular">
! 	<StockSpace name="A1" price="82"/>
! 	<StockSpace name="A2" price="75"/>
! 	<StockSpace name="A3" price="70"/>
! 	<StockSpace name="A4" price="65"/>
! 	<StockSpace name="A5" price="60"/>
! 	<StockSpace name="A6" price="50"/>
! 	<StockSpace name="A7" price="40"/>
! 	<StockSpace name="B1" price="90"/>
! 	<StockSpace name="B2" price="82"/>
! 	<StockSpace name="B3" price="75"/>
! 	<StockSpace name="B4" price="70"/>
! 	<StockSpace name="B5" price="65"/>
! 	<StockSpace name="B6" price="60"/>
! 	<StockSpace name="B7" price="50"/>
! 	<StockSpace name="C1" price="100"/>
! 	<StockSpace name="C2" price="90"/>
! 	<StockSpace name="C3" price="82"/>
! 	<StockSpace name="C4" price="75"/>
! 	<StockSpace name="C5" price="70">
! 		<StartSpace/>
! 	</StockSpace> 
! 	<StockSpace name="C6" price="65"/>
! 	<StockSpace name="C7" price="60"/>
! 	<StockSpace name="D1" price="110"/>
! 	<StockSpace name="D2" price="100"/>
! 	<StockSpace name="D3" price="90"/>
! 	<StockSpace name="D4" price="82">
! 		<StartSpace/>
! 	</StockSpace> 
! 	<StockSpace name="D5" price="75">
! 		<StartSpace/>
! 	</StockSpace> 
! 	<StockSpace name="D6" price="70"/>
! 	<StockSpace name="D7" price="65"/>
! 	<StockSpace name="E1" price="122"/>
! 	<StockSpace name="E2" price="110"/>
! 	<StockSpace name="E3" price="100">
! 		<StartSpace/>
! 	</StockSpace> 
! 	<StockSpace name="E4" price="90">
! 		<StartSpace/>
! 	</StockSpace> 
! 	<StockSpace name="E5" price="82"/>
! 	<StockSpace name="E6" price="75"/>
! 	<StockSpace name="F1" price="135" />
! 	<StockSpace name="F2" price="122" />
! 	<StockSpace name="F3" price="110" />
! 	<StockSpace name="F4" price="100" />
! 	<StockSpace name="F5" price="90" />
! 	<StockSpace name="G1" price="150"/>
! 	<StockSpace name="G2" price="135"/>
! 	<StockSpace name="G3" price="122"/>
! 	<StockSpace name="G4" price="110"/>
! 	<StockSpace name="H1" price="165" />
! 	<StockSpace name="H2" price="150" />
! 	<StockSpace name="H3" price="135" />
! 	<StockSpace name="H4" price="122" />
! 	<StockSpace name="I1" price="180" />
! 	<StockSpace name="I2" price="165" />
! 	<StockSpace name="I3" price="150" />
! 	<StockSpace name="J1" price="200" />
! 	<StockSpace name="J2" price="180" />
! 	<StockSpace name="J3" price="165" />
! 	<StockSpace name="K1" price="220" />
! 	<StockSpace name="K2" price="200" />
! 	<StockSpace name="K3" price="280" />
! 	<StockSpace name="L1" price="245" />
! 	<StockSpace name="L2" price="220" />
! 	<StockSpace name="M1" price="270" />
! 	<StockSpace name="M2" price="245" />
! 	<StockSpace name="N1" price="300" />
! 	<StockSpace name="N2" price="270" />
! 	<StockSpace name="O1" price="330" />
! 	<StockSpace name="P1" price="360" />
! 	<StockSpace name="Q1" price="400" />
  </StockMarket>

Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1851/Game.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Game.xml	23 Jan 2010 23:02:06 -0000	1.10
--- Game.xml	31 Jan 2010 22:15:58 -0000	1.11
***************
*** 9,13 ****
  			<TreasuryShareLimit percentage="50"/>
  			<StockRound sequence="SellBuy">
! 		        <NoSaleIfNotOperated/>
  			</StockRound>
  		</GameParameters>
--- 9,13 ----
  			<TreasuryShareLimit percentage="50"/>
  			<StockRound sequence="SellBuy">
! 				<NoSaleIfNotOperated/>
  			</StockRound>
  		</GameParameters>

[Rails-commits] 18xx build.xml,1.11,1.12 buildinfo.xml,1.1,1.2

[Freek D. <mac...@us...>]

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

Modified Files:
	build.xml buildinfo.xml 
Log Message:
Fix indentation: XML files contain tabs

Index: build.xml
===================================================================
RCS file: /cvsroot/rails/18xx/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** build.xml	30 Jan 2010 20:53:36 -0000	1.11
--- build.xml	31 Jan 2010 22:15:48 -0000	1.12
***************
*** 1,91 ****
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <!-- WARNING: Eclipse auto-generated file.
!               Any modifications will be overwritten.
!               To include a user specific buildfile here, simply create one in the same
!               directory with the processing instruction <?eclipse.ant.import?>
!               as the first entry and export the buildfile again. -->
  <project basedir="." default="build" name="18xx">
!     <property environment="env"/>
!     <property name="debuglevel" value="source,lines,vars"/>
!     <property name="target" value="1.5"/>
!     <property name="source" value="1.5"/>
  	<property name="version" value="1.1.2"/>
  	<taskdef name="jarbundler" 
  		classpath="tools/lib/jarbundler-2.1.0.jar"
  		classname="net.sourceforge.jarbundler.JarBundler" />
!     <path id="18xx.classpath">
!         <pathelement location="classes"/>
!         <pathelement location="lib/log4j-1.2/log4j-1.2.14.jar"/>
!         <pathelement location="lib/batik-1.6/batik-rasterizer.jar"/>
!         <pathelement location="lib/batik-1.6/batik.jar"/>
!     </path>
!     <target depends="clean" name="init">
!         <mkdir dir="classes"/>
!         <copy includeemptydirs="false" todir="classes">
!             <fileset dir=".">
!                 <exclude name="**/*.launch"/>
!                 <exclude name="**/*.java"/>
!                 <exclude name="tools/**"/>
!                 <exclude name="images/**"/>
!             </fileset>
!         </copy>
!     </target>
!     <target name="clean">
!         <delete dir="classes"/>
!     	<delete dir="jar"/>
!     </target>
!     <target depends="clean" name="cleanall">
  		<delete dir="rails-${version}"/>
  		<delete dir="rails-mac-${version}"/>
  		<delete file="18xx.log"/>
  	</target>
!     <target depends="build-subprojects,build-project,build-release" name="build"/>
!     <target name="build-subprojects"/>
!     <target depends="init" name="build-project">
!         <echo message="${ant.project.name}: ${ant.file}"/>
!         <javac debug="true" debuglevel="${debuglevel}" destdir="classes" source="${source}" target="${target}">
!             <src path="."/>
!             <classpath refid="18xx.classpath"/>
!         </javac>
!     </target>
!     <target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects"/>
!     <target description="copy Eclipse compiler jars to ant lib directory" name="init-eclipse-compiler">
!         <copy todir="${ant.library.dir}">
!             <fileset dir="${ECLIPSE_HOME}/plugins" includes="org.eclipse.jdt.core_*.jar"/>
!         </copy>
!         <unzip dest="${ant.library.dir}">
!             <patternset includes="jdtCompilerAdapter.jar"/>
!             <fileset dir="${ECLIPSE_HOME}/plugins" includes="org.eclipse.jdt.core_*.jar"/>
!         </unzip>
!     </target>
!     <target description="compile project with Eclipse compiler" name="build-eclipse-compiler">
!         <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
!         <antcall target="build"/>
!     </target>
  	<target name="build-release">
!         <mkdir dir="jar"/>
!         <copy includeemptydirs="false" todir="jar">
!             <fileset dir="classes">
!                 <exclude name="**/*.launch"/>
!                 <exclude name="**/*.java"/>
!             	<exclude name="rails/test/*"/>
!             	<exclude name="18xx.log"/>
!             	<exclude name="build.xml"/>
!             	<exclude name="buildinfo.xml"/>
!             	<exclude name="manifest"/>
!             	<exclude name="doc/*"/>
!             	<exclude name="html/*"/>
!             	<exclude name="lib/**"/>
!             	<exclude name="rails-${version}/**"/>
!             	<exclude name="rails-*-${version}/**"/>
!             	<exclude name="rails.bat"/>
!             	<exclude name="rails.sh"/>
!             	<exclude name=".project"/>
!             	<exclude name=".classpath"/>
!             	<exclude name="**/CVS/*"/>
!             	<exclude name="**/.settings/*"/>
!             	<exclude name="**/rails-${version}.jar"/>
!             </fileset>
!         </copy>
  		<mkdir dir="rails-${version}"/>
  		<copy includeemptydirs="false" todir="rails-${version}">
--- 1,91 ----
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <!-- WARNING: Eclipse auto-generated file.
! 			  Any modifications will be overwritten.
! 			  To include a user specific buildfile here, simply create one in the same
! 			  directory with the processing instruction <?eclipse.ant.import?>
! 			  as the first entry and export the buildfile again. -->
  <project basedir="." default="build" name="18xx">
! 	<property environment="env"/>
! 	<property name="debuglevel" value="source,lines,vars"/>
! 	<property name="target" value="1.5"/>
! 	<property name="source" value="1.5"/>
  	<property name="version" value="1.1.2"/>
  	<taskdef name="jarbundler" 
  		classpath="tools/lib/jarbundler-2.1.0.jar"
  		classname="net.sourceforge.jarbundler.JarBundler" />
! 	<path id="18xx.classpath">
! 		<pathelement location="classes"/>
! 		<pathelement location="lib/log4j-1.2/log4j-1.2.14.jar"/>
! 		<pathelement location="lib/batik-1.6/batik-rasterizer.jar"/>
! 		<pathelement location="lib/batik-1.6/batik.jar"/>
! 	</path>
! 	<target depends="clean" name="init">
! 		<mkdir dir="classes"/>
! 		<copy includeemptydirs="false" todir="classes">
! 			<fileset dir=".">
! 				<exclude name="**/*.launch"/>
! 				<exclude name="**/*.java"/>
! 				<exclude name="tools/**"/>
! 				<exclude name="images/**"/>
! 			</fileset>
! 		</copy>
! 	</target>
! 	<target name="clean">
! 		<delete dir="classes"/>
! 		<delete dir="jar"/>
! 	</target>
! 	<target depends="clean" name="cleanall">
  		<delete dir="rails-${version}"/>
  		<delete dir="rails-mac-${version}"/>
  		<delete file="18xx.log"/>
  	</target>
! 	<target depends="build-subprojects,build-project,build-release" name="build"/>
! 	<target name="build-subprojects"/>
! 	<target depends="init" name="build-project">
! 		<echo message="${ant.project.name}: ${ant.file}"/>
! 		<javac debug="true" debuglevel="${debuglevel}" destdir="classes" source="${source}" target="${target}">
! 			<src path="."/>
! 			<classpath refid="18xx.classpath"/>
! 		</javac>
! 	</target>
! 	<target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects"/>
! 	<target description="copy Eclipse compiler jars to ant lib directory" name="init-eclipse-compiler">
! 		<copy todir="${ant.library.dir}">
! 			<fileset dir="${ECLIPSE_HOME}/plugins" includes="org.eclipse.jdt.core_*.jar"/>
! 		</copy>
! 		<unzip dest="${ant.library.dir}">
! 			<patternset includes="jdtCompilerAdapter.jar"/>
! 			<fileset dir="${ECLIPSE_HOME}/plugins" includes="org.eclipse.jdt.core_*.jar"/>
! 		</unzip>
! 	</target>
! 	<target description="compile project with Eclipse compiler" name="build-eclipse-compiler">
! 		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
! 		<antcall target="build"/>
! 	</target>
  	<target name="build-release">
! 		<mkdir dir="jar"/>
! 		<copy includeemptydirs="false" todir="jar">
! 			<fileset dir="classes">
! 				<exclude name="**/*.launch"/>
! 				<exclude name="**/*.java"/>
! 				<exclude name="rails/test/*"/>
! 				<exclude name="18xx.log"/>
! 				<exclude name="build.xml"/>
! 				<exclude name="buildinfo.xml"/>
! 				<exclude name="manifest"/>
! 				<exclude name="doc/*"/>
! 				<exclude name="html/*"/>
! 				<exclude name="lib/**"/>
! 				<exclude name="rails-${version}/**"/>
! 				<exclude name="rails-*-${version}/**"/>
! 				<exclude name="rails.bat"/>
! 				<exclude name="rails.sh"/>
! 				<exclude name=".project"/>
! 				<exclude name=".classpath"/>
! 				<exclude name="**/CVS/*"/>
! 				<exclude name="**/.settings/*"/>
! 				<exclude name="**/rails-${version}.jar"/>
! 			</fileset>
! 		</copy>
  		<mkdir dir="rails-${version}"/>
  		<copy includeemptydirs="false" todir="rails-${version}">
***************
*** 131,138 ****
  		</jarbundler>
  	</target>
!     <target name="RunGame">
!         <java classname="rails.util.RunGame" failonerror="true" fork="yes">
!             <classpath refid="18xx.classpath"/>
!         </java>
!     </target>
  </project>
--- 131,138 ----
  		</jarbundler>
  	</target>
! 	<target name="RunGame">
! 		<java classname="rails.util.RunGame" failonerror="true" fork="yes">
! 			<classpath refid="18xx.classpath"/>
! 		</java>
! 	</target>
  </project>

Index: buildinfo.xml
===================================================================
RCS file: /cvsroot/rails/18xx/buildinfo.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** buildinfo.xml	6 Nov 2009 20:20:36 -0000	1.1
--- buildinfo.xml	31 Jan 2010 22:15:55 -0000	1.2
***************
*** 10,16 ****
  
  public class BuildInfo {
! 	public static final String buildDate = "${TODAY}";
  }
! 		</echo>
  	</target>
  </project>
\ No newline at end of file
--- 10,16 ----
  
  public class BuildInfo {
!     public static final String buildDate = "${TODAY}";
  }
! </echo>
  	</target>
  </project>
\ No newline at end of file

[Rails-commits] 18xx/data/1830 CompanyManager.xml, 1.30, 1.31 StockMarket.xml, 1.3, 1.4

[Freek D. <mac...@us...>]

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

Modified Files:
	CompanyManager.xml StockMarket.xml 
Log Message:
Fix indentation: XML files contain tabs

Index: CompanyManager.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1830/CompanyManager.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** CompanyManager.xml	19 Jan 2010 19:47:20 -0000	1.30
--- CompanyManager.xml	31 Jan 2010 22:15:57 -0000	1.31
***************
*** 8,17 ****
  		<Float percentage="60"/>
  		<ShareUnit percentage="10"/>
!         <BaseTokens>
  			<!-- HomeBase lay options: "whenStarted", "whenFloated", "firstOR" (default) -->
! `		    <HomeBase lay="firstOR"/>
  			<!-- LayCost methods: only "sequence" (1830 style) implemented so far (default) -->
! 	        <LayCost method="sequence" cost="0,40,100"/>
!         </BaseTokens>
  		<Certificate type="President" shares="2"/>
  		<Certificate shares="1" number="8"/>
--- 8,17 ----
  		<Float percentage="60"/>
  		<ShareUnit percentage="10"/>
! 		<BaseTokens>
  			<!-- HomeBase lay options: "whenStarted", "whenFloated", "firstOR" (default) -->
! 			<HomeBase lay="firstOR"/>
  			<!-- LayCost methods: only "sequence" (1830 style) implemented so far (default) -->
! 			<LayCost method="sequence" cost="0,40,100"/>
! 		</BaseTokens>
  		<Certificate type="President" shares="2"/>
  		<Certificate shares="1" number="8"/>
***************
*** 19,28 ****
  	</CompanyType>
  	<Company name="SVNRR" type="Private" basePrice="20" revenue="5"
! 		longName="Schuylkill Valley Navigation &amp; Railroad Company">
!         <Blocking hex="G15"/>
!     </Company>
  	<Company name="C&amp;StL" type="Private" basePrice="40" revenue="10"
! 		longName="Champlain &amp; St.Lawrence">
!         <Blocking hex="B20"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
--- 19,28 ----
  	</CompanyType>
  	<Company name="SVNRR" type="Private" basePrice="20" revenue="5"
! 			longName="Schuylkill Valley Navigation &amp; Railroad Company">
! 		<Blocking hex="G15"/>
! 	</Company>
  	<Company name="C&amp;StL" type="Private" basePrice="40" revenue="10"
! 			longName="Champlain &amp; St.Lawrence">
! 		<Blocking hex="B20"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
***************
*** 33,37 ****
  	<Company name="D&amp;H" type="Private" basePrice="70" revenue="15"
  		longName="Delaware &amp; Hudson">
!         <Blocking hex="F16"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
--- 33,37 ----
  	<Company name="D&amp;H" type="Private" basePrice="70" revenue="15"
  		longName="Delaware &amp; Hudson">
! 		<Blocking hex="F16"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
***************
*** 45,49 ****
  	<Company name="M&amp;H" type="Private" basePrice="110" revenue="20"
  		longName="Mohawk &amp; Hudson">
!         <Blocking hex="D18"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByPlayer" when="anyTime" class="rails.game.special.ExchangeForShare">
--- 45,49 ----
  	<Company name="M&amp;H" type="Private" basePrice="110" revenue="20"
  		longName="Mohawk &amp; Hudson">
! 		<Blocking hex="D18"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByPlayer" when="anyTime" class="rails.game.special.ExchangeForShare">
***************
*** 55,93 ****
  		longName="Camden &amp; Amboy">
  		<Info key="ComesWithCertificate" parm="PRR,10"/>
!         <Blocking hex="H18"/>
!     </Company>
  	<Company name="B&amp;O" type="Private" basePrice="220" revenue="30"
  		longName="Baltimore &amp; Ohio">
  		<Info key="ComesWithPresidency" parm="B&amp;O,20"/>
!         <Blocking hex="I13,I15"/>
!     </Company>
!   
  	<!-- Note two supported colour specification formats:
! 		RGB decimal with commas and RGB hexadecimal without commas -->
  	<Company name="B&amp;O" type="Public" tokens="3" fgColour="255,255,255" bgColour="0,0,255">
  		<FirstTrainCloses type="Private" name="B&amp;O"/>
!     <Home hex="I15"/>
  	</Company>
  	<Company name="PRR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="008000">
!     <Home hex="H12"/>
  	</Company>
  	<Company name="NYNH" type="Public" tokens="2" fgColour="000000" bgColour="FF8000">
!     <Home hex="G19" city="2"/>
!   </Company>
  	<Company name="NYC" type="Public" tokens="4" fgColour="FFFFFF" bgColour="000000">
!     <Home hex="E19"/>
!   </Company>
!   <Company name="Erie" type="Public" tokens="3" fgColour="000000" bgColour="FFFF00">
!     <Home hex="E11"/>
!   </Company>
  	<Company name="B&amp;M" type="Public" tokens="2" fgColour="000000" bgColour="60E060">
!     <Home hex="E23"/>
!   </Company>
  	<Company name="C&amp;O" type="Public" tokens="3" fgColour="000000" bgColour="A0E0FF">
!     <Home hex="F6"/>
!   </Company>
  	<Company name="CPR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="FF0000">
!     <Home hex="A19"/>
!   </Company>
  	<StartPacket roundClass="rails.game.StartRound_1830">
  		<Bidding initial="5" minimum="5" increment="1"/>
--- 55,93 ----
  		longName="Camden &amp; Amboy">
  		<Info key="ComesWithCertificate" parm="PRR,10"/>
! 		<Blocking hex="H18"/>
! 	</Company>
  	<Company name="B&amp;O" type="Private" basePrice="220" revenue="30"
  		longName="Baltimore &amp; Ohio">
  		<Info key="ComesWithPresidency" parm="B&amp;O,20"/>
! 		<Blocking hex="I13,I15"/>
! 	</Company>
! 	
  	<!-- Note two supported colour specification formats:
! 	     RGB decimal with commas and RGB hexadecimal without commas -->
  	<Company name="B&amp;O" type="Public" tokens="3" fgColour="255,255,255" bgColour="0,0,255">
  		<FirstTrainCloses type="Private" name="B&amp;O"/>
! 		<Home hex="I15"/>
  	</Company>
  	<Company name="PRR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="008000">
! 		<Home hex="H12"/>
  	</Company>
  	<Company name="NYNH" type="Public" tokens="2" fgColour="000000" bgColour="FF8000">
! 		<Home hex="G19" city="2"/>
! 	</Company>
  	<Company name="NYC" type="Public" tokens="4" fgColour="FFFFFF" bgColour="000000">
! 		<Home hex="E19"/>
! 	</Company>
! 	<Company name="Erie" type="Public" tokens="3" fgColour="000000" bgColour="FFFF00">
! 		<Home hex="E11"/>
! 	</Company>
  	<Company name="B&amp;M" type="Public" tokens="2" fgColour="000000" bgColour="60E060">
! 		<Home hex="E23"/>
! 	</Company>
  	<Company name="C&amp;O" type="Public" tokens="3" fgColour="000000" bgColour="A0E0FF">
! 		<Home hex="F6"/>
! 	</Company>
  	<Company name="CPR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="FF0000">
! 		<Home hex="A19"/>
! 	</Company>
  	<StartPacket roundClass="rails.game.StartRound_1830">
  		<Bidding initial="5" minimum="5" increment="1"/>

Index: StockMarket.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1830/StockMarket.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StockMarket.xml	13 Dec 2009 16:39:49 -0000	1.3
--- StockMarket.xml	31 Jan 2010 22:15:57 -0000	1.4
***************
*** 2,149 ****
  	<!-- Note two supported colour specification formats:
  		RGB decimal with commas and RGB hexadecimal without commas -->
!   <StockSpaceType name="yellow" colour="255,255,0">
!     <NoCertLimit/>
!   </StockSpaceType>
!   <StockSpaceType name="orange" colour="FF8000">
!     <NoCertLimit/>
!     <NoHoldLimit/>
!   </StockSpaceType>
!   <StockSpaceType name="brown" colour="884000">
!     <NoCertLimit/>
!     <NoHoldLimit/>
!     <NoBuyLimit/>
!   </StockSpaceType>
!   
!   <StockSpace name="A1" price="60" type="yellow"/>
!   <StockSpace name="A2" price="53" type="yellow"/>
!   <StockSpace name="A3" price="46" type="yellow"/>
!   <StockSpace name="A4" price="39" type="orange"/>
!   <StockSpace name="A5" price="32" type="orange"/>
!   <StockSpace name="A6" price="25" type="brown"/>
!   <StockSpace name="A7" price="18" type="brown"/>
!   <StockSpace name="A8" price="10" type="brown"/>
!   <StockSpace name="B1" price="67" />
!   <StockSpace name="B2" price="60" type="yellow"/>
!   <StockSpace name="B3" price="55" type="yellow"/>
!   <StockSpace name="B4" price="48" type="yellow"/>
!   <StockSpace name="B5" price="41" type="orange"/>
!   <StockSpace name="B6" price="34" type="orange"/>
!   <StockSpace name="B7" price="27" type="brown"/>
!   <StockSpace name="B8" price="20" type="brown"/>
!   <StockSpace name="B9" price="10" type="brown"/>
!   <StockSpace name="C1" price="71" />
!   <StockSpace name="C2" price="66" />
!   <StockSpace name="C3" price="60" type="yellow"/>
!   <StockSpace name="C4" price="54" type="yellow"/>
!   <StockSpace name="C5" price="48" type="yellow"/>
!   <StockSpace name="C6" price="42" type="orange"/>
!   <StockSpace name="C7" price="36" type="orange"/>
!   <StockSpace name="C8" price="30" type="brown"/>
!   <StockSpace name="C9" price="20" type="brown"/>
!   <StockSpace name="C10" price="10" type="brown"/>
!   <StockSpace name="D1" price="76" />
!   <StockSpace name="D2" price="70" />
!   <StockSpace name="D3" price="65" />
!   <StockSpace name="D4" price="60" type="yellow"/>
!   <StockSpace name="D5" price="55" type="yellow"/>
!   <StockSpace name="D6" price="50" type="yellow"/>
!   <StockSpace name="D7" price="45" type="orange"/>
!   <StockSpace name="D8" price="40" type="orange"/>
!   <StockSpace name="D9" price="30" type="brown"/>
!   <StockSpace name="D10" price="20" type="brown"/>
!   <StockSpace name="D11" price="10" type="brown"/>
!   <StockSpace name="E1" price="82" />
!   <StockSpace name="E2" price="76" />
!   <StockSpace name="E3" price="70" />
!   <StockSpace name="E4" price="66" />
!   <StockSpace name="E5" price="62" />
!   <StockSpace name="E6" price="58" type="yellow"/>
!   <StockSpace name="E7" price="54" type="yellow"/>
!   <StockSpace name="E8" price="50" type="yellow"/>
!   <StockSpace name="E9" price="40" type="orange"/>
!   <StockSpace name="E10" price="30" type="brown"/>
!   <StockSpace name="E11" price="20" type="brown"/>
!   <StockSpace name="F1" price="90" />
!   <StockSpace name="F2" price="82" />
!   <StockSpace name="F3" price="76" />
!   <StockSpace name="F4" price="71" />
!   <StockSpace name="F5" price="67" />
!   <StockSpace name="F6" price="65" />
!   <StockSpace name="F7" price="63" />
!   <StockSpace name="F8" price="60" type="yellow"/>
!   <StockSpace name="F9" price="50" type="yellow"/>
!   <StockSpace name="F10" price="40" type="orange"/>
!   <StockSpace name="F11" price="30" type="brown"/>
!   <StockSpace name="G1" price="100" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G2" price="90" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G3" price="82" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G4" price="76" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G5" price="71" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G6" price="67" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G7" price="67" />
!   <StockSpace name="G8" price="67" />
!   <StockSpace name="G9" price="60" type="yellow"/>
!   <StockSpace name="G10" price="50" type="yellow"/>
!   <StockSpace name="G11" price="40" type="orange"/>
!   <StockSpace name="H1" price="112" />
!   <StockSpace name="H2" price="100" />
!   <StockSpace name="H3" price="90" />
!   <StockSpace name="H4" price="82" />
!   <StockSpace name="H5" price="76" />
!   <StockSpace name="H6" price="71" />
!   <StockSpace name="H7" price="69" />
!   <StockSpace name="H8" price="68" />
!   <StockSpace name="I1" price="126" />
!   <StockSpace name="I2" price="112" />
!   <StockSpace name="I3" price="100" />
!   <StockSpace name="I4" price="90" />
!   <StockSpace name="I5" price="82" />
!   <StockSpace name="I6" price="75" />
!   <StockSpace name="I7" price="70" />
!   <StockSpace name="J1" price="142" />
!   <StockSpace name="J2" price="126" />
!   <StockSpace name="J3" price="111" />
!   <StockSpace name="J4" price="100" />
!   <StockSpace name="J5" price="90" />
!   <StockSpace name="J6" price="80" />
!   <StockSpace name="K1" price="160" />
!   <StockSpace name="K2" price="142" />
!   <StockSpace name="K3" price="125" />
!   <StockSpace name="K4" price="110" />
!   <StockSpace name="K5" price="100" />
!   <StockSpace name="L1" price="180" />
!   <StockSpace name="L2" price="160" />
!   <StockSpace name="L3" price="140" />
!   <StockSpace name="L4" price="120" />
!   <StockSpace name="M1" price="200" />
!   <StockSpace name="M2" price="180" />
!   <StockSpace name="M3" price="155" />
!   <StockSpace name="M4" price="130" />
!   <StockSpace name="N1" price="225" />
!   <StockSpace name="N2" price="200" />
!   <StockSpace name="N3" price="170" />
!   <StockSpace name="O1" price="250" />
!   <StockSpace name="O2" price="220" />
!   <StockSpace name="O3" price="185" />
!   <StockSpace name="P1" price="275" />
!   <StockSpace name="P2" price="240" />
!   <StockSpace name="P3" price="200" />
!   <StockSpace name="Q1" price="300" />
!   <StockSpace name="Q2" price="260" />
!   <StockSpace name="R1" price="325" />
!   <StockSpace name="R2" price="280" />
!   <StockSpace name="S1" price="350" />
!   <StockSpace name="S2" price="300" />
  </StockMarket>
--- 2,149 ----
  	<!-- Note two supported colour specification formats:
  		RGB decimal with commas and RGB hexadecimal without commas -->
! 	<StockSpaceType name="yellow" colour="255,255,0">
! 		<NoCertLimit/>
! 	</StockSpaceType>
! 	<StockSpaceType name="orange" colour="FF8000">
! 		<NoCertLimit/>
! 		<NoHoldLimit/>
! 	</StockSpaceType>
! 	<StockSpaceType name="brown" colour="884000">
! 		<NoCertLimit/>
! 		<NoHoldLimit/>
! 		<NoBuyLimit/>
! 	</StockSpaceType>
! 	
! 	<StockSpace name="A1" price="60" type="yellow"/>
! 	<StockSpace name="A2" price="53" type="yellow"/>
! 	<StockSpace name="A3" price="46" type="yellow"/>
! 	<StockSpace name="A4" price="39" type="orange"/>
! 	<StockSpace name="A5" price="32" type="orange"/>
! 	<StockSpace name="A6" price="25" type="brown"/>
! 	<StockSpace name="A7" price="18" type="brown"/>
! 	<StockSpace name="A8" price="10" type="brown"/>
! 	<StockSpace name="B1" price="67" />
! 	<StockSpace name="B2" price="60" type="yellow"/>
! 	<StockSpace name="B3" price="55" type="yellow"/>
! 	<StockSpace name="B4" price="48" type="yellow"/>
! 	<StockSpace name="B5" price="41" type="orange"/>
! 	<StockSpace name="B6" price="34" type="orange"/>
! 	<StockSpace name="B7" price="27" type="brown"/>
! 	<StockSpace name="B8" price="20" type="brown"/>
! 	<StockSpace name="B9" price="10" type="brown"/>
! 	<StockSpace name="C1" price="71" />
! 	<StockSpace name="C2" price="66" />
! 	<StockSpace name="C3" price="60" type="yellow"/>
! 	<StockSpace name="C4" price="54" type="yellow"/>
! 	<StockSpace name="C5" price="48" type="yellow"/>
! 	<StockSpace name="C6" price="42" type="orange"/>
! 	<StockSpace name="C7" price="36" type="orange"/>
! 	<StockSpace name="C8" price="30" type="brown"/>
! 	<StockSpace name="C9" price="20" type="brown"/>
! 	<StockSpace name="C10" price="10" type="brown"/>
! 	<StockSpace name="D1" price="76" />
! 	<StockSpace name="D2" price="70" />
! 	<StockSpace name="D3" price="65" />
! 	<StockSpace name="D4" price="60" type="yellow"/>
! 	<StockSpace name="D5" price="55" type="yellow"/>
! 	<StockSpace name="D6" price="50" type="yellow"/>
! 	<StockSpace name="D7" price="45" type="orange"/>
! 	<StockSpace name="D8" price="40" type="orange"/>
! 	<StockSpace name="D9" price="30" type="brown"/>
! 	<StockSpace name="D10" price="20" type="brown"/>
! 	<StockSpace name="D11" price="10" type="brown"/>
! 	<StockSpace name="E1" price="82" />
! 	<StockSpace name="E2" price="76" />
! 	<StockSpace name="E3" price="70" />
! 	<StockSpace name="E4" price="66" />
! 	<StockSpace name="E5" price="62" />
! 	<StockSpace name="E6" price="58" type="yellow"/>
! 	<StockSpace name="E7" price="54" type="yellow"/>
! 	<StockSpace name="E8" price="50" type="yellow"/>
! 	<StockSpace name="E9" price="40" type="orange"/>
! 	<StockSpace name="E10" price="30" type="brown"/>
! 	<StockSpace name="E11" price="20" type="brown"/>
! 	<StockSpace name="F1" price="90" />
! 	<StockSpace name="F2" price="82" />
! 	<StockSpace name="F3" price="76" />
! 	<StockSpace name="F4" price="71" />
! 	<StockSpace name="F5" price="67" />
! 	<StockSpace name="F6" price="65" />
! 	<StockSpace name="F7" price="63" />
! 	<StockSpace name="F8" price="60" type="yellow"/>
! 	<StockSpace name="F9" price="50" type="yellow"/>
! 	<StockSpace name="F10" price="40" type="orange"/>
! 	<StockSpace name="F11" price="30" type="brown"/>
! 	<StockSpace name="G1" price="100" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G2" price="90" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G3" price="82" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G4" price="76" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G5" price="71" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G6" price="67" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G7" price="67" />
! 	<StockSpace name="G8" price="67" />
! 	<StockSpace name="G9" price="60" type="yellow"/>
! 	<StockSpace name="G10" price="50" type="yellow"/>
! 	<StockSpace name="G11" price="40" type="orange"/>
! 	<StockSpace name="H1" price="112" />
! 	<StockSpace name="H2" price="100" />
! 	<StockSpace name="H3" price="90" />
! 	<StockSpace name="H4" price="82" />
! 	<StockSpace name="H5" price="76" />
! 	<StockSpace name="H6" price="71" />
! 	<StockSpace name="H7" price="69" />
! 	<StockSpace name="H8" price="68" />
! 	<StockSpace name="I1" price="126" />
! 	<StockSpace name="I2" price="112" />
! 	<StockSpace name="I3" price="100" />
! 	<StockSpace name="I4" price="90" />
! 	<StockSpace name="I5" price="82" />
! 	<StockSpace name="I6" price="75" />
! 	<StockSpace name="I7" price="70" />
! 	<StockSpace name="J1" price="142" />
! 	<StockSpace name="J2" price="126" />
! 	<StockSpace name="J3" price="111" />
! 	<StockSpace name="J4" price="100" />
! 	<StockSpace name="J5" price="90" />
! 	<StockSpace name="J6" price="80" />
! 	<StockSpace name="K1" price="160" />
! 	<StockSpace name="K2" price="142" />
! 	<StockSpace name="K3" price="125" />
! 	<StockSpace name="K4" price="110" />
! 	<StockSpace name="K5" price="100" />
! 	<StockSpace name="L1" price="180" />
! 	<StockSpace name="L2" price="160" />
! 	<StockSpace name="L3" price="140" />
! 	<StockSpace name="L4" price="120" />
! 	<StockSpace name="M1" price="200" />
! 	<StockSpace name="M2" price="180" />
! 	<StockSpace name="M3" price="155" />
! 	<StockSpace name="M4" price="130" />
! 	<StockSpace name="N1" price="225" />
! 	<StockSpace name="N2" price="200" />
! 	<StockSpace name="N3" price="170" />
! 	<StockSpace name="O1" price="250" />
! 	<StockSpace name="O2" price="220" />
! 	<StockSpace name="O3" price="185" />
! 	<StockSpace name="P1" price="275" />
! 	<StockSpace name="P2" price="240" />
! 	<StockSpace name="P3" price="200" />
! 	<StockSpace name="Q1" price="300" />
! 	<StockSpace name="Q2" price="260" />
! 	<StockSpace name="R1" price="325" />
! 	<StockSpace name="R2" price="280" />
! 	<StockSpace name="S1" price="350" />
! 	<StockSpace name="S2" price="300" />
  </StockMarket>

[Rails-commits] 18xx/data/18Kaas CompanyManager.xml, 1.9, 1.10 Map.xml, 1.5, 1.6 StockMarket.xml, 1.2, 1.3 TileSet.xml, 1.4, 1.5

[Freek D. <mac...@us...>]

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

Modified Files:
	CompanyManager.xml Map.xml StockMarket.xml TileSet.xml 
Log Message:
Fix indentation: XML files contain tabs

Index: Map.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/18Kaas/Map.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Map.xml	8 Nov 2009 14:46:16 -0000	1.5
--- Map.xml	31 Jan 2010 22:16:03 -0000	1.6
***************
*** 33,38 ****
  	<Hex name="G6" tile="0" cost="80"/>
  	<Hex name="G8" tile="-11" cost="80" label="B+" city="Haarlem"/>
! 	<Hex name="G10" tile="-22" orientation="5"  city="Amsterdam"/><!-- not the right tile! TBD -->
! 	<Hex name="G12" tile="0" cost="80"/><!-- not the right tile, should be empty yellow-->
  	<Hex name="G14" tile="0"/>
  	<Hex name="G16" tile="-20" cost="80" label="OO" city="Apeldoorn/Deventer"/>
--- 33,38 ----
  	<Hex name="G6" tile="0" cost="80"/>
  	<Hex name="G8" tile="-11" cost="80" label="B+" city="Haarlem"/>
! 	<Hex name="G10" tile="-22" orientation="5"  city="Amsterdam"/><!-- TODO: not the right tile! TBD -->
! 	<Hex name="G12" tile="0" cost="80"/><!-- FIXME: not the right tile, should be empty yellow-->
  	<Hex name="G14" tile="0"/>
  	<Hex name="G16" tile="-20" cost="80" label="OO" city="Apeldoorn/Deventer"/>
***************
*** 70,74 ****
  	<Hex name="K16" tile="-10" cost="120" city="Venlo"/>
  	<Hex name="K18" tile="-901" orientation="2" value="2" city="Ruhrgebied"/>
!     <Hex name="L1" tile="-901" orientation="5" value="10,60" city="Engeland"/>
  	<Hex name="L3" tile="-10"/>
  	<Hex name="L5" tile="0"/>
--- 70,74 ----
  	<Hex name="K16" tile="-10" cost="120" city="Venlo"/>
  	<Hex name="K18" tile="-901" orientation="2" value="2" city="Ruhrgebied"/>
! 	<Hex name="L1" tile="-901" orientation="5" value="10,60" city="Engeland"/>
  	<Hex name="L3" tile="-10"/>
  	<Hex name="L5" tile="0"/>

Index: TileSet.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/18Kaas/TileSet.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TileSet.xml	27 Jan 2010 20:40:12 -0000	1.4
--- TileSet.xml	31 Jan 2010 22:16:04 -0000	1.5
***************
*** 54,58 ****
  	<Tile id="14" quantity="3">
  		<Upgrade id="63" hex="!I12"/>
!     <Upgrade id="9220" hex="I12"/>
  	</Tile>
  	<Tile id="15" quantity="2">
--- 54,58 ----
  	<Tile id="14" quantity="3">
  		<Upgrade id="63" hex="!I12"/>
! 		<Upgrade id="9220" hex="I12"/>
  	</Tile>
  	<Tile id="15" quantity="2">
***************
*** 114,118 ****
  	<Tile id="62" quantity="1" />
  	<Tile id="63" quantity="3" />
!   <Tile id="9220" quantity="1" />
  	<Tile id="64" quantity="1" />
  	<Tile id="65" quantity="1" />
--- 114,118 ----
  	<Tile id="62" quantity="1" />
  	<Tile id="63" quantity="3" />
! 	<Tile id="9220" quantity="1" />
  	<Tile id="64" quantity="1" />
  	<Tile id="65" quantity="1" />

Index: StockMarket.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/18Kaas/StockMarket.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StockMarket.xml	13 Dec 2009 16:39:49 -0000	1.2
--- StockMarket.xml	31 Jan 2010 22:16:03 -0000	1.3
***************
*** 1,147 ****
  <StockMarket type="rectangular">
!   <StockSpaceType name="yellow" colour="FFFF00">
!     <NoCertLimit/>
!   </StockSpaceType>
!   <StockSpaceType name="orange" colour="FF8000">
!     <NoCertLimit/>
!     <NoHoldLimit/>
!   </StockSpaceType>
!   <StockSpaceType name="brown" colour="884000">
!     <NoCertLimit/>
!     <NoHoldLimit/>
!     <NoBuyLimit/>
!   </StockSpaceType>
!   
!   <StockSpace name="A1" price="60" type="yellow"/>
!   <StockSpace name="A2" price="53" type="yellow"/>
!   <StockSpace name="A3" price="46" type="yellow"/>
!   <StockSpace name="A4" price="39" type="orange"/>
!   <StockSpace name="A5" price="32" type="orange"/>
!   <StockSpace name="A6" price="25" type="brown"/>
!   <StockSpace name="A7" price="18" type="brown"/>
!   <StockSpace name="A8" price="10" type="brown"/>
!   <StockSpace name="B1" price="67" />
!   <StockSpace name="B2" price="60" type="yellow"/>
!   <StockSpace name="B3" price="55" type="yellow"/>
!   <StockSpace name="B4" price="48" type="yellow"/>
!   <StockSpace name="B5" price="41" type="orange"/>
!   <StockSpace name="B6" price="34" type="orange"/>
!   <StockSpace name="B7" price="27" type="brown"/>
!   <StockSpace name="B8" price="20" type="brown"/>
!   <StockSpace name="B9" price="10" type="brown"/>
!   <StockSpace name="C1" price="71" />
!   <StockSpace name="C2" price="66" />
!   <StockSpace name="C3" price="60" type="yellow"/>
!   <StockSpace name="C4" price="54" type="yellow"/>
!   <StockSpace name="C5" price="48" type="yellow"/>
!   <StockSpace name="C6" price="42" type="orange"/>
!   <StockSpace name="C7" price="36" type="orange"/>
!   <StockSpace name="C8" price="30" type="brown"/>
!   <StockSpace name="C9" price="20" type="brown"/>
!   <StockSpace name="C10" price="10" type="brown"/>
!   <StockSpace name="D1" price="76" />
!   <StockSpace name="D2" price="70" />
!   <StockSpace name="D3" price="65" />
!   <StockSpace name="D4" price="60" type="yellow"/>
!   <StockSpace name="D5" price="55" type="yellow"/>
!   <StockSpace name="D6" price="50" type="yellow"/>
!   <StockSpace name="D7" price="45" type="orange"/>
!   <StockSpace name="D8" price="40" type="orange"/>
!   <StockSpace name="D9" price="30" type="brown"/>
!   <StockSpace name="D10" price="20" type="brown"/>
!   <StockSpace name="D11" price="10" type="brown"/>
!   <StockSpace name="E1" price="82" />
!   <StockSpace name="E2" price="76" />
!   <StockSpace name="E3" price="70" />
!   <StockSpace name="E4" price="66" />
!   <StockSpace name="E5" price="62" />
!   <StockSpace name="E6" price="58" type="yellow"/>
!   <StockSpace name="E7" price="54" type="yellow"/>
!   <StockSpace name="E8" price="50" type="yellow"/>
!   <StockSpace name="E9" price="40" type="orange"/>
!   <StockSpace name="E10" price="30" type="brown"/>
!   <StockSpace name="E11" price="20" type="brown"/>
!   <StockSpace name="F1" price="90" />
!   <StockSpace name="F2" price="82" />
!   <StockSpace name="F3" price="76" />
!   <StockSpace name="F4" price="71" />
!   <StockSpace name="F5" price="67" />
!   <StockSpace name="F6" price="65" />
!   <StockSpace name="F7" price="63" />
!   <StockSpace name="F8" price="60" type="yellow"/>
!   <StockSpace name="F9" price="50" type="yellow"/>
!   <StockSpace name="F10" price="40" type="orange"/>
!   <StockSpace name="F11" price="30" type="brown"/>
!   <StockSpace name="G1" price="100" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G2" price="90" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G3" price="82" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G4" price="76" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G5" price="71" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G6" price="67" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G7" price="67" />
!   <StockSpace name="G8" price="67" />
!   <StockSpace name="G9" price="60" type="yellow"/>
!   <StockSpace name="G10" price="50" type="yellow"/>
!   <StockSpace name="G11" price="40" type="orange"/>
!   <StockSpace name="H1" price="112" />
!   <StockSpace name="H2" price="100" />
!   <StockSpace name="H3" price="90" />
!   <StockSpace name="H4" price="82" />
!   <StockSpace name="H5" price="76" />
!   <StockSpace name="H6" price="71" />
!   <StockSpace name="H7" price="69" />
!   <StockSpace name="H8" price="68" />
!   <StockSpace name="I1" price="126" />
!   <StockSpace name="I2" price="112" />
!   <StockSpace name="I3" price="100" />
!   <StockSpace name="I4" price="90" />
!   <StockSpace name="I5" price="82" />
!   <StockSpace name="I6" price="75" />
!   <StockSpace name="I7" price="70" />
!   <StockSpace name="J1" price="142" />
!   <StockSpace name="J2" price="126" />
!   <StockSpace name="J3" price="111" />
!   <StockSpace name="J4" price="100" />
!   <StockSpace name="J5" price="90" />
!   <StockSpace name="J6" price="80" />
!   <StockSpace name="K1" price="160" />
!   <StockSpace name="K2" price="142" />
!   <StockSpace name="K3" price="125" />
!   <StockSpace name="K4" price="110" />
!   <StockSpace name="K5" price="100" />
!   <StockSpace name="L1" price="180" />
!   <StockSpace name="L2" price="160" />
!   <StockSpace name="L3" price="140" />
!   <StockSpace name="L4" price="120" />
!   <StockSpace name="M1" price="200" />
!   <StockSpace name="M2" price="180" />
!   <StockSpace name="M3" price="155" />
!   <StockSpace name="M4" price="130" />
!   <StockSpace name="N1" price="225" />
!   <StockSpace name="N2" price="200" />
!   <StockSpace name="N3" price="170" />
!   <StockSpace name="O1" price="250" />
!   <StockSpace name="O2" price="220" />
!   <StockSpace name="O3" price="185" />
!   <StockSpace name="P1" price="275" />
!   <StockSpace name="P2" price="240" />
!   <StockSpace name="P3" price="200" />
!   <StockSpace name="Q1" price="300" />
!   <StockSpace name="Q2" price="260" />
!   <StockSpace name="R1" price="325" />
!   <StockSpace name="R2" price="280" />
!   <StockSpace name="S1" price="350" />
!   <StockSpace name="S2" price="300" />
  </StockMarket>
--- 1,147 ----
  <StockMarket type="rectangular">
! 	<StockSpaceType name="yellow" colour="FFFF00">
! 		<NoCertLimit/>
! 	</StockSpaceType>
! 	<StockSpaceType name="orange" colour="FF8000">
! 		<NoCertLimit/>
! 		<NoHoldLimit/>
! 	</StockSpaceType>
! 	<StockSpaceType name="brown" colour="884000">
! 		<NoCertLimit/>
! 		<NoHoldLimit/>
! 		<NoBuyLimit/>
! 	</StockSpaceType>
! 	
! 	<StockSpace name="A1" price="60" type="yellow"/>
! 	<StockSpace name="A2" price="53" type="yellow"/>
! 	<StockSpace name="A3" price="46" type="yellow"/>
! 	<StockSpace name="A4" price="39" type="orange"/>
! 	<StockSpace name="A5" price="32" type="orange"/>
! 	<StockSpace name="A6" price="25" type="brown"/>
! 	<StockSpace name="A7" price="18" type="brown"/>
! 	<StockSpace name="A8" price="10" type="brown"/>
! 	<StockSpace name="B1" price="67" />
! 	<StockSpace name="B2" price="60" type="yellow"/>
! 	<StockSpace name="B3" price="55" type="yellow"/>
! 	<StockSpace name="B4" price="48" type="yellow"/>
! 	<StockSpace name="B5" price="41" type="orange"/>
! 	<StockSpace name="B6" price="34" type="orange"/>
! 	<StockSpace name="B7" price="27" type="brown"/>
! 	<StockSpace name="B8" price="20" type="brown"/>
! 	<StockSpace name="B9" price="10" type="brown"/>
! 	<StockSpace name="C1" price="71" />
! 	<StockSpace name="C2" price="66" />
! 	<StockSpace name="C3" price="60" type="yellow"/>
! 	<StockSpace name="C4" price="54" type="yellow"/>
! 	<StockSpace name="C5" price="48" type="yellow"/>
! 	<StockSpace name="C6" price="42" type="orange"/>
! 	<StockSpace name="C7" price="36" type="orange"/>
! 	<StockSpace name="C8" price="30" type="brown"/>
! 	<StockSpace name="C9" price="20" type="brown"/>
! 	<StockSpace name="C10" price="10" type="brown"/>
! 	<StockSpace name="D1" price="76" />
! 	<StockSpace name="D2" price="70" />
! 	<StockSpace name="D3" price="65" />
! 	<StockSpace name="D4" price="60" type="yellow"/>
! 	<StockSpace name="D5" price="55" type="yellow"/>
! 	<StockSpace name="D6" price="50" type="yellow"/>
! 	<StockSpace name="D7" price="45" type="orange"/>
! 	<StockSpace name="D8" price="40" type="orange"/>
! 	<StockSpace name="D9" price="30" type="brown"/>
! 	<StockSpace name="D10" price="20" type="brown"/>
! 	<StockSpace name="D11" price="10" type="brown"/>
! 	<StockSpace name="E1" price="82" />
! 	<StockSpace name="E2" price="76" />
! 	<StockSpace name="E3" price="70" />
! 	<StockSpace name="E4" price="66" />
! 	<StockSpace name="E5" price="62" />
! 	<StockSpace name="E6" price="58" type="yellow"/>
! 	<StockSpace name="E7" price="54" type="yellow"/>
! 	<StockSpace name="E8" price="50" type="yellow"/>
! 	<StockSpace name="E9" price="40" type="orange"/>
! 	<StockSpace name="E10" price="30" type="brown"/>
! 	<StockSpace name="E11" price="20" type="brown"/>
! 	<StockSpace name="F1" price="90" />
! 	<StockSpace name="F2" price="82" />
! 	<StockSpace name="F3" price="76" />
! 	<StockSpace name="F4" price="71" />
! 	<StockSpace name="F5" price="67" />
! 	<StockSpace name="F6" price="65" />
! 	<StockSpace name="F7" price="63" />
! 	<StockSpace name="F8" price="60" type="yellow"/>
! 	<StockSpace name="F9" price="50" type="yellow"/>
! 	<StockSpace name="F10" price="40" type="orange"/>
! 	<StockSpace name="F11" price="30" type="brown"/>
! 	<StockSpace name="G1" price="100" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G2" price="90" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G3" price="82" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G4" price="76" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G5" price="71" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G6" price="67" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G7" price="67" />
! 	<StockSpace name="G8" price="67" />
! 	<StockSpace name="G9" price="60" type="yellow"/>
! 	<StockSpace name="G10" price="50" type="yellow"/>
! 	<StockSpace name="G11" price="40" type="orange"/>
! 	<StockSpace name="H1" price="112" />
! 	<StockSpace name="H2" price="100" />
! 	<StockSpace name="H3" price="90" />
! 	<StockSpace name="H4" price="82" />
! 	<StockSpace name="H5" price="76" />
! 	<StockSpace name="H6" price="71" />
! 	<StockSpace name="H7" price="69" />
! 	<StockSpace name="H8" price="68" />
! 	<StockSpace name="I1" price="126" />
! 	<StockSpace name="I2" price="112" />
! 	<StockSpace name="I3" price="100" />
! 	<StockSpace name="I4" price="90" />
! 	<StockSpace name="I5" price="82" />
! 	<StockSpace name="I6" price="75" />
! 	<StockSpace name="I7" price="70" />
! 	<StockSpace name="J1" price="142" />
! 	<StockSpace name="J2" price="126" />
! 	<StockSpace name="J3" price="111" />
! 	<StockSpace name="J4" price="100" />
! 	<StockSpace name="J5" price="90" />
! 	<StockSpace name="J6" price="80" />
! 	<StockSpace name="K1" price="160" />
! 	<StockSpace name="K2" price="142" />
! 	<StockSpace name="K3" price="125" />
! 	<StockSpace name="K4" price="110" />
! 	<StockSpace name="K5" price="100" />
! 	<StockSpace name="L1" price="180" />
! 	<StockSpace name="L2" price="160" />
! 	<StockSpace name="L3" price="140" />
! 	<StockSpace name="L4" price="120" />
! 	<StockSpace name="M1" price="200" />
! 	<StockSpace name="M2" price="180" />
! 	<StockSpace name="M3" price="155" />
! 	<StockSpace name="M4" price="130" />
! 	<StockSpace name="N1" price="225" />
! 	<StockSpace name="N2" price="200" />
! 	<StockSpace name="N3" price="170" />
! 	<StockSpace name="O1" price="250" />
! 	<StockSpace name="O2" price="220" />
! 	<StockSpace name="O3" price="185" />
! 	<StockSpace name="P1" price="275" />
! 	<StockSpace name="P2" price="240" />
! 	<StockSpace name="P3" price="200" />
! 	<StockSpace name="Q1" price="300" />
! 	<StockSpace name="Q2" price="260" />
! 	<StockSpace name="R1" price="325" />
! 	<StockSpace name="R2" price="280" />
! 	<StockSpace name="S1" price="350" />
! 	<StockSpace name="S2" price="300" />
  </StockMarket>

Index: CompanyManager.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/18Kaas/CompanyManager.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CompanyManager.xml	17 Jan 2010 14:05:48 -0000	1.9
--- CompanyManager.xml	31 Jan 2010 22:16:03 -0000	1.10
***************
*** 10,23 ****
  		<Certificate type="President" shares="2"/>
  		<Certificate shares="1" number="8"/>
! 	    <BaseTokens>
! 		    <LayCost method="sequence" cost="0,40,100"/>
!     	</BaseTokens>
  		<Trains number="4,4,3,2"/>
  	</CompanyType>
  	<Company name="SVNRR" type="Private" basePrice="20" revenue="5">
!     <Blocking hex="H9"/>
!   </Company>
  	<Company name="C&amp;StL" type="Private" basePrice="40" revenue="10">
!     <Blocking hex="D15"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
--- 10,23 ----
  		<Certificate type="President" shares="2"/>
  		<Certificate shares="1" number="8"/>
! 		<BaseTokens>
! 			<LayCost method="sequence" cost="0,40,100"/>
! 		</BaseTokens>
  		<Trains number="4,4,3,2"/>
  	</CompanyType>
  	<Company name="SVNRR" type="Private" basePrice="20" revenue="5">
! 		<Blocking hex="H9"/>
! 	</Company>
  	<Company name="C&amp;StL" type="Private" basePrice="40" revenue="10">
! 		<Blocking hex="D15"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
***************
*** 27,31 ****
  	</Company>
  	<Company name="D&amp;H" type="Private" basePrice="70" revenue="15">
!     <Blocking hex="K16"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
--- 27,31 ----
  	</Company>
  	<Company name="D&amp;H" type="Private" basePrice="70" revenue="15">
! 		<Blocking hex="K16"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
***************
*** 38,42 ****
  	</Company>
  	<Company name="M&amp;H" type="Private" basePrice="110" revenue="20">
!     <Blocking hex="D9"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByPlayer" when="anyTime" class="rails.game.special.ExchangeForShare">
--- 38,42 ----
  	</Company>
  	<Company name="M&amp;H" type="Private" basePrice="110" revenue="20">
! 		<Blocking hex="D9"/>
  		<SpecialProperties>
  			<SpecialProperty condition="ifOwnedByPlayer" when="anyTime" class="rails.game.special.ExchangeForShare">
***************
*** 46,78 ****
  	</Company>
  	<Company name="C&amp;A" type="Private" basePrice="160" revenue="25">
!     <Blocking hex="J7"/>
!   </Company>
  	<Company name="B&amp;O" type="Private" basePrice="220" revenue="30">
!     <Blocking hex="G6,G8"/>
!   </Company>
  	<Company name="B&amp;O" type="Public" tokens="3" fgColour="FFFFFF" bgColour="0000FF">
  		<FirstTrainCloses type="Private" name="B&amp;O"/>
!     <Home hex="G8"/>
  	</Company>
  	<Company name="PRR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="008000">
!     <Home hex="I12"/>
  	</Company>
  	<Company name="NYNH" type="Public" tokens="2" fgColour="000000" bgColour="FF8000">
!     <Home hex="G10" city="2"/>
  	</Company>
  	<Company name="NYC" type="Public" tokens="4" fgColour="FFFFFF" bgColour="000000">
!     <Home hex="E10"/>
  	</Company>
  	<Company name="Erie" type="Public" tokens="3" fgColour="000000" bgColour="FFFF00">
!     <Home hex="G16"/>
  	</Company>
  	<Company name="B&amp;M" type="Public" tokens="2" fgColour="000000" bgColour="60E060">
!     <Home hex="K8"/>
  	</Company>
  	<Company name="C&amp;O" type="Public" tokens="3" fgColour="000000" bgColour="A0E0FF">
!     <Home hex="O16"/>
  	</Company>
  	<Company name="CPR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="FF0000">
!     <Home hex="B17"/>
  	</Company>
  	<StartPacket roundClass="rails.game.StartRound_1830">
--- 46,78 ----
  	</Company>
  	<Company name="C&amp;A" type="Private" basePrice="160" revenue="25">
! 		<Blocking hex="J7"/>
! 	</Company>
  	<Company name="B&amp;O" type="Private" basePrice="220" revenue="30">
! 		<Blocking hex="G6,G8"/>
! 	</Company>
  	<Company name="B&amp;O" type="Public" tokens="3" fgColour="FFFFFF" bgColour="0000FF">
  		<FirstTrainCloses type="Private" name="B&amp;O"/>
! 		<Home hex="G8"/>
  	</Company>
  	<Company name="PRR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="008000">
! 		<Home hex="I12"/>
  	</Company>
  	<Company name="NYNH" type="Public" tokens="2" fgColour="000000" bgColour="FF8000">
! 		<Home hex="G10" city="2"/>
  	</Company>
  	<Company name="NYC" type="Public" tokens="4" fgColour="FFFFFF" bgColour="000000">
! 		<Home hex="E10"/>
  	</Company>
  	<Company name="Erie" type="Public" tokens="3" fgColour="000000" bgColour="FFFF00">
! 		<Home hex="G16"/>
  	</Company>
  	<Company name="B&amp;M" type="Public" tokens="2" fgColour="000000" bgColour="60E060">
! 		<Home hex="K8"/>
  	</Company>
  	<Company name="C&amp;O" type="Public" tokens="3" fgColour="000000" bgColour="A0E0FF">
! 		<Home hex="O16"/>
  	</Company>
  	<Company name="CPR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="FF0000">
! 		<Home hex="B17"/>
  	</Company>
  	<StartPacket roundClass="rails.game.StartRound_1830">

[Rails-commits] 18xx/data/18EU CompanyManager.xml, 1.13, 1.14 Game.xml, 1.17, 1.18 Map.xml, 1.11, 1.12 StockMarket.xml, 1.1, 1.2

[Freek D. <mac...@us...>]

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

Modified Files:
	CompanyManager.xml Game.xml Map.xml StockMarket.xml 
Log Message:
Fix indentation: XML files contain tabs

Index: CompanyManager.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/18EU/CompanyManager.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CompanyManager.xml	17 Jan 2010 14:05:48 -0000	1.13
--- CompanyManager.xml	31 Jan 2010 22:16:02 -0000	1.14
***************
*** 1,26 ****
  <?xml version="1.0"?>
  <CompanyManager>
!   <CompanyType name="Minor" class="rails.game.PublicCompany" fgColour="000000" bgColour="CCCCCC">
!     <ShareUnit percentage="100"/>
!     <Certificate type="President" shares="1"/>
  	<StockPrice market="no"/>
  	<Payout split="always"/>
!     <TileLays>
! 		<Number colour="yellow" phase="2" number="2" occurrences="1"/>
! 		<Number colour="green" phase="3,4" number="0"/>
!     </TileLays>
  	<BaseTokens>
  		<HomeBase lay="whenStarted"/>
  	</BaseTokens>
  	<Trains initial="2" number="2,2,1" mandatory="no"/>
!   </CompanyType>
!   <CompanyType name="Major" class="rails.game.PublicCompany" capitalisation="incremental">
!     <Float percentage="50"/>
  	<TreasuryCanHoldOwnShares maxPerc="80"/>
  	<HomeBase lay="whenStarted"/>
!     <StockPrice par="no"/>
!     <ShareUnit percentage="10"/>
!     <Certificate type="President" shares="2"/>
!     <Certificate shares="1" number="8"/>
  	<Capitalisation type="incremental"/>
  	<BaseTokens>
--- 1,26 ----
  <?xml version="1.0"?>
  <CompanyManager>
! 	<CompanyType name="Minor" class="rails.game.PublicCompany" fgColour="000000" bgColour="CCCCCC">
! 		<ShareUnit percentage="100"/>
! 		<Certificate type="President" shares="1"/>
  	<StockPrice market="no"/>
  	<Payout split="always"/>
! 		<TileLays>
! 			<Number colour="yellow" phase="2" number="2" occurrences="1"/>
! 			<Number colour="green" phase="3,4" number="0"/>
! 		</TileLays>
  	<BaseTokens>
  		<HomeBase lay="whenStarted"/>
  	</BaseTokens>
  	<Trains initial="2" number="2,2,1" mandatory="no"/>
! 	</CompanyType>
! 	<CompanyType name="Major" class="rails.game.PublicCompany" capitalisation="incremental">
! 		<Float percentage="50"/>
  	<TreasuryCanHoldOwnShares maxPerc="80"/>
  	<HomeBase lay="whenStarted"/>
! 		<StockPrice par="no"/>
! 		<ShareUnit percentage="10"/>
! 		<Certificate type="President" shares="2"/>
! 		<Certificate shares="1" number="8"/>
  	<Capitalisation type="incremental"/>
  	<BaseTokens>
***************
*** 28,116 ****
  		<HomeBase lay="whenStarted"/>
  	</BaseTokens>
!     <Payout split="allowed" mustExceedPriceToMove="yes"/>
  	<Trains number="4,4,3,2"/>
  	<TradeShares mustHaveOperated="yes"/>
!   </CompanyType>
!   
!   <Company name="1" longname="CdF du Nord" type="Minor">
!     <Home hex="J1" city="1"/>
!   </Company>
!   <Company name="2" longname="Etat Belge" type="Minor">
!     <Home hex="H3"/>
!   </Company>
!   <Company name="3" longname="PLM" type="Minor">
!     <Home hex="J1" city="2"/>
!   </Company>
!   <Company name="4" longname="Leipzig-Dresden" type="Minor">
!     <Home hex="G10"/>
!   </Company>
!   <Company name="5" longname="Adriatica" type="Minor">
!     <Home hex="S8"/>
!   </Company>
!   <Company name="6" longname="KF Nordbahn" type="Minor">
!     <Home hex="N11" city="1"/>
!   </Company>
!   <Company name="7" longname="Berlin-Potsdam" type="Minor">
!     <Home hex="E10" city="2"/>
!   </Company>
!   <Company name="8" longname="Hungarian" type="Minor">
!     <Home hex="P13"/>
!   </Company>
!   <Company name="9" longname="Berlin-Stettin" type="Minor">
!     <Home hex="E10" city="1"/>
!   </Company>
!   <Company name="10" longname="Alta Italia" type="Minor">
!     <Home hex="R5"/>
!   </Company>
!   <Company name="11" longname="S&#252;dbahn" type="Minor">
!     <Home hex="N11" city="2"/>
!   </Company>
!   <Company name="12" longname="HSM" type="Minor">
!     <Home hex="C4"/>
!   </Company>
!   <Company name="13" longname="Ludwigsbahn" type="Minor">
!     <Home hex="L7"/>
!   </Company>
!   <Company name="14" longname="Strasbourg-B&#226;le" type="Minor">
!     <Home hex="M4"/>
!   </Company>
!   <Company name="15" longname="Grand Central" type="Minor">
!     <Home hex="Q2"/>
!   </Company>
  
!   <Company name="SNCB" longname="CdF Belges" type="Major" tokens="5" fgColour="000000" bgColour="DDAA00">
!   </Company>
!   <Company name="NS" longname="Ned. Spoorwegen" type="Major" tokens="5" fgColour="0000FF" bgColour="FFDD00">
!   </Company>
!   <Company name="KBS" longname="Kon. Bayerische Eisenbahn" type="Major" tokens="5" fgColour="000000" bgColour="C0E0FF">
!   </Company>
!   <Company name="KPEV" longname="Kon. Preussische Eisenbahn" type="Major" tokens="5" fgColour="000000" bgColour="2255FF">
!   </Company>
!   <Company name="KK&#214;B" longname="K-K &#214;sterr. Staatsbahn" type="Major" tokens="5" fgColour="000000" bgColour="FFFF00">
!   </Company>
!   <Company name="FS" longname="Ferrovie dello Stato" type="Major" tokens="5" fgColour="FFFFFF" bgColour="00AA00">
!   </Company>
!   <Company name="SNCF" longname="CdF Fran&#231;aise" type="Major" tokens="5" fgColour="FFFFFF" bgColour="FF0000">
!   </Company>
!   <Company name="DR" longname="Deutsche Reichsbahn" type="Major" tokens="5" fgColour="FFFFFF" bgColour="000000">
!   </Company>
!   
!   <StartPacket roundClass="rails.game.specific._18EU.StartRound_18EU">
! 	<Bidding initial="0" minimum="5" increment="5"/>
!     <Item name="1"   type="Minor" basePrice="100"/>
!     <Item name="2"   type="Minor" basePrice="100"/>
!     <Item name="3"   type="Minor" basePrice="100"/>
!     <Item name="4"   type="Minor" basePrice="100"/>
!     <Item name="5"   type="Minor" basePrice="100"/>
!     <Item name="6"   type="Minor" basePrice="100"/>
!     <Item name="7"   type="Minor" basePrice="100"/>
!     <Item name="8"   type="Minor" basePrice="100"/>
!     <Item name="9"   type="Minor" basePrice="100"/>
!     <Item name="10"   type="Minor" basePrice="100"/>
!     <Item name="11"   type="Minor" basePrice="100"/>
!     <Item name="12"   type="Minor" basePrice="100"/>
!     <Item name="13"   type="Minor" basePrice="100"/>
!     <Item name="14"   type="Minor" basePrice="100"/>
!     <Item name="15"   type="Minor" basePrice="100"/>
!   </StartPacket>
  </CompanyManager>
--- 28,116 ----
  		<HomeBase lay="whenStarted"/>
  	</BaseTokens>
! 		<Payout split="allowed" mustExceedPriceToMove="yes"/>
  	<Trains number="4,4,3,2"/>
  	<TradeShares mustHaveOperated="yes"/>
! 	</CompanyType>
! 	
! 	<Company name="1" longname="CdF du Nord" type="Minor">
! 		<Home hex="J1" city="1"/>
! 	</Company>
! 	<Company name="2" longname="Etat Belge" type="Minor">
! 		<Home hex="H3"/>
! 	</Company>
! 	<Company name="3" longname="PLM" type="Minor">
! 		<Home hex="J1" city="2"/>
! 	</Company>
! 	<Company name="4" longname="Leipzig-Dresden" type="Minor">
! 		<Home hex="G10"/>
! 	</Company>
! 	<Company name="5" longname="Adriatica" type="Minor">
! 		<Home hex="S8"/>
! 	</Company>
! 	<Company name="6" longname="KF Nordbahn" type="Minor">
! 		<Home hex="N11" city="1"/>
! 	</Company>
! 	<Company name="7" longname="Berlin-Potsdam" type="Minor">
! 		<Home hex="E10" city="2"/>
! 	</Company>
! 	<Company name="8" longname="Hungarian" type="Minor">
! 		<Home hex="P13"/>
! 	</Company>
! 	<Company name="9" longname="Berlin-Stettin" type="Minor">
! 		<Home hex="E10" city="1"/>
! 	</Company>
! 	<Company name="10" longname="Alta Italia" type="Minor">
! 		<Home hex="R5"/>
! 	</Company>
! 	<Company name="11" longname="S&#252;dbahn" type="Minor">
! 		<Home hex="N11" city="2"/>
! 	</Company>
! 	<Company name="12" longname="HSM" type="Minor">
! 		<Home hex="C4"/>
! 	</Company>
! 	<Company name="13" longname="Ludwigsbahn" type="Minor">
! 		<Home hex="L7"/>
! 	</Company>
! 	<Company name="14" longname="Strasbourg-B&#226;le" type="Minor">
! 		<Home hex="M4"/>
! 	</Company>
! 	<Company name="15" longname="Grand Central" type="Minor">
! 		<Home hex="Q2"/>
! 	</Company>
  
! 	<Company name="SNCB" longname="CdF Belges" type="Major" tokens="5" fgColour="000000" bgColour="DDAA00">
! 	</Company>
! 	<Company name="NS" longname="Ned. Spoorwegen" type="Major" tokens="5" fgColour="0000FF" bgColour="FFDD00">
! 	</Company>
! 	<Company name="KBS" longname="Kon. Bayerische Eisenbahn" type="Major" tokens="5" fgColour="000000" bgColour="C0E0FF">
! 	</Company>
! 	<Company name="KPEV" longname="Kon. Preussische Eisenbahn" type="Major" tokens="5" fgColour="000000" bgColour="2255FF">
! 	</Company>
! 	<Company name="KK&#214;B" longname="K-K &#214;sterr. Staatsbahn" type="Major" tokens="5" fgColour="000000" bgColour="FFFF00">
! 	</Company>
! 	<Company name="FS" longname="Ferrovie dello Stato" type="Major" tokens="5" fgColour="FFFFFF" bgColour="00AA00">
! 	</Company>
! 	<Company name="SNCF" longname="CdF Fran&#231;aise" type="Major" tokens="5" fgColour="FFFFFF" bgColour="FF0000">
! 	</Company>
! 	<Company name="DR" longname="Deutsche Reichsbahn" type="Major" tokens="5" fgColour="FFFFFF" bgColour="000000">
! 	</Company>
! 	
! 	<StartPacket roundClass="rails.game.specific._18EU.StartRound_18EU">
! 		<Bidding initial="0" minimum="5" increment="5"/>
! 		<Item name="1"	 type="Minor" basePrice="100"/>
! 		<Item name="2"	 type="Minor" basePrice="100"/>
! 		<Item name="3"	 type="Minor" basePrice="100"/>
! 		<Item name="4"	 type="Minor" basePrice="100"/>
! 		<Item name="5"	 type="Minor" basePrice="100"/>
! 		<Item name="6"	 type="Minor" basePrice="100"/>
! 		<Item name="7"	 type="Minor" basePrice="100"/>
! 		<Item name="8"	 type="Minor" basePrice="100"/>
! 		<Item name="9"	 type="Minor" basePrice="100"/>
! 		<Item name="10"		type="Minor" basePrice="100"/>
! 		<Item name="11"		type="Minor" basePrice="100"/>
! 		<Item name="12"		type="Minor" basePrice="100"/>
! 		<Item name="13"		type="Minor" basePrice="100"/>
! 		<Item name="14"		type="Minor" basePrice="100"/>
! 		<Item name="15"		type="Minor" basePrice="100"/>
! 	</StartPacket>
  </CompanyManager>

Index: Map.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/18EU/Map.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Map.xml	7 Dec 2009 17:46:37 -0000	1.11
--- Map.xml	31 Jan 2010 22:16:03 -0000	1.12
***************
*** 1,124 ****
  <Map mapClass="rails.ui.swing.hexmap.NSHexMap" tileOrientation="NS" letterOrientation="vertical" even="A">
!     <!-- Hex name="" tile="" orientation="" value="" impassable="" label="" cost="" value="" port="yes/no" -->
!     <Hex name="A4" port="yes" value="10" tile="-800" orientation="0"/>
!     <Hex name="B7" value="30,50" tile="-939" orientation="1" city="Hamburg"/>
!     <Hex name="C4" label="Y" tile="-10" city="Amsterdam"/>
!     <Hex name="C6" tile="-1" city="Bremen"/>
!     <Hex name="C8" tile="0" />
!     <Hex name="C10" tile="0" />
!     <Hex name="D3" tile="-1" city="Rotterdam"/>
!     <Hex name="D5" tile="0" />
!     <Hex name="D7" tile="0" />
!     <Hex name="D9" tile="0" />
!     <Hex name="D11" tile="-1" city="Stettin"/>
!     <Hex name="E4" tile="-1" city="Utrecht"/>
!     <Hex name="E6" tile="0" />
!     <Hex name="E8" tile="0" />
!     <Hex name="E10" label="B" tile="-3005" orientation="1" city="Berlin"/>
!     <Hex name="E12" tile="-1" city="Thorn"/>
!     <Hex name="E14" value="20,30" tile="-901" orientation="2" city="Warsaw"/>
!     <Hex name="F1" value="40,70" tile="-902" orientation="1" city="London"/>
!     <Hex name="F3" tile="-1" city="Antwerp"/>
!     <Hex name="F5" tile="-10" city="Dortmund"/>
!     <Hex name="F7" tile="-1" city="Hannover"/>
!     <Hex name="F9" tile="0" />
!     <Hex name="F11" tile="0" />
!     <Hex name="F13" tile="0" />
!     <Hex name="G2" tile="-1" city="Lille"/>
!     <Hex name="G4" tile="-10" city="Cologne"/>
!     <Hex name="G6" tile="0" />
!     <Hex name="G8" tile="-1" city="Magdeburg"/>
!     <Hex name="G10" label="Y" tile="-10" city="Dresden"/>
!     <Hex name="G12" tile="0" />
!     <Hex name="H1" tile="0" />
!     <Hex name="H3" label="Y" tile="-10" city="Brussels"/>
!     <Hex name="H5" tile="0" />
!     <Hex name="H7" tile="0" />
!     <Hex name="H9" tile="-1" city="Leipzig"/>
!     <Hex name="H11" cost="60" tile="0" />
!     <Hex name="H13" tile="0" />
!     <Hex name="I2" tile="0" />
!     <Hex name="I4" cost="60" tile="0" />
!     <Hex name="I6" tile="-10" city="Frankfurt"/>
!     <Hex name="I8" tile="0" />
!     <Hex name="I10" cost="60" tile="0" />
!     <Hex name="I12" cost="60" tile="0" />
!     <Hex name="J1" label="P" tile="-3006" city="Paris"/>
!     <Hex name="J3" cost="60" tile="0" />
!     <Hex name="J5" tile="0" />
!     <Hex name="J7" tile="-1" city="Nuremberg"/>
!     <Hex name="J9" cost="60" tile="0" />
!     <Hex name="J11" tile="0" />
!     <Hex name="J13" cost="60" tile="-1" city="Krakau"/>
!     <Hex name="K2" tile="0" />
!     <Hex name="K4" cost="60" tile="0" />
!     <Hex name="K6" tile="-1" city="Augsburg"/>
!     <Hex name="K8" tile="0" />
!     <Hex name="K10" tile="-10" city="Prague"/>
!     <Hex name="K12" tile="0" />
!     <Hex name="L1" tile="0" />
!     <Hex name="L3" tile="0" />
!     <Hex name="L5" tile="-1" city="Stuttgart"/>
!     <Hex name="L7" tile="-10" city="Munich"/>
!     <Hex name="L9" cost="60" tile="0" />
!     <Hex name="L11" tile="-1" city="Brünn"/>
!     <Hex name="L13" tile="0" />
!     <Hex name="M2" tile="-1" city="Dijon"/>
!     <Hex name="M4" label="Y" tile="-10" city="Strasbourg"/>
!     <Hex name="M6" tile="0" />
!     <Hex name="M8" tile="0" />
!     <Hex name="M10" cost="60" tile="0" />
!     <Hex name="M12" tile="0" />
!     <Hex name="N1" cost="60" tile="0" />
!     <Hex name="N3" tile="0" />
!     <Hex name="N5" cost="60" tile="-1" city="Zurich"/>
!     <Hex name="N7" tile="0" />
!     <Hex name="N9" cost="60" tile="-1" city="Salzburg"/>
!     <Hex name="N11" label="V" tile="-3005" city="Vienna"/>
!     <Hex name="N13" tile="0" />
!     <Hex name="O2" tile="0" />
!     <Hex name="O4" tile="-1" city="Basel"/>
!     <Hex name="O6" cost="60" tile="0" />
!     <Hex name="O8" cost="60" tile="-1" city="Innsbruck"/>
!     <Hex name="O10" cost="120,60" label="M" tile="0" /><!-- Tauern -->
!     <Hex name="O12" cost="60" tile="-1" city="Pressburg"/>
!     <Hex name="P1" cost="60" tile="0" />
!     <Hex name="P3" tile="-1" city="Geneva"/>
!     <!-- Multiple upgrade costs: first value applies to FIRST tile laid
!         (regardless the colour). Any subsequent values apply to 
!         yellow-to-green, green-to-brown etc. upgrades -->
!     <Hex name="P5" cost="120,60" label="M" tile="0" /><!-- Simplon -->
!     <Hex name="P7" cost="60" tile="0" />
!     <Hex name="P9" cost="120,60" label="M" tile="0" /><!-- Arlberg -->
!     <Hex name="P11" cost="60" label="M" tile="8" orientation="1"/><!-- Semmering -->
!     <Hex name="P13" label="Y" tile="-10" city="Budapest"/>
!     <Hex name="Q2" label="Y" tile="-10" city="Lyon"/>
!     <Hex name="Q4" cost="120,60" label="M" tile="0" /><!-- Lotschberg -->
!     <Hex name="Q6" cost="120,60" label="M" tile="0" /><!-- Gotthard -->
!     <Hex name="Q8" cost="120,60" label="M" tile="0" /><!-- Brenner -->
!     <Hex name="Q10" tile="0" />
!     <Hex name="Q12" tile="0" />
!     <Hex name="Q14" value="30,50" tile="-901" orientation="3" city="Bucharest"/>
!     <Hex name="R1" tile="0" />
!     <Hex name="R3" cost="120,60" label="M" tile="0" /><!-- Frejus -->
!     <Hex name="R5" label="Y" tile="-10" city="Milan"/>
!     <Hex name="R7" cost="120,60" label="M" tile="0" /><!-- Albula -->
!     <Hex name="R9" tile="-10" orientation="4" city="Trieste"/>
!     <Hex name="R11" tile="0" />
!     <Hex name="S2" tile="-10" city="Marseille"/>
!     <Hex name="S4" tile="-10" city="Turin"/>
!     <Hex name="S6" tile="0" />
!     <Hex name="S8" label="Y" tile="-10" city="Venice"/>
!     <Hex name="S10" tile="0" />
!     <Hex name="T1" tile="0" />
!     <Hex name="T3" cost="60" tile="-1" city="Nice"/>
!     <Hex name="T5" tile="-10" city="Genoa"/>
!     <Hex name="T7" tile="-1" city="Bologna"/>
!     <Hex name="T9" port="yes" value="10" tile="-800" orientation="3"/>
!     <Hex name="U2" port="yes" value="10" tile="-800" orientation="3"/>
!     <Hex name="U4" tile="0" />
!     <Hex name="U6" tile="-1" city="Florence"/>
!     <Hex name="U8" tile="0" />
!     <Hex name="V5" port="yes" value="10" tile="-800" orientation="3"/>
!     <Hex name="V7" label="V" value="30,50" tile="-903" orientation="4" city="Rome"/>
  </Map>
--- 1,124 ----
  <Map mapClass="rails.ui.swing.hexmap.NSHexMap" tileOrientation="NS" letterOrientation="vertical" even="A">
! 	<!-- Hex name="" tile="" orientation="" value="" impassable="" label="" cost="" value="" port="yes/no" -->
! 	<Hex name="A4" port="yes" value="10" tile="-800" orientation="0"/>
! 	<Hex name="B7" value="30,50" tile="-939" orientation="1" city="Hamburg"/>
! 	<Hex name="C4" label="Y" tile="-10" city="Amsterdam"/>
! 	<Hex name="C6" tile="-1" city="Bremen"/>
! 	<Hex name="C8" tile="0" />
! 	<Hex name="C10" tile="0" />
! 	<Hex name="D3" tile="-1" city="Rotterdam"/>
! 	<Hex name="D5" tile="0" />
! 	<Hex name="D7" tile="0" />
! 	<Hex name="D9" tile="0" />
! 	<Hex name="D11" tile="-1" city="Stettin"/>
! 	<Hex name="E4" tile="-1" city="Utrecht"/>
! 	<Hex name="E6" tile="0" />
! 	<Hex name="E8" tile="0" />
! 	<Hex name="E10" label="B" tile="-3005" orientation="1" city="Berlin"/>
! 	<Hex name="E12" tile="-1" city="Thorn"/>
! 	<Hex name="E14" value="20,30" tile="-901" orientation="2" city="Warsaw"/>
! 	<Hex name="F1" value="40,70" tile="-902" orientation="1" city="London"/>
! 	<Hex name="F3" tile="-1" city="Antwerp"/>
! 	<Hex name="F5" tile="-10" city="Dortmund"/>
! 	<Hex name="F7" tile="-1" city="Hannover"/>
! 	<Hex name="F9" tile="0" />
! 	<Hex name="F11" tile="0" />
! 	<Hex name="F13" tile="0" />
! 	<Hex name="G2" tile="-1" city="Lille"/>
! 	<Hex name="G4" tile="-10" city="Cologne"/>
! 	<Hex name="G6" tile="0" />
! 	<Hex name="G8" tile="-1" city="Magdeburg"/>
! 	<Hex name="G10" label="Y" tile="-10" city="Dresden"/>
! 	<Hex name="G12" tile="0" />
! 	<Hex name="H1" tile="0" />
! 	<Hex name="H3" label="Y" tile="-10" city="Brussels"/>
! 	<Hex name="H5" tile="0" />
! 	<Hex name="H7" tile="0" />
! 	<Hex name="H9" tile="-1" city="Leipzig"/>
! 	<Hex name="H11" cost="60" tile="0" />
! 	<Hex name="H13" tile="0" />
! 	<Hex name="I2" tile="0" />
! 	<Hex name="I4" cost="60" tile="0" />
! 	<Hex name="I6" tile="-10" city="Frankfurt"/>
! 	<Hex name="I8" tile="0" />
! 	<Hex name="I10" cost="60" tile="0" />
! 	<Hex name="I12" cost="60" tile="0" />
! 	<Hex name="J1" label="P" tile="-3006" city="Paris"/>
! 	<Hex name="J3" cost="60" tile="0" />
! 	<Hex name="J5" tile="0" />
! 	<Hex name="J7" tile="-1" city="Nuremberg"/>
! 	<Hex name="J9" cost="60" tile="0" />
! 	<Hex name="J11" tile="0" />
! 	<Hex name="J13" cost="60" tile="-1" city="Krakau"/>
! 	<Hex name="K2" tile="0" />
! 	<Hex name="K4" cost="60" tile="0" />
! 	<Hex name="K6" tile="-1" city="Augsburg"/>
! 	<Hex name="K8" tile="0" />
! 	<Hex name="K10" tile="-10" city="Prague"/>
! 	<Hex name="K12" tile="0" />
! 	<Hex name="L1" tile="0" />
! 	<Hex name="L3" tile="0" />
! 	<Hex name="L5" tile="-1" city="Stuttgart"/>
! 	<Hex name="L7" tile="-10" city="Munich"/>
! 	<Hex name="L9" cost="60" tile="0" />
! 	<Hex name="L11" tile="-1" city="Brünn"/>
! 	<Hex name="L13" tile="0" />
! 	<Hex name="M2" tile="-1" city="Dijon"/>
! 	<Hex name="M4" label="Y" tile="-10" city="Strasbourg"/>
! 	<Hex name="M6" tile="0" />
! 	<Hex name="M8" tile="0" />
! 	<Hex name="M10" cost="60" tile="0" />
! 	<Hex name="M12" tile="0" />
! 	<Hex name="N1" cost="60" tile="0" />
! 	<Hex name="N3" tile="0" />
! 	<Hex name="N5" cost="60" tile="-1" city="Zurich"/>
! 	<Hex name="N7" tile="0" />
! 	<Hex name="N9" cost="60" tile="-1" city="Salzburg"/>
! 	<Hex name="N11" label="V" tile="-3005" city="Vienna"/>
! 	<Hex name="N13" tile="0" />
! 	<Hex name="O2" tile="0" />
! 	<Hex name="O4" tile="-1" city="Basel"/>
! 	<Hex name="O6" cost="60" tile="0" />
! 	<Hex name="O8" cost="60" tile="-1" city="Innsbruck"/>
! 	<Hex name="O10" cost="120,60" label="M" tile="0" /><!-- Tauern -->
! 	<Hex name="O12" cost="60" tile="-1" city="Pressburg"/>
! 	<Hex name="P1" cost="60" tile="0" />
! 	<Hex name="P3" tile="-1" city="Geneva"/>
! 	<!-- Multiple upgrade costs: first value applies to FIRST tile laid
! 		(regardless the colour). Any subsequent values apply to 
! 		yellow-to-green, green-to-brown etc. upgrades -->
! 	<Hex name="P5" cost="120,60" label="M" tile="0" /><!-- Simplon -->
! 	<Hex name="P7" cost="60" tile="0" />
! 	<Hex name="P9" cost="120,60" label="M" tile="0" /><!-- Arlberg -->
! 	<Hex name="P11" cost="60" label="M" tile="8" orientation="1"/><!-- Semmering -->
! 	<Hex name="P13" label="Y" tile="-10" city="Budapest"/>
! 	<Hex name="Q2" label="Y" tile="-10" city="Lyon"/>
! 	<Hex name="Q4" cost="120,60" label="M" tile="0" /><!-- Lotschberg -->
! 	<Hex name="Q6" cost="120,60" label="M" tile="0" /><!-- Gotthard -->
! 	<Hex name="Q8" cost="120,60" label="M" tile="0" /><!-- Brenner -->
! 	<Hex name="Q10" tile="0" />
! 	<Hex name="Q12" tile="0" />
! 	<Hex name="Q14" value="30,50" tile="-901" orientation="3" city="Bucharest"/>
! 	<Hex name="R1" tile="0" />
! 	<Hex name="R3" cost="120,60" label="M" tile="0" /><!-- Frejus -->
! 	<Hex name="R5" label="Y" tile="-10" city="Milan"/>
! 	<Hex name="R7" cost="120,60" label="M" tile="0" /><!-- Albula -->
! 	<Hex name="R9" tile="-10" orientation="4" city="Trieste"/>
! 	<Hex name="R11" tile="0" />
! 	<Hex name="S2" tile="-10" city="Marseille"/>
! 	<Hex name="S4" tile="-10" city="Turin"/>
! 	<Hex name="S6" tile="0" />
! 	<Hex name="S8" label="Y" tile="-10" city="Venice"/>
! 	<Hex name="S10" tile="0" />
! 	<Hex name="T1" tile="0" />
! 	<Hex name="T3" cost="60" tile="-1" city="Nice"/>
! 	<Hex name="T5" tile="-10" city="Genoa"/>
! 	<Hex name="T7" tile="-1" city="Bologna"/>
! 	<Hex name="T9" port="yes" value="10" tile="-800" orientation="3"/>
! 	<Hex name="U2" port="yes" value="10" tile="-800" orientation="3"/>
! 	<Hex name="U4" tile="0" />
! 	<Hex name="U6" tile="-1" city="Florence"/>
! 	<Hex name="U8" tile="0" />
! 	<Hex name="V5" port="yes" value="10" tile="-800" orientation="3"/>
! 	<Hex name="V7" label="V" value="30,50" tile="-903" orientation="4" city="Rome"/>
  </Map>

Index: StockMarket.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/18EU/StockMarket.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StockMarket.xml	12 Oct 2007 00:00:21 -0000	1.1
--- StockMarket.xml	31 Jan 2010 22:16:03 -0000	1.2
***************
*** 1,77 ****
  <StockMarket type="rectangular">
!   <StockSpace name="A1" price="82" />
!   <StockSpace name="A2" price="75" />
!   <StockSpace name="A3" price="70" />
!   <StockSpace name="A4" price="65" />
!   <StockSpace name="A5" price="60" />
!   <StockSpace name="A6" price="50" />
!   <StockSpace name="A7" price="40" />
!   <StockSpace name="B1" price="90" />
!   <StockSpace name="B2" price="82" />
!   <StockSpace name="B3" price="75" />
!   <StockSpace name="B4" price="70" />
!   <StockSpace name="B5" price="65" />
!   <StockSpace name="B6" price="60" />
!   <StockSpace name="B7" price="50" />
!   <StockSpace name="C1" price="100" />
!   <StockSpace name="C2" price="90" />
!   <StockSpace name="C3" price="82" />
!   <StockSpace name="C4" price="75" />
!   <StockSpace name="C5" price="70" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="C6" price="65" />
!   <StockSpace name="C7" price="60" />
!   <StockSpace name="D1" price="110" />
!   <StockSpace name="D2" price="100" />
!   <StockSpace name="D3" price="90" />
!   <StockSpace name="D4" price="82" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="D5" price="75" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="D6" price="70" />
!   <StockSpace name="D7" price="65" />
!   <StockSpace name="E1" price="122" />
!   <StockSpace name="E2" price="110" />
!   <StockSpace name="E3" price="100" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="E4" price="90" >
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="E5" price="82" />
!   <StockSpace name="E6" price="75" />
!   <StockSpace name="F1" price="135" />
!   <StockSpace name="F2" price="122" />
!   <StockSpace name="F3" price="110" />
!   <StockSpace name="F4" price="100" />
!   <StockSpace name="F5" price="90" />
!   <StockSpace name="G1" price="150" />
!   <StockSpace name="G2" price="135" />
!   <StockSpace name="G3" price="122" />
!   <StockSpace name="G4" price="110" />
!   <StockSpace name="H1" price="165" />
!   <StockSpace name="H2" price="150" />
!   <StockSpace name="H3" price="135" />
!   <StockSpace name="H4" price="122" />
!   <StockSpace name="I1" price="180" />
!   <StockSpace name="I2" price="165" />
!   <StockSpace name="I3" price="150" />
!   <StockSpace name="J1" price="200" />
!   <StockSpace name="J2" price="180" />
!   <StockSpace name="J3" price="165" />
!   <StockSpace name="K1" price="220" />
!   <StockSpace name="K2" price="200" />
!   <StockSpace name="K3" price="180" />
!   <StockSpace name="L1" price="245" />
!   <StockSpace name="L2" price="220" />
!   <StockSpace name="M1" price="270" />
!   <StockSpace name="M2" price="245" />
!   <StockSpace name="N1" price="300" />
!   <StockSpace name="N2" price="270" />
!   <StockSpace name="O1" price="330" />
!   <StockSpace name="P1" price="360" />
!   <StockSpace name="Q1" price="400" />
  </StockMarket>
--- 1,77 ----
  <StockMarket type="rectangular">
! 	<StockSpace name="A1" price="82" />
! 	<StockSpace name="A2" price="75" />
! 	<StockSpace name="A3" price="70" />
! 	<StockSpace name="A4" price="65" />
! 	<StockSpace name="A5" price="60" />
! 	<StockSpace name="A6" price="50" />
! 	<StockSpace name="A7" price="40" />
! 	<StockSpace name="B1" price="90" />
! 	<StockSpace name="B2" price="82" />
! 	<StockSpace name="B3" price="75" />
! 	<StockSpace name="B4" price="70" />
! 	<StockSpace name="B5" price="65" />
! 	<StockSpace name="B6" price="60" />
! 	<StockSpace name="B7" price="50" />
! 	<StockSpace name="C1" price="100" />
! 	<StockSpace name="C2" price="90" />
! 	<StockSpace name="C3" price="82" />
! 	<StockSpace name="C4" price="75" />
! 	<StockSpace name="C5" price="70" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="C6" price="65" />
! 	<StockSpace name="C7" price="60" />
! 	<StockSpace name="D1" price="110" />
! 	<StockSpace name="D2" price="100" />
! 	<StockSpace name="D3" price="90" />
! 	<StockSpace name="D4" price="82" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="D5" price="75" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="D6" price="70" />
! 	<StockSpace name="D7" price="65" />
! 	<StockSpace name="E1" price="122" />
! 	<StockSpace name="E2" price="110" />
! 	<StockSpace name="E3" price="100" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="E4" price="90" >
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="E5" price="82" />
! 	<StockSpace name="E6" price="75" />
! 	<StockSpace name="F1" price="135" />
! 	<StockSpace name="F2" price="122" />
! 	<StockSpace name="F3" price="110" />
! 	<StockSpace name="F4" price="100" />
! 	<StockSpace name="F5" price="90" />
! 	<StockSpace name="G1" price="150" />
! 	<StockSpace name="G2" price="135" />
! 	<StockSpace name="G3" price="122" />
! 	<StockSpace name="G4" price="110" />
! 	<StockSpace name="H1" price="165" />
! 	<StockSpace name="H2" price="150" />
! 	<StockSpace name="H3" price="135" />
! 	<StockSpace name="H4" price="122" />
! 	<StockSpace name="I1" price="180" />
! 	<StockSpace name="I2" price="165" />
! 	<StockSpace name="I3" price="150" />
! 	<StockSpace name="J1" price="200" />
! 	<StockSpace name="J2" price="180" />
! 	<StockSpace name="J3" price="165" />
! 	<StockSpace name="K1" price="220" />
! 	<StockSpace name="K2" price="200" />
! 	<StockSpace name="K3" price="180" />
! 	<StockSpace name="L1" price="245" />
! 	<StockSpace name="L2" price="220" />
! 	<StockSpace name="M1" price="270" />
! 	<StockSpace name="M2" price="245" />
! 	<StockSpace name="N1" price="300" />
! 	<StockSpace name="N2" price="270" />
! 	<StockSpace name="O1" price="330" />
! 	<StockSpace name="P1" price="360" />
! 	<StockSpace name="Q1" price="400" />
  </StockMarket>

Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/18EU/Game.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Game.xml	23 Jan 2010 23:02:05 -0000	1.17
--- Game.xml	31 Jan 2010 22:16:02 -0000	1.18
***************
*** 10,15 ****
  				sequence="sellBuy"
  				skipFirst="yes">
! 		        <NoSaleInFirstSR/>
! 		        <NoSaleIfNotOperated/>
  			</StockRound>
  			<OperatingRound class="rails.game.specific._18EU.OperatingRound_18EU"/>
--- 10,15 ----
  				sequence="sellBuy"
  				skipFirst="yes">
! 				<NoSaleInFirstSR/>
! 				<NoSaleIfNotOperated/>
  			</StockRound>
  			<OperatingRound class="rails.game.specific._18EU.OperatingRound_18EU"/>

[Rails-commits] 18xx/data/18AL CompanyManager.xml, 1.25, 1.26 Game.xml, 1.26, 1.27 StockMarket.xml, 1.4, 1.5

[Freek D. <mac...@us...>]

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

Modified Files:
	CompanyManager.xml Game.xml StockMarket.xml 
Log Message:
Fix indentation: XML files contain tabs

Index: CompanyManager.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/18AL/CompanyManager.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** CompanyManager.xml	17 Jan 2010 14:05:47 -0000	1.25
--- CompanyManager.xml	31 Jan 2010 22:15:59 -0000	1.26
***************
*** 10,16 ****
  		<Certificate type="President" shares="2"/>
  		<Certificate shares="1" number="8"/>
! 	    <BaseTokens>
! 		    <LayCost method="sequence" cost="0,40,100"/>
! 	    </BaseTokens>
  		<Trains number="4,4,3,2"/>
  	</CompanyType>
--- 10,16 ----
  		<Certificate type="President" shares="2"/>
  		<Certificate shares="1" number="8"/>
! 		<BaseTokens>
! 			<LayCost method="sequence" cost="0,40,100"/>
! 		</BaseTokens>
  		<Trains number="4,4,3,2"/>
  	</CompanyType>

Index: StockMarket.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/18AL/StockMarket.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StockMarket.xml	13 Dec 2009 16:39:49 -0000	1.4
--- StockMarket.xml	31 Jan 2010 22:16:02 -0000	1.5
***************
*** 1,91 ****
  <StockMarket type="rectangular">
!   <StockSpaceType name="yellow" colour="FFFF00">
!     <NoCertLimit/>
!   </StockSpaceType>
  
!   <StockSpace name="A1" price="60" />
!   <StockSpace name="A2" price="55" />
!   <StockSpace name="A3" price="50" type="yellow"/>
!   <StockSpace name="A4" price="45" type="yellow"/>
!   <StockSpace name="A5" price="40" type="yellow"/>
!   <StockSpace name="A6" price="35" type="yellow"/>
!   <StockSpace name="A7" price="30" type="yellow"/>
!   <StockSpace name="B1" price="65" />
!   <StockSpace name="B2" price="60" />
!   <StockSpace name="B3" price="55" />
!   <StockSpace name="B4" price="50" type="yellow"/>
!   <StockSpace name="B5" price="45" type="yellow"/>
!   <StockSpace name="B6" price="40" type="yellow"/>
!   <StockSpace name="B7" price="35" type="yellow"/>
!   <StockSpace name="C1" price="70" />
!   <StockSpace name="C2" price="65" />
!   <StockSpace name="C3" price="60">
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="C4" price="55" />
!   <StockSpace name="C5" price="50" type="yellow"/>
!   <StockSpace name="C6" price="45" type="yellow"/>
!   <StockSpace name="C7" price="40" type="yellow"/>
!   <StockSpace name="D1" price="75" />
!   <StockSpace name="D2" price="70">
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="D3" price="65" />
!   <StockSpace name="D4" price="60" />
!   <StockSpace name="D5" price="55" />
!   <StockSpace name="D6" price="50" type="yellow"/>
!   <StockSpace name="D7" price="45" type="yellow"/>
!   <StockSpace name="E1" price="80"/>
!   <StockSpace name="E2" price="75">
!     <StartSpace/>
!   </StockSpace>  
!   <StockSpace name="E3" price="70"/>
!   <StockSpace name="E4" price="65"/>
!   <StockSpace name="E5" price="60"/>
!   <StockSpace name="E6" price="55" type="yellow"/>
!   <StockSpace name="E7" price="50" type="yellow"/>
!   <StockSpace name="F1" price="90">
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="F2" price="80" />
!   <StockSpace name="F3" price="75" />
!   <StockSpace name="F4" price="70" />
!   <StockSpace name="F5" price="65" />
!   <StockSpace name="G1" price="105">
!     <StartSpace/>
!   </StockSpace>
!   <StockSpace name="G2" price="90" />
!   <StockSpace name="G3" price="80" />
!   <StockSpace name="G4" price="75" />
!   <StockSpace name="G5" price="70" />
!   <StockSpace name="H1" price="120" />
!   <StockSpace name="H2" price="105" />
!   <StockSpace name="H3" price="90" />
!   <StockSpace name="H4" price="80" />
!   <StockSpace name="H5" price="75" />
!   <StockSpace name="I1" price="135" />
!   <StockSpace name="I2" price="120" />
!   <StockSpace name="I3" price="105" />
!   <StockSpace name="I4" price="90" />
!   <StockSpace name="J1" price="150" />
!   <StockSpace name="J2" price="135" />
!   <StockSpace name="J3" price="120" />
!   <StockSpace name="J4" price="105" />
!   <StockSpace name="K1" price="170" />
!   <StockSpace name="K2" price="150" />
!   <StockSpace name="K3" price="135" />
!   <StockSpace name="K4" price="105" />
!   <StockSpace name="L1" price="190" />
!   <StockSpace name="L2" price="170" />
!   <StockSpace name="L3" price="150" />
!   <StockSpace name="M1" price="215" />
!   <StockSpace name="M2" price="190" />
!   <StockSpace name="M3" price="170" />
!   <StockSpace name="N1" price="240" />
!   <StockSpace name="N2" price="215" />
!   <StockSpace name="O1" price="270" />
!   <StockSpace name="O2" price="240" />
!   <StockSpace name="P1" price="300">
!     <GameOver/>
!   </StockSpace>
  </StockMarket>
--- 1,91 ----
  <StockMarket type="rectangular">
! 	<StockSpaceType name="yellow" colour="FFFF00">
! 		<NoCertLimit/>
! 	</StockSpaceType>
  
! 	<StockSpace name="A1" price="60" />
! 	<StockSpace name="A2" price="55" />
! 	<StockSpace name="A3" price="50" type="yellow"/>
! 	<StockSpace name="A4" price="45" type="yellow"/>
! 	<StockSpace name="A5" price="40" type="yellow"/>
! 	<StockSpace name="A6" price="35" type="yellow"/>
! 	<StockSpace name="A7" price="30" type="yellow"/>
! 	<StockSpace name="B1" price="65" />
! 	<StockSpace name="B2" price="60" />
! 	<StockSpace name="B3" price="55" />
! 	<StockSpace name="B4" price="50" type="yellow"/>
! 	<StockSpace name="B5" price="45" type="yellow"/>
! 	<StockSpace name="B6" price="40" type="yellow"/>
! 	<StockSpace name="B7" price="35" type="yellow"/>
! 	<StockSpace name="C1" price="70" />
! 	<StockSpace name="C2" price="65" />
! 	<StockSpace name="C3" price="60">
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="C4" price="55" />
! 	<StockSpace name="C5" price="50" type="yellow"/>
! 	<StockSpace name="C6" price="45" type="yellow"/>
! 	<StockSpace name="C7" price="40" type="yellow"/>
! 	<StockSpace name="D1" price="75" />
! 	<StockSpace name="D2" price="70">
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="D3" price="65" />
! 	<StockSpace name="D4" price="60" />
! 	<StockSpace name="D5" price="55" />
! 	<StockSpace name="D6" price="50" type="yellow"/>
! 	<StockSpace name="D7" price="45" type="yellow"/>
! 	<StockSpace name="E1" price="80"/>
! 	<StockSpace name="E2" price="75">
! 		<StartSpace/>
! 	</StockSpace>	 
! 	<StockSpace name="E3" price="70"/>
! 	<StockSpace name="E4" price="65"/>
! 	<StockSpace name="E5" price="60"/>
! 	<StockSpace name="E6" price="55" type="yellow"/>
! 	<StockSpace name="E7" price="50" type="yellow"/>
! 	<StockSpace name="F1" price="90">
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="F2" price="80" />
! 	<StockSpace name="F3" price="75" />
! 	<StockSpace name="F4" price="70" />
! 	<StockSpace name="F5" price="65" />
! 	<StockSpace name="G1" price="105">
! 		<StartSpace/>
! 	</StockSpace>
! 	<StockSpace name="G2" price="90" />
! 	<StockSpace name="G3" price="80" />
! 	<StockSpace name="G4" price="75" />
! 	<StockSpace name="G5" price="70" />
! 	<StockSpace name="H1" price="120" />
! 	<StockSpace name="H2" price="105" />
! 	<StockSpace name="H3" price="90" />
! 	<StockSpace name="H4" price="80" />
! 	<StockSpace name="H5" price="75" />
! 	<StockSpace name="I1" price="135" />
! 	<StockSpace name="I2" price="120" />
! 	<StockSpace name="I3" price="105" />
! 	<StockSpace name="I4" price="90" />
! 	<StockSpace name="J1" price="150" />
! 	<StockSpace name="J2" price="135" />
! 	<StockSpace name="J3" price="120" />
! 	<StockSpace name="J4" price="105" />
! 	<StockSpace name="K1" price="170" />
! 	<StockSpace name="K2" price="150" />
! 	<StockSpace name="K3" price="135" />
! 	<StockSpace name="K4" price="105" />
! 	<StockSpace name="L1" price="190" />
! 	<StockSpace name="L2" price="170" />
! 	<StockSpace name="L3" price="150" />
! 	<StockSpace name="M1" price="215" />
! 	<StockSpace name="M2" price="190" />
! 	<StockSpace name="M3" price="170" />
! 	<StockSpace name="N1" price="240" />
! 	<StockSpace name="N2" price="215" />
! 	<StockSpace name="O1" price="270" />
! 	<StockSpace name="O2" price="240" />
! 	<StockSpace name="P1" price="300">
! 		<GameOver/>
! 	</StockSpace>
  </StockMarket>

Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/18AL/Game.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Game.xml	23 Jan 2010 23:02:06 -0000	1.26
--- Game.xml	31 Jan 2010 22:16:02 -0000	1.27
***************
*** 12,17 ****
  			<BankPoolLimit percentage="50"/>
  			<StockRound>
! 		         <NoSaleInFirstSR/>
! 	        </StockRound>
  		</GameParameters>
  		<GuiClasses>
--- 12,17 ----
  			<BankPoolLimit percentage="50"/>
  			<StockRound>
! 				 <NoSaleInFirstSR/>
! 			</StockRound>
  		</GameParameters>
  		<GuiClasses>