rails-commits Mailing List for Rails: an 18xx game system (Page 56)

Status: Beta

Brought to you by: neutronc, wakko666

rails-commits — CVS Commits

You can subscribe to this list here.

2008	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct (3)	_Nov (46)	_Dec (57)
2009	_Jan (51)	_Feb (10)	_Mar	_Apr	_May (14)	_Jun	_Jul (13)	_Aug (30)	_Sep (83)	_Oct (56)	_Nov (148)	_Dec (107)
2010	_Jan (260)	_Feb (164)	_Mar (183)	_Apr (99)	_May (160)	_Jun (40)	_Jul (33)	_Aug (48)	_Sep (22)	_Oct (24)	_Nov (1)	_Dec (12)
2011	_Jan (6)	_Feb (15)	_Mar (13)	_Apr (37)	_May (27)	_Jun (29)	_Jul (33)	_Aug (20)	_Sep (17)	_Oct (20)	_Nov (33)	_Dec (17)
2012	_Jan (39)	_Feb (38)	_Mar (20)	_Apr (21)	_May (17)	_Jun (22)	_Jul (16)	_Aug (3)	_Sep (9)	_Oct (10)	_Nov	_Dec

Flat | Threaded

<< < 1 .. 54 55 56 57 58 .. 86 > >> (Page 56 of 86)

[Rails-commits] 18xx my.properties,1.10,1.11

From: Erik V. <ev...@us...> - 2010-01-18 18:49:42

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

Modified Files:
	my.properties 
Log Message:
Initial implementation of Autopass and RequestTurn

Index: my.properties
===================================================================
RCS file: /cvsroot/rails/18xx/my.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** my.properties	28 Nov 2009 22:41:05 -0000	1.10
--- my.properties	18 Jan 2010 18:49:30 -0000	1.11
***************
*** 69,76 ****
  #report.window.editable=yes
  
! ### Default players
! # Comma-separated list of player names. 
! # Useful for game testing purposes.
  #default_players=Alice,Bob,Charlie 
  
  ### Default game
--- 69,82 ----
  #report.window.editable=yes
  
! ### Player info
! ##  Default players
! #   Comma-separated list of player names. 
! #   Useful for game testing purposes.
  #default_players=Alice,Bob,Charlie 
+ #
+ ##  Local player name
+ #   Useful for distributed usage (Internet, PBEM, cloud storage/dropbox)
+ #   Required for "request turn" facility with cloud storage (dropbox)
+ #local.player.name=Alice
  
  ### Default game

[Rails-commits] 18xx/rails/ui/swing ORPanel.java,1.41,1.42

From: Erik V. <ev...@us...> - 2010-01-18 18:48:34

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

Modified Files:
	ORPanel.java 
Log Message:
Added phase and train info to the status window

Index: ORPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** ORPanel.java	16 Jan 2010 21:16:30 -0000	1.41
--- ORPanel.java	18 Jan 2010 18:47:29 -0000	1.42
***************
*** 47,50 ****
--- 47,52 ----
      private JMenuItem remainingTilesMenuItem;
      private JMenu privatesInfoMenu;
+     private JMenu trainsInfoMenu;
+     private JMenu phasesInfoMenu;
      private JMenu specialMenu;
      private JMenu loansMenu;
***************
*** 157,161 ****
  
          addPrivatesInfo();
!         
          specialMenu = new JMenu(LocalText.getText("SPECIAL"));
          specialMenu.setBackground(Color.YELLOW);
--- 159,165 ----
  
          addPrivatesInfo();
!         addTrainsInfo();
!         addPhasesInfo();
! 
          specialMenu = new JMenu(LocalText.getText("SPECIAL"));
          specialMenu.setBackground(Color.YELLOW);
***************
*** 464,499 ****
  
      }
