rails-commits — CVS Commits

[Rails-commits] 18xx/rails/game PublicCertificateI.java, 1.11, 1.12 StockRound.java, 1.75, 1.76 GameManager.java, 1.106, 1.107 PublicCompany.java, 1.99, 1.100 PublicCertificate.java, 1.18, 1.19

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

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

Modified Files:
	PublicCertificateI.java StockRound.java GameManager.java 
	PublicCompany.java PublicCertificate.java 
Log Message:
Fixed 1835 certificate ordering in IPO after Undo

Index: PublicCompany.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCompany.java,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** PublicCompany.java	25 May 2010 20:27:17 -0000	1.99
--- PublicCompany.java	17 Jun 2010 21:35:54 -0000	1.100
***************
*** 487,490 ****
--- 487,491 ----
          }
  
+         int certIndex = 0;
          List<Tag> certificateTags = tag.getChildren("Certificate");
          if (certificateTags != null) {
***************
*** 521,525 ****
                  for (int k = 0; k < number; k++) {
                      certificate = new PublicCertificate(shares, president,
!                             certIsInitiallyAvailable, certificateCount);
                      addCertificate(certificate);
                      shareTotal += shares * shareUnit.intValue();
--- 522,526 ----
                  for (int k = 0; k < number; k++) {
                      certificate = new PublicCertificate(shares, president,
!                             certIsInitiallyAvailable, certificateCount, certIndex++);
                      addCertificate(certificate);
                      shareTotal += shares * shareUnit.intValue();

Index: GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** GameManager.java	15 Jun 2010 20:16:54 -0000	1.106
--- GameManager.java	17 Jun 2010 21:35:54 -0000	1.107
***************
*** 908,915 ****
                  }
                  getCurrentRound().setPossibleActions();
                  if (!isGameOver()) setCorrectionActions();
  
              } catch (Exception e) {
!                 log.debug("Error while reprocessing " + action.toString(), e);
                  throw new Exception("Reload failure", e);
              }
--- 908,919 ----
                  }
                  getCurrentRound().setPossibleActions();
+                 //String playerName = getCurrentPlayer().getName();
+                 //for (PossibleAction a : possibleActions.getList()) {
+                 //    log.debug(playerName+" may: "+a.toString());
+                 //}
                  if (!isGameOver()) setCorrectionActions();
  
              } catch (Exception e) {
!                 log.error("Error while reprocessing " + action.toString(), e);
                  throw new Exception("Reload failure", e);
              }

Index: PublicCertificate.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCertificate.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** PublicCertificate.java	31 Jan 2010 22:22:28 -0000	1.18
--- PublicCertificate.java	17 Jun 2010 21:35:54 -0000	1.19
***************
*** 34,37 ****
--- 34,40 ----
      /** A key identifying the certificate's unique ID */
      protected String certId;
+     
+     /** Index within company (to be maintained in the IPO) */
+     protected int indexInCompany;
  
      /** A map allowing to find certificates by unique id */
***************
*** 43,51 ****
  
      public PublicCertificate(int shares, boolean president, 
!             boolean available, float certificateCount) {
          this.shares = shares;
          this.president = president;
          this.initiallyAvailable = available;
          this.certificateCount = certificateCount;
      }
  
--- 46,55 ----
  
      public PublicCertificate(int shares, boolean president, 
!             boolean available, float certificateCount, int index) {
          this.shares = shares;
          this.president = president;
          this.initiallyAvailable = available;
          this.certificateCount = certificateCount;
+         this.indexInCompany = index;
      }
  
***************
*** 55,58 ****
--- 59,63 ----
          this.initiallyAvailable = oldCert.isInitiallyAvailable();
          this.certificateCount = oldCert.getCertificateCount();
+         this.indexInCompany = oldCert.getIndexInCompany();
      }
  
***************
*** 65,68 ****
--- 70,77 ----
          return certId;
      }
