rails-commits — CVS Commits

[Rails-commits] 18xx/classes/rails-1.0.7-rc2/lib/batik-1.6 - New directory

[Brett L. <wak...@us...>]

Update of /cvsroot/rails/18xx/classes/rails-1.0.7-rc2/lib/batik-1.6
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/classes/rails-1.0.7-rc2/lib/batik-1.6

Log Message:
Directory /cvsroot/rails/18xx/classes/rails-1.0.7-rc2/lib/batik-1.6 added to the repository

[Rails-commits] 18xx/classes/rails-1.0.7-rc2/lib/log4j-1.2 - New directory

[Brett L. <wak...@us...>]

Update of /cvsroot/rails/18xx/classes/rails-1.0.7-rc2/lib/log4j-1.2
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28732/classes/rails-1.0.7-rc2/lib/log4j-1.2

Log Message:
Directory /cvsroot/rails/18xx/classes/rails-1.0.7-rc2/lib/log4j-1.2 added to the repository

[Rails-commits] 18xx/rails/game StartRound_1830.java,1.23,1.24

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

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

Modified Files:
	StartRound_1830.java 
Log Message:
Undoing the passing-player-cannot-bid-again fix for 1830-style auctions.
This was against the rules.

Index: StartRound_1830.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StartRound_1830.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** StartRound_1830.java	17 Nov 2009 19:31:21 -0000	1.23
--- StartRound_1830.java	22 Nov 2009 14:28:49 -0000	1.24
***************
*** 306,310 ****
              } else {
                  // More than one left: find next bidder
!             	auctionItem.setBid(-1, player);
                  setNextBiddingPlayer(auctionItem,
                          getCurrentPlayerIndex());
--- 306,315 ----
              } else {
                  // More than one left: find next bidder
!                 
!             	//auctionItem.setBid(-1, player);
!                 // That was incorrect: passing players may still bid.
!                 // But often they won't, or don't have the money.
!                 // TODO Need autopass facility, and skipping of turns if no money
!                 
                  setNextBiddingPlayer(auctionItem,
                          getCurrentPlayerIndex());

[Rails-commits] 18xx my.properties,1.7,1.8

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

Update of /cvsroot/rails/18xx
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24920

Modified Files:
	my.properties 
Log Message:
Suffix special value to insert next player name

Index: my.properties
===================================================================
RCS file: /cvsroot/rails/18xx/my.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** my.properties	21 Nov 2009 18:14:32 -0000	1.7
--- my.properties	21 Nov 2009 19:28:59 -0000	1.8
***************
*** 43,47 ****
  # Optionally, a suffix (e.g. player name) can be added after the time stamp
  # with a preceding underscore (which is automatically added)
! #save.filename.suffix=Me
  # The default extension is .rails
  #save.filename.extension=rails
--- 43,48 ----
  # Optionally, a suffix (e.g. player name) can be added after the time stamp
  # with a preceding underscore (which is automatically added)
! # The special value NEXT_PLAYER puts the next moving player name into this spot. 
! #save.filename.suffix=NEXT_PLAYER
  # The default extension is .rails
  #save.filename.extension=rails

[Rails-commits] 18xx/rails/ui/swing GameUIManager.java,1.23,1.24

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

Update of /cvsroot/rails/18xx/rails/ui/swing
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24748/rails/ui/swing

Modified Files:
	GameUIManager.java 
Log Message:
Suffix special value to insert next player name

Index: GameUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameUIManager.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** GameUIManager.java	21 Nov 2009 18:14:31 -0000	1.23
--- GameUIManager.java	21 Nov 2009 19:26:50 -0000	1.24
***************
*** 40,47 ****
--- 40,49 ----
      protected static final String DEFAULT_SAVE_PATTERN = "yyyyMMdd_HHmm";
      protected static final String DEFAULT_SAVE_EXTENSION = "rails";
+     protected static final String NEXT_PLAYER_SUFFIX = "NEXT_PLAYER";
  
      protected String saveDirectory;
      protected String savePattern;
      protected String saveExtension;
+     protected String saveSuffixSpec = "";
      protected String saveSuffix = "";
      protected String providedName = null;
***************
*** 79,85 ****
              saveDateTimeFormat.setTimeZone(TimeZone.getTimeZone(timezone));
          }
!         String suffix = Config.get("save.filename.suffix"); 
!         if (Util.hasValue(suffix)) {
!             saveSuffix = "_" + suffix;
          }
  
--- 81,87 ----
              saveDateTimeFormat.setTimeZone(TimeZone.getTimeZone(timezone));
          }
!         saveSuffixSpec = Config.get("save.filename.suffix"); 
!         if (Util.hasValue(saveSuffixSpec) && !saveSuffixSpec.equals(NEXT_PLAYER_SUFFIX)) {
!             saveSuffix = "_" + saveSuffixSpec;
          }
  
***************
*** 424,427 ****
--- 426,432 ----
              filename = providedName;
          } else {
+             if (NEXT_PLAYER_SUFFIX.equals(saveSuffixSpec)) {
+                 saveSuffix = "_" + gameManager.getCurrentPlayer().getName();
+             }
              filename =
                      saveDirectory + "/" + gameManager.getGameName() + "_"

[Rails-commits] 18xx my.properties,1.6,1.7

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

Update of /cvsroot/rails/18xx
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10980

Modified Files:
	my.properties 
Log Message:
Two new config variables to tweak the predefined save filenames

Index: my.properties
===================================================================
RCS file: /cvsroot/rails/18xx/my.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** my.properties	27 May 2008 22:56:55 -0000	1.6
--- my.properties	21 Nov 2009 18:14:32 -0000	1.7
***************
*** 38,41 ****
--- 38,47 ----
  # SimpleDateFormat (just Google that name to find the codes).  
  #save.filename.date_time_pattern=yyyyMMdd_HHmm
+ # The default timezone is local time.
+ # A specific timezone (such as UTC) can be set; the value must be a Java timezone ID
+ #save.filename.date_time_zone=UTC
+ # Optionally, a suffix (e.g. player name) can be added after the time stamp
+ # with a preceding underscore (which is automatically added)
+ #save.filename.suffix=Me
  # The default extension is .rails
  #save.filename.extension=rails

[Rails-commits] 18xx/rails/game OperatingRound.java,1.77,1.78

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

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

Modified Files:
	OperatingRound.java 
Log Message:
Allow not buying a train when trainless, with a warning that this is only allowed without a route

Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** OperatingRound.java	17 Nov 2009 19:31:25 -0000	1.77
--- OperatingRound.java	20 Nov 2009 20:56:50 -0000	1.78
***************
*** 1183,1186 ****
--- 1183,1187 ----
              // FIXME: Need to check for valid route before throwing an
              // error.
+         	/* Check TEMPORARILY disabled
              errMsg =
                      LocalText.getText("CompanyMustOwnATrain",
***************
*** 1189,1192 ****
--- 1190,1194 ----
              DisplayBuffer.add(errMsg);
              return false;
+             */
          }
  
