rails-commits — CVS Commits

[Rails-commits] 18xx LocalisedText.properties,1.82,1.83

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

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

Modified Files:
	LocalisedText.properties 
Log Message:
Beautified report window contents & log

Index: LocalisedText.properties
===================================================================
RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** LocalisedText.properties	25 Nov 2009 18:48:19 -0000	1.82
--- LocalisedText.properties	27 Nov 2009 20:35:18 -0000	1.83
***************
*** 86,99 ****
  ClickToSelectForBuying=Click to select for buying
  CompanyAlreadyStarted={0} has already been started.
! CompanyDiscardsTrain={0} discards {1}-train to Pool
  CompanyDoesNotExist=Company {0} does not exist
  CompanyDoesNotOwnTrain=Company {0} does not own a {1}-train
  CompanyDoesNotPayDividend={0} does not pay a dividend
! CompanyHasLoans={0} (president {1}) has {2} loans of {3}, total is {4}
! CompanyHasShares={0} has {1} shares of {2}% each
  CompanyHasNoType=Company {0} has no type defined
  CompanyHasUnknownType=Company {0} has an undefined type {1}
  CompanyMustOwnATrain={0} must own a train
  CompanyMustPayLoanInterest={0} must pay {1} loan interest
  CompanyPaysLoanInterest={0} pays {1} as {2}% interest over {3} loans of {4}
  CompanyPaysOutFull={0} pays out full dividend of {1}
--- 86,100 ----
  ClickToSelectForBuying=Click to select for buying
  CompanyAlreadyStarted={0} has already been started.
! CompanyDiscardsTrain={0} discards a {1}-train to Pool
  CompanyDoesNotExist=Company {0} does not exist
  CompanyDoesNotOwnTrain=Company {0} does not own a {1}-train
  CompanyDoesNotPayDividend={0} does not pay a dividend
! CompanyHasLoans=\n{0} ({1}) has {2} loans of {3}, total is {4}
! CompanyHasShares=\n{0} has {1} shares of {2}% each
  CompanyHasNoType=Company {0} has no type defined
  CompanyHasUnknownType=Company {0} has an undefined type {1}
  CompanyMustOwnATrain={0} must own a train
  CompanyMustPayLoanInterest={0} must pay {1} loan interest
+ CompanyOperates=\n{0} ({1}) operates.
  CompanyPaysLoanInterest={0} pays {1} as {2}% interest over {3} loans of {4}
  CompanyPaysOutFull={0} pays out full dividend of {1}
***************
*** 119,123 ****
  DestinationsReachedPrompt=Select companies that have reached their destinations
  DiscardsBaseToken={0} discards a {1} base token on {2}
- DiscardTrain=Discard {0}-train
  DoesNotExist=Item does not exist
  DoesNotForm={0} does not form
--- 120,123 ----
***************
*** 130,139 ****
  EMERGENCY_SHARE_SELLING_TITLE=Rails: Game Status - SELLING SHARES FOR EMERGENCY CASH RAISING
  END_OF_GAME_CLOSE_ALL_WINDOWS=Close all windows
! END_SR=All players have passed, end of SR {0}
  EndOfExchangeRound=All minors are closed, end of Exchange Round
  ENTER_PRICE_OR_CANCEL=Enter a valid price or hit Cancel
  ERROR=Error
  EXCHANGED=exchanged
! EndOfOperatingRound=End of Operating Round {0}
  EnterRevenue=Enter the earnings of the operating company
  ExchangesBaseToken={0} exchanges a {1} base token on {2}
--- 130,140 ----
  EMERGENCY_SHARE_SELLING_TITLE=Rails: Game Status - SELLING SHARES FOR EMERGENCY CASH RAISING
  END_OF_GAME_CLOSE_ALL_WINDOWS=Close all windows
! END_SR=\nAll players have passed, end of SR {0}
  EndOfExchangeRound=All minors are closed, end of Exchange Round
+ EndOfFormationRound=\nEnd of {0} formation round, resuming {1}
  ENTER_PRICE_OR_CANCEL=Enter a valid price or hit Cancel
  ERROR=Error
  EXCHANGED=exchanged
! EndOfOperatingRound=\nEnd of Operating Round {0}
  EnterRevenue=Enter the earnings of the operating company
  ExchangesBaseToken={0} exchanges a {1} base token on {2}
***************
*** 219,223 ****
  MAP=Map
  MapWindowTitle=Rails: Map
! MapWindowORTitle=Rails: Map, Operating Round {0} of {1}
  MARKET=Stock Market
  MayDiscardTrain={0} may voluntarily discard a train 
--- 220,224 ----
  MAP=Map
  MapWindowTitle=Rails: Map
! MapWindowORTitle=Rails: Map, Operating Round {0} ({1} of {2})
  MARKET=Stock Market
  MayDiscardTrain={0} may voluntarily discard a train 
***************
*** 330,334 ****
  SelectStationForToken=Select a station on this tile for this token
  SelectStationForTokenOption=Place token in station {0} with tracks to {1}
! SELECT_ITEM={0} selects {1} for auctioning
  SELL=Sell
  SELL_SHARE_LOG={0} sells a {1}% share of {2} to Pool for {3}.
--- 331,335 ----
  SelectStationForToken=Select a station on this tile for this token
  SelectStationForTokenOption=Place token in station {0} with tracks to {1}
! SelectForAuctioning=\n{0} selects {1} for auctioning
  SELL=Sell
  SELL_SHARE_LOG={0} sells a {1}% share of {2} to Pool for {3}.