+     
+     public int getIndexInCompany() {
+         return indexInCompany;
+     }
  
      public static PublicCertificateI getByUniqueId(String certId) {

Index: PublicCertificateI.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PublicCertificateI.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PublicCertificateI.java	30 Aug 2009 18:15:18 -0000	1.11
--- PublicCertificateI.java	17 Jun 2010 21:35:54 -0000	1.12
***************
*** 11,14 ****
--- 11,16 ----
      /** Set the certificate's unique ID */
      public String getUniqueId();
+     
+     public int getIndexInCompany();
  
      /**

Index: StockRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockRound.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** StockRound.java	15 Jun 2010 20:16:54 -0000	1.75
--- StockRound.java	17 Jun 2010 21:35:54 -0000	1.76
***************
*** 168,173 ****
                  certs = map.get(compName);
                  if (certs == null || certs.isEmpty()) continue;
                  /* Only the top certificate is buyable from the IPO */
!                 cert = certs.get(0);
                  comp = cert.getCompany();
                  unitsForPrice = comp.getShareUnitsForSharePrice();
--- 168,184 ----
                  certs = map.get(compName);
                  if (certs == null || certs.isEmpty()) continue;
+                 
                  /* Only the top certificate is buyable from the IPO */
!                 int lowestIndex = 99;
!                 cert = null;
!                 int index;
!                 for (PublicCertificateI c : certs) {
!                     index = c.getIndexInCompany();
!                     if (index < lowestIndex) {
!                         lowestIndex = index;
!                         cert = c;
!                     }
!                 }
!                 
                  comp = cert.getCompany();
                  unitsForPrice = comp.getShareUnitsForSharePrice();

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

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

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

Modified Files:
	StockRound_18EU.java 
Log Message:
Fixed 1835 certificate ordering in IPO after Undo

Index: StockRound_18EU.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/StockRound_18EU.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** StockRound_18EU.java	24 May 2010 11:20:42 -0000	1.40
--- StockRound_18EU.java	17 Jun 2010 21:35:54 -0000	1.41
***************
*** 113,117 ****
  
                  /* Only the top certificate is buyable from the IPO */
!                 cert = certs.get(0);
                  comp = cert.getCompany();
                  if (isSaleRecorded(currentPlayer, comp)) continue;
--- 113,127 ----
  
                  /* Only the top certificate is buyable from the IPO */
!                 int lowestIndex = 99;
!                 cert = null;
!                 int index;
!                 for (PublicCertificateI c : certs) {
!                     index = c.getIndexInCompany();
!                     if (index < lowestIndex) {
!                         lowestIndex = index;
!                         cert = c;
!                     }
!                 }
! 
                  comp = cert.getCompany();
                  if (isSaleRecorded(currentPlayer, comp)) continue;

[Rails-commits] 18xx/rails/ui/swing/elements CheckBoxDialog.java, 1.8, 1.9

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

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

Modified Files:
	CheckBoxDialog.java 
Log Message:
Cancel button made optional (it's probably never used anyway)

Index: CheckBoxDialog.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/elements/CheckBoxDialog.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CheckBoxDialog.java	28 Mar 2010 20:14:20 -0000	1.8
--- CheckBoxDialog.java	16 Jun 2010 20:59:10 -0000	1.9
***************
*** 31,34 ****
--- 31,35 ----
      boolean selectedOptions[];
      int chosenOption = -1;
+     boolean hasCancelButton = false;
  
      protected static Logger log =
***************
*** 37,45 ****
      public CheckBoxDialog(DialogOwner owner, String title, String message,
              String[] options) {
!         this (owner, title, message, options, null);
      }
  
      public CheckBoxDialog(DialogOwner owner, String title, String message,
!             String[] options, boolean[] selectedOptions) {
          super((Frame) null, title, false); // Non-modal
          this.owner = owner;
--- 38,46 ----
      public CheckBoxDialog(DialogOwner owner, String title, String message,
              String[] options) {
!         this (owner, title, message, options, null, false);
      }
  
      public CheckBoxDialog(DialogOwner owner, String title, String message,
!             String[] options, boolean[] selectedOptions, boolean addCancelButton) {
          super((Frame) null, title, false); // Non-modal
          this.owner = owner;
***************
*** 47,50 ****
--- 48,52 ----
          this.options = options;
          this.numOptions = options.length;
+         this.hasCancelButton = addCancelButton;
          if (selectedOptions != null) {
              this.selectedOptions = selectedOptions;
***************
*** 84,91 ****
          buttonPane.add(okButton);
  
!         cancelButton = new JButton(LocalText.getText("Cancel"));
!         cancelButton.setMnemonic(KeyEvent.VK_C);
!         cancelButton.addActionListener(this);
!         buttonPane.add(cancelButton);
  
          checkBoxes = new JCheckBox[numOptions];
--- 86,95 ----
          buttonPane.add(okButton);
  
!         if (hasCancelButton) {
!             cancelButton = new JButton(LocalText.getText("Cancel"));
!             cancelButton.setMnemonic(KeyEvent.VK_C);
!             cancelButton.addActionListener(this);
!             buttonPane.add(cancelButton);
!         }
  
          checkBoxes = new JCheckBox[numOptions];

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

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

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

Modified Files:
	StatusWindow_1856.java 
Log Message:
Fixed previous fix

Index: StatusWindow_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_1856/StatusWindow_1856.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** StatusWindow_1856.java	15 Jun 2010 20:16:54 -0000	1.7
--- StatusWindow_1856.java	15 Jun 2010 22:04:11 -0000	1.8
***************
*** 28,33 ****
              immediateAction = possibleActions.getType(RepayLoans.class).get(0);
          // Moved up
!         //} else if (possibleActions.contains(DiscardTrain.class)) {
!         //    immediateAction = possibleActions.getType(DiscardTrain.class).get(0);
          } else if (possibleActions.contains(ExchangeTokens.class)) {
              immediateAction = possibleActions.getType(ExchangeTokens.class).get(0);
--- 28,33 ----
              immediateAction = possibleActions.getType(RepayLoans.class).get(0);
          // Moved up
!         } else if (possibleActions.contains(DiscardTrain.class)) {
!             immediateAction = possibleActions.getType(DiscardTrain.class).get(0);
          } else if (possibleActions.contains(ExchangeTokens.class)) {
              immediateAction = possibleActions.getType(ExchangeTokens.class).get(0);

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

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

Update of /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_1835
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30779/rails/ui/swing/gamespecific/_1835

Modified Files:
	StatusWindow_1835.java 
Log Message:
1835: fixed train discarding by PR at end of any PR formation round.

Index: StatusWindow_1835.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_1835/StatusWindow_1835.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StatusWindow_1835.java	15 Apr 2010 19:49:50 -0000	1.5
--- StatusWindow_1835.java	15 Jun 2010 20:16:54 -0000	1.6
***************
*** 6,9 ****
--- 6,10 ----
  
  import rails.game.*;
+ import rails.game.action.DiscardTrain;
  import rails.game.special.ExchangeForShare;
  import rails.game.specific._1835.*;
***************
*** 37,40 ****
--- 38,43 ----
          } else if (possibleActions.contains(FoldIntoPrussian.class)) {
              immediateAction = possibleActions.getType(FoldIntoPrussian.class).get(0);
+         } else if (possibleActions.contains(DiscardTrain.class)) {
+             immediateAction = possibleActions.getType(DiscardTrain.class).get(0);
          }
      }

[Rails-commits] 18xx/rails/ui/swing StatusWindow.java,1.45,1.46

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

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

Modified Files:
	StatusWindow.java 
Log Message:
1835: fixed train discarding by PR at end of any PR formation round.

Index: StatusWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/StatusWindow.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** StatusWindow.java	10 Jun 2010 20:54:31 -0000	1.45
--- StatusWindow.java	15 Jun 2010 20:16:54 -0000	1.46
***************
*** 381,384 ****
--- 381,391 ----
          if (!(currentRound instanceof StockRound || currentRound instanceof EndOfGameRound)) 
              return;
+         
+         // Moved here from StatusWindow_1856. It's getting generic...
+         if (possibleActions.contains(DiscardTrain.class)) {
+             immediateAction = possibleActions.getType(DiscardTrain.class).get(0);
+             return;
+         }
+ 
  
          if (currentRound instanceof TreasuryShareRound) {
***************
*** 609,613 ****
  
      public boolean processImmediateAction() {
!         // No such actions here
          return true;
      }
--- 616,626 ----
  
      public boolean processImmediateAction() {
!         if (immediateAction instanceof DiscardTrain) {
!             // Make a local copy and discard the original,
!             // so that it's not going to loop.
!             DiscardTrain nextAction = (DiscardTrain) immediateAction;
!             immediateAction = null;
!             gameUIManager.discardTrains (nextAction);
!         }
          return true;
      }
***************
*** 720,722 ****
  
  
! }
--- 733,735 ----
  
  
! }
\ No newline at end of file

[Rails-commits] 18xx/rails/game StockRound.java, 1.74, 1.75 GameManager.java, 1.105, 1.106

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

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

Modified Files:
	StockRound.java GameManager.java 
Log Message:
1835: fixed train discarding by PR at end of any PR formation round.

Index: GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** GameManager.java	30 May 2010 17:03:30 -0000	1.105
--- GameManager.java	15 Jun 2010 20:16:54 -0000	1.106
***************
*** 897,901 ****
  
              try {
!                 log.debug("Action: " + action);
                  if (!processCorrectionActions(action) && !getCurrentRound().process(action)) {
                      String msg = "Player "+action.getPlayerName()+"\'s action \""
--- 897,901 ----
  
              try {
!                 log.debug("Action ("+action.getPlayerName()+"): " + action);
                  if (!processCorrectionActions(action) && !getCurrentRound().process(action)) {
                      String msg = "Player "+action.getPlayerName()+"\'s action \""
***************
*** 917,920 ****
--- 917,922 ----
                      "ExecutedActions");
              if (moveStack.isOpen()) moveStack.finish();
+             
+             log.debug("Turn: "+getCurrentPlayer().getName());
          }
  

Index: StockRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StockRound.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** StockRound.java	25 May 2010 20:27:17 -0000	1.74
--- StockRound.java	15 Jun 2010 20:16:54 -0000	1.75
***************
*** 490,493 ****
--- 490,494 ----
      }
  
+     // Return value indicates whether the action has been processed.
      protected boolean processGameSpecificAction(PossibleAction action) {
  

[Rails-commits] 18xx/rails/game/specific/_1835 PrussianFormationRound.java, 1.12, 1.13

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

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

Modified Files:
	PrussianFormationRound.java 
Log Message:
1835: fixed train discarding by PR at end of any PR formation round.

Index: PrussianFormationRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1835/PrussianFormationRound.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PrussianFormationRound.java	7 May 2010 20:03:48 -0000	1.12
--- PrussianFormationRound.java	15 Jun 2010 20:16:54 -0000	1.13
***************
*** 7,10 ****
--- 7,11 ----
  import rails.common.GuiDef;
  import rails.game.*;
+ import rails.game.action.DiscardTrain;
  import rails.game.action.PossibleAction;
  import rails.game.move.CashMove;
***************
*** 23,30 ****
  	private boolean mergePr;
  	private boolean forcedMerge;
  
      private enum Step {
          START,
!         MERGE
      };
  
--- 24,34 ----
  	private boolean mergePr;
  	private boolean forcedMerge;
+     
+     private List<CompanyI> foldablePrePrussians;
  
      private enum Step {
          START,
!         MERGE,
!         DISCARD_TRAINS
      };
  
***************
*** 71,77 ****
--- 75,83 ----
              startingPlayer
                      = ((GameManager_1835)gameManager).getPrussianFormationStartingPlayer();
+             log.debug("Original Prussian starting player was "+startingPlayer.getName());
              setCurrentPlayer(startingPlayer);
              if (forcedMerge) {
                  List<SpecialPropertyI> sps;
+                 setFoldablePrePrussians();
                  List<CompanyI> foldables = new ArrayList<CompanyI> ();
                  for (PrivateCompanyI company : gameManager.getAllPrivateCompanies()) {
***************
*** 90,93 ****
--- 96,101 ----
                  executeExchange (foldables, false, true);
                  finishRound();
+             } else {
+                 findNextMergingPlayer(false);
              }
          }
***************
*** 108,144 ****
          } else if (step == Step.MERGE) {
  
!         	while (true) {
!         		List<CompanyI> foldables = new ArrayList<CompanyI> ();
! 	            SpecialPropertyI sp;
! 	            for (PrivateCompanyI company : currentPlayer.getPortfolio().getPrivateCompanies()) {
! 	                sp = company.getSpecialProperties().get(0);
! 	                if (sp instanceof ExchangeForShare) {
! 	                    foldables.add(company);
! 	                }
! 	            }
! 	            PublicCompanyI company;
! 	            List<SpecialPropertyI> sps;
! 	            for (PublicCertificateI cert : currentPlayer.getPortfolio().getCertificates()) {
! 	                if (!cert.isPresidentShare()) continue;
! 	                company = cert.getCompany();
! 	                sps = company.getSpecialProperties();
! 	                if (sps != null && !sps.isEmpty() && sps.get(0) instanceof ExchangeForShare) {
! 	                	foldables.add(company);
! 	                }
! 	            }
! 	            if (foldables.isEmpty()) {
! 	            	// No merge options for the current player, try the next one
! 	            	setNextPlayer();
! 	            	if (getCurrentPlayer() == startingPlayer) {
! 	            		finishRound();
! 	            		break;
! 	            	} else {
! 	            		continue;
! 	            	}
! 	            } else {
! 	                possibleActions.add(new FoldIntoPrussian(foldables));
! 	                break;
! 	            }
! 	        }
          }
          return true;
--- 116,127 ----
          } else if (step == Step.MERGE) {
  
!             possibleActions.add(new FoldIntoPrussian(foldablePrePrussians));
!             
!         } else if (step == Step.DISCARD_TRAINS) {
!             
!             if (prussian.getNumberOfTrains() > prussian.getTrainLimit(getCurrentPhase().getIndex())) {
!                 possibleActions.add(new DiscardTrain(prussian,
!                         prussian.getPortfolio().getUniqueTrains(), true));
!             }
          }
          return true;
***************
*** 146,149 ****
--- 129,154 ----
      }
  
+     private void setFoldablePrePrussians () {
+ 
+         foldablePrePrussians = new ArrayList<CompanyI> ();
+         SpecialPropertyI sp;
+         for (PrivateCompanyI company : currentPlayer.getPortfolio().getPrivateCompanies()) {
+             sp = company.getSpecialProperties().get(0);
+             if (sp instanceof ExchangeForShare) {
+                 foldablePrePrussians.add(company);
+             }
+         }
+         PublicCompanyI company;
+         List<SpecialPropertyI> sps;
+         for (PublicCertificateI cert : currentPlayer.getPortfolio().getCertificates()) {
+             if (!cert.isPresidentShare()) continue;
+             company = cert.getCompany();
+             sps = company.getSpecialProperties();
+             if (sps != null && !sps.isEmpty() && sps.get(0) instanceof ExchangeForShare) {
+                 foldablePrePrussians.add(company);
+             }
+         }
+     }
+     
      @Override
  	protected boolean processGameSpecificAction(PossibleAction action) {
***************
*** 158,174 ****
                  } else {
                      step = Step.MERGE;
                  }
              } else if (step == Step.MERGE) {
                  
                  mergeIntoPrussian (a);
! 
!             	// No merge options for the current player, try the next one
!             	setNextPlayer();
!             	if (getCurrentPlayer() == startingPlayer) {
!             		finishRound();
!             	}
! 
              }
              return true;
          } else {
              return false;
--- 163,182 ----
                  } else {
                      step = Step.MERGE;
+                     findNextMergingPlayer(false);
                  }