***************
*** 1949,1956 ****
          } else if (step == STEP_BUY_TRAIN) {
              setBuyableTrains();
!             if (!operatingCompany.mustOwnATrain()
!                     || operatingCompany.getPortfolio().getNumberOfTrains() > 0) {
                          doneAllowed = true;
!             }
          } else if (step == STEP_DISCARD_TRAINS) {
              setTrainsToDiscard();
--- 1951,1960 ----
          } else if (step == STEP_BUY_TRAIN) {
              setBuyableTrains();
!             // TODO Need route checking here.
!             // TEMPORARILY allow not buying a train if none owned
!             //if (!operatingCompany.mustOwnATrain()
!             //        || operatingCompany.getPortfolio().getNumberOfTrains() > 0) {
                          doneAllowed = true;
!             //}
          } else if (step == STEP_DISCARD_TRAINS) {
              setTrainsToDiscard();
***************
*** 2079,2084 ****
                  cost = train.getCost();
                  if (cost <= cash) {
!                     if (canBuyTrainNow)
!                         possibleActions.add(new BuyTrain(train, ipo, cost));
                  } else if (costOfCheapestTrain == 0
                             || cost < costOfCheapestTrain) {
--- 2083,2091 ----
                  cost = train.getCost();
                  if (cost <= cash) {
!                     if (canBuyTrainNow) {
!                     	BuyTrain action = new BuyTrain(train, ipo, cost);
!                     	action.setHasNoTrains(!hasTrains); // TEMPORARY
!                         possibleActions.add(action);
!                     }
                  } else if (costOfCheapestTrain == 0
                             || cost < costOfCheapestTrain) {
***************
*** 2111,2114 ****
--- 2118,2122 ----
                      BuyTrain bt = new BuyTrain(train, ipo, reducedPrice);
                      bt.setSpecialProperty(stb);
+                 	bt.setHasNoTrains(!hasTrains); // TEMPORARY
                      possibleActions.add(bt);
                  }
***************
*** 2126,2130 ****
                  cost = train.getCost();
                  if (cost <= cash) {
!                     possibleActions.add(new BuyTrain(train, pool, cost));
                  } else if (costOfCheapestTrain == 0
                             || cost < costOfCheapestTrain) {
--- 2134,2140 ----
                  cost = train.getCost();
                  if (cost <= cash) {
!                 	BuyTrain bt = new BuyTrain(train, pool, cost);
!                 	bt.setHasNoTrains(!hasTrains); // TEMPORARY
!                     possibleActions.add(bt);
                  } else if (costOfCheapestTrain == 0
                             || cost < costOfCheapestTrain) {
***************
*** 2134,2142 ****
              }
              if (!hasTrains && possibleActions.getType(BuyTrain.class).isEmpty()
!                 && cheapestTrain != null && presidentMayHelp) {
!                 possibleActions.add(new BuyTrain(cheapestTrain,
!                         cheapestTrain.getHolder(), costOfCheapestTrain)
!                     .setPresidentMustAddCash(costOfCheapestTrain
!                                                                                                 - cash));
              }
          }
--- 2144,2153 ----
              }
              if (!hasTrains && possibleActions.getType(BuyTrain.class).isEmpty()
!             		&& cheapestTrain != null && presidentMayHelp) {
!             	BuyTrain bt = new BuyTrain(cheapestTrain,
!                         cheapestTrain.getHolder(), costOfCheapestTrain);
!             	bt.setPresidentMustAddCash(costOfCheapestTrain);
!             	bt.setHasNoTrains(!hasTrains); // TEMPORARY
!                 possibleActions.add(bt);
              }
          }

[Rails-commits] 18xx/rails/ui/swing ORUIManager.java,1.32,1.33

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

Update of /cvsroot/rails/18xx/rails/ui/swing
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9296/rails/ui/swing

Modified Files:
	ORUIManager.java 
Log Message:
Allow not buying a train when trainless, with a warning that this is only allowed without a route

Index: ORUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** ORUIManager.java	5 Nov 2009 22:50:38 -0000	1.32
--- ORUIManager.java	20 Nov 2009 20:56:50 -0000	1.33
***************
*** 1182,1186 ****
              orPanel.initTrainBuying(true);
  
!             setMessage(LocalText.getText("BuyTrain"));
  
          } else if (possibleActions.contains(DiscardTrain.class)) {
--- 1182,1198 ----
              orPanel.initTrainBuying(true);
  
!             StringBuffer b = new StringBuffer(LocalText.getText("BuyTrain"));
! 
!             // TEMPORARY extra message about having no route
!             for (BuyTrain bTrain : possibleActions.getType(BuyTrain.class)) {
! 	            if (bTrain.hasNoTrains()) {
! 	                b.append("<br><font color=\"red\">");
! 	                b.append(LocalText.getText("MustBuyTrainIfNoRoute"));
! 	                b.append("</font>");
! 	                break;
! 	            }
!             }
! 
!             setMessage(b.toString());
  
          } else if (possibleActions.contains(DiscardTrain.class)) {

[Rails-commits] 18xx/rails/game/action BuyTrain.java,1.11,1.12

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

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

Modified Files:
	BuyTrain.java 
Log Message:
Allow not buying a train when trainless, with a warning that this is only allowed without a route

Index: BuyTrain.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/BuyTrain.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** BuyTrain.java	4 Nov 2009 20:33:21 -0000	1.11
--- BuyTrain.java	20 Nov 2009 20:56:51 -0000	1.12
***************
*** 27,30 ****
--- 27,31 ----
      private String fromName;
      private int fixedCost = 0;
+     private boolean hasNoTrains = false; // TODO Remove once route checking exists
      transient private List<TrainI> trainsForExchange = null;
      private String[] trainsForExchangeUniqueIds;
***************
*** 88,92 ****
      }
  
!     /**
       * @return Returns the specialProperty.
       */
--- 89,97 ----
      }
  
!     public void setHasNoTrains(boolean hasNoTrains) {
! 		this.hasNoTrains = hasNoTrains;
! 	}
! 
! 	/**
       * @return Returns the specialProperty.
       */
***************
*** 143,147 ****
      }
  
!     public Portfolio getHolder() {
          return train.getHolder();
      }
--- 148,156 ----
      }
  
!     public boolean hasNoTrains() {
! 		return hasNoTrains;
! 	}
! 
! 	public Portfolio getHolder() {
          return train.getHolder();
      }