***************
*** 348,352 ****
  START_COMPANY_LOG={0} starts {1} at {2} and pays {3} for {4} shares ({5}%) to {6}
  StartACompany=Start {0} by buying a {1}% share for {2}
! START_OR=\nStart of Operating Round {0}
  START_ROUND_TITLE=Rails: Start Round
  STOCK_ROUND_TITLE=Rails: Game Status - STOCK ROUND {0}
--- 349,353 ----
  START_COMPANY_LOG={0} starts {1} at {2} and pays {3} for {4} shares ({5}%) to {6}
  StartACompany=Start {0} by buying a {1}% share for {2}
! START_OR=\n=======================\nStart of Operating Round {0}\n=======================
  START_ROUND_TITLE=Rails: Start Round
  STOCK_ROUND_TITLE=Rails: Game Status - STOCK ROUND {0}
***************
*** 365,374 ****
  StartCompany={0}  (buy {1}% share for {2})
  StartCompanyFixed=Start {0} by buying {1}% share for {2}
! StartCGRFormationRound=Starting CGR formation round. Starting player is {0}
! StartFinalMinorExchangeRound=Start of the Final Minor Company Exchange Round
! StartOfInitialRound=Start of initial round
  StartOfPhase=Start of phase {0}.
  StartPacketHasNoClass=Start packet {0} has no class defined.
! StartStockRound=Start of Stock Round {0}
  Status_Unavailable=Currently unavailable
  Status_Biddable=Click to bid on this item
--- 366,375 ----
  StartCompany={0}  (buy {1}% share for {2})
  StartCompanyFixed=Start {0} by buying {1}% share for {2}
! StartFormationRound=\n++++++++++++++++++++++++\nStarting {0} formation round\n++++++++++++++++++++++++\nStarting player is {1}
! StartFinalMinorExchangeRound=++++++++++++++++++++++++++++++++++++++++\nStart of the Final Minor Company Exchange Round\n++++++++++++++++++++++++++++++++++++++++
! StartOfInitialRound=\n================\nStart of initial round\n================
  StartOfPhase=Start of phase {0}.
  StartPacketHasNoClass=Start packet {0} has no class defined.
! StartStockRound=\n==================\nStart of Stock Round {0}\n==================
  Status_Unavailable=Currently unavailable
  Status_Biddable=Click to bid on this item

[Rails-commits] 18xx/rails/game ReportBuffer.java,1.6,1.7

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

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

Modified Files:
	ReportBuffer.java 
Log Message:
Enable empty lines