+                 
              } else if (step == Step.MERGE) {
                  
                  mergeIntoPrussian (a);
!                 
              }
+             
              return true;
+             
+         } else if (action instanceof DiscardTrain) {
+             
+             discardTrain ((DiscardTrain) action);
+             return true;
+             
          } else {
              return false;
***************
*** 176,179 ****
--- 184,209 ----
      }
  
+     protected boolean findNextMergingPlayer(boolean skipCurrentPlayer) {
+         
+         while (true) {
+             
+             if (skipCurrentPlayer) {
+                 setNextPlayer();
+                 if (getCurrentPlayer() == startingPlayer) {
+                     if (prussian.getNumberOfTrains() > prussian.getTrainLimit(getCurrentPhase().getIndex())) {
+                         step = Step.DISCARD_TRAINS;
+                     } else {
+                         finishRound();
+                     }
+                     return false;
+                 }
+             }
+             
+             setFoldablePrePrussians();
+             if (!foldablePrePrussians.isEmpty()) return true;
+             skipCurrentPlayer = true;
+         }
+     }
+     
      private boolean startPrussian (FoldIntoPrussian action) {
  
***************
*** 248,251 ****
--- 278,283 ----
          // Execute
          if (folding) executeExchange (folded, false, false);
+         
+         findNextMergingPlayer(true);
  
          return folding;
***************
*** 326,348 ****
          }
  