!     
      protected void addPrivatesInfo () {
!         
          List<PrivateCompanyI> privates = orWindow.gameUIManager.getGameManager().getAllPrivateCompanies();
          if (privates == null || privates.isEmpty()) return;
!         
          privatesInfoMenu = new JMenu(LocalText.getText("PRIVATES"));
          privatesInfoMenu.setEnabled(true);
          infoMenu.add(privatesInfoMenu);
!         
          JMenu item;
          List<SpecialPropertyI> sps;
!         StringBuffer b;
          String info;
  
          for (PrivateCompanyI p : privates) {
              sps = p.getSpecialProperties();
!             b = new StringBuffer("<html>");
              if (Util.hasValue(p.getLongName())) {
!                 b.append(p.getLongName());
              }
              info = p.getInfoText();
              if (Util.hasValue(info)) {
!                 if (b.length() > 6) b.append("<br>");
!                 b.append(info);
              } else if (sps == null || sps.isEmpty()) {
!                 if (b.length() > 6) b.append("<br>");
!                 b.append(LocalText.getText("NoSpecialProperty"));
              } else {
                  for (SpecialPropertyI sp : sps) {
!                     if (b.length() > 6) b.append("<br>");
!                     b.append(sp.toString());
                  }
              }
--- 468,500 ----
  
      }
! 
      protected void addPrivatesInfo () {
! 
          List<PrivateCompanyI> privates = orWindow.gameUIManager.getGameManager().getAllPrivateCompanies();
          if (privates == null || privates.isEmpty()) return;
! 
          privatesInfoMenu = new JMenu(LocalText.getText("PRIVATES"));
          privatesInfoMenu.setEnabled(true);
          infoMenu.add(privatesInfoMenu);
! 
          JMenu item;
          List<SpecialPropertyI> sps;
!         StringBuffer b = new StringBuffer("<html>");
          String info;
  
          for (PrivateCompanyI p : privates) {
              sps = p.getSpecialProperties();
!             b.setLength(6);
              if (Util.hasValue(p.getLongName())) {
!                 appendInfoText (b, p.getLongName());
              }
              info = p.getInfoText();
              if (Util.hasValue(info)) {
!                 appendInfoText(b, info);
              } else if (sps == null || sps.isEmpty()) {
!                 appendInfoText(b, LocalText.getText("NoSpecialProperty"));
              } else {
                  for (SpecialPropertyI sp : sps) {
!                     appendInfoText(b, sp.toString());
                  }
              }
***************
*** 505,508 ****
--- 506,569 ----
      }
  
+     protected void addTrainsInfo() {
+ 
+     	TrainManager tm = orWindow.getGameUIManager().getGameManager().getTrainManager();
+     	List<TrainTypeI> types = tm.getTrainTypes();
+         JMenu item;
+         StringBuffer b = new StringBuffer("<html>");
+ 
+         trainsInfoMenu = new JMenu(LocalText.getText("TRAINS"));
+         trainsInfoMenu.setEnabled(true);
+         infoMenu.add(trainsInfoMenu);
+ 
+         for (TrainTypeI type : types) {
+         	b.setLength(6);
+         	if (Util.hasValue(type.getStartedPhaseName())) {
+         		appendInfoText(b, LocalText.getText("StartsPhase", type.getStartedPhaseName()));
+         	}
+         	if (type.getRustedTrainType() != null) {
+         		appendInfoText(b, LocalText.getText("RustsTrains", type.getRustedTrainType().getName()));
+         	}
+         	if (type.getReleasedTrainType() != null) {
+         		appendInfoText(b, LocalText.getText("ReleasesTrains", type.getReleasedTrainType().getName()));
+         	}
+         	if (b.length() == 6) b.append(LocalText.getText("None"));
+ 
+             item = new JMenu (LocalText.getText("N_Train", type.getName()));
+             item.setEnabled(true);
+             item.add(new JMenuItem(b.toString()));
+             trainsInfoMenu.add(item);
+     	}
+     }
+ 
+     protected void addPhasesInfo() {
+ 
+     	PhaseManager pm = orWindow.getGameUIManager().getGameManager().getPhaseManager();
+     	List<Phase> phases = pm.getPhases();
+         JMenu item;
+         StringBuffer b = new StringBuffer("<html>");
+ 
+         phasesInfoMenu = new JMenu(LocalText.getText("Phases"));
+         phasesInfoMenu.setEnabled(true);
+         infoMenu.add(phasesInfoMenu);
+ 
+         for (Phase phase : phases) {
+         	b.setLength(6);
+         	appendInfoText(b, LocalText.getText("PhaseTileColours", phase.getTileColoursString()));
+         	appendInfoText(b, LocalText.getText("PhaseNumberOfORs", phase.getNumberOfOperatingRounds()));
+         	appendInfoText(b, LocalText.getText("PhaseOffBoardStep", phase.getOffBoardRevenueStep()));
+             item = new JMenu (LocalText.getText("PhaseX", phase.getName()));
+             item.setEnabled(true);
+             item.add(new JMenuItem(b.toString()));
+             phasesInfoMenu.add(item);
+     	}
+     }
+ 
+     private void appendInfoText (StringBuffer b, String text) {
+     	if (text == null || text.length() == 0) return;
+     	if (b.length() > 6) b.append("<br>");
+     	b.append(text);
+     }
+ 
      public void finish() {

[Rails-commits] 18xx LocalisedText.properties,1.95,1.96

From: Erik V. <ev...@us...> - 2010-01-18 18:48:18

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

Modified Files:
	LocalisedText.properties 
Log Message:
Added phase and train info to the status window

Index: LocalisedText.properties
===================================================================
RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** LocalisedText.properties	16 Jan 2010 21:16:23 -0000	1.95
--- LocalisedText.properties	18 Jan 2010 18:47:16 -0000	1.96
***************
*** 9,12 ****
--- 9,14 ----
  AlreadySoldThisTurn={0} already sold {1} this turn
  AmountMustBeMultipleOf10=Amount ({0}) must be a multiple of 10
+ Autopass=Autopass
+ Autopasses={0} autopasses
  BANK=Bank
  BANK_SHARES=Bank shares
***************
*** 67,71 ****
  CannotLayTileOn={0} cannot lay tile {1} on {2} for {3}: {4}
  CannotPayOutRevenue={0} cannot pay out revenue of {1}: {2}
! CannotProcessRevenue=Cannot process revenue {0} of {1}: {2}.
  CannotRepayLoans={0} cannot repay {1} loan(s) of {2}: {3}
  CannotSplitRevenue={0} cannot split revenue of {1}: {2}
--- 69,74 ----
  CannotLayTileOn={0} cannot lay tile {1} on {2} for {3}: {4}
  CannotPayOutRevenue={0} cannot pay out revenue of {1}: {2}
! CannotProcessRevenue=Cannot process revenue {0} of {1}: {2}
! CannotRequestTurn=Cannot request turn for {0}
  CannotRepayLoans={0} cannot repay {1} loan(s) of {2}: {3}
  CannotSplitRevenue={0} cannot split revenue of {1}: {2}
***************
*** 302,305 ****
--- 305,313 ----
  PRIVATES=Privates
  PaysLoanInterest={0} pays {1} interest for outstanding loans
+ PhaseNumberOfORs=Number of ORs: {0}
+ PhaseOffBoardStep=Off-board revenue step: {0}
+ Phases=Phases
+ PhaseTileColours=Allowed tile colours: {0}
+ PhaseX=Phase {0}
  PlayerCash=Each player receives {0} from the Bank.
  PlayerDoesNotOwn=Player {0} does not own {1}
***************
*** 324,327 ****
--- 332,336 ----
  REDO=Redo
  ReleasedFromEscrow={0} receives {1} released from bank escrow
+ ReleasesTrains=Makes {0}-trains available for purchasing
  RemainingTiles=Remaining tiles
  RepayLoans=Repay loan(s)
***************
*** 333,336 ****
--- 342,346 ----
  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.
  RunsWithBorrowedTrain={0} runs with a borrowed {1}-train and must withhold revenue
+ RustsTrains=Rusts {0}-trains
  SAVE=Save
  SaveFailed=Save failed, reason: {0}
***************
*** 385,388 ****
--- 395,399 ----
  StartOfPhase=Start of phase {0}.
  StartPacketHasNoClass=Start packet {0} has no class defined.
+ StartsPhase=Starts phase {0}
  StartStockRound=\n==================\nStart of Stock Round {0}\n==================
  Status_Unavailable=Currently unavailable

[Rails-commits] 18xx/rails/game PhaseManager.java, 1.18, 1.19 Phase.java, 1.14, 1.15

From: Erik V. <ev...@us...> - 2010-01-18 18:47:59

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

Modified Files:
	PhaseManager.java Phase.java 
Log Message:
Added phase and train info to the status window

Index: PhaseManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/PhaseManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** PhaseManager.java	31 Oct 2009 17:08:26 -0000	1.18
--- PhaseManager.java	18 Jan 2010 18:46:57 -0000	1.19
***************
*** 87,89 ****
--- 87,93 ----
      }
  
+     public List<Phase> getPhases() {
+     	return phaseList;
+     }
+ 
  }

Index: Phase.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Phase.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Phase.java	31 Oct 2009 17:08:27 -0000	1.14
--- Phase.java	18 Jan 2010 18:47:16 -0000	1.15
***************
*** 33,37 ****
      /** May company buy more than one Train of each type from the Bank per turn? */
      protected boolean oneTrainPerTypePerTurn = false;
!     
      /** Is loan taking allowed */
      protected boolean loanTakingAllowed = false;
--- 33,37 ----
      /** May company buy more than one Train of each type from the Bank per turn? */
      protected boolean oneTrainPerTypePerTurn = false;
! 
      /** Is loan taking allowed */
      protected boolean loanTakingAllowed = false;
***************
*** 126,134 ****
                              oneTrainPerTypePerTurn);
          }