Index: ReportBuffer.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/ReportBuffer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ReportBuffer.java	30 Oct 2009 21:53:03 -0000	1.6
--- ReportBuffer.java	27 Nov 2009 20:34:01 -0000	1.7
***************
*** 63,70 ****
  
      private void addMessage (String message) {
!         if (Util.hasValue(message)) {
              reportBuffer.append(message).append("\n");
              /* Also log the message */
!             log.info(message);
              /* Also write it to the report file, if requested */
              if (wantReport) writeToReport(message);
--- 63,70 ----
  
      private void addMessage (String message) {
!         if (message != null) {
              reportBuffer.append(message).append("\n");
              /* Also log the message */
!             if (message.length() > 0) log.info(message);
              /* Also write it to the report file, if requested */
              if (wantReport) writeToReport(message);

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

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

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

Modified Files:
	my.properties 
Log Message:
Added report.window.open and or.number_format

Index: my.properties
===================================================================
RCS file: /cvsroot/rails/18xx/my.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** my.properties	21 Nov 2009 19:28:59 -0000	1.8
--- my.properties	27 Nov 2009 20:33:32 -0000	1.9
***************
*** 60,63 ****
--- 60,69 ----
  #report.filename.extension=log
  
+ ### Report window
+ # By default the report window is closed when starting or loading a game.
+ # This property allows to open it automatically.
+ # Valid values are yes and no (default).
+ #report.window.open=yes
+ 
  ### Default players
  # Comma-separated list of player names. 
***************
*** 70,73 ****
--- 76,84 ----
  #default_game=1830
  
+ ### Various options
+ # Show simple (ORx) or composite (ORx.x) OR number.
+ # Valid values: "simple" and "composite" (default)
+ #or.number_format=simple
+ 
  ####################### Log4J properties ##############################
  # For information on how to customise log4j logging, see for instance

[Rails-commits] 18xx/rails/ui/swing ORWindow.java,1.27,1.28

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

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

Modified Files:
	ORWindow.java 
Log Message:
Changed window title

Index: ORWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORWindow.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ORWindow.java	17 Nov 2009 19:31:27 -0000	1.27
--- ORWindow.java	27 Nov 2009 20:31:50 -0000	1.28
***************
*** 153,163 ****
      public void activate(OperatingRound or) {
  		GameManager gameManager = (GameManager) gameUIManager.getGameManager();
- 		String compositeORNumber = gameManager.getCompositeORNumber ();
  		String numORs = gameManager.getNumOfORs ();
  
          /*if (!or.wasInterrupted())*/ orPanel.recreate(or);
          setTitle(LocalText.getText("MapWindowORTitle",
! 								   compositeORNumber,
! 								   numORs ));
          pack();
          if (lastBounds != null) {
--- 153,163 ----
      public void activate(OperatingRound or) {
  		GameManager gameManager = (GameManager) gameUIManager.getGameManager();
  		String numORs = gameManager.getNumOfORs ();
  
          /*if (!or.wasInterrupted())*/ orPanel.recreate(or);
          setTitle(LocalText.getText("MapWindowORTitle",
!         		gameManager.getORId(),
!         		String.valueOf(gameManager.getRelativeORNumber()),
!         		numORs ));
          pack();
          if (lastBounds != null) {

[Rails-commits] 18xx/rails/ui/swing GameUIManager.java, 1.25, 1.26 ReportWindow.java, 1.10, 1.11

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

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

Modified Files:
	GameUIManager.java ReportWindow.java 
Log Message:
Scroll down ReportWindow after load.

Index: ReportWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ReportWindow.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ReportWindow.java	23 Dec 2008 20:02:45 -0000	1.10
--- ReportWindow.java	26 Nov 2009 22:15:28 -0000	1.11
***************
*** 69,79 ****
          if (newText.length() > 0) {
              message.append(newText);
!             SwingUtilities.invokeLater(new Runnable() {
!                 public void run() {
!                     messageWindow.vbar.setValue(messageWindow.vbar.getMaximum());
!                 }
!             });
          }
      }
  
      public void keyPressed(KeyEvent e) {
--- 69,83 ----
          if (newText.length() > 0) {
              message.append(newText);
!             scrollDown();
          }
      }
+     
+     public void scrollDown () {
+         SwingUtilities.invokeLater(new Runnable() {
+             public void run() {
+                 messageWindow.vbar.setValue(messageWindow.vbar.getMaximum());
+             }
+         });
+     }
  
      public void keyPressed(KeyEvent e) {

Index: GameUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameUIManager.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** GameUIManager.java	25 Nov 2009 18:48:19 -0000	1.25
--- GameUIManager.java	26 Nov 2009 22:15:27 -0000	1.26
***************
*** 108,111 ****
--- 108,112 ----
          updateUI();
  
+         reportWindow.scrollDown();
      }
  

[Rails-commits] 18xx/rails/game OperatingRound.java,1.79,1.80

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

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

Modified Files:
	OperatingRound.java 
Log Message:
Name change only

Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** OperatingRound.java	25 Nov 2009 18:44:17 -0000	1.79
--- OperatingRound.java	26 Nov 2009 20:14:30 -0000	1.80
***************
*** 1306,1310 ****
                  break;
              }
!             
              // Fixed price must be honoured
              int fixedPrice = action.getFixedCost();
--- 1306,1310 ----
                  break;
              }
! 
              // Fixed price must be honoured
              int fixedPrice = action.getFixedCost();
***************
*** 1530,1534 ****
          moveStack.start(true);
          //
!         if (action.isForced()) moveStack.setLinkedToPrevious();
  
          pool.buyTrain(train, 0);
--- 1530,1534 ----
          moveStack.start(true);
          //
!         if (action.isForced()) moveStack.linkToPreviousMoveSet();
  
          pool.buyTrain(train, 0);
***************
*** 2156,2161 ****
              	BuyTrain bt = new BuyTrain(cheapestTrain,
                          cheapestTrain.getHolder(), costOfCheapestTrain);
!             	bt.setPresidentMustAddCash(costOfCheapestTrain);
!             	bt.setHasNoTrains(!hasTrains); // TEMPORARY
                  possibleActions.add(bt);
              }
--- 2156,2161 ----
              	BuyTrain bt = new BuyTrain(cheapestTrain,
                          cheapestTrain.getHolder(), costOfCheapestTrain);
!             	bt.setPresidentMustAddCash(costOfCheapestTrain - cash);
!             	bt.setHasNoTrains(!hasTrains); // TODO TEMPORARY
                  possibleActions.add(bt);
              }

[Rails-commits] 18xx/rails/game/move MoveStack.java, 1.1, 1.2 MoveSet.java, 1.12, 1.13

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

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

Modified Files:
	MoveStack.java MoveSet.java 
Log Message:
Name change only

Index: MoveSet.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/MoveSet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** MoveSet.java	7 Oct 2009 19:00:38 -0000	1.12
--- MoveSet.java	26 Nov 2009 20:14:30 -0000	1.13
***************
*** 19,26 ****
  
      private List<Move> moves = new ArrayList<Move>();
-     private List<Move> reversedMoves = null;
      private boolean undoableByPlayer;
      /** If TRUE, undoing this move will also undo the previous one. */
!     private boolean linkedToPrevious = false;
  
      protected static Logger log =
--- 19,25 ----
  
      private List<Move> moves = new ArrayList<Move>();
      private boolean undoableByPlayer;
      /** If TRUE, undoing this move will also undo the previous one. */
!     private boolean linkedToPreviousMoveSet = false;
  
      protected static Logger log =
***************
*** 46,54 ****
      protected void unexecute() {
  
!         // Create a reversed move list, if not yet done
!     	if (reversedMoves == null) {
!     		reversedMoves = new ArrayList<Move>(moves);
!     		Collections.reverse(reversedMoves);
!     	}
          for (Move move : reversedMoves) {
              move.undo();
--- 45,51 ----
      protected void unexecute() {
  
!         // Create a reversed move list
!     	List<Move> reversedMoves = new ArrayList<Move>(moves);
!     	Collections.reverse(reversedMoves);
          for (Move move : reversedMoves) {
              move.undo();
***************
*** 61,70 ****
      }
  
!     public void setLinkedToPrevious() {
!         linkedToPrevious = true;
      }
  
!     protected boolean isLinkedToPrevious() {
!     	return linkedToPrevious;
      }
  
--- 58,67 ----
      }
  
!     public void linkToPreviousMoveSet() {
!         linkedToPreviousMoveSet = true;
      }
  
!     protected boolean isLinkedToPreviousMove() {
!     	return linkedToPreviousMoveSet;
      }
  

Index: MoveStack.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/move/MoveStack.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MoveStack.java	7 Oct 2009 19:00:38 -0000	1.1
--- MoveStack.java	26 Nov 2009 20:14:30 -0000	1.2
***************
*** 42,46 ****
      }
  
!     public boolean start(boolean undoableByPlayer) {
          log.debug(">>> Start MoveSet(index=" + (lastIndex + 1) + ")");
          if (currentMoveSet == null) {
--- 42,46 ----
      }
  
!     public MoveSet start(boolean undoableByPlayer) {
          log.debug(">>> Start MoveSet(index=" + (lastIndex + 1) + ")");
          if (currentMoveSet == null) {
***************
*** 49,56 ****
                  moveStack.remove(moveStack.size() - 1);
              }
!             return true;
          } else {
!             log.warn("MoveStack is already open");
!             return false;
          }
      }
--- 49,56 ----
                  moveStack.remove(moveStack.size() - 1);
              }
!             return currentMoveSet;
          } else {
!             log.warn("MoveSet is already open");
!             return currentMoveSet;
          }
      }
***************
*** 97,103 ****
      }
  