!         // Check the trains, autodiscard any excess non-permanent trains
!         int trainLimit = prussian.getTrainLimit(gameManager.getCurrentPlayerIndex());
!         List<TrainI> trains = prussian.getPortfolio().getTrainList();
!         if (prussian.getNumberOfTrains() > trainLimit) {
!             ReportBuffer.add("");
!             int numberToDiscard = prussian.getNumberOfTrains() - trainLimit;
!             List<TrainI> trainsToDiscard = new ArrayList<TrainI>(4);
!             for (TrainI train : trains) {
!                 if (!train.getType().isPermanent()) {
!                     trainsToDiscard.add(train);
!                     if (--numberToDiscard == 0) break;
!                 }
              }
!             for (TrainI train : trainsToDiscard) {
!                 train.moveTo(pool);
!                 ReportBuffer.add(LocalText.getText("CompanyDiscardsTrain",
!                         PR_ID, train.getName()));
              }
          }
      }
  
--- 358,417 ----
          }
  
!     }
! 
!     public boolean discardTrain(DiscardTrain action) {
! 
!         TrainI train = action.getDiscardedTrain();
!         PublicCompanyI company = action.getCompany();
! 
!         String errMsg = null;
! 
!         // Dummy loop to enable a quick jump out.
!         while (true) {
!             // Checks
!             // Must be correct step
!             if (company != prussian) {
!                 errMsg = LocalText.getText("WrongCompany", company.getName(), prussian.getName());
!                 break;
              }
! 
!             if (train == null && action.isForced()) {
!                 errMsg = LocalText.getText("NoTrainSpecified");
!                 break;
              }
+ 
+             // Does the company own such a train?
+             if (!company.getPortfolio().getTrainList().contains(train)) {
+                 errMsg =
+                         LocalText.getText("CompanyDoesNotOwnTrain",
+                                 company.getName(),
+                                 train.getName() );
+                 break;
+             }
+ 
+             break;
          }
+         if (errMsg != null) {
+             DisplayBuffer.add(LocalText.getText("CannotDiscardTrain",
+                     company.getName(),
+                     (train != null ?train.getName() : "?"),
+                     errMsg ));
+             return false;
+         }
+ 
+         /* End of validation, start of execution */
+         moveStack.start(true);
+         //
+         if (action.isForced()) moveStack.linkToPreviousMoveSet();
+ 
+         pool.buyTrain(train, 0);
+         ReportBuffer.add(LocalText.getText("CompanyDiscardsTrain",
+                 company.getName(),
+                 train.getName() ));
+ 
+         // This always finished this type of round
+         finishRound();
+         
+         return true;
      }
  

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

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

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