***************
*** 220,224 ****
              ClassNotFoundException {
  
!         in.defaultReadObject();
  
          GameManagerI gameManager = GameManager.getInstance();
--- 229,245 ----
              ClassNotFoundException {
  
!         //in.defaultReadObject();
!         // TEMPORARY Custom reading for backwards compatibility
!     	// TODO We need this code only until route checking is implemented,
!     	// as then it will be possible to detect route existence.
!         ObjectInputStream.GetField fields = in.readFields();
!         trainUniqueId = (String) fields.get("trainUniqueId", trainUniqueId);
!         fromName = (String) fields.get("fromName", fromName);
!         fixedCost = fields.get("fixedCost", fixedCost);
!         hasNoTrains = fields.get("hasNoTrains", hasNoTrains);//TEMPORARY
!         trainsForExchangeUniqueIds = (String[]) fields.get("trainsForExchangeUniqueIds", trainsForExchangeUniqueIds);
!         presidentMustAddCash = fields.get("presidentMustAddCash", presidentMustAddCash);
!         presidentMayAddCash = fields.get("presidentMayAddCash", presidentMayAddCash);
!         presidentCashToAdd = fields.get("presidentCashToAdd", presidentCashToAdd);
  
          GameManagerI gameManager = GameManager.getInstance();

[Rails-commits] 18xx LocalisedText.properties,1.79,1.80

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

Update of /cvsroot/rails/18xx
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9296

Modified Files:
	LocalisedText.properties 
Log Message:
Allow not buying a train when trainless, with a warning that this is only allowed without a route

Index: LocalisedText.properties
===================================================================
RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** LocalisedText.properties	29 Oct 2009 19:40:53 -0000	1.79
--- LocalisedText.properties	20 Nov 2009 20:56:51 -0000	1.80
***************
*** 227,235 ****
  MonetiseTreasuryShares={0} puts 5 shares from Treasury in the Pool and receives {1} from the Bank
  MoreLoansNotAllowed={0} would exceed loans limit of {1}
- PaysTo={0} pays {1} to {2} 
- Payout={0} receives {1} for {2} {3}% shares
  MOVE=Move
  MODERATOR=Moderator
  MustBuyExtraShareAsPresident={0} must buy an extra {1} {2}% share to obtain the President's certificate
  MustRepayLoans={0} must repay {1} loans of {2} for {3}
  NamesTrain={0} names {1}-train as {2}
--- 227,234 ----
  MonetiseTreasuryShares={0} puts 5 shares from Treasury in the Pool and receives {1} from the Bank
  MoreLoansNotAllowed={0} would exceed loans limit of {1}
  MOVE=Move
  MODERATOR=Moderator
  MustBuyExtraShareAsPresident={0} must buy an extra {1} {2}% share to obtain the President's certificate
+ MustBuyTrainIfNoRoute=You must buy a train unless you have no route
  MustRepayLoans={0} must repay {1} loans of {2} for {3}
  NamesTrain={0} names {1}-train as {2}
***************
*** 274,277 ****
--- 273,278 ----
  PASSES={0} passes.
  PAYOUT=Pay out
+ PaysTo={0} pays {1} to {2} 
+ Payout={0} receives {1} for {2} {3}% shares
  PaysForTokens={0} pays {1} to Bank for {2} tokens
  PLAYERS=Players
***************
*** 322,326 ****
  SelectMinorToMerge=Select the minor to merge to start company {0}
  SelectNoBid=Select, No Bid
! SelectTrain=Select a train and press OK, or press Cancel.
  SelectCheapTrain=You can buy a cheaper new train by using {0}.
  SelectStationForToken=Select a station on this tile for this token
--- 323,327 ----
  SelectMinorToMerge=Select the minor to merge to start company {0}
  SelectNoBid=Select, No Bid
! SelectTrain=Select a train and press OK, or press Done.
  SelectCheapTrain=You can buy a cheaper new train by using {0}.
  SelectStationForToken=Select a station on this tile for this token

[Rails-commits] 18xx/rails/ui/swing GameUIManager.java, 1.21, 1.22 GameSetupWindow.java, 1.16, 1.17

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

Update of /cvsroot/rails/18xx/rails/ui/swing
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1759/rails/ui/swing

Modified Files:
	GameUIManager.java GameSetupWindow.java 
Log Message:
Made Save follow Load directory

Index: GameSetupWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameSetupWindow.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** GameSetupWindow.java	17 Nov 2009 19:31:28 -0000	1.16
--- GameSetupWindow.java	19 Nov 2009 20:48:53 -0000	1.17
***************
*** 211,214 ****
--- 211,215 ----
  
              startGameUIManager(game);
+             gameUIManager.setSaveDirectory (saveDirectory);
              gameUIManager.startLoadedGame();
              setVisible(false);

Index: GameUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameUIManager.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** GameUIManager.java	2 Nov 2009 23:30:35 -0000	1.21
--- GameUIManager.java	19 Nov 2009 20:48:53 -0000	1.22
***************
*** 434,437 ****
--- 434,441 ----
      }
  
+     public void setSaveDirectory(String saveDirectory) {
+         this.saveDirectory = saveDirectory;
+     }
+ 
      public PossibleAction getLastAction() {
          return lastAction;

[Rails-commits] 18xx/data GamesList.xml,1.13,1.14

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

Update of /cvsroot/rails/18xx/data
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1691/data

Modified Files:
	GamesList.xml 
Log Message:
Comment on Erie removed from 1830 game notes

Index: GamesList.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/GamesList.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** GamesList.xml	4 Nov 2009 21:57:48 -0000	1.13
--- GamesList.xml	19 Nov 2009 20:48:29 -0000	1.14
***************
*** 10,15 ****
  - The M&H/NYC share swap can only be executed in the SR, in the owning player's turn.
  - Privates cannot be traded between players.
- - Token handling and track preservation on OO tiles do not yet work correctly. 
-   This also implies, that the Erie home base cannot yet be selected. 
  		</Description>
  		<Option name="WithOptional6Train" type="toggle" default="no"/>
--- 10,13 ----

[Rails-commits] 18xx/rails/game StartItem.java, 1.19, 1.20 StartRound.java, 1.29, 1.30

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

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

Modified Files:
	StartItem.java StartRound.java 
Log Message:
Fixed prioritysetting bug during start round

Index: StartItem.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StartItem.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** StartItem.java	17 Nov 2009 19:31:24 -0000	1.19
--- StartItem.java	17 Nov 2009 22:38:29 -0000	1.20
***************
*** 376,391 ****
  
      /**
-      * Get the last Bid done by a given player.
-      *
-      * @param playerName The name of the player.
-      * @return His latest Bid object.
-      */
-     //public int getBidForPlayer(String playerName) {
-     //    Player player = Game.getPlayerManager().getPlayerByName(playerName);
-     //    int index = player.getIndex();
-     //    return bids[index].intValue();
-     //}
- 
-     /**
       * Check if the start item has been sold.
       *
--- 376,379 ----

Index: StartRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StartRound.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** StartRound.java	29 Oct 2009 19:41:28 -0000	1.29
--- StartRound.java	17 Nov 2009 22:38:29 -0000	1.30
***************
*** 174,177 ****
--- 174,178 ----
      protected boolean buy(String playerName, BuyStartItem boughtItem) {
          StartItem item = boughtItem.getStartItem();
+         int lastBid = item.getBid();
          String errMsg = null;
          Player player = getCurrentPlayer();
***************
*** 229,234 ****
          assignItem(player, item, price, sharePrice);
  
!         // Set priority
!         gameManager.setPriorityPlayer();
          setNextPlayer();
  
--- 230,238 ----
          assignItem(player, item, price, sharePrice);
  
!         // Set priority (only if the item was not auctioned)
!         // ASSUMPTION: getting an item in auction mode never changes priority
!         if (lastBid == 0) {
!             gameManager.setPriorityPlayer();
!         }
          setNextPlayer();
  

[Rails-commits] 18xx/rails/ui/swing RemainingTilesWindow.java, 1.6, 1.7 ORWindow.java, 1.26, 1.27 GameSetupWindow.java, 1.15, 1.16

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

Update of /cvsroot/rails/18xx/rails/ui/swing
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6307/rails/ui/swing

Modified Files:
	RemainingTilesWindow.java ORWindow.java GameSetupWindow.java 
Log Message:
Fixed various bugs

Index: ORWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORWindow.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ORWindow.java	2 Nov 2009 23:30:35 -0000	1.26
--- ORWindow.java	17 Nov 2009 19:31:27 -0000	1.27
***************
*** 113,120 ****
      }
  
-     public ORUIManager getOrUIManager() {
-         return orUIManager;
-     }
- 
      public MessagePanel getMessagePanel() {
          return messagePanel;
--- 113,116 ----

Index: RemainingTilesWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/RemainingTilesWindow.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RemainingTilesWindow.java	30 Oct 2009 21:53:03 -0000	1.6
--- RemainingTilesWindow.java	17 Nov 2009 19:31:27 -0000	1.7
***************
*** 48,52 ****
          addWindowListener(this);
  
!         init();
  
          this.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
--- 48,52 ----
          addWindowListener(this);
  
!         init(orWindow.getGameUIManager());
  
          this.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
***************
*** 56,60 ****
      }
  
!     private void init() {
  
          TileManager tmgr = gameUIManager.getGameManager().getTileManager();
--- 56,60 ----
      }
  
!     private void init(GameUIManager gameUIManager) {
  
          TileManager tmgr = gameUIManager.getGameManager().getTileManager();

Index: GameSetupWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameSetupWindow.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** GameSetupWindow.java	8 Nov 2009 10:45:49 -0000	1.15
--- GameSetupWindow.java	17 Nov 2009 19:31:28 -0000	1.16
***************
*** 4,7 ****
--- 4,11 ----
  import java.awt.*;
  import java.awt.event.*;
+ import java.io.File;
+ import java.util.*;
+ import java.util.List;
+ 
  import javax.swing.*;
  
***************
*** 10,19 ****
  import rails.common.Defs;
  import rails.game.*;
! import rails.ui.swing.GameUIManager;
! import rails.util.*;
! 
! import java.io.File;
! import java.util.*;
! import java.util.List;
  
  /**
--- 14,19 ----
  import rails.common.Defs;
  import rails.game.*;
! import rails.util.Config;
! import rails.util.LocalText;
  
  /**
***************
*** 371,375 ****
              System.exit(-1);
          } else {
!             game.start();
              startGameUIManager (game);
              gameUIManager.gameUIInit();
--- 371,380 ----
              System.exit(-1);
          } else {
!             String startError = game.start();
!             if (startError != null) {
!                 JOptionPane.showMessageDialog(this, startError, "",
!                         JOptionPane.ERROR_MESSAGE);
!             	System.exit(-1);
!             }
              startGameUIManager (game);
              gameUIManager.gameUIInit();
***************
*** 379,383 ****
          // XXX: object rather than just making it invisible
      }
!     
      private void startGameUIManager(Game game) {
          GameManagerI gameManager = game.getGameManager();
--- 384,388 ----
          // XXX: object rather than just making it invisible
      }
! 
      private void startGameUIManager(Game game) {
          GameManagerI gameManager = game.getGameManager();

[Rails-commits] 18xx/rails/game StartRound_1830.java, 1.22, 1.23 StartItem.java, 1.18, 1.19 Player.java, 1.21, 1.22 OperatingRound.java, 1.76, 1.77 Tile.java, 1.30, 1.31 Game.java, 1.37, 1.38

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

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

Modified Files:
	StartRound_1830.java StartItem.java Player.java 
	OperatingRound.java Tile.java Game.java 
Log Message:
Fixed various bugs

Index: StartItem.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StartItem.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** StartItem.java	25 Sep 2009 19:13:01 -0000	1.18
--- StartItem.java	17 Nov 2009 19:31:24 -0000	1.19
***************
*** 282,287 ****
          bids[index].set(amount);
  
-         // Take care for negative values, meaning "has passed"
-         // (used in 18EU)
          if (amount > 0) {
              lastBidderIndex.set(index);
--- 282,285 ----
***************
*** 292,295 ****
--- 290,297 ----
              bids[index].resetOption(MoneyModel.SUPPRESS_ZERO);
              bids[index].update();
+         } else {
+         	// Passed
+         	bids[index].set(0);
+         	bids[index].update();
          }
  

Index: Player.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Player.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Player.java	12 Sep 2009 09:40:56 -0000	1.21
--- Player.java	17 Nov 2009 19:31:25 -0000	1.22
***************
*** 13,17 ****
  
      public static int MIN_PLAYERS = 2;
!     
      private String name = "";
  
--- 13,17 ----
  
      public static int MIN_PLAYERS = 2;
! 
      private String name = "";
  
***************
*** 85,89 ****
  
          for (PublicCertificateI cert : portfolio.getCertificates()) {
!             worth += cert.getCompany().getGameEndPrice();
          }
          for (PrivateCompanyI priv : portfolio.getPrivateCompanies()) {
--- 85,89 ----
  
          for (PublicCertificateI cert : portfolio.getCertificates()) {
!             worth += cert.getCompany().getGameEndPrice() * cert.getShares();
          }
          for (PrivateCompanyI priv : portfolio.getPrivateCompanies()) {

Index: Game.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Game.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Game.java	14 Nov 2009 20:21:51 -0000	1.37
--- Game.java	17 Nov 2009 19:31:26 -0000	1.38
***************
*** 58,63 ****
      }
  
!     public void start() {
          gameManager.startGame(gameOptions);
      }
  
--- 58,71 ----
      }
  
!     public String  start() {
! 
!     	if (players.size() < playerManager.minPlayers
!     			|| players.size() > playerManager.maxPlayers) {
!     		return name+" is not configured to be played with "+players.size()+" players\n"
!     				+ "Please enter a valid number of players, or add a <Players> entry to data/"+name+"/Game.xml";
!     	}
! 
          gameManager.startGame(gameOptions);
+         return null;
      }
  
***************
*** 231,235 ****
              log.debug("Number of loaded actions: " + executedActions.size());
  
!             game.start();
  
              log.debug("Starting to execute loaded actions");
--- 239,247 ----
              log.debug("Number of loaded actions: " + executedActions.size());
  
!             String startError = game.start();
!             if (startError != null) {
!                 DisplayBuffer.add(startError);
!                 return null;
!             }
  
              log.debug("Starting to execute loaded actions");

Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** OperatingRound.java	7 Nov 2009 12:09:55 -0000	1.76
--- OperatingRound.java	17 Nov 2009 19:31:25 -0000	1.77
***************
*** 548,552 ****
              cost = operatingCompany.getBaseTokenLayCost();
              if (stl != null && stl.isFree()) cost = 0;
!  
              // Does the company have the money?
              if (cost > operatingCompany.getCash()) {
--- 548,552 ----
              cost = operatingCompany.getBaseTokenLayCost();
              if (stl != null && stl.isFree()) cost = 0;
! 
              // Does the company have the money?
              if (cost > operatingCompany.getCash()) {
***************
*** 1307,1311 ****
              // Does the company have room for another train?
              int trainLimit = operatingCompany.getCurrentTrainLimit();
!             if (!canBuyTrain()) {
                  errMsg =
                          LocalText.getText("WouldExceedTrainLimit",
--- 1307,1311 ----
              // Does the company have room for another train?
              int trainLimit = operatingCompany.getCurrentTrainLimit();
!             if (!isBelowTrainLimit() && !action.isForcedExchange()) {
                  errMsg =
                          LocalText.getText("WouldExceedTrainLimit",
***************
*** 2058,2062 ****
          boolean atTrainLimit =
                  operatingCompany.getNumberOfTrains() >= operatingCompany.getCurrentTrainLimit();
!         boolean canBuyTrainNow = canBuyTrain();
          boolean presidentMayHelp = !hasTrains && operatingCompany.mustOwnATrain();
          TrainI cheapestTrain = null;
--- 2058,2062 ----
          boolean atTrainLimit =
                  operatingCompany.getNumberOfTrains() >= operatingCompany.getCurrentTrainLimit();
!         boolean canBuyTrainNow = isBelowTrainLimit();
          boolean presidentMayHelp = !hasTrains && operatingCompany.mustOwnATrain();
          TrainI cheapestTrain = null;
***************
*** 2096,2103 ****
                          if (atTrainLimit) action.setForcedExchange(true);
                          possibleActions.add(action);
                      }
                  }
  
!                 if (!canBuyTrainNow) return;
  
                  // Can a special property be used?
--- 2096,2104 ----
                          if (atTrainLimit) action.setForcedExchange(true);
                          possibleActions.add(action);
+                         canBuyTrainNow = true;
                      }
                  }
  
!                 if (!canBuyTrainNow) continue;
  
                  // Can a special property be used?
***************
*** 2209,2213 ****
       * @return
       */
!     protected boolean canBuyTrain() {
          return operatingCompany.getNumberOfTrains() < operatingCompany.getCurrentTrainLimit();
      }
--- 2210,2214 ----
       * @return
       */
!     protected boolean isBelowTrainLimit() {
          return operatingCompany.getNumberOfTrains() < operatingCompany.getCurrentTrainLimit();
      }

Index: StartRound_1830.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StartRound_1830.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** StartRound_1830.java	7 Oct 2009 21:03:36 -0000	1.22
--- StartRound_1830.java	17 Nov 2009 19:31:21 -0000	1.23
***************
*** 306,309 ****
--- 306,310 ----
              } else {
                  // More than one left: find next bidder
+             	auctionItem.setBid(-1, player);
                  setNextBiddingPlayer(auctionItem,
                          getCurrentPlayerIndex());

Index: Tile.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Tile.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Tile.java	31 Oct 2009 17:08:26 -0000	1.30
--- Tile.java	17 Nov 2009 19:31:26 -0000	1.31
***************
*** 270,278 ****
      }
  
!     public void finishConfiguration (TileManager tileManager) 
      throws ConfigurationException {
!         
          for (Upgrade upgrade : upgrades) {
!             
              TileI tile = tileManager.getTile(upgrade.getTileId());
              if (tile != null) {
--- 270,278 ----
      }
  
!     public void finishConfiguration (TileManager tileManager)
      throws ConfigurationException {
! 
          for (Upgrade upgrade : upgrades) {
! 
              TileI tile = tileManager.getTile(upgrade.getTileId());
              if (tile != null) {
***************
*** 284,288 ****
          }
      }
!     
      /**
       * @return Returns the colour.
--- 284,288 ----
          }
      }
! 
      /**
       * @return Returns the colour.
***************
*** 372,377 ****
      }
  
      public String getUpgradesString(MapHex hex) {
!         return upgradesString;
      }
  
--- 372,388 ----
      }
  
+     /** Get a delimited list of all possible upgrades, regardless current phase */
      public String getUpgradesString(MapHex hex) {
!     	StringBuffer b = new StringBuffer();
!     	TileI tile;
!         for (Upgrade upgrade : upgrades) {
!             tile = upgrade.getTile();
!             if (upgrade.isAllowedForHex(hex)) {
!             	if (b.length() > 0) b.append(",");
!                 b.append(tile.getExternalId());
!             }
!         }
! 
!         return b.toString();
      }
  
***************
*** 451,455 ****
  
      protected class Upgrade {
!         
          /** The upgrade tile id */
          int tileId;
--- 462,466 ----
  
      protected class Upgrade {
! 
          /** The upgrade tile id */
          int tileId;
***************
*** 501,504 ****
--- 512,528 ----
          }
  
+         protected boolean isAllowedForHex(MapHex hex) {
+ 
+             if (hexes != null) convertHexString(hex.getMapManager());
+ 
+             if (allowedHexes != null) {
+                 return allowedHexes.contains(hex);
+             } else if (disallowedHexes != null) {
+                 return !disallowedHexes.contains(hex);
+             } else {
+                 return true;
+             }
+         }
+ 
          public void setTile(TileI tile) {
              this.tile = tile;

[Rails-commits] 18xx/rails/game/specific/_18EU OperatingRound_18EU.java, 1.8, 1.9

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

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

Modified Files:
	OperatingRound_18EU.java 
Log Message:
Fixed various bugs

Index: OperatingRound_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/OperatingRound_18EU.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** OperatingRound_18EU.java	9 Oct 2009 19:03:49 -0000	1.8
--- OperatingRound_18EU.java	17 Nov 2009 19:31:27 -0000	1.9
***************
*** 54,58 ****
          boolean atTrainLimit =
                  operatingCompany.getNumberOfTrains() >= operatingCompany.getCurrentTrainLimit();
!         boolean canBuyTrainNow = canBuyTrain();
          boolean presidentMayHelp = operatingCompany.mustOwnATrain();
          TrainI cheapestTrain = null;
--- 54,58 ----
          boolean atTrainLimit =
                  operatingCompany.getNumberOfTrains() >= operatingCompany.getCurrentTrainLimit();
!         boolean canBuyTrainNow = isBelowTrainLimit();
          boolean presidentMayHelp = operatingCompany.mustOwnATrain();
          TrainI cheapestTrain = null;
***************
*** 163,168 ****
      /** In 18EU, a company can (effectively) exchange a Pullmann */
      @Override
!     protected boolean canBuyTrain() {
!         return super.canBuyTrain()
                 || operatingCompany.getPortfolio().getTrainOfType(pullmannType) != null
                 && hasPullmannAtStart.booleanValue();
--- 163,168 ----
      /** In 18EU, a company can (effectively) exchange a Pullmann */
      @Override
!     protected boolean isBelowTrainLimit() {
!         return super.isBelowTrainLimit()
                 || operatingCompany.getPortfolio().getTrainOfType(pullmannType) != null
                 && hasPullmannAtStart.booleanValue();

[Rails-commits] 18xx/rails/ui/swing StartRoundWindow.java, 1.32, 1.33

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

Update of /cvsroot/rails/18xx/rails/ui/swing
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15356/rails/ui/swing

Modified Files:
	StartRoundWindow.java 
Log Message:
Fixed bug that left BidAmount disabled after a reload

Index: StartRoundWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/StartRoundWindow.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** StartRoundWindow.java	30 Oct 2009 21:53:04 -0000	1.32
--- StartRoundWindow.java	16 Nov 2009 18:11:19 -0000	1.33
***************
*** 468,472 ****
  
          buyButton.setEnabled(buyAllowed);
!         if (includeBidding) bidButton.setEnabled(bidAllowed);
          passButton.setEnabled(passAllowed);
  
--- 468,475 ----
  
          buyButton.setEnabled(buyAllowed);
!         if (includeBidding) {
!         	bidButton.setEnabled(bidAllowed);
!         	bidAmount.setEnabled(bidAllowed);
!         }
          passButton.setEnabled(passAllowed);
  

[Rails-commits] 18xx/rails/game Game.java,1.36,1.37

[Brett L. <wak...@us...>]

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

Modified Files:
	Game.java 
Log Message:
Update version references to 1.0.7-rc2. Improve build.xml to better automate building a release.

Index: Game.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Game.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** Game.java	8 Nov 2009 01:37:42 -0000	1.36
--- Game.java	14 Nov 2009 20:21:51 -0000	1.37
***************
*** 12,16 ****
  
  public class Game {
!     public static final String version = "1.0.7-rc1";
  
      /** The component Manager */
--- 12,16 ----
  
  public class Game {
!     public static final String version = "1.0.7-rc2";
  
      /** The component Manager */

[Rails-commits] 18xx build.xml, 1.3, 1.4 rails.sh, 1.1, 1.2 rails.bat, 1.1, 1.2

[Brett L. <wak...@us...>]

Update of /cvsroot/rails/18xx
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31014

Modified Files:
	build.xml rails.sh rails.bat 
Log Message:
Update version references to 1.0.7-rc2. Improve build.xml to better automate building a release.

Index: rails.bat
===================================================================
RCS file: /cvsroot/rails/18xx/rails.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rails.bat	9 Nov 2009 16:25:37 -0000	1.1
--- rails.bat	14 Nov 2009 20:21:51 -0000	1.2
***************
*** 1,3 ****
  
! java -jar rails-1.0.7-rc1.jar
!  %1
\ No newline at end of file
--- 1,2 ----
  
! java -jar rails-1.0.7-rc2.jar %1
\ No newline at end of file

Index: rails.sh
===================================================================
RCS file: /cvsroot/rails/18xx/rails.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rails.sh	9 Nov 2009 16:25:37 -0000	1.1
--- rails.sh	14 Nov 2009 20:21:51 -0000	1.2
***************
*** 1,3 ****
  #!/bin/bash
  
! java -jar ./rails-1.0.7-rc1.jar $1
--- 1,3 ----
  #!/bin/bash
  
! java -jar ./rails-1.0.7-rc2.jar $1

Index: build.xml
===================================================================
RCS file: /cvsroot/rails/18xx/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.xml	8 Nov 2009 01:37:42 -0000	1.3
--- build.xml	14 Nov 2009 20:21:51 -0000	1.4
***************
*** 8,13 ****
      <property environment="env"/>
      <property name="debuglevel" value="source,lines,vars"/>
!     <property name="target" value="1.6"/>
!     <property name="source" value="1.6"/>
      <path id="18xx.classpath">
          <pathelement location="classes"/>
--- 8,14 ----
      <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.0.7-rc2"/>
      <path id="18xx.classpath">
          <pathelement location="classes"/>
***************
*** 27,33 ****
      <target name="clean">
          <delete dir="classes"/>
      </target>
      <target depends="clean" name="cleanall"/>
!     <target depends="build-subprojects,build-project,build-jar" name="build"/>
      <target name="build-subprojects"/>
      <target depends="init" name="build-project">
--- 28,35 ----
      <target name="clean">
          <delete dir="classes"/>
+     	<delete dir="jar"/>
      </target>
      <target depends="clean" name="cleanall"/>
!     <target depends="build-subprojects,build-project,build-release" name="build"/>
      <target name="build-subprojects"/>
      <target depends="init" name="build-project">
***************
*** 52,57 ****
          <antcall target="build"/>
      </target>
! 	<target name="build-jar">
! 		<jar destfile="rails-1.0.7-rc1.jar" basedir="classes" duplicate="preserve">
  			<manifest>
  				<attribute name="Main-Class" value="rails.util.RunGame" />
--- 54,96 ----
          <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.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}">
! 			<fileset dir=".">
! 				<include name="LICENSE"/>
! 				<include name="README"/>
! 				<include name="AUTHORS"/>
! 				<include name="rails.bat"/>
! 				<include name="rails.sh"/>
! 				<include name="my.properties"/>
! 				<include name="LocalisedText.properties"/>
! 				<include name="games.properties"/>
! 				<include name="lib/**"/>
! 			</fileset>
! 		</copy>
! 		<jar destfile="rails-${version}/rails-${version}.jar" basedir="jar" duplicate="preserve">		
  			<manifest>
  				<attribute name="Main-Class" value="rails.util.RunGame" />

[Rails-commits] 18xx/classes/.settings - New directory

[Brett L. <wak...@us...>]

Update of /cvsroot/rails/18xx/classes/.settings
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31006/classes/.settings

Log Message:
Directory /cvsroot/rails/18xx/classes/.settings added to the repository

[Rails-commits] 18xx/rails/game StockMarket.java,1.22,1.23

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

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

Modified Files:
	StockMarket.java 
Log Message:
Fixed: error if price token moves down.

Index: StockMarket.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockMarket.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** StockMarket.java	5 Nov 2009 22:50:37 -0000	1.22
--- StockMarket.java	11 Nov 2009 22:26:47 -0000	1.23
***************
*** 270,273 ****
--- 270,276 ----
          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

[Rails-commits] 18xx rails.sh,NONE,1.1 rails.bat,NONE,1.1

[Brett L. <wak...@us...>]

Update of /cvsroot/rails/18xx
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22013

Added Files:
	rails.sh rails.bat 
Log Message:
Add batch file and shell script to cvs.

--- NEW FILE: rails.bat ---

java -jar rails-1.0.7-rc1.jar
 %1
--- NEW FILE: rails.sh ---
#!/bin/bash

java -jar ./rails-1.0.7-rc1.jar $1

[Rails-commits] 18xx/data/1870 Map.xml,1.9,1.10

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

Update of /cvsroot/rails/18xx/data/1870
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32325/data/1870

Modified Files:
	Map.xml 
Log Message:
Added missing city names

Index: Map.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1870/Map.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Map.xml	5 Mar 2008 19:55:16 -0000	1.9
--- Map.xml	8 Nov 2009 14:46:16 -0000	1.10
***************
*** 136,141 ****
  	<Hex name="M18" tile="0"/>
  	<Hex name="M20" tile="-10" city="Mobile"/>
! 	<Hex name="M22" tile="-903" orientation="2" value="20,30,50"/>
! 	<Hex name="N1" tile="-903" orientation="5" value="20,40,50"/>
  	<Hex name="N3" tile="0"/>
  	<Hex name="N5" tile="0"/>
--- 136,141 ----
  	<Hex name="M18" tile="0"/>
  	<Hex name="M20" tile="-10" city="Mobile"/>
! 	<Hex name="M22" tile="-903" orientation="2" value="20,30,50" city="Southeast"/>
! 	<Hex name="N1" tile="-903" orientation="5" value="20,40,50" city="Southwest"/>
  	<Hex name="N3" tile="0"/>
  	<Hex name="N5" tile="0"/>

[Rails-commits] 18xx/data/1830 Map.xml,1.13,1.14

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

Update of /cvsroot/rails/18xx/data/1830
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32325/data/1830

Modified Files:
	Map.xml 
Log Message:
Added missing city names

Index: Map.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1830/Map.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Map.xml	23 Jan 2007 21:50:56 -0000	1.13
--- Map.xml	8 Nov 2009 14:46:16 -0000	1.14
***************
*** 1,6 ****
  <Map mapClass="rails.ui.swing.hexmap.EWHexMap" tileOrientation="EW" letterOrientation="vertical" even="B">
! 	<Hex name="A9" tile="-901" orientation="0" value="30,50"/>
! 	<Hex name="A11" tile="-902" orientation="1" value="30,50"/>
! 	<Hex name="A17" tile="-7" orientation="1"/>
  	<Hex name="A19" tile="-103"  orientation="0"/>
  	<Hex name="B10" tile="-10"/>
--- 1,6 ----
  <Map mapClass="rails.ui.swing.hexmap.EWHexMap" tileOrientation="EW" letterOrientation="vertical" even="B">
! 	<Hex name="A9" tile="-901" orientation="0" value="30,50" city="Canadian West"/>
! 	<Hex name="A11" tile="-902" orientation="1" value="30,50" city="Canadian West"/>
! 	<Hex name="A17" tile="-7" orientation="1" city="Montreal"/>
  	<Hex name="A19" tile="-103"  orientation="0"/>
  	<Hex name="B10" tile="-10"/>
***************
*** 43,50 ****
  	<Hex name="E19" tile="-10"/>
  	<Hex name="E21" tile="0" cost="120"/>
! 	<Hex name="E23" tile="-11"  orientation="5" label="B"/>
! 	<Hex name="F2" tile="-903" orientation="5" value="40,70"/>
  	<Hex name="F4" tile="-10" cost="80"/>
! 	<Hex name="F6" tile="-105"/>
  	<Hex name="F8" tile="0"/>
  	<Hex name="F10" tile="-1"/>
--- 43,50 ----
  	<Hex name="E19" tile="-10"/>
  	<Hex name="E21" tile="0" cost="120"/>
! 	<Hex name="E23" tile="-11"  orientation="5" label="B" city="Boston"/>
! 	<Hex name="F2" tile="-903" orientation="5" value="40,70" city="Chicago"/>
  	<Hex name="F4" tile="-10" cost="80"/>
! 	<Hex name="F6" tile="-105" city="Cleveland"/>
  	<Hex name="F8" tile="0"/>
  	<Hex name="F10" tile="-1"/>
***************
*** 64,68 ****
  	<Hex name="G15" tile="0" cost="120"/>
  	<Hex name="G17" tile="-2"/>
! 	<Hex name="G19" tile="-21"  orientation="1" cost="80"/>
  	<Hex name="H2" tile="0"/>
  	<Hex name="H4" tile="-10"/>
--- 64,68 ----
  	<Hex name="G15" tile="0" cost="120"/>
  	<Hex name="G17" tile="-2"/>
! 	<Hex name="G19" tile="-21"  orientation="1" cost="80" city="New York"/>
  	<Hex name="H2" tile="0"/>
  	<Hex name="H4" tile="-10"/>
***************
*** 74,78 ****
  	<Hex name="H16" tile="-10"/>
  	<Hex name="H18" tile="-20" label="OO"/>
! 	<Hex name="I1" tile="-901" orientation="5" value="30,60"/>
  	<Hex name="I3" tile="0"/>
  	<Hex name="I5" tile="0"/>
--- 74,78 ----
  	<Hex name="H16" tile="-10"/>
  	<Hex name="H18" tile="-20" label="OO"/>
! 	<Hex name="I1" tile="-901" orientation="5" value="30,60" city="Gulf"/>
  	<Hex name="I3" tile="0"/>
  	<Hex name="I5" tile="0"/>
***************
*** 81,88 ****
  	<Hex name="I11" tile="0" cost="120"/>
  	<Hex name="I13" tile="0"/>
! 	<Hex name="I15" tile="-11" label="B"/>
  	<Hex name="I17" tile="0" cost="80"/>
  	<Hex name="I19" tile="-3" orientation="2"/>
! 	<Hex name="J2" tile="-902" orientation="5" value="30,60"/>
  	<Hex name="J4" tile="0"/>
  	<Hex name="J6" tile="0"/>
--- 81,88 ----
  	<Hex name="I11" tile="0" cost="120"/>
  	<Hex name="I13" tile="0"/>
! 	<Hex name="I15" tile="-11" label="B" city="Baltimore"/>
  	<Hex name="I17" tile="0" cost="80"/>
  	<Hex name="I19" tile="-3" orientation="2"/>
! 	<Hex name="J2" tile="-902" orientation="5" value="30,60" city="Gulf"/>
  	<Hex name="J4" tile="0"/>
  	<Hex name="J6" tile="0"/>
***************
*** 90,95 ****
  	<Hex name="J10" tile="0" cost="120"/>
  	<Hex name="J12" tile="0" cost="120"/>
! 	<Hex name="J14" tile="-10" cost="80"/>
! 	<Hex name="K13" tile="-902" orientation="4" value="30,40"/>
  	<Hex name="K15" tile="-104" orientation="3"/>
  		
--- 90,95 ----
  	<Hex name="J10" tile="0" cost="120"/>
  	<Hex name="J12" tile="0" cost="120"/>
! 	<Hex name="J14" tile="-10" cost="80" city="Washington"/>
! 	<Hex name="K13" tile="-902" orientation="4" value="30,40" city="Deep South"/>
  	<Hex name="K15" tile="-104" orientation="3"/>
  		

[Rails-commits] 18xx/data/18Kaas Map.xml,1.4,1.5

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

Update of /cvsroot/rails/18xx/data/18Kaas
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32325/data/18Kaas

Modified Files:
	Map.xml 
Log Message:
Added missing city names

Index: Map.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/18Kaas/Map.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Map.xml	23 Jan 2007 21:50:53 -0000	1.4
--- Map.xml	8 Nov 2009 14:46:16 -0000	1.5
***************
*** 4,18 ****
  	<Hex name="A18" tile="-3" value="10" orientation="0"/>
  	<Hex name="B11" tile="-8" orientation="1"/>
! 	<Hex name="B13" tile="-10"/>
  	<Hex name="B15" tile="0"/>
! 	<Hex name="B17" tile="-10"/>
  	<Hex name="B19" tile="0"/>
  	<Hex name="C10" tile="0" cost="80"/>
! 	<Hex name="C12" tile="-1"/>
  	<Hex name="C14" tile="0"/>
  	<Hex name="C16" tile="0"/>
  	<Hex name="C18" tile="0"/>
! 	<Hex name="C20" tile="-901" orientation="3" value="40,50"/>
! 	<Hex name="D7" tile="-3" orientation="5" value="10"/>
  	<Hex name="D9" tile="0" cost="80"/>
  	<Hex name="D13" tile="0" cost="80"/>
--- 4,18 ----
  	<Hex name="A18" tile="-3" value="10" orientation="0"/>
  	<Hex name="B11" tile="-8" orientation="1"/>
! 	<Hex name="B13" tile="-10" city="Leeuwarden"/>
  	<Hex name="B15" tile="0"/>
! 	<Hex name="B17" tile="-10" city="Groningen"/>
  	<Hex name="B19" tile="0"/>
  	<Hex name="C10" tile="0" cost="80"/>
! 	<Hex name="C12" tile="-1" city="Sneek"/>
  	<Hex name="C14" tile="0"/>
  	<Hex name="C16" tile="0"/>
  	<Hex name="C18" tile="0"/>
! 	<Hex name="C20" tile="-901" orientation="3" value="40,50" city="Bremen/Hannover"/>
! 	<Hex name="D7" tile="-3" orientation="5" value="10" city="Den Helder"/>
  	<Hex name="D9" tile="0" cost="80"/>
  	<Hex name="D13" tile="0" cost="80"/>
***************
*** 21,80 ****
  	<Hex name="D19" tile="0"/>
  	<Hex name="E8" tile="0"/>
! 	<Hex name="E10" tile="-105" value="30" orientation="1"/>
! 	<Hex name="E14" tile="-10"/>
  	<Hex name="E16" tile="0"/>
! 	<Hex name="E18" tile="-2"/>
! 	<Hex name="F7" tile="-1"/>
  	<Hex name="F9" tile="0"/>
! 	<Hex name="F13" tile="-1"/>
  	<Hex name="F15" tile="0" cost="80"/>
  	<Hex name="F17" tile="0"/>
  	<Hex name="F19" tile="-8" orientation="3"/>
  	<Hex name="G6" tile="0" cost="80"/>
! 	<Hex name="G8" tile="-11" cost="80" label="B+"/>
! 	<Hex name="G10" tile="-22" orientation="5" /><!-- 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"/>
! 	<Hex name="G18" tile="-20" label="OO"/>
! 	<Hex name="G20" tile="-901" orientation="1" value="40,50"/>
! 	<Hex name="H5" tile="-10"/>
! 	<Hex name="H7" tile="-1"/>
  	<Hex name="H9" tile="0"/>
! 	<Hex name="H11" tile="-2"/>
! 	<Hex name="H13" tile="-10"/>
  	<Hex name="H15" tile="0" cost="80"/>
  	<Hex name="H17" tile="0"/>
  	<Hex name="H19" tile="0"/>
! 	<Hex name="I4" tile="-1"/>
  	<Hex name="I6" tile="0"/>
! 	<Hex name="I8" tile="-10"/>
  	<Hex name="I10" tile="0"/>
! 	<Hex name="I12" tile="-10" cost="80" label="U"/>
! 	<Hex name="I14" tile="-2" cost="80"/>
  	<Hex name="I16" tile="0" cost="80"/>
  	<Hex name="I18" tile="0"/>
! 	<Hex name="J3" tile="-901" orientation="4" value="10,60"/>
  	<Hex name="J5" tile="-8" orientation="5"/>
! 	<Hex name="J7" tile="-20" label="OO"/>
  	<Hex name="J9" tile="0" cost="120"/>
  	<Hex name="J11" tile="0" cost="80"/>
  	<Hex name="J13" tile="0"/>
  	<Hex name="J15" tile="0" cost="80"/>
! 	<Hex name="J17" tile="-902" orientation="3" value="2"/>
  	<Hex name="K6" tile="0" cost="80"/>
! 	<Hex name="K8" tile="-11" orientation="5" label="B"/>
  	<Hex name="K10" tile="0"/>
! 	<Hex name="K12" tile="-20" label="OO"/>
  	<Hex name="K14" tile="0"/>
! 	<Hex name="K16" tile="-10" cost="120"/>
! 	<Hex name="K18" tile="-901" orientation="2" value="2"/>
!   <Hex name="L1" tile="-901" orientation="5" value="10,60"/>
  	<Hex name="L3" tile="-10"/>
  	<Hex name="L5" tile="0"/>
  	<Hex name="L7" tile="-8" orientation="4"/>
! 	<Hex name="L9" tile="-902" orientation="4" value="30,60"/>
! 	<Hex name="L13" tile="-1"/>
! 	<Hex name="L15" tile="-1" cost="80"/>
  	<Hex name="L17" tile="0"/>
  	<Hex name="M14" tile="0"/>
--- 21,80 ----
  	<Hex name="D19" tile="0"/>
  	<Hex name="E8" tile="0"/>
! 	<Hex name="E10" tile="-105" value="30" orientation="1" city="Hoorn"/>
! 	<Hex name="E14" tile="-10" city="Zwolle"/>
  	<Hex name="E16" tile="0"/>
! 	<Hex name="E18" tile="-2" city="Coevorden/Emmen"/>
! 	<Hex name="F7" tile="-1" city="Beverwijk"/>
  	<Hex name="F9" tile="0"/>
! 	<Hex name="F13" tile="-1" city="Lelystad"/>
  	<Hex name="F15" tile="0" cost="80"/>
  	<Hex name="F17" tile="0"/>
  	<Hex name="F19" tile="-8" orientation="3"/>
  	<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"/>
! 	<Hex name="G18" tile="-20" label="OO" city="Hengelo/Enschede"/>
! 	<Hex name="G20" tile="-901" orientation="1" value="40,50" city="Bremen/Hannover"/>
! 	<Hex name="H5" tile="-10" city="Den Haag"/>
! 	<Hex name="H7" tile="-1" city="Leiden"/>
  	<Hex name="H9" tile="0"/>
! 	<Hex name="H11" tile="-2" city="Bussum/Hilversum"/>
! 	<Hex name="H13" tile="-10" city="Amersfoort"/>
  	<Hex name="H15" tile="0" cost="80"/>
  	<Hex name="H17" tile="0"/>
  	<Hex name="H19" tile="0"/>
! 	<Hex name="I4" tile="-1" city="Hoek van Holland"/>
  	<Hex name="I6" tile="0"/>
! 	<Hex name="I8" tile="-10" city="Gouda"/>
  	<Hex name="I10" tile="0"/>
! 	<Hex name="I12" tile="-10" cost="80" label="U" city="Utrecht"/>
! 	<Hex name="I14" tile="-2" cost="80" city="Arnhem/Nijmegen"/>
  	<Hex name="I16" tile="0" cost="80"/>
  	<Hex name="I18" tile="0"/>
! 	<Hex name="J3" tile="-901" orientation="4" value="10,60" city="Engeland"/>
  	<Hex name="J5" tile="-8" orientation="5"/>
! 	<Hex name="J7" tile="-20" label="OO" city="Rotterdam"/>
  	<Hex name="J9" tile="0" cost="120"/>
  	<Hex name="J11" tile="0" cost="80"/>
  	<Hex name="J13" tile="0"/>
  	<Hex name="J15" tile="0" cost="80"/>
! 	<Hex name="J17" tile="-902" orientation="3" value="2" city="Ruhrgebied"/>
  	<Hex name="K6" tile="0" cost="80"/>
! 	<Hex name="K8" tile="-11" orientation="5" label="B" city="Breda"/>
  	<Hex name="K10" tile="0"/>
! 	<Hex name="K12" tile="-20" label="OO" city="Tilburg/Eindhoven"/>
  	<Hex name="K14" tile="0"/>
! 	<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"/>
  	<Hex name="L7" tile="-8" orientation="4"/>
! 	<Hex name="L9" tile="-902" orientation="4" value="30,60" city="Brussel"/>
! 	<Hex name="L13" tile="-1" city="Weert"/>
! 	<Hex name="L15" tile="-1" cost="80" city="Roermond"/>
  	<Hex name="L17" tile="0"/>
  	<Hex name="M14" tile="0"/>
***************
*** 82,87 ****
  	<Hex name="N15" tile="0" cost="80"/>
  	<Hex name="N17" tile="0"/>
! 	<Hex name="N19" tile="-901" orientation="2" value="30,50"/>
! 	<Hex name="O14" tile="-901" orientation="4" value="20,30"/>
! 	<Hex name="O16" tile="-105" orientation="3" value="30"/>
  </Map>
--- 82,87 ----
  	<Hex name="N15" tile="0" cost="80"/>
  	<Hex name="N17" tile="0"/>
! 	<Hex name="N19" tile="-901" orientation="2" value="30,50" city="Aken/Keulen"/>
! 	<Hex name="O14" tile="-901" orientation="4" value="20,30" city="Luik"/>
! 	<Hex name="O16" tile="-105" orientation="3" value="30" city="Heerlen"/>
  </Map>