!     public void setLinkedToPrevious() {
          if (currentMoveSet != null) {
!             currentMoveSet.setLinkedToPrevious();
          } else {
              log.warn("No MoveSet open");
--- 97,103 ----
      }
  
!     public void linkToPreviousMoveSet() {
          if (currentMoveSet != null) {
!             currentMoveSet.linkToPreviousMoveSet();
          } else {
              log.warn("No MoveSet open");
***************
*** 115,119 ****
                  undoAction = moveStack.get(lastIndex--);
                  undoAction.unexecute();
!             } while (undoAction.isLinkedToPrevious());
              return true;
          } else {
--- 115,119 ----
                  undoAction = moveStack.get(lastIndex--);
                  undoAction.unexecute();
!             } while (undoAction.isLinkedToPreviousMove());
              return true;
          } else {

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

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

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

Modified Files:
	StockRound_18EU.java 
Log Message:
Name change only

Index: StockRound_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/StockRound_18EU.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** StockRound_18EU.java	9 Oct 2009 20:20:34 -0000	1.26
--- StockRound_18EU.java	26 Nov 2009 20:14:30 -0000	1.27
***************
*** 638,642 ****
          moveStack.start(false);
          //
!         if (action.isForced()) moveStack.setLinkedToPrevious();
  
          pool.buyTrain(train, 0);
--- 638,642 ----
          moveStack.start(false);
          //
!         if (action.isForced()) moveStack.linkToPreviousMoveSet();
  
          pool.buyTrain(train, 0);

[Rails-commits] 18xx/rails/game/specific/_1856 CGRFormationRound.java, 1.22, 1.23

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

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

Modified Files:
	CGRFormationRound.java 
Log Message:
Name change only

Index: CGRFormationRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1856/CGRFormationRound.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** CGRFormationRound.java	31 Oct 2009 17:08:26 -0000	1.22
--- CGRFormationRound.java	26 Nov 2009 20:14:30 -0000	1.23
***************
*** 770,774 ****
          if (train != null) {
  
!             if (action.isForced()) moveStack.setLinkedToPrevious();
  
              train.moveTo(pool);
--- 770,774 ----
          if (train != null) {
  
!             if (action.isForced()) moveStack.linkToPreviousMoveSet();
  
              train.moveTo(pool);

[Rails-commits] 18xx/rails/game ShareSellingRound.java,1.25,1.26

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

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

Modified Files:
	ShareSellingRound.java 
Log Message:
Link sale to previous move (Undo must affect both)

Index: ShareSellingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/ShareSellingRound.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** ShareSellingRound.java	23 Nov 2009 18:31:23 -0000	1.25
--- ShareSellingRound.java	26 Nov 2009 20:14:00 -0000	1.26
***************
*** 322,326 ****
          }
  
!         moveStack.start(true);
  
          ReportBuffer.add(LocalText.getText("SELL_SHARES_LOG",
--- 322,326 ----
          }
  
!         moveStack.start(true).linkToPreviousMoveSet();
  
          ReportBuffer.add(LocalText.getText("SELL_SHARES_LOG",

[Rails-commits] 18xx/rails/game PublicCompany.java,1.72,1.73

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

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

Modified Files:
	PublicCompany.java 
Log Message:
Alllow negative train cost; subtract train sale amount from seller

Index: PublicCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompany.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** PublicCompany.java	23 Nov 2009 18:32:45 -0000	1.72
--- PublicCompany.java	26 Nov 2009 20:13:19 -0000	1.73
***************
*** 588,592 ****
          tokensCostThisTurn.setOption(MoneyModel.SUPPRESS_ZERO);
          trainsCostThisTurn = new MoneyModel(name + "_spentOnTrains");
!         trainsCostThisTurn.setOption(MoneyModel.SUPPRESS_ZERO);
          bonusValue = new BonusModel(name + "_bonusValue");
  
--- 588,592 ----
          tokensCostThisTurn.setOption(MoneyModel.SUPPRESS_ZERO);
          trainsCostThisTurn = new MoneyModel(name + "_spentOnTrains");
!         trainsCostThisTurn.setOption(MoneyModel.SUPPRESS_ZERO|MoneyModel.ALLOW_NEGATIVE);
          bonusValue = new BonusModel(name + "_bonusValue");
  
***************
*** 1481,1484 ****
--- 1481,1487 ----
       */
      public void buyTrain(TrainI train, int price) {
+         if (train.getOwner() instanceof PublicCompanyI) {
+         	((MoneyModel)((PublicCompanyI)train.getOwner()).getTrainsSpentThisTurnModel()).add(-price);
+         }
          portfolio.buyTrain(train, price);
          trainsCostThisTurn.add(price);

[Rails-commits] 18xx/rails/ui/swing/hexmap GUIBar.java,1.1,1.2

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

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

Modified Files:
	GUIBar.java 
Log Message:
Change bar colour from black to blue

Index: GUIBar.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/GUIBar.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GUIBar.java	6 Nov 2009 20:23:53 -0000	1.1
--- GUIBar.java	26 Nov 2009 20:12:06 -0000	1.2
***************
*** 10,14 ****
  public class GUIBar {
  
!     private Color color = Color.BLACK;
      private int x1, x2;
      private int y1, y2;
--- 10,14 ----
  public class GUIBar {
  
!     private Color color = Color.BLUE;
      private int x1, x2;
      private int y1, y2;

[Rails-commits] 18xx/rails/game Bank.java,1.16,1.17

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

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

Modified Files:
	Bank.java 
Log Message:
Allow negative values & reorder with minus always in front

Index: Bank.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Bank.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Bank.java	4 Nov 2009 20:33:22 -0000	1.16
--- Bank.java	26 Nov 2009 20:11:39 -0000	1.17
***************
*** 213,217 ****
  
      public static String format(int amount) {
!         return instance.moneyFormat.replaceFirst("@", String.valueOf(amount));
      }
  
--- 213,221 ----
  
      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;
      }
  

[Rails-commits] 18xx/rails/ui/swing GameStatus.java,1.29,1.30

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

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

Modified Files:
	GameStatus.java 
Log Message:
Check for player index <0

Index: GameStatus.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameStatus.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** GameStatus.java	24 Nov 2009 20:21:48 -0000	1.29
--- GameStatus.java	25 Nov 2009 19:21:31 -0000	1.30
***************
*** 842,845 ****
--- 842,846 ----
      protected void setPlayerCertButton(int i, int j, boolean clickable, Object o) {
  
+         if (j < 0) return;
          setPlayerCertButton(i, j, clickable);
          if (clickable && o != null) {
***************
*** 850,853 ****
--- 851,855 ----
  
      protected void setPlayerCertButton(int i, int j, boolean clickable) {
+         if (j < 0) return;
          if (clickable) {
              certPerPlayerButton[i][j].setText(certPerPlayer[i][j].getText());

[Rails-commits] 18xx LocalisedText.properties,1.81,1.82

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

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

Modified Files:
	LocalisedText.properties 
Log Message:
Better handling of load errors. 
If the game engine deems a move invalid, processing stops at that point, and play can be resumed from there. A sensible set of messages is displayed.

Index: LocalisedText.properties
===================================================================
RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** LocalisedText.properties	23 Nov 2009 18:32:47 -0000	1.81
--- LocalisedText.properties	25 Nov 2009 18:48:19 -0000	1.82
***************
*** 148,151 ****
--- 148,152 ----
  Extra4Trains=Extra 4-trains
  FILE=File
+ FixedPriceNotPaid=Invalid price {0}, fixed price is {1}
  FloatsWithCash={0} floats and receives {1}
  Floats={0} floats
***************
*** 214,217 ****
--- 215,219 ----
  LoadFailed=Load failed, reason: {0}
  LoadGame=Load Game
+ LoadInterrupted=Load interrupted at this point, you can continue play from here
  LoansNotAllowed={0} may not take any loans
  MAP=Map

[Rails-commits] 18xx/rails/game GameManager.java, 1.69, 1.70 GameManagerI.java, 1.21, 1.22 Game.java, 1.39, 1.40

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

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

Modified Files:
	GameManager.java GameManagerI.java Game.java 
Log Message:
Better handling of load errors. 
If the game engine deems a move invalid, processing stops at that point, and play can be resumed from there. A sensible set of messages is displayed.

Index: GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** GameManager.java	8 Nov 2009 10:45:49 -0000	1.69
--- GameManager.java	25 Nov 2009 18:48:19 -0000	1.70
***************
*** 634,638 ****
  
          boolean result = true;
!         
          DisplayBuffer.clear();
  
--- 634,638 ----
  
          boolean result = true;
! 
          DisplayBuffer.clear();
  
***************
*** 735,742 ****
       * @see rails.game.GameManagerI#processOnReload(java.util.List)
       */
!     public void processOnReload(List<PossibleAction> actions) throws Exception {
  
          for (PossibleAction action : actions) {
  
              // TEMPORARY FIX TO ALLOW OLD 1856 SAVED FILES TO BE PROCESSED
              if (!possibleActions.contains(action.getClass())
--- 735,743 ----
       * @see rails.game.GameManagerI#processOnReload(java.util.List)
       */
!     public boolean processOnReload(List<PossibleAction> actions) throws Exception {
  
          for (PossibleAction action : actions) {
  
+         	DisplayBuffer.clear();
              // TEMPORARY FIX TO ALLOW OLD 1856 SAVED FILES TO BE PROCESSED
              if (!possibleActions.contains(action.getClass())
***************
*** 750,759 ****
              try {
                  log.debug("Action: " + action);
!                 getCurrentRound().process(action);
                  getCurrentRound().setPossibleActions();
              } catch (Exception e) {
                  log.debug("Error while reprocessing " + action.toString(), e);
                  throw new Exception("Reload failure", e);
- 
              }
              new AddToList<PossibleAction>(executedActions, action,
--- 751,767 ----
              try {
                  log.debug("Action: " + action);
!                 if (!getCurrentRound().process(action)) {
!                 	String msg = "Player "+action.getPlayerName()+"\'s action \""
!                 		+action.toString()+"\"\n  in "+getCurrentRound().getRoundName()
!                 		+" is considered invalid by the game engine";
!                 	log.error(msg);
!                 	DisplayBuffer.add(msg);
!                     if (moveStack.isOpen()) moveStack.finish();
!                 	return false;
!                 }
                  getCurrentRound().setPossibleActions();
              } catch (Exception e) {
                  log.debug("Error while reprocessing " + action.toString(), e);
                  throw new Exception("Reload failure", e);
              }
              new AddToList<PossibleAction>(executedActions, action,
***************
*** 761,764 ****
--- 769,773 ----
              if (moveStack.isOpen()) moveStack.finish();
          }
+         return true;
      }
  

Index: Game.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Game.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Game.java	22 Nov 2009 18:48:40 -0000	1.39
--- Game.java	25 Nov 2009 18:48:19 -0000	1.40
***************
*** 72,77 ****
      public boolean setup() {
  
-         ReportBuffer.add(LocalText.getText("GameIs", name));
- 
          try {
              // Have the ComponentManager work through the other rails.game files
--- 72,75 ----
***************
*** 90,93 ****
--- 88,92 ----
              log.info("========== Start of rails.game " + name + " ==========");
              log.info("Rails version "+version);
+             ReportBuffer.add(LocalText.getText("GameIs", name));
  
              // Have the ComponentManager work through the other rails.game files
***************
*** 247,251 ****
              log.debug("Starting to execute loaded actions");
  
!             game.getGameManager().processOnReload(executedActions);
  
              return game;
--- 246,253 ----
              log.debug("Starting to execute loaded actions");
  
!             if (!game.getGameManager().processOnReload(executedActions)) {
!                 log.error ("Load interrupted");
!                 DisplayBuffer.add(LocalText.getText("LoadInterrupted"));
!             }
  
              return game;

Index: GameManagerI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManagerI.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** GameManagerI.java	4 Nov 2009 20:33:22 -0000	1.21
--- GameManagerI.java	25 Nov 2009 18:48:19 -0000	1.22
***************
*** 49,53 ****
      public abstract boolean process(PossibleAction action);
  
!     public abstract void processOnReload(List<PossibleAction> actions)
              throws Exception;
  
--- 49,53 ----
      public abstract boolean process(PossibleAction action);
  
!     public abstract boolean processOnReload(List<PossibleAction> actions)
              throws Exception;
  

[Rails-commits] 18xx/rails/ui/swing ORUIManager.java, 1.33, 1.34 GameUIManager.java, 1.24, 1.25 GameSetupWindow.java, 1.17, 1.18

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

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

Modified Files:
	ORUIManager.java GameUIManager.java GameSetupWindow.java 
Log Message:
Better handling of load errors. 
If the game engine deems a move invalid, processing stops at that point, and play can be resumed from there. A sensible set of messages is displayed.

Index: ORUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** ORUIManager.java	20 Nov 2009 20:56:50 -0000	1.33
--- ORUIManager.java	25 Nov 2009 18:48:19 -0000	1.34
***************
*** 890,894 ****
                  exchangedTrain = oldTrains.get(index);
              }
- 
          }
  
--- 890,893 ----

Index: GameSetupWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameSetupWindow.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** GameSetupWindow.java	19 Nov 2009 20:48:53 -0000	1.17
--- GameSetupWindow.java	25 Nov 2009 18:48:19 -0000	1.18
***************
*** 207,210 ****
--- 207,213 ----
                              DisplayBuffer.get(), "", JOptionPane.ERROR_MESSAGE);
                      return;
+                 } else if (DisplayBuffer.getSize() > 0) {
+                     JOptionPane.showMessageDialog(this,
+                             DisplayBuffer.get(), "", JOptionPane.ERROR_MESSAGE);
                  }
              }

Index: GameUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameUIManager.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** GameUIManager.java	21 Nov 2009 19:26:50 -0000	1.24
--- GameUIManager.java	25 Nov 2009 18:48:19 -0000	1.25
***************
*** 81,85 ****
              saveDateTimeFormat.setTimeZone(TimeZone.getTimeZone(timezone));
          }
!         saveSuffixSpec = Config.get("save.filename.suffix"); 
          if (Util.hasValue(saveSuffixSpec) && !saveSuffixSpec.equals(NEXT_PLAYER_SUFFIX)) {
              saveSuffix = "_" + saveSuffixSpec;
--- 81,85 ----
              saveDateTimeFormat.setTimeZone(TimeZone.getTimeZone(timezone));
          }
!         saveSuffixSpec = Config.get("save.filename.suffix");
          if (Util.hasValue(saveSuffixSpec) && !saveSuffixSpec.equals(NEXT_PLAYER_SUFFIX)) {
              saveSuffix = "_" + saveSuffixSpec;
***************
*** 431,435 ****
              filename =
                      saveDirectory + "/" + gameManager.getGameName() + "_"
!                             + saveDateTimeFormat.format(new Date()) 
                              + saveSuffix + "."
                              + saveExtension;
--- 431,435 ----
              filename =
                      saveDirectory + "/" + gameManager.getGameName() + "_"
!                             + saveDateTimeFormat.format(new Date())
                              + saveSuffix + "."
                              + saveExtension;

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

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

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

Modified Files:
	BuyTrain.java 
Log Message:
Fixed missing deserialization statements. These cause all train prices becoming $0 on a reload

Index: BuyTrain.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/BuyTrain.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** BuyTrain.java	20 Nov 2009 20:56:51 -0000	1.12
--- BuyTrain.java	25 Nov 2009 18:45:28 -0000	1.13
***************
*** 30,33 ****
--- 30,34 ----
      transient private List<TrainI> trainsForExchange = null;
      private String[] trainsForExchangeUniqueIds;
+     private boolean forcedExchange = false;
      private boolean presidentMustAddCash = false;
      private boolean presidentMayAddCash = false;
***************
*** 42,46 ****
      transient private TrainI exchangedTrain = null;
      private String exchangedTrainUniqueId;
-     private boolean forcedExchange = false;
  
      public static final long serialVersionUID = 2L;
--- 43,46 ----
***************
*** 60,64 ****
              trainsForExchangeUniqueIds = new String[trains.size()];
              for (int i = 0; i < trains.size(); i++) {
!                 trainsForExchangeUniqueIds[i] = trains.get(i).getName(); // TODO:
                  // Must
                  // be
--- 60,65 ----
              trainsForExchangeUniqueIds = new String[trains.size()];
              for (int i = 0; i < trains.size(); i++) {
!                 trainsForExchangeUniqueIds[i] = trains.get(i).getName();
!                 // TODO:
                  // Must
                  // be
***************
*** 183,191 ****
          this.exchangedTrain = exchangedTrain;
          if (exchangedTrain != null)
!             this.exchangedTrainUniqueId = exchangedTrain.getName();// TODO:
!         // Must be
!         // replaced
!         // by unique
!         // Id
      }
  
--- 184,188 ----
          this.exchangedTrain = exchangedTrain;
          if (exchangedTrain != null)
!             this.exchangedTrainUniqueId = exchangedTrain.getName();
      }
  
***************
*** 201,204 ****
--- 198,202 ----
          } else {
              b.append(" for any amount");
+             if (pricePaid > 0) b.append(" - paid: ").append(Bank.format(pricePaid));
          }
          if (specialProperty != null) {
***************
*** 213,216 ****
--- 211,215 ----
              b.append(" may add cash up to ").append(
                      Bank.format(presidentCashToAdd));
+         if (pricePaid > 0) b.append(" - paid: ").append(Bank.format(pricePaid));
  
          return b.toString();
***************
*** 239,245 ****
--- 238,249 ----
          hasNoTrains = fields.get("hasNoTrains", hasNoTrains);//TEMPORARY
          trainsForExchangeUniqueIds = (String[]) fields.get("trainsForExchangeUniqueIds", trainsForExchangeUniqueIds);
+         forcedExchange = fields.get("forcedExchange", forcedExchange);
          presidentMustAddCash = fields.get("presidentMustAddCash", presidentMustAddCash);
          presidentMayAddCash = fields.get("presidentMayAddCash", presidentMayAddCash);
          presidentCashToAdd = fields.get("presidentCashToAdd", presidentCashToAdd);
+         specialPropertyId = fields.get("specialPropertyId", specialPropertyId);
+         pricePaid = fields.get("pricePaid", pricePaid);
+         addedCash = fields.get("addedCash", addedCash);
+         exchangedTrainUniqueId = (String) fields.get("exchangedTrainUniqueId", exchangedTrainUniqueId);
  
          GameManagerI gameManager = GameManager.getInstance();

[Rails-commits] 18xx/rails/game Round.java, 1.28, 1.29 StockRound.java, 1.50, 1.51 RoundI.java, 1.12, 1.13

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

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

Modified Files:
	Round.java StockRound.java RoundI.java 
Log Message:
Added getRoundName()

Index: Round.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Round.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Round.java	23 Nov 2009 18:32:44 -0000	1.28
--- Round.java	25 Nov 2009 18:44:45 -0000	1.29
***************
*** 375,378 ****
--- 375,381 ----
      }
  
+     public String getRoundName() {
+     	return this.getClass().getSimpleName();
+     }
  
  }

Index: RoundI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/RoundI.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** RoundI.java	6 Oct 2009 18:34:04 -0000	1.12
--- RoundI.java	25 Nov 2009 18:44:45 -0000	1.13
***************
*** 28,30 ****
--- 28,33 ----
  
      public void resume();
+ 
+     public String getRoundName();
+ 
  }

Index: StockRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockRound.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** StockRound.java	23 Nov 2009 18:31:54 -0000	1.50
--- StockRound.java	25 Nov 2009 18:44:45 -0000	1.51
***************
*** 1328,1330 ****
--- 1328,1335 ----
          return "StockRound " + getStockRoundNumber();
      }
+ 
+     @Override
+ 	public String getRoundName() {
+     	return toString();
+     }
  }

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

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

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

Modified Files:
	OperatingRound.java 
Log Message:
Check on honouring a fixed train price

Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** OperatingRound.java	20 Nov 2009 20:56:50 -0000	1.78
--- OperatingRound.java	25 Nov 2009 18:44:17 -0000	1.79
***************
*** 1306,1309 ****
--- 1306,1317 ----
                  break;
              }
+             
+             // Fixed price must be honoured
+             int fixedPrice = action.getFixedCost();
+             if (fixedPrice != 0 && fixedPrice != price) {
+                 errMsg = LocalText.getText("FixedPriceNotPaid",
+                         Bank.format(price),
+                         Bank.format(fixedPrice));
+             }
  
              // Does the company have room for another train?
***************
*** 1360,1363 ****
--- 1368,1372 ----
              break;
          }
+ 
          if (errMsg != null) {
              DisplayBuffer.add(LocalText.getText("CannotBuyTrainFor",
***************
*** 2349,2351 ****
--- 2358,2365 ----
      }
  
+     @Override
+ 	public String getRoundName() {
+     	return toString();
+     }
+ 
  }

[Rails-commits] 18xx/rails/ui/swing GameStatus.java,1.28,1.29

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

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

Modified Files:
	GameStatus.java 
Log Message:
Fixed bug that made old actions stick to a button

Index: GameStatus.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameStatus.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** GameStatus.java	25 Sep 2009 19:13:01 -0000	1.28
--- GameStatus.java	24 Nov 2009 20:21:48 -0000	1.29
***************
*** 754,757 ****
--- 754,758 ----
              setIPOCertButton(i, false);
              setPoolCertButton(i, false);
+             setPlayerCertButton (i, actorIndex, false);
              if (compCanHoldOwnShares) setTreasuryCertButton(i, false);
          }

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

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

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

Modified Files:
	LocalisedText.properties 
Log Message:
Added new GameOption "LeaveAuctionOnPass" to 1830-style games

Index: LocalisedText.properties
===================================================================
RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** LocalisedText.properties	20 Nov 2009 20:56:51 -0000	1.80
--- LocalisedText.properties	23 Nov 2009 18:32:47 -0000	1.81
***************
*** 211,214 ****
--- 211,215 ----
  LaysTileAt={0} lays tile #{1} at hex {2}
  LaysTileAtFor={0} lays tile #{1} at hex {2} for {3}
+ LeaveAuctionOnPass=Leave private auction on pass
  LoadFailed=Load failed, reason: {0}
  LoadGame=Load Game

[Rails-commits] 18xx/data/1856 Game.xml,1.26,1.27

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

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

Modified Files:
	Game.xml 
Log Message:
Added new GameOption "LeaveAuctionOnPass" to 1830-style games

Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1856/Game.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Game.xml	7 Oct 2009 21:03:36 -0000	1.26
--- Game.xml	23 Nov 2009 18:32:47 -0000	1.27
***************
*** 3,6 ****
--- 3,7 ----
  	<Component name="GameManager" class="rails.game.specific._1856.GameManager_1856">
  		<Game name="1856"/>
+ 		<GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/>
  		<StockRound class="rails.game.specific._1856.StockRound_1856" 
  			sequence="SellBuyOrBuySell"/>

[Rails-commits] 18xx/data/1830 Game.xml,1.24,1.25

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

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

Modified Files:
	Game.xml 
Log Message:
Added new GameOption "LeaveAuctionOnPass" to 1830-style games

Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1830/Game.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Game.xml	3 Sep 2009 21:36:54 -0000	1.24
--- Game.xml	23 Nov 2009 18:32:47 -0000	1.25
***************
*** 15,18 ****
--- 15,19 ----
  		<GameOption name="WithOptional6Train" type="toggle" default="no"/>
  		<GameOption name="UnlimitedTopTrains" parm="D" type="toggle" default="no"/>
+ 		<GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/>
  		<PlayerShareLimit percentage="60"/>
  		<BankPoolLimit percentage="50"/>

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

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

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

Modified Files:
	GamesList.xml 
Log Message:
Added new GameOption "LeaveAuctionOnPass" to 1830-style games

Index: GamesList.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/GamesList.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** GamesList.xml	19 Nov 2009 20:48:29 -0000	1.14
--- GamesList.xml	23 Nov 2009 18:32:47 -0000	1.15
***************
*** 13,16 ****
--- 13,17 ----
  		<Option name="WithOptional6Train" type="toggle" default="no"/>
  		<Option name="UnlimitedTopTrains" parm="D" type="toggle" default="no"/>
+ 		<Option name="LeaveAuctionOnPass" type="toggle" default="no"/>
  		<Players minimum="3" maximum="6"/>
  	</Game>
***************
*** 54,57 ****
--- 55,59 ----
  Designed by Bill Dixon
  		</Description>
+ 		<Option name="LeaveAuctionOnPass" type="toggle" default="no"/>
  		<Players minimum="3" maximum="6"/>
  	</Game>
***************
*** 64,67 ****
--- 66,70 ----
  Aspects not present in 1830 have not been implemented yet.
  		</Description>
+ 		<Option name="LeaveAuctionOnPass" type="toggle" default="no"/>
  		<Players minimum="2" maximum="6"/>
  	</Game>
***************
*** 70,73 ****
--- 73,77 ----
  		<Option name="UnlimitedTopTrains" parm="4D" type="toggle" default="no"/>
  		<Option name="Obsolete4Trains" type="toggle" default="yes"/>
+ 		<Option name="LeaveAuctionOnPass" type="toggle" default="no"/>
  		<Description>18AL  - The Railroads come to Alabama
  (c) 2000, 2004 Mark Derrick and John David Galt
***************
*** 99,106 ****
  (c) 1992 ERJO GAMES
  
! Should work, but has not been extensively tested. Linitations as with 1830.
  		</Description>
  		<Option name="WithOptional6Train" type="toggle" default="no"/>
  		<Option name="UnlimitedTopTrains" parm="D" type="toggle" default="no"/>
  		<Players minimum="3" maximum="6"/>
  	</Game>
--- 103,111 ----
  (c) 1992 ERJO GAMES
  
! Should work, but has not been extensively tested. Limitations as with 1830.
  		</Description>
  		<Option name="WithOptional6Train" type="toggle" default="no"/>
  		<Option name="UnlimitedTopTrains" parm="D" type="toggle" default="no"/>
+ 		<Option name="LeaveAuctionOnPass" type="toggle" default="no"/>
  		<Players minimum="3" maximum="6"/>
  	</Game>