Modified Files:
	StatusWindow_1856.java 
Log Message:
1835: fixed train discarding by PR at end of any PR formation round.

Index: StatusWindow_1856.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/gamespecific/_1856/StatusWindow_1856.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StatusWindow_1856.java	31 Jan 2010 22:22:34 -0000	1.6
--- StatusWindow_1856.java	15 Jun 2010 20:16:54 -0000	1.7
***************
*** 27,32 ****
              //repayLoans (action);
              immediateAction = possibleActions.getType(RepayLoans.class).get(0);
!         } else if (possibleActions.contains(DiscardTrain.class)) {
!             immediateAction = possibleActions.getType(DiscardTrain.class).get(0);
          } else if (possibleActions.contains(ExchangeTokens.class)) {
              immediateAction = possibleActions.getType(ExchangeTokens.class).get(0);
--- 27,33 ----
              //repayLoans (action);
              immediateAction = possibleActions.getType(RepayLoans.class).get(0);
!         // Moved up
!         //} else if (possibleActions.contains(DiscardTrain.class)) {
!         //    immediateAction = possibleActions.getType(DiscardTrain.class).get(0);
          } else if (possibleActions.contains(ExchangeTokens.class)) {
              immediateAction = possibleActions.getType(ExchangeTokens.class).get(0);
***************
*** 47,50 ****
--- 48,53 ----
              repayLoans (nextAction);
              return true;
+            
+             /* Moved up
          } else if (immediateAction instanceof DiscardTrain) {
              // Make a local copy and discard the original,
***************
*** 54,57 ****
--- 57,61 ----
              gameUIManager.discardTrains (nextAction);
              return true;
+             */
          } else if (immediateAction instanceof ExchangeTokens) {
              // Make a local copy and discard the original,

[Rails-commits] 18xx LocalisedText.properties,1.139,1.140

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

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

Modified Files:
	LocalisedText.properties 
Log Message:
Fixed bug 1889 won't save in ISR - ID: 3008749

Index: LocalisedText.properties
===================================================================
RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** LocalisedText.properties	6 Jun 2010 12:59:54 -0000	1.139
--- LocalisedText.properties	10 Jun 2010 20:54:31 -0000	1.140
***************
*** 62,65 ****
--- 62,66 ----
  CloseMinor=Close minor {0}
  CLOSE_MINOR_LOG={0} closes minor {1}, transferring {2} cash and {3} train(s) to the Bank
+ CLOSE_WINDOW=Do you really want to exit the game?
  COMPANY=Company
  COMPANY_DETAILS=Company details

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

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

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

Modified Files:
	StartRound.java 
Log Message:
Fixed bug 1889 won't save in ISR - ID: 3008749

Index: StartRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/StartRound.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** StartRound.java	8 May 2010 13:56:30 -0000	1.36
--- StartRound.java	10 Jun 2010 20:54:32 -0000	1.37
***************
*** 49,53 ****
          this.startPacket = gameManager.getStartPacket();
  
!         guiHints.setVisibilityHint(GuiDef.Panel.STATUS, false);
          guiHints.setVisibilityHint(GuiDef.Panel.STOCK_MARKET, false);
          guiHints.setVisibilityHint(GuiDef.Panel.MAP, true);
--- 49,53 ----
          this.startPacket = gameManager.getStartPacket();
  
!         guiHints.setVisibilityHint(GuiDef.Panel.STATUS, true);
          guiHints.setVisibilityHint(GuiDef.Panel.STOCK_MARKET, false);
          guiHints.setVisibilityHint(GuiDef.Panel.MAP, true);

[Rails-commits] 18xx/rails/ui/swing StatusWindow.java, 1.44, 1.45 StartRoundWindow.java, 1.37, 1.38

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

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

Modified Files:
	StatusWindow.java StartRoundWindow.java 
Log Message:
Fixed bug 1889 won't save in ISR - ID: 3008749

Index: StatusWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/StatusWindow.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** StatusWindow.java	30 May 2010 11:31:47 -0000	1.44
--- StatusWindow.java	10 Jun 2010 20:54:31 -0000	1.45
***************
*** 282,286 ****
              @Override
              public void windowClosing(WindowEvent e) {
!                 if (JOptionPane.showConfirmDialog(frame, "Do you really want to exit the game?", "Select", JOptionPane.OK_CANCEL_OPTION)
                          == JOptionPane.OK_OPTION) {
                      frame.dispose();
--- 282,286 ----
              @Override
              public void windowClosing(WindowEvent e) {
!                 if (JOptionPane.showConfirmDialog(frame, LocalText.getText("CLOSE_WINDOW"), LocalText.getText("Select"), JOptionPane.OK_CANCEL_OPTION)
                          == JOptionPane.OK_OPTION) {
                      frame.dispose();

Index: StartRoundWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/StartRoundWindow.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** StartRoundWindow.java	3 Feb 2010 05:37:55 -0000	1.37
--- StartRoundWindow.java	10 Jun 2010 20:54:31 -0000	1.38
***************
*** 183,190 ****
          setSize(275, 325);
          setVisible(true);
-         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
          requestFocus();
  
          addKeyListener(this);
  
          pack();
--- 183,190 ----
          setSize(275, 325);
          setVisible(true);
          requestFocus();
  
          addKeyListener(this);
+         
  
          pack();
***************
*** 322,325 ****
--- 322,338 ----
          dummyButton = new ClickField("", "", "", this, itemGroup);
  
+         // set closing behavior and listener
+         setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE );
+         final JFrame thisFrame = this;
+         addWindowListener(new WindowAdapter () {
+             @Override
+             public void windowClosing(WindowEvent e) {
+                 if (JOptionPane.showConfirmDialog(thisFrame, LocalText.getText("CLOSE_WINDOW"), LocalText.getText("Select"), JOptionPane.OK_CANCEL_OPTION)
+                         == JOptionPane.OK_OPTION) {
+                     thisFrame.dispose();
+                     System.exit(0);
+                 }
+             }
+         });
      }
  

[Rails-commits] 18xx/rails/game/specific/_1835 OperatingRound_1835.java, 1.9, 1.10

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

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

Modified Files:
	OperatingRound_1835.java 
Log Message:
Fixed potential nullpointer bug

Index: OperatingRound_1835.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/specific/_1835/OperatingRound_1835.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** OperatingRound_1835.java	15 May 2010 16:36:09 -0000	1.9
--- OperatingRound_1835.java	10 Jun 2010 20:03:31 -0000	1.10
***************
*** 124,127 ****
--- 124,128 ----
          if (operatingCompany.getName().equalsIgnoreCase(GameManager_1835.PR_ID)) {
              for (Player player : deniedIncomeShare.keySet()) {
+                 if (!sharesPerRecipient.containsKey(player)) continue;
                  int share = deniedIncomeShare.get(player);
                  int shares = share / operatingCompany.getShareUnit();

[Rails-commits] 18xx/data/18Kaas Game.xml,1.17,1.18

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

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

Modified Files:
	Game.xml 
Log Message:
Fixed wrong gameoption name for 18Kaas

Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/18Kaas/Game.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Game.xml	30 May 2010 10:42:39 -0000	1.17
--- Game.xml	8 Jun 2010 21:07:19 -0000	1.18
***************
*** 5,9 ****
  		<GameOption name="RouteAwareness" values="Highlight,Deactivate" default="Deactivate" />
  		<GameOption name="RevenueCalculation" values="Suggest,Deactivate" default="Deactivate" />
! 		<GameOption name="RuhrgebiedDoublesOnlyMajors" type="toggle" default="yes" />
  		<GameOption name="NoMapMode" type="toggle" default="no" />
  		<GameOption name="WithOptional6Train" type="toggle" default="no"/>
--- 5,9 ----
  		<GameOption name="RouteAwareness" values="Highlight,Deactivate" default="Deactivate" />
  		<GameOption name="RevenueCalculation" values="Suggest,Deactivate" default="Deactivate" />
! 		<GameOption name="18KaasRuhrgebiedDoublesOnlyMajors" type="toggle" default="yes" />
  		<GameOption name="NoMapMode" type="toggle" default="no" />
  		<GameOption name="WithOptional6Train" type="toggle" default="no"/>

[Rails-commits] 18xx/rails/game Game.java,1.55,1.56

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

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

Modified Files:
	Game.java 
Log Message:
Added '+' to game version 

Index: Game.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Game.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** Game.java	31 May 2010 14:02:33 -0000	1.55
--- Game.java	6 Jun 2010 13:01:00 -0000	1.56
***************
*** 14,18 ****
  
  public class Game {
!     public static final String version = "1.3";
  
      /** The component Manager */
--- 14,18 ----
  
  public class Game {
!     public static final String version = "1.3+";
  
      /** The component Manager */

[Rails-commits] 18xx/rails/util ListAndFixSavedFiles.java,1.5,1.6

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

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

Modified Files:
	ListAndFixSavedFiles.java 
Log Message:
Added player names

Index: ListAndFixSavedFiles.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/util/ListAndFixSavedFiles.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ListAndFixSavedFiles.java	29 Apr 2010 19:48:17 -0000	1.5
--- ListAndFixSavedFiles.java	6 Jun 2010 13:00:10 -0000	1.6
***************
*** 258,262 ****
          int i=0;
          for (PossibleAction action : executedActions) {
!             reportText.append("Action "+(i++)+": "+action.toString());
              reportText.append("\n");
          }
--- 258,262 ----
          int i=0;
          for (PossibleAction action : executedActions) {
!             reportText.append("Action "+(i++)+" "+action.getPlayerName()+": "+action.toString());
              reportText.append("\n");
          }

[Rails-commits] 18xx LocalisedText.properties,1.138,1.139

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

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

Modified Files:
	LocalisedText.properties 
Log Message:
Fixed a message

Index: LocalisedText.properties
===================================================================
RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -d -r1.138 -r1.139
*** LocalisedText.properties	30 May 2010 11:32:15 -0000	1.138
--- LocalisedText.properties	6 Jun 2010 12:59:54 -0000	1.139
***************
*** 567,571 ****
  WORTH=Worth
  WouldExceedCertLimit=Would exceed certificate limit of {0}.
! WouldExceedHoldLimit={0} would exceed holding limit of {0}%.
  WouldExceedTrainLimit=Would exceed train limit of {0}
  WouldExceedSharesAtPlayers=Number of loans ({0}) would exceed number of shares in player hands ({1})
--- 567,571 ----
  WORTH=Worth
  WouldExceedCertLimit=Would exceed certificate limit of {0}.
! WouldExceedHoldLimit={0} would exceed holding limit of {1}%.
  WouldExceedTrainLimit=Would exceed train limit of {0}
  WouldExceedSharesAtPlayers=Number of loans ({0}) would exceed number of shares in player hands ({1})

[Rails-commits] 18xx/rails/game Game.java,1.54,1.55

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

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

Modified Files:
	Game.java 
Log Message:
Bump version strings to 1.3


Index: Game.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Game.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** Game.java	18 May 2010 04:12:23 -0000	1.54
--- Game.java	31 May 2010 14:02:33 -0000	1.55
***************
*** 14,18 ****
  
  public class Game {
!     public static final String version = "1.2.2";
  
      /** The component Manager */
--- 14,18 ----
  
  public class Game {
!     public static final String version = "1.3";
  
      /** The component Manager */

[Rails-commits] 18xx rails.sh, 1.9, 1.10 rails.bat, 1.10, 1.11 build.xml, 1.19, 1.20

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

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

Modified Files:
	rails.sh rails.bat build.xml 
Log Message:
Bump version strings to 1.3


Index: rails.bat
===================================================================
RCS file: /cvsroot/rails/18xx/rails.bat,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** rails.bat	21 Mar 2010 17:30:05 -0000	1.10
--- rails.bat	31 May 2010 14:02:33 -0000	1.11
***************
*** 1,2 ****
  
! java -jar rails-1.2.2.jar %1
\ No newline at end of file
--- 1,2 ----
  
! java -jar rails-1.3.jar %1
\ No newline at end of file

Index: rails.sh
===================================================================
RCS file: /cvsroot/rails/18xx/rails.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** rails.sh	21 Mar 2010 17:30:05 -0000	1.9
--- rails.sh	31 May 2010 14:02:33 -0000	1.10
***************
*** 1,3 ****
  #!/bin/bash
  
! java -jar ./rails-1.2.2.jar $1
\ No newline at end of file
--- 1,3 ----
  #!/bin/bash
  
! java -jar ./rails-1.3.jar $1
\ No newline at end of file

Index: build.xml
===================================================================
RCS file: /cvsroot/rails/18xx/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** build.xml	8 May 2010 22:05:26 -0000	1.19
--- build.xml	31 May 2010 14:02:33 -0000	1.20
***************
*** 10,14 ****
  	<property name="target" value="1.5"/>
  	<property name="source" value="1.5"/>
! 	<property name="version" value="1.2.2"/>
  	<taskdef name="jarbundler" 
  		classpath="tools/lib/jarbundler-2.1.0.jar"
--- 10,14 ----
  	<property name="target" value="1.5"/>
  	<property name="source" value="1.5"/>
! 	<property name="version" value="1.3"/>
  	<taskdef name="jarbundler" 
  		classpath="tools/lib/jarbundler-2.1.0.jar"

[Rails-commits] 18xx/data/1889 Game.xml,1.11,1.12

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

Update of /cvsroot/rails/18xx/data/1889
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv15557/data/1889

Modified Files:
	Game.xml 
Log Message:
Last minute change: 70% default for saved game options

Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1889/Game.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Game.xml	30 May 2010 10:42:38 -0000	1.11
--- Game.xml	30 May 2010 17:11:16 -0000	1.12
***************
*** 22,26 ****
  		<GameOption name="WithOptional6Train" type="toggle" default="no"/>
  		<GameOption name="UnlimitedTopTrains" parm="D" type="toggle" default="yes"/>
! 		<GameOption name="TwoPlayersCertLimit70Percent" type="toggle" default="no"/>
  		<GameParameters>
  			<PlayerShareLimit percentage="60">
--- 22,26 ----
  		<GameOption name="WithOptional6Train" type="toggle" default="no"/>
  		<GameOption name="UnlimitedTopTrains" parm="D" type="toggle" default="yes"/>
! 		<GameOption name="TwoPlayersCertLimit70Percent" type="toggle" default="yes"/>
  		<GameParameters>
  			<PlayerShareLimit percentage="60">

[Rails-commits] 18xx/data/1830 Game.xml,1.37,1.38

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

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

Modified Files:
	Game.xml 
Log Message:
Last minute change: 70% default for saved game options

Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1830/Game.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Game.xml	30 May 2010 10:42:39 -0000	1.37
--- Game.xml	30 May 2010 17:11:16 -0000	1.38
***************
*** 25,29 ****
  		<GameOption name="UnlimitedTiles" type="toggle" default="no"/>
  		<GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/>
! 		<GameOption name="TwoPlayersCertLimit70Percent" type="toggle" default="no"/>
  		<GameParameters>
  			<PlayerShareLimit percentage="60">
--- 25,29 ----
  		<GameOption name="UnlimitedTiles" type="toggle" default="no"/>
  		<GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/>
! 		<GameOption name="TwoPlayersCertLimit70Percent" type="toggle" default="yes"/>
  		<GameParameters>
  			<PlayerShareLimit percentage="60">

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

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

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

Modified Files:
	GameManager.java 
Log Message:
Last minute change: deactivate all revenue algorithm for nomap mode

Index: GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** GameManager.java	30 May 2010 10:42:39 -0000	1.104
--- GameManager.java	30 May 2010 17:03:30 -0000	1.105
***************
*** 510,521 ****
  
          // define guiParameters from gameOptions
!         if (GameOption.convertValueToBoolean(getGameOption("NoMapMode")))
              guiParameters.put(GuiDef.Parm.NO_MAP_MODE, true);
!         
!         if (getGameOption("RouteAwareness").equalsIgnoreCase("Highlight"))
!             guiParameters.put(GuiDef.Parm.ROUTE_HIGHLIGHT, true);
!             
!         if (getGameOption("RevenueCalculation").equalsIgnoreCase("Suggest"))
!             guiParameters.put(GuiDef.Parm.REVENUE_SUGGEST, true);
  
      }
--- 510,525 ----
  
          // define guiParameters from gameOptions
!         if (GameOption.convertValueToBoolean(getGameOption("NoMapMode"))) {
              guiParameters.put(GuiDef.Parm.NO_MAP_MODE, true);
!             guiParameters.put(GuiDef.Parm.ROUTE_HIGHLIGHT, false);
!             guiParameters.put(GuiDef.Parm.REVENUE_SUGGEST, false);
!         } else { 
!             if (getGameOption("RouteAwareness").equalsIgnoreCase("Highlight")) {
!                 guiParameters.put(GuiDef.Parm.ROUTE_HIGHLIGHT, true);
!             }
!             if (getGameOption("RevenueCalculation").equalsIgnoreCase("Suggest")) {
!                 guiParameters.put(GuiDef.Parm.REVENUE_SUGGEST, true);
!             }
!         }
  
      }

[Rails-commits] 18xx/data/1835 TileSet.xml,1.15,1.16

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

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

Modified Files:
	TileSet.xml 
Log Message:
Upgrade possibility for Nuernberg preprinted in 1835

Index: TileSet.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1835/TileSet.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** TileSet.xml	15 May 2010 19:05:40 -0000	1.15
--- TileSet.xml	30 May 2010 11:41:46 -0000	1.16
***************
*** 40,44 ****
  		<Upgrade id="216"/>
  	</Tile>
! 	<Tile id="-810"/>
  	<Tile id="-901"/>
  	
--- 40,46 ----
  		<Upgrade id="216"/>
  	</Tile>
! 	<Tile id="-810"><!-- Nuernberg -->
! 		<Upgrade id="218"/>
! 	</Tile>
  	<Tile id="-901"/>
  	

[Rails-commits] 18xx LocalisedText.properties,1.137,1.138

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

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

Modified Files:
	LocalisedText.properties 
Log Message:
Several changes due to the game options

Index: LocalisedText.properties
===================================================================
RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v
retrieving revision 1.137
retrieving revision 1.138
diff -C2 -d -r1.137 -r1.138
*** LocalisedText.properties	29 May 2010 23:33:43 -0000	1.137
--- LocalisedText.properties	30 May 2010 11:32:15 -0000	1.138
***************
*** 2,6 ****
  1889PrivateBactive=Player {0} (owner of Private B) may lay port tile
  1889PrivateCactive=Player {0} (previous owner of Private C) may lay tile on C4 immediately
! 18ALOptimizeNamedTrains=Optimize named token assignment
  ActionNotAllowed=Action {0} is not allowed
  ALL=All
--- 2,7 ----
  1889PrivateBactive=Player {0} (owner of Private B) may lay port tile
  1889PrivateCactive=Player {0} (previous owner of Private C) may lay tile on C4 immediately
! 18ALOptimizeNamedTrains=Optimize named train assignment
! 18KaasRuhrgebiedDoublesOnlyMajors=Ruhrgebied bonus applies for cities only
  ActionNotAllowed=Action {0} is not allowed
  ALL=All
***************
*** 423,426 ****
--- 424,428 ----
  REPORT=Report Window
  REVENUE=Revenue
+ RevenueCalculation=support for revenue calculation
  RevenueStations=, Cities = {0}, Towns = {1}
  RevenueStationsIgnoreMinors=, Cities = {0}
***************
*** 428,431 ****
--- 430,434 ----
  RevenueWithNoTrains={0} owns no trains, so revenue is {1}.
  RotateTile=Click tile to rotate it, or select another tile or hex, or press Lay Tile to confirm tile, or press the No Tile button.
+ RouteAwareness=support for tile and token lays
  RunsWithBorrowedTrain={0} runs with a borrowed {1}-train and must withhold revenue
  RustsTrains=Rusts {0}-trains

[Rails-commits] 18xx/rails/ui/swing StatusWindow.java,1.43,1.44

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

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

Modified Files:
	StatusWindow.java 
Log Message:
Deactivate Map Export

Index: StatusWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/StatusWindow.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** StatusWindow.java	9 Apr 2010 07:20:27 -0000	1.43
--- StatusWindow.java	30 May 2010 11:31:47 -0000	1.44
***************
*** 112,123 ****
          fileMenu.add(saveItem);
  
!         exportItem = new ActionMenuItem(LocalText.getText("EXPORT"));
!         exportItem.setActionCommand(EXPORT_CMD);
!         exportItem.addActionListener(this);
!         exportItem.setEnabled(true);
!         exportItem.setPossibleAction(new GameAction(GameAction.EXPORT));
!         fileMenu.add(exportItem);
! 
!         fileMenu.addSeparator();
  
          menuItem = new JMenuItem(LocalText.getText("QUIT"));
--- 112,123 ----
          fileMenu.add(saveItem);
  
!         // export menu item
! //        exportItem = new ActionMenuItem(LocalText.getText("EXPORT"));
! //        exportItem.setActionCommand(EXPORT_CMD);
! //        exportItem.addActionListener(this);
! //        exportItem.setEnabled(true);
! //        exportItem.setPossibleAction(new GameAction(GameAction.EXPORT));
! //        fileMenu.add(exportItem);
! //        fileMenu.addSeparator();
  
          menuItem = new JMenuItem(LocalText.getText("QUIT"));