!         
          Tag loansTag = tag.getChild("Loans");
          if (loansTag != null) {
              loanTakingAllowed = loansTag.getAttributeAsBoolean("allowed",
!                     loanTakingAllowed); 
          }
  
--- 126,134 ----
                              oneTrainPerTypePerTurn);
          }
! 
          Tag loansTag = tag.getChild("Loans");
          if (loansTag != null) {
              loanTakingAllowed = loansTag.getAttributeAsBoolean("allowed",
!                     loanTakingAllowed);
          }
  
***************
*** 164,167 ****
--- 164,171 ----
      }
  
+     public String getTileColoursString() {
+     	return colourList;
+     }
+ 
      public int getIndex() {
          return index;

[Rails-commits] 18xx/data/18EU Game.xml,1.12,1.13

From: Erik V. <ev...@us...> - 2010-01-18 18:43:54

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

Modified Files:
	Game.xml 
Log Message:
Fixed bug in phases definition


Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/18EU/Game.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Game.xml	17 Jan 2010 14:05:48 -0000	1.12
--- Game.xml	18 Jan 2010 18:43:36 -0000	1.13
***************
*** 99,106 ****
  			<Tiles colour="yellow,green,brown"/>
  		</Phase>
! 		<Phase name="7">
! 			<Tiles colour="yellow,green,brown"/>
! 		</Phase>
! 		<Phase name="4D">
  			<Tiles colour="yellow,green,brown,grey"/>
  		</Phase>
--- 99,103 ----
  			<Tiles colour="yellow,green,brown"/>
  		</Phase>
! 		<Phase name="8">
  			<Tiles colour="yellow,green,brown,grey"/>
  		</Phase>

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

From: Erik V. <ev...@us...> - 2010-01-17 22:49:45

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

Modified Files:
	GameManager.java 
Log Message:
Clear visibility hints after loading

Index: GameManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** GameManager.java	17 Jan 2010 14:05:48 -0000	1.77
--- GameManager.java	17 Jan 2010 22:49:06 -0000	1.78
***************
*** 832,835 ****
--- 832,837 ----
  
          DisplayBuffer.clear();
+         guiHints.clearVisibilityHints();
+         
          return true;
      }

[Rails-commits] 18xx/rails/ui/swing GameUIManager.java,1.33,1.34

From: Erik V. <ev...@us...> - 2010-01-17 18:33:16

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

Modified Files:
	GameUIManager.java 
Log Message:
Fix for companies not being able to start at lowest price.

Index: GameUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameUIManager.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** GameUIManager.java	14 Jan 2010 20:49:22 -0000	1.33
--- GameUIManager.java	17 Jan 2010 18:32:46 -0000	1.34
***************
*** 462,466 ****
  
      			int index = dialog.getSelectedOption();
!     			if (index > 0) {
      				int price = action.getStartPrices()[index];
      				action.setStartPrice(price);
--- 462,466 ----
  
      			int index = dialog.getSelectedOption();
!     			if (index >= 0) {
      				int price = action.getStartPrices()[index];
      				action.setStartPrice(price);

[Rails-commits] 18xx/data/1856 Game.xml, 1.29, 1.30 CompanyManager.xml, 1.31, 1.32