rails-devel — List for discussion of Rails development

Re: [Rails-devel] Start orientation of THB

[Erik V. <eri...@xs...>]

I forgot to add that *this* change will create a saved file incompatibility
for 1830/1856 games that already have passed a case where  the Erie/THB had
floated after the green OO tile had been laid on their home hex. Rails now
*requires* the extra player action to explicitly place that token on one of
the two cities, and it will be missing in older saved files. So for these
games, 1.1.4 saved files will be incompatible with 1.1.3 ones.

Erik.

-----Original Message-----
From: Erik Vos [mailto:eri...@xs...] 
Sent: Wednesday 03 February 2010 21:35
To: 'Development list for Rails: an 18xx game'
Cc: 'brett lentz'; 'Arne Östlund'
Subject: RE: Start orientation of THB

This has now been fixed.
If the 1856 THB (or the 1830 Erie, for that matter) 
starts, the token city is left undefined. 

If there is already a green OO tile on the home hex,
the player is asked to assign the home city at the
start of the first OR turn of the company.
This is irrespective of what the rules say about
when home tokens are laid.

Normally the home token is laid at the moment that the rules
prescribe (at start, at floating or in the first OR turn),
but in this case there is no easy way to accomplish that.

Erik.

-----Original Message-----
From: Erik Vos [mailto:eri...@xs...] 
Sent: Monday 01 February 2010 22:22
To: 'brett lentz'; 'Arne Östlund'
Subject: RE: Start orientation of THB

Arne,

You're right. This case is not covered yet.
I'll try to fix it later this week.

Erik.

-----Original Message-----
From: brett lentz [mailto:wak...@gm...] 
Sent: Monday 01 February 2010 18:53
To: Erik Vos
Subject: Fwd: Start orientation of THB

---------- Forwarded message ----------
From: Arne Östlund <arn...@gl...>
Date: Mon, Feb 1, 2010 at 9:14 AM
Subject: Re: Start orientation of THB
To: rai...@li...


Hi Erik

We are playing an 1856 PBeM campaigne and discovered that THB has no
option to choose start position if the green #59 is already placed. In
our game #59 @ L15 has legs N and SW and Rails forces THB to start at
the towm with leg SW even though it would have been more natural to
start northwards. I have sent a save file to show the problem.

Yours,
Arne Östlund

Re: [Rails-devel] [Rails-commits] upgrade / file versioning

[Erik V. <eri...@xs...>]

I am not aware of any saved file incompatibilities between these versions. 
But that doesn't guarantee that these don't exist, of course. 
See also my next message.

Erik.

-----Original Message-----
From: Jim Black [mailto:ji...@ko...] 
Sent: Thursday 04 February 2010 00:37
To: rai...@li...
Subject: [Rails-commits] upgrade / file versioning

The new Info in the Rails 1.1.3 update looks great.  However, the first time
I tried to save with 1.1.3, no 1.1.2 players could read my game file- so I
had to switch back to 1.1.2.  

Was this happenstance, as to be expected sometimes- or, is there a major
file version upgrade implicit in 1.1.3? 

thanks,
 - jim
  
On Feb 3, 2010, at 12:17 PM, rai...@li...
wrote:

> Send Rails-commits mailing list submissions to
> 	rai...@li...
> 
> To subscribe or unsubscribe via the World Wide Web, visit
> 	https://lists.sourceforge.net/lists/listinfo/rails-commits
> or, via email, send a message with subject or body 'help' to
> 	rai...@li...
> 
> You can reach the person managing the list at
> 	rai...@li...
> 
> When replying, please edit your Subject line so it is more specific
> than "Re: Contents of Rails-commits digest..."
> 
> 
> Today's Topics:
> 
>   1. 18xx/data/1889 Game.xml,1.1,1.2 (Erik Vos)
>   2. 18xx/data/1856 CompanyManager.xml,1.33,1.34 (Erik Vos)
>   3. 18xx/rails/ui/swing/hexmap HexMap.java,1.21,1.22 (Erik Vos)
>   4. 18xx/rails/ui/swing ORUIManager.java,1.49,1.50 (Erik Vos)
>   5. 18xx/rails/game/action LayToken.java, 1.9,	1.10
>      LayBaseToken.java, 1.6, 1.7 (Erik Vos)
>   6. 18xx/rails/game MapHex.java, 1.34,	1.35 PublicCompany.java,
>      1.80, 1.81 OperatingRound.java, 1.95,	1.96 PublicCompanyI.java,
>      1.43, 1.44 (Erik Vos)
>   7. 18xx/tools ConvertTilesXML.java, NONE, 1.1 Util.java,	NONE,
>      1.1 MakeGameTileSets.java, NONE, 1.1 XmlUtils.java, NONE, 1.1
>      (Erik Vos)
> 
> 
> ----------------------------------------------------------------------
> 
> Message: 1
> Date: Wed, 03 Feb 2010 20:05:44 +0000
> From: Erik Vos <ev...@us...>
> Subject: [Rails-commits] 18xx/data/1889 Game.xml,1.1,1.2
> To: rai...@li...
> Message-ID: <E1N...@sf...>
> 
> Update of /cvsroot/rails/18xx/data/1889
> In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32238/data/1889
> 
> Modified Files:
> 	Game.xml 
> Log Message:
> Fixed money symbol
> 
> Index: Game.xml
> ===================================================================
> RCS file: /cvsroot/rails/18xx/data/1889/Game.xml,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -C2 -d -r1.1 -r1.2
> *** Game.xml	3 Feb 2010 05:37:54 -0000	1.1
> --- Game.xml	3 Feb 2010 20:05:42 -0000	1.2
> ***************
> *** 46,50 ****
>  	<Component name="Bank" class="rails.game.Bank">
>  		<Bank amount="7000"/>
> ! 		<Money format="¥@"/>
>  	</Component>
>  	<Component name="TileManager" class="rails.game.TileManager" 
> --- 46,50 ----
>  	<Component name="Bank" class="rails.game.Bank">
>  		<Bank amount="7000"/>
> ! 		<Money format="&#xa5;@"/>
>  	</Component>
>  	<Component name="TileManager" class="rails.game.TileManager" 
> 
> 
> 
> 
> ------------------------------
> 
> Message: 2
> Date: Wed, 03 Feb 2010 20:16:45 +0000
> From: Erik Vos <ev...@us...>
> Subject: [Rails-commits] 18xx/data/1856 CompanyManager.xml,1.33,1.34
> To: rai...@li...
> Message-ID: <E1N...@sf...>
> 
> Update of /cvsroot/rails/18xx/data/1856
> In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1357/data/1856
> 
> Modified Files:
> 	CompanyManager.xml 
> Log Message:
> Home base on green OO tile can now be chosen in first turn
> 
> Index: CompanyManager.xml
> ===================================================================
> RCS file: /cvsroot/rails/18xx/data/1856/CompanyManager.xml,v
> retrieving revision 1.33
> retrieving revision 1.34
> diff -C2 -d -r1.33 -r1.34
> *** CompanyManager.xml	31 Jan 2010 22:15:58 -0000	1.33
> --- CompanyManager.xml	3 Feb 2010 20:16:40 -0000	1.34
> ***************
> *** 113,117 ****
>  	</Company>
>  	<Company name="THB" type="Public" tokens="2" fgColour="000000"
bgColour="B0B040">
> ! 		<Home hex="L15"/>
>  		<Destination hex="J11"/>
>  	</Company>
> --- 113,117 ----
>  	</Company>
>  	<Company name="THB" type="Public" tokens="2" fgColour="000000"
bgColour="B0B040">
> ! 		<Home hex="L15" city="0"/><!-- City to be selected in first
turn-->
>  		<Destination hex="J11"/>
>  	</Company>
> 
> 
> 
> 
> ------------------------------
> 
> Message: 3
> Date: Wed, 03 Feb 2010 20:16:42 +0000
> From: Erik Vos <ev...@us...>
> Subject: [Rails-commits] 18xx/rails/ui/swing/hexmap
> 	HexMap.java,1.21,1.22
> To: rai...@li...
> Message-ID: <E1N...@sf...>
> 
> Update of /cvsroot/rails/18xx/rails/ui/swing/hexmap
> In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1357/rails/ui/swing/hexmap
> 
> Modified Files:
> 	HexMap.java 
> Log Message:
> Home base on green OO tile can now be chosen in first turn
> 
> Index: HexMap.java
> ===================================================================
> RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/HexMap.java,v
> retrieving revision 1.21
> retrieving revision 1.22
> diff -C2 -d -r1.21 -r1.22
> *** HexMap.java	31 Jan 2010 22:22:36 -0000	1.21
> --- HexMap.java	3 Feb 2010 20:16:40 -0000	1.22
> ***************
> *** 203,206 ****
> --- 203,210 ----
>      }
> 
> +     public void setSelectedHex (GUIHex hex) {
> +     	selectedHex = hex;
> +     }
> + 
>      public boolean isAHexSelected() // Not used
>      {
> 
> 
> 
> 
> ------------------------------
> 
> Message: 4
> Date: Wed, 03 Feb 2010 20:16:39 +0000
> From: Erik Vos <ev...@us...>
> Subject: [Rails-commits] 18xx/rails/ui/swing
> 	ORUIManager.java,1.49,1.50
> To: rai...@li...
> Message-ID: <E1N...@sf...>
> 
> Update of /cvsroot/rails/18xx/rails/ui/swing
> In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1357/rails/ui/swing
> 
> Modified Files:
> 	ORUIManager.java 
> Log Message:
> Home base on green OO tile can now be chosen in first turn
> 
> Index: ORUIManager.java
> ===================================================================
> RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v
> retrieving revision 1.49
> retrieving revision 1.50
> diff -C2 -d -r1.49 -r1.50
> *** ORUIManager.java	3 Feb 2010 05:37:55 -0000	1.49
> --- ORUIManager.java	3 Feb 2010 20:16:36 -0000	1.50
> ***************
> *** 529,536 ****
>          for (LayTile action : possibleActions.getType(LayTile.class)) {
>              if (action.getType() == LayTile.SPECIAL_PROPERTY
> !                     && !action.getSpecialProperty().requiresConnection()
// sfy 1889
> !                     &&
action.getSpecialProperty().getLocations().contains(mapHex)
> !                 )
> !             {
>                  // log.debug(hex.getName()+" is a special property
target");
>                  return true;
> --- 529,533 ----
>          for (LayTile action : possibleActions.getType(LayTile.class)) {
>              if (action.getType() == LayTile.SPECIAL_PROPERTY
> !                 &&
action.getSpecialProperty().getLocations().contains(mapHex)) {
>                  // log.debug(hex.getName()+" is a special property
target");
>                  return true;
> ***************
> *** 631,635 ****
>                      String selected =
>                         (String) JOptionPane.showInputDialog(orWindow,
> !
LocalText.getText("SelectStationForToken"),
>
LocalText.getText("WhichStation"),
>
JOptionPane.PLAIN_MESSAGE, null,
> --- 628,635 ----
>                      String selected =
>                         (String) JOptionPane.showInputDialog(orWindow,
> !
LocalText.getText("SelectStationForToken",
> !
action.getPlayerName(),
> !
selectedHex.getName(),
> !
action.getCompanyName()),
>
LocalText.getText("WhichStation"),
>
JOptionPane.PLAIN_MESSAGE, null,
> ***************
> *** 786,790 ****
>
Bank.format(bTrain.getPresidentCashToAdd())));
>              }
> !             
>              if (bTrain.getExtraMessage() != null) {
>                  b.append(" (").append(bTrain.getExtraMessage()+")");
> --- 786,790 ----
>
Bank.format(bTrain.getPresidentCashToAdd())));
>              }
> ! 
>              if (bTrain.getExtraMessage() != null) {
>                  b.append(" (").append(bTrain.getExtraMessage()+")");
> ***************
> *** 810,814 ****
>          }
>          setMessage(msgbuf.toString());
> !         
>          String selectedActionText =
>                  (String) JOptionPane.showInputDialog(orWindow,
> --- 810,814 ----
>          }
>          setMessage(msgbuf.toString());
> ! 
>          String selectedActionText =
>                  (String) JOptionPane.showInputDialog(orWindow,
> ***************
> *** 1119,1122 ****
> --- 1119,1131 ----
>              orWindow.requestFocus();
> 
> +             // Check first action.
> +             // If it's to lay a home token, handle that here
> +             LayBaseToken lbt =
possibleActions.getType(LayBaseToken.class).get(0);
> +             if (lbt.getType() == LayBaseToken.HOME_CITY) {
> +
map.setSelectedHex(map.getHexByName(lbt.getChosenHex().getName()));
> +             	layBaseToken (lbt);
> +             	return;
> +             }
> + 
>              // Include bonus tokens
>              List<LayToken> possibleTokenLays =
> 
> 
> 
> 
> ------------------------------
> 
> Message: 5
> Date: Wed, 03 Feb 2010 20:16:42 +0000
> From: Erik Vos <ev...@us...>
> Subject: [Rails-commits] 18xx/rails/game/action LayToken.java, 1.9,
> 	1.10 LayBaseToken.java, 1.6, 1.7
> To: rai...@li...
> Message-ID: <E1N...@sf...>
> 
> Update of /cvsroot/rails/18xx/rails/game/action
> In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1357/rails/game/action
> 
> Modified Files:
> 	LayToken.java LayBaseToken.java 
> Log Message:
> Home base on green OO tile can now be chosen in first turn
> 
> Index: LayBaseToken.java
> ===================================================================
> RCS file: /cvsroot/rails/18xx/rails/game/action/LayBaseToken.java,v
> retrieving revision 1.6
> retrieving revision 1.7
> diff -C2 -d -r1.6 -r1.7
> *** LayBaseToken.java	31 Jan 2010 22:22:28 -0000	1.6
> --- LayBaseToken.java	3 Feb 2010 20:16:40 -0000	1.7
> ***************
> *** 26,29 ****
> --- 26,30 ----
>      public final static int LOCATION_SPECIFIC = 1; // Valid hex
>      public final static int SPECIAL_PROPERTY = 2; // Directed by a
special
> +     public final static int HOME_CITY = 3; // If city on home hex is
undefined in 1st turn
>      // property
> 
> ***************
> *** 52,55 ****
> --- 53,62 ----
>      }
> 
> +     public LayBaseToken (MapHex hex) {
> +     	super (hex);
> +     	setChosenHex (hex);
> +     	type = HOME_CITY;
> +     }
> + 
>      public int getChosenStation() {
>          return chosenStation;
> 
> Index: LayToken.java
> ===================================================================
> RCS file: /cvsroot/rails/18xx/rails/game/action/LayToken.java,v
> retrieving revision 1.9
> retrieving revision 1.10
> diff -C2 -d -r1.9 -r1.10
> *** LayToken.java	4 Jun 2008 19:00:29 -0000	1.9
> --- LayToken.java	3 Feb 2010 20:16:38 -0000	1.10
> ***************
> *** 1,4 ****
>  /* $Header$
> !  * 
>   * Created on 14-Sep-2006
>   * Change Log:
> --- 1,4 ----
>  /* $Header$
> !  *
>   * Created on 14-Sep-2006
>   * Change Log:
> ***************
> *** 6,9 ****
> --- 6,10 ----
>  package rails.game.action;
> 
> + import java.util.ArrayList;
>  import java.util.List;
> 
> ***************
> *** 56,59 ****
> --- 57,66 ----
>      }
> 
> +     public LayToken (MapHex hex) {
> +     	this.locations = new ArrayList<MapHex>(1);
> +     	locations.add(hex);
> +         buildLocationNameString();
> +     }
> + 
>      /**
>       * @return Returns the chosenHex.
> ***************
> *** 90,94 ****
>       * @return Returns the location.
>       */
> !     public MapHex getLocation() {
>          if (locations != null) {
>              return locations.get(0);
> --- 97,102 ----
>       * @return Returns the location.
>       */
> !     @Deprecated
> ! 	public MapHex getLocation() {
>          if (locations != null) {
>              return locations.get(0);
> 
> 
> 
> 
> ------------------------------
> 
> Message: 6
> Date: Wed, 03 Feb 2010 20:16:42 +0000
> From: Erik Vos <ev...@us...>
> Subject: [Rails-commits] 18xx/rails/game MapHex.java, 1.34,	1.35
> 	PublicCompany.java, 1.80, 1.81 OperatingRound.java, 1.95,	1.96
> 	PublicCompanyI.java, 1.43, 1.44
> To: rai...@li...
> Message-ID: <E1N...@sf...>
> 
> Update of /cvsroot/rails/18xx/rails/game
> In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1357/rails/game
> 
> Modified Files:
> 	MapHex.java PublicCompany.java OperatingRound.java 
> 	PublicCompanyI.java 
> Log Message:
> Home base on green OO tile can now be chosen in first turn
> 
> Index: OperatingRound.java
> ===================================================================
> RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
> retrieving revision 1.95
> retrieving revision 1.96
> diff -C2 -d -r1.95 -r1.96
> *** OperatingRound.java	3 Feb 2010 05:37:54 -0000	1.95
> --- OperatingRound.java	3 Feb 2010 20:16:40 -0000	1.96
> ***************
> *** 493,498 ****
> 
>              // Checks
> !             // Must be correct step
> !             if (getStep() != STEP_LAY_TOKEN) {
>                  errMsg = LocalText.getText("WrongActionNoTokenLay");
>                  break;
> --- 493,498 ----
> 
>              // Checks
> !             // Must be correct step (exception: home base lay)
> !             if (getStep() != STEP_LAY_TOKEN && action.getType() !=
LayBaseToken.HOME_CITY) {
>                  errMsg = LocalText.getText("WrongActionNoTokenLay");
>                  break;
> ***************
> *** 566,569 ****
> --- 566,572 ----
>              operatingCompany.layBaseToken(hex, cost);
> 
> +             // If this is a home base token lay, stop here
> +             if (action.getType() == LayBaseToken.HOME_CITY) return true;
> + 
>              if (cost > 0) {
>                  new CashMove(operatingCompany, bank, cost);
> ***************
> *** 1926,1939 ****
> 
>          int step = getStep();
> 
>          if (step == STEP_LAY_TRACK) {
> -             setNormalTileLays();
> -             setSpecialTileLays();
> -             log.debug("Normal tile lays: " +
currentNormalTileLays.size());
> -             log.debug("Special tile lays: " +
currentSpecialTileLays.size());
> 
> !             possibleActions.addAll(currentNormalTileLays);
> !             possibleActions.addAll(currentSpecialTileLays);
> !             possibleActions.add(new NullAction(NullAction.SKIP));
> 
>          } else if (step == STEP_LAY_TOKEN) {
> --- 1929,1951 ----
> 
>          int step = getStep();
> +         boolean forced = false;
> 
>          if (step == STEP_LAY_TRACK) {
> 
> !         	if (!operatingCompany.hasLaidHomeBaseTokens()) {
> !         		// This can occur if the home hex has two cities and
track,
> !         		// such as the green OO tile #59
> !         		possibleActions.add(new LayBaseToken
(operatingCompany.getHomeHex()));
> !         		forced = true;
> !         	} else {
> ! 	            setNormalTileLays();
> ! 	            setSpecialTileLays();
> ! 	            log.debug("Normal tile lays: " +
currentNormalTileLays.size());
> ! 	            log.debug("Special tile lays: " +
currentSpecialTileLays.size());
> ! 
> ! 	            possibleActions.addAll(currentNormalTileLays);
> ! 	            possibleActions.addAll(currentSpecialTileLays);
> ! 	            possibleActions.add(new NullAction(NullAction.SKIP));
> !         	}
> 
>          } else if (step == STEP_LAY_TOKEN) {
> ***************
> *** 1962,1966 ****
>          // The following additional "common" actions are only available
if the
>          // primary action is not forced.
> !         if (step >= 0) {
> 
>              setBonusTokenLays();
> --- 1974,1978 ----
>          // The following additional "common" actions are only available
if the
>          // primary action is not forced.
> !         if (step >= 0 && !forced) {
> 
>              setBonusTokenLays();
> ***************
> *** 2234,2238 ****
>          return operatingCompany.getNumberOfTrains() <
operatingCompany.getCurrentTrainLimit();
>      }
> !     
>      /**
>       * Can the company buy a train now?
> --- 2246,2250 ----
>          return operatingCompany.getNumberOfTrains() <
operatingCompany.getCurrentTrainLimit();
>      }
> ! 
>      /**
>       * Can the company buy a train now?
> 
> Index: MapHex.java
> ===================================================================
> RCS file: /cvsroot/rails/18xx/rails/game/MapHex.java,v
> retrieving revision 1.34
> retrieving revision 1.35
> diff -C2 -d -r1.34 -r1.35
> *** MapHex.java	31 Jan 2010 22:22:28 -0000	1.34
> --- MapHex.java	3 Feb 2010 20:16:40 -0000	1.35
> ***************
> *** 846,850 ****
>              log.error("No cities for home station on hex " + name);
>          } else {
> !             homes.put(company, cities.get(cityNumber - 1));
>          }
>      }
> --- 846,850 ----
>              log.error("No cities for home station on hex " + name);
>          } else {
> !             homes.put(company, cities.get(Math.max(cityNumber - 1, 0)));
>          }
>      }
> 
> Index: PublicCompany.java
> ===================================================================
> RCS file: /cvsroot/rails/18xx/rails/game/PublicCompany.java,v
> retrieving revision 1.80
> retrieving revision 1.81
> diff -C2 -d -r1.80 -r1.81
> *** PublicCompany.java	2 Feb 2010 20:00:03 -0000	1.80
> --- PublicCompany.java	3 Feb 2010 20:16:40 -0000	1.81
> ***************
> *** 800,805 ****
>          return mayTradeShares;
>      }
> !     
> !     /** Stub that allows exclusions such as that 1856 CGR may not buy a
4 */ 
>      public boolean mayBuyTrainType (TrainI train) {
>          return true;
> --- 800,805 ----
>          return mayTradeShares;
>      }
> ! 
> !     /** Stub that allows exclusions such as that 1856 CGR may not buy a
4 */
>      public boolean mayBuyTrainType (TrainI train) {
>          return true;
> ***************
> *** 829,833 ****
>              start(startSpace);
>          }
> - 
>      }
> 
> --- 829,832 ----
> ***************
> *** 928,932 ****
> 
>      }
> !     
>      public ModelObject getClosedModel () {
>          return closedObject;
> --- 927,931 ----
> 
>      }
> ! 
>      public ModelObject getClosedModel () {
>          return closedObject;
> ***************
> *** 1034,1038 ****
> 
>      public void updatePlayersWorth() {
> !         
>          Map<Player, Boolean> done = new HashMap<Player, Boolean>(8);
>          Player owner;
> --- 1033,1037 ----
> 
>      public void updatePlayersWorth() {
> ! 
>          Map<Player, Boolean> done = new HashMap<Player, Boolean>(8);
>          Player owner;
> ***************
> *** 1673,1676 ****
> --- 1672,1676 ----
>      }
> 
> +     // Return value is not used
>      public boolean layHomeBaseTokens() {
> 
> ***************
> *** 1680,1685 ****
>          // has a choice, such in 1830 Erie.
>          if (hasLaidHomeBaseTokens()) return true;
>          log.debug(name + " lays home base on " + homeHex.getName() + "
city "
> !                   + homeCityNumber);
>          return homeHex.layBaseToken(this, homeCityNumber);
>      }
> --- 1680,1699 ----
>          // has a choice, such in 1830 Erie.
>          if (hasLaidHomeBaseTokens()) return true;
> + 
> +         if (homeCityNumber == 0) {
> +         	// This applies to cases like 1830 Erie and 1856 THB.
> +         	// On a trackless tile it does not matter, but if
> +         	// the tile has track (such as the green OO tile),
> +         	// the player must select a city.
> +         	Map<Integer, List<Track>> tracks
> +         			=
homeHex.getCurrentTile().getTracksPerStationMap();
> +         	if (tracks == null || tracks.isEmpty()) {
> +         		homeCityNumber = 1;
> +         	} else {
> +         		return false;
> +         	}
> +         }
>          log.debug(name + " lays home base on " + homeHex.getName() + "
city "
> !                 + homeCityNumber);
>          return homeHex.layBaseToken(this, homeCityNumber);
>      }
> 
> Index: PublicCompanyI.java
> ===================================================================
> RCS file: /cvsroot/rails/18xx/rails/game/PublicCompanyI.java,v
> retrieving revision 1.43
> retrieving revision 1.44
> diff -C2 -d -r1.43 -r1.44
> *** PublicCompanyI.java	2 Feb 2010 19:59:43 -0000	1.43
> --- PublicCompanyI.java	3 Feb 2010 20:16:40 -0000	1.44
> ***************
> *** 298,301 ****
> --- 298,302 ----
> 
>      public boolean layHomeBaseTokens();
> +     public boolean hasLaidHomeBaseTokens();
> 
>      public BaseToken getFreeToken();
> ***************
> *** 352,356 ****
>      public int sharesOwnedByPlayers();
>      public String getExtraShareMarks ();
> !     
>      public ModelObject getClosedModel ();
> 
> --- 353,357 ----
>      public int sharesOwnedByPlayers();
>      public String getExtraShareMarks ();
> ! 
>      public ModelObject getClosedModel ();
> 
> 
> 
> 
> 
> ------------------------------
> 
> Message: 7
> Date: Wed, 03 Feb 2010 20:16:40 +0000
> From: Erik Vos <ev...@us...>
> Subject: [Rails-commits] 18xx/tools ConvertTilesXML.java, NONE, 1.1
> 	Util.java,	NONE, 1.1 MakeGameTileSets.java, NONE, 1.1
XmlUtils.java,
> 	NONE, 1.1
> To: rai...@li...
> Message-ID: <E1N...@sf...>
> 
> Update of /cvsroot/rails/18xx/tools
> In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1357/tools
> 
> Added Files:
> 	ConvertTilesXML.java Util.java MakeGameTileSets.java 
> 	XmlUtils.java 
> Log Message:
> Home base on green OO tile can now be chosen in first turn
> 
> --- NEW FILE: XmlUtils.java ---
> /* $Header: /cvsroot/rails/18xx/tools/XmlUtils.java,v 1.1 2010/02/03
20:16:38 evos Exp $*/
> package tools;
> 
> import java.io.IOException;
> 
> import javax.xml.parsers.DocumentBuilder;
> import javax.xml.parsers.DocumentBuilderFactory;
> import javax.xml.parsers.ParserConfigurationException;
> 
> import org.w3c.dom.*;
> import org.xml.sax.SAXException;
> 
> import rails.game.ConfigurationException;
> 
> /**
> * Booch utility class providing helper functions for working with XML.
> */
> public final class XmlUtils {
> 
>    /**
>     * No-args private constructor, to prevent (meaningless) construction
of one
>     * of these.
>     */
>    private XmlUtils() {}
> 
>    /**
>     * Extracts the String value of a given attribute from a NodeNameMap.
>     * Returns null if no such attribute can be found. See
>     * extractStringAttribute(NamedNodeMap nnp, String attrName, String
>     * defaultValue)
>     * 
>     * @param nnp the NodeNameMap to search for the Attribute
>     * @param attrName the name of the attribute who's value is desired
>     * @return the named attribute's value or null if absent.
>     */
>    /** @deprecated */
>    public static String extractStringAttribute(NamedNodeMap nnp,
>            String attrName) {
>        return extractStringAttribute(nnp, attrName, null);
>    }
> 
>    /**
>     * Extracts the String value of a given attribute from a NodeNameMap.
>     * Returns a default value if no such attribute can be found.
>     * 
>     * @param nnp the NodeNameMap to search for the Attribute
>     * @param attrName the name of the attribute who's value is desired
>     * @param defaultValue the value to be returned if the attribute is
absent.
>     * @return the named attribute's value, or the default value if absent.
>     */
>    /** @deprecated */
>    public static String extractStringAttribute(NamedNodeMap nnp,
>            String attrName, String defaultValue) {
> 
>        if (nnp == null) return defaultValue;
>        Node nameAttr = nnp.getNamedItem(attrName);
>        if (nameAttr == null) return defaultValue;
>        return nameAttr.getNodeValue();
>    }
> 
>    /**
>     * Extracts the integer value of a given attribute from a NodeNameMap.
>     * Returns zero if no such attribute can be found.
>     * 
>     * @see
>     * @param nnp the NodeNameMap to search for the Attribute
>     * @param attrName the name of the attribute who's value is desired
>     * @return the named attribute's value, or zero if absent.
>     */
>    /** @deprecated */
>    public static int extractIntegerAttribute(NamedNodeMap nnp, String
attrName)
>            throws ConfigurationException {
>        return extractIntegerAttribute(nnp, attrName, 0);
>    }
> 
>    /**
>     * Extracts the integer value of a given attribute from a NodeNameMap.
>     * Returns a default value if no such attribute can be found.
>     * 
>     * @see
>     * @param nnp the NodeNameMap to search for the Attribute
>     * @param attrName the name of the attribute who's value is desired.
>     * @param defaultValue The value returned if the attribute is absent.
>     * @return the named attribute's value or the dedault value.
>     */
>    /** @deprecated */
>    public static int extractIntegerAttribute(NamedNodeMap nnp,
>            String attrName, int defaultValue) throws
ConfigurationException {
> 
>        if (nnp == null) return defaultValue;
>        Node nameAttr = nnp.getNamedItem(attrName);
>        if (nameAttr == null) {
>            return defaultValue;
>        }
>        String value = nameAttr.getNodeValue();
>        try {
>            return Integer.parseInt(value);
>        } catch (Exception e) {
>            throw new ConfigurationException("Invalid integer value: " +
value,
>                    e);
>        }
>    }
> 
>    /**
>     * Extracts the boolean value of a given attribute from a NodeNameMap.
Any
>     * string that starts with T or t (for "true") or Y or y (for "yes") is
>     * considered to represent true, all other values will produce false.
>     * 
>     * @param nnp The NodeNameMap to search for the Attribute
>     * @param attrName The name of the attribute who's value is desired
>     * @return The named attribute's value, or false if absent.
>     */
>    /** @deprecated */
>    public static boolean extractBooleanAttribute(NamedNodeMap nnp,
>            String attrName) throws ConfigurationException {
>        return extractBooleanAttribute(nnp, attrName, false);
>    }
> 
>    /**
>     * Extracts the boolean value of a given attribute from a NodeNameMap.
>     * Returns a default value if no such attribute can be found. Any
string
>     * that starts with T or t (for "true") or Y or y (for "yes") is
considered
>     * to represent true, all other values will produce false.
>     * 
>     * @param nnp The NodeNameMap to search for the Attribute
>     * @param attrName The name of the attribute who's value is desired
>     * @param defaultValue The value returned if the attribute is absent.
>     * @return The named attribute's value or the default value.
>     */
>    /** @deprecated */
>    public static boolean extractBooleanAttribute(NamedNodeMap nnp,
>            String attrName, boolean defaultValue)
>            throws ConfigurationException {
> 
>        if (nnp == null) return defaultValue;
>        Node nameAttr = nnp.getNamedItem(attrName);
>        if (nameAttr == null) {
>            return defaultValue;
>        }
>        String value = nameAttr.getNodeValue();
>        return value.matches("^[TtYy].*");
>    }
> 
>    /** @deprecated */
>    public static int[] extractIntegerArrayAttribute(NamedNodeMap nnp,
>            String attrName) throws ConfigurationException {
> 
>        if (nnp == null) return null;
>        Node nameAttr = nnp.getNamedItem(attrName);
>        if (nameAttr == null) return new int[0];
>        String[] values = nameAttr.getNodeValue().split(",");
>        int[] result = new int[values.length];
>        int i = 0;
>        try {
>            for (i = 0; i < values.length; i++) {
>                result[i] = Integer.parseInt(values[i]);
>            }
>        } catch (NumberFormatException e) {
>            throw new ConfigurationException("Invalid integer '" +
values[i]
>                                             + "' in attribute '" +
attrName
>                                             + "'");
>        }
>        return result;
> 
>    }
> 
>    /**
>     * Opens and parses an xml file. Searches the root level of the file
for an
>     * element with the supplied name.
>     * 
>     * @param fileName the name of the file to open
>     * @param elementName the name of the element to find
>     * @return the named element in the named file
>     * @throws ConfigurationException if there is any problem opening and
>     * parsing the file, or if the file does not contain a top level
element
>     * with the given name.
>     */
>    public static Element findElementInFile(String fileName, String
elementName)
>            throws ConfigurationException {
>        Document doc = null;
>        try {
>            // Step 1: create a DocumentBuilderFactory and
setNamespaceAware
>            DocumentBuilderFactory dbf =
DocumentBuilderFactory.newInstance();
>            dbf.setNamespaceAware(true);
>            // Step 2: create a DocumentBuilder
>            DocumentBuilder db = dbf.newDocumentBuilder();
> 
>            // Step 3: parse the input file to get a Document object
>            doc = db.parse(Util.getStreamForFile(fileName));
> 
>        } catch (ParserConfigurationException e) {
>            throw new ConfigurationException("Could not read/parse " +
fileName
>                                             + " to find element "
>                                             + elementName, e);
>        } catch (SAXException e) {
>            throw new ConfigurationException("Could not read/parse " +
fileName
>                                             + " to find element "
>                                             + elementName, e);
>        } catch (IOException e) {
>            throw new ConfigurationException("Could not read/parse " +
fileName
>                                             + " to find element "
>                                             + elementName, e);
>        }
> 
>        if (doc == null) {
>            throw new ConfigurationException("Cannot find file " +
fileName);
>        }
> 
>        // Now find the named Element
>        NodeList nodeList = doc.getChildNodes();
>        for (int iNode = 0; (iNode < nodeList.getLength()); iNode++) {
>            Node childNode = nodeList.item(iNode);
>            if ((childNode != null)
>                && (childNode.getNodeName().equals(elementName))
>                && (childNode.getNodeType() == Node.ELEMENT_NODE)) {
>                return (Element) childNode;
>            }
>        }
>        throw new ConfigurationException("Could not find " + elementName
>                                         + " in " + fileName);
>    }
> }
> 
> --- NEW FILE: Util.java ---
> /* $Header: /cvsroot/rails/18xx/tools/Util.java,v 1.1 2010/02/03 20:16:38
evos Exp $*/
> package tools;
> 
> import java.io.File;
> import java.io.FileInputStream;
> import java.io.IOException;
> import java.io.InputStream;
> 
> public final class Util {
>    /**
>     * No-args private constructor, to prevent (meaningless) construction
of one
>     * of these.
>     */
>    private Util() {}
> 
>    public static boolean hasValue(String s) {
>        return s != null && !s.equals("");
>    }
> 
>    /**
>     * Open an input stream from a file, which may exist as a physical file
or
>     * in a JAR file. The name must be valid for both options.
>     * 
>     * @author Erik Vos
>     */
>    public static InputStream getStreamForFile(String fileName)
>            throws IOException {
> 
>        File file = new File(fileName);
>        if (file.exists()) {
>            return new FileInputStream(file);
>        } else {
>            return null;
>        }
>    }
> 
> }
> 
> --- NEW FILE: ConvertTilesXML.java ---
> package tools;
> 
> import java.io.*;
> import java.util.*;
> import java.util.regex.*;
> 
> import javax.xml.parsers.*;
> import javax.xml.transform.*;
> import javax.xml.transform.dom.*;
> import javax.xml.transform.stream.StreamResult;
> 
> import org.w3c.dom.*;
> 
> import rails.game.ConfigurationException;
> import rails.util.Util;
> import tools.XmlUtils;
> 
> /**
> * Convert an XML tile dictionary, as created by Marco Rocci's Tile
Designer, to
> * an XML file for use in Rails 18xx. <p> The default names are:
> */
> public class ConvertTilesXML {
> 
>    private static String inputFilePath = "tiles/TileDictionary.xml";
> 
>    private static String outputFilePath = "tiles/Tiles.xml";
> 
>    private static Map<String, String> colourMap, gaugeMap, sidesMap,
cityMap;
>    private static Map<String, String[]> stationMap;
>    private static Map<String, String> junctionPosition;
> 
>    /** Maps non-edge non-station junctions to tracks ending there. */
>    private static Map<String, List<Element>> unresolvedTrack;
>    /** Maps tracks to edge/station junctions */
>    private static Map<Element, String> resolvedTrack;
> 
>    private static Pattern namePattern = Pattern.compile("^(\\d+)(/.*)?");
> 
>    Document outputDoc;
>    Element outputJunction;
>    String tileNo;
>    String colour;
> 
>    static {
>        colourMap = new HashMap<String, String>();
>        colourMap.put("tlYellow", "yellow");
>        colourMap.put("tlGreen", "green");
>        colourMap.put("tlBrown", "brown");
>        colourMap.put("tlGray", "gray");
>        colourMap.put("tlOffMap", "red");
>        colourMap.put("tlMapFixed", "fixed");
>        colourMap.put("tlMapUpgradableToYellow", "white");
>        colourMap.put("tlMapUpgradableToGreen", "yellow");
>        colourMap.put("tlMapUpgradableToBrown", "green");
> 
>        stationMap = new HashMap<String, String[]>();
>        stationMap.put("jtWhistlestop", new String[] { "Town", "0" });
>        stationMap.put("jtCity", new String[] { "City", "1" });
>        stationMap.put("jtDoubleCity", new String[] { "City", "2" });
>        stationMap.put("jtTripleCity", new String[] { "City", "3" });
>        stationMap.put("jtQuadrupleCity", new String[] { "City", "4" });
>        stationMap.put("jtNone", new String[] { "", "0" });
>        // Note: an additional station type is "Pass".
> 
>        gaugeMap = new HashMap<String, String>();
>        gaugeMap.put("ctNormal", "normal");
>        gaugeMap.put("ctSmall", "narrow");
>        gaugeMap.put("ctUniversal", "dual");
>        gaugeMap.put("ctTunnel", "normal");
>        gaugeMap.put("ctMountain", "normal");
>        // 1841 Pass: Station type is changed to Pass.
> 
>        sidesMap = new HashMap<String, String>();
>        sidesMap.put("tp4SideA", "side0");
>        sidesMap.put("tp4SideB", "side1");
>        sidesMap.put("tp4SideC", "side2");
>        sidesMap.put("tp4SideD", "side3");
>        sidesMap.put("tp4SideE", "side4");
>        sidesMap.put("tp4SideF", "side5");
> 
>        cityMap = new HashMap<String, String>();
>        cityMap.put("tpCenter", "0");
>        cityMap.put("tp1SideA", "001");
>        cityMap.put("tp1CornerA", "051");
>        cityMap.put("tp1SideB", "101");
>        cityMap.put("tp1CornerB", "151");
>        cityMap.put("tp1SideC", "201");
>        cityMap.put("tp1CornerC", "251");
>        cityMap.put("tp1SideD", "301");
>        cityMap.put("tp1CornerD", "351");
>        cityMap.put("tp1SideE", "401");
>        cityMap.put("tp1CornerE", "451");
>        cityMap.put("tp1SideF", "501");
>        cityMap.put("tp1CornerF", "551");
>        cityMap.put("tp2SideA", "002");
>        cityMap.put("tp2CornerA", "052");
>        cityMap.put("tp2SideB", "102");
>        cityMap.put("tp2CornerB", "152");
>        cityMap.put("tp2SideC", "202");
>        cityMap.put("tp2CornerC", "252");
>        cityMap.put("tp2SideD", "302");
>        cityMap.put("tp2CornerD", "352");
>        cityMap.put("tp2SideE", "402");
>        cityMap.put("tp2CornerE", "452");
>        cityMap.put("tp2SideF", "502");
>        cityMap.put("tp2CornerF", "552");
>        cityMap.put("tp3SideA", "003");
>        cityMap.put("tp3CornerA", "053");
>        cityMap.put("tp3SideB", "103");
>        cityMap.put("tp3CornerB", "153");
>        cityMap.put("tp3SideC", "203");
>        cityMap.put("tp3CornerC", "253");
>        cityMap.put("tp3SideD", "303");
>        cityMap.put("tp3CornerD", "353");
>        cityMap.put("tp3SideE", "403");
>        cityMap.put("tp3CornerE", "453");
>        cityMap.put("tp3SideF", "503");
>        cityMap.put("tp3CornerF", "553");
>        cityMap.put("tpCurve1RightA", "006");
>        cityMap.put("tpCurve2RightA", "007");
>        cityMap.put("tpCurve2LeftA", "008");
>        cityMap.put("tpCurve1LeftA", "009");
>        cityMap.put("tpCurve1RightB", "106");
>        cityMap.put("tpCurve2RightB", "107");
>        cityMap.put("tpCurve2LeftB", "108");
>        cityMap.put("tpCurve1LeftB", "109");
>        cityMap.put("tpCurve1RightC", "206");
>        cityMap.put("tpCurve2RightC", "207");
>        cityMap.put("tpCurve2LeftC", "208");
>        cityMap.put("tpCurve1LeftC", "209");
>        cityMap.put("tpCurve1RightD", "306");
>        cityMap.put("tpCurve2RightD", "307");
>        cityMap.put("tpCurve2LeftD", "308");
>        cityMap.put("tpCurve1LeftD", "309");
>        cityMap.put("tpCurve1RightE", "406");
>        cityMap.put("tpCurve2RightE", "407");
>        cityMap.put("tpCurve2LeftE", "408");
>        cityMap.put("tpCurve1LeftE", "409");
>        cityMap.put("tpCurve1RightF", "506");
>        cityMap.put("tpCurve2RightF", "507");
>        cityMap.put("tpCurve2LeftF", "508");
>        cityMap.put("tpCurve1LeftF", "509");
> 
>    }
> 
>    public static void main(String[] args) {
> 
>        if (args != null) {
>            if (args.length > 0) inputFilePath = args[0];
>            if (args.length > 1) outputFilePath = args[1];
>        }
> 
>        try {
>            new ConvertTilesXML();
>        } catch (ConfigurationException e) {
>            e.printStackTrace();
>        }
> 
>    }
> 
>    private ConvertTilesXML() throws ConfigurationException {
> 
>        Element inputTopElement =
>                XmlUtils.findElementInFile(inputFilePath, "tiles");
> 
>        try {
>            DocumentBuilderFactory factory =
>                    DocumentBuilderFactory.newInstance();
>            DocumentBuilder builder = factory.newDocumentBuilder();
>            DOMImplementation impl = builder.getDOMImplementation();
>            outputDoc = impl.createDocument(null, "Tiles", null);
> 
>            convertXML(inputTopElement, outputDoc);
> 
>            TransformerFactory.newInstance().newTransformer().transform(
>                    new DOMSource(outputDoc),
>                    new StreamResult(new FileOutputStream(new File(
>                            outputFilePath))));
> 
>        } catch (Exception e) {
>            throw new ConfigurationException("Document build error", e);
>        }
> 
>    }
> 
>    private void convertXML(Element inputElement, Document outputDoc)
>            throws ConfigurationException {
> 
>        NodeList children = inputElement.getElementsByTagName("tile");
>        for (int i = 0; i < children.getLength(); i++) {
>            Element inputTile = (Element) children.item(i);
>            Element outputTile = outputDoc.createElement("Tile");
>            outputDoc.getDocumentElement().appendChild(outputTile);
>            convertTile(inputTile, outputTile);
>        }
> 
>    }
> 
>    private void convertTile(Element inputTile, Element outputTile)
>            throws ConfigurationException {
> 
>        String id =
>
inputTile.getElementsByTagName("ID").item(0).getFirstChild().getNodeValue();
>        System.out.println(id);
>        tileNo = id;
>        outputTile.setAttribute("id", id);
>        // int intId;
>        try {
>            Integer.parseInt(id);
>        } catch (NumberFormatException e) {
>            throw new ConfigurationException("Non-numeric ID: " + id, e);
>        }
> 
>        String level =
>
inputTile.getElementsByTagName("level").item(0).getFirstChild().getNodeValue
();
>        colour = colourMap.get(level);
>        if (colour == null) {
>            throw new ConfigurationException("Unknown level: " + level);
>        } else {
>            outputTile.setAttribute("colour", colour);
>        }
> 
>        String name =
>
inputTile.getElementsByTagName("name").item(0).getFirstChild().getNodeValue(
);
>        Matcher m = namePattern.matcher(name);
>        if (m.matches()) {
>            outputTile.setAttribute("name", m.group(1));
>        } else
>            outputTile.setAttribute("name", name);
>        // The below does not work for "B+"
>        /*
>         * if (intId > 0) { throw new ConfigurationException("Tile with
ID=" +
>         * id + " has a name not starting with a number: " + name); }
>         */
> 
>        /*
>         * Create map to hold the station 'identifiers', which are referred
to
>         * in the track definitions.
>         */
>        junctionPosition = new HashMap<String, String>();
>        outputJunction = null;
> 
>        Element junctions =
>                (Element)
inputTile.getElementsByTagName("junctions").item(0);
>        NodeList children = junctions.getElementsByTagName("junction");
>        for (int i = 0; i < children.getLength(); i++) {
>            Element inputJunction = (Element) children.item(i);
>            outputJunction = outputDoc.createElement("Station");
>            outputTile.appendChild(outputJunction);
> 
>            convertJunction(i, inputJunction, outputJunction);
>        }
> 
>        unresolvedTrack = new HashMap<String, List<Element>>();
>        resolvedTrack = new HashMap<Element, String>();
> 
>        Element connections =
>                (Element)
inputTile.getElementsByTagName("connections").item(0);
>        children = connections.getElementsByTagName("connection");
>        for (int i = 0; i < children.getLength(); i++) {
>            Element inputConnection = (Element) children.item(i);
>            convertConnection(inputConnection, outputTile);
>        }
> 
>        // Iterator it = unresolvedTrack.keySet().iterator();
>        String end1, end2;
>        // while (it.hasNext())
>        for (String key : unresolvedTrack.keySet()) {
>            // String key = (String) it.next();
>            List<Element> list = unresolvedTrack.get(key);
>            Element[] ends = list.toArray(new Element[0]);
>            if (ends.length <= 1) {
>                throw new ConfigurationException("Loose end " + ends[0]
>                                                 + " in tile " + tileNo);
>            }
>            for (int i = 1; i < ends.length; i++) {
>                end1 = resolvedTrack.get(ends[i]);
>                if (end1 == null) {
>                    throw new ConfigurationException("Loose end " + ends[i]
>                                                     + " in tile " +
tileNo);
>                }
>                for (int j = 0; j < i; j++) {
>                    end2 = resolvedTrack.get(ends[j]);
>                    if (end2 == null) {
>                        throw new ConfigurationException("Loose end " +
ends[j]
>                                                         + " in tile " +
tileNo);
>                    }
>                    Element outputConnection =
outputDoc.createElement("Track");
>                    outputConnection.setAttribute("gauge",
>                            ends[i].getAttribute("gauge"));
>                    outputConnection.setAttribute("from", end1);
>                    outputConnection.setAttribute("to", end2);
>                    outputTile.appendChild(outputConnection);
> 
>                }
>            }
>        }
>    }
> 
>    private void convertJunction(int i, Element inputJunction,
>            Element outputJunction) throws ConfigurationException {
> 
>        String cityId = "city" + (i + 1);
>        outputJunction.setAttribute("id", cityId);
> 
>        String type =
>
inputJunction.getElementsByTagName("junType").item(0).getFirstChild().getNod
eValue();
> 
>        String[] station = stationMap.get(type);
>        if (station == null) {
>            throw new ConfigurationException("Unknown junction type: " +
type);
>        } else {
>            station = station.clone();
>        }
> 
>        /*
>         * Off-map cities have the special type "OffMapCity" which does not
>         * allow driving through. Original type "town" indicates that no
token
>         * can be placed.
>         */
>        if (colour.equals("red")) {
>            if (station[0].equals("Town")) station[1] = "0";
>            station[0] = "OffMapCity";
>        }
> 
>        outputJunction.setAttribute("type", station[0]);
>        if (!station[1].equals("0")) {
>            outputJunction.setAttribute("slots", station[1]);
>        }
> 
>        // String[] p = (String[]) ((String[])
stationMap.get(type)).clone();
>        if (station == null) {
>            throw new ConfigurationException("Unknown junction type: " +
type);
>        }
> 
>        // Junction revenue
>        Element revenue =
>                (Element)
inputJunction.getElementsByTagName("revenue").item(0);
>        if (revenue != null) {
>            String value =
>
revenue.getElementsByTagName("value").item(0).getFirstChild().getNodeValue()
;
>            outputJunction.setAttribute("value", value);
>        }
> 
>        // Junction position
>        String junctionPos =
>
inputJunction.getElementsByTagName("position").item(0).getFirstChild().getNo
deValue();
>        junctionPosition.put(junctionPos, cityId);
>        String jName = cityMap.get(junctionPos);
>        if (Util.hasValue(jName)) {
>            outputJunction.setAttribute("position", jName);
>        } else {
>            throw new ConfigurationException("Unknown position: " +
junctionPos);
>        }
>    }
> 
>    private void convertConnection(Element inputConnection, Element
outputTile)
>            throws ConfigurationException {
> 
>        String type =
>
inputConnection.getElementsByTagName("conType").item(0).getFirstChild().getN
odeValue();
>        String gauge = gaugeMap.get(type);
>        Element outputConnection;
>        if (gauge == null) {
>            throw new ConfigurationException("Unknown gauge type: " +
type);
>        } else {
>            outputConnection = outputDoc.createElement("Track");
>            outputConnection.setAttribute("gauge", gauge);
>        }
> 
>        // 1841 special: A pass is not a track type but a station type.
>        if (type.equals("ctMountain"))
>            outputJunction.setAttribute("type", "pass");
> 
>        boolean fromOK =
>                convertTrackEnd(inputConnection, outputConnection,
"position1",
>                        "from");
>        boolean toOK =
>                convertTrackEnd(inputConnection, outputConnection,
"position2",
>                        "to");
> 
>        if (fromOK && toOK) outputTile.appendChild(outputConnection);
> 
>    }
> 
>    private boolean convertTrackEnd(Element inputConnection,
>            Element outputConnection, String inputName, String outputName)
>            throws ConfigurationException {
> 
>        String position =
>
inputConnection.getElementsByTagName(inputName).item(0).getFirstChild().getN
odeValue();
> 
>        String end = sidesMap.get(position);
>        if (end == null) end = junctionPosition.get(position);
>        if (end != null) {
>            outputConnection.setAttribute(outputName, end);
>            resolvedTrack.put(outputConnection, end);
>            return true;
>        } else {
>            if (!unresolvedTrack.containsKey(position)) {
>                unresolvedTrack.put(position, new ArrayList<Element>());
>            }
>            unresolvedTrack.get(position).add(outputConnection);
>            return false;
>        }
>    }
> 
> }
> 
> --- NEW FILE: MakeGameTileSets.java ---
> package tools;
> 
> import java.io.*;
> import java.util.*;
> 
> import javax.xml.parsers.*;
> import javax.xml.transform.*;
> import javax.xml.transform.dom.*;
> import javax.xml.transform.stream.StreamResult;
> 
> import org.w3c.dom.*;
> 
> import rails.game.ConfigurationException;
> import tools.XmlUtils;
> 
> /**
> * Convert an XML tile dictionary, as created by Marco Rocci's Tile
Designer, to
> * an XML file for use in Rails 18xx.
> */
> public class MakeGameTileSets {
> 
>    private static String tilesFilePath = "tiles/Tiles.xml";
> 
>    public static void main(String[] args) {
> 
>        try {
>            if (args.length == 0) {
> 
>                System.out.println("Provide rails.game name(s) for which to
create"
>                                   + " tile sets as argument(s).\nALL
implies all games below the data directory.");
> 
>            } else if (args[0].equalsIgnoreCase("ALL")) {
> 
>                List<String> games = new ArrayList<String>();
> 
>                File gamesDir = new File("data");
>                if (gamesDir.exists() && gamesDir.isDirectory()) {
>                    File[] files = gamesDir.listFiles();
>                    for (int i = 0; i < files.length; i++) {
>                        if (files[i].isDirectory()
>                            && !files[i].getName().equalsIgnoreCase("CVS"))
{
>                            games.add(files[i].getName());
>                        }
>                    }
>                }
> 
>                new MakeGameTileSets(games.toArray(new String[0]));
> 
>            } else {
> 
>                new MakeGameTileSets(args);
> 
>            }
> 
>        } catch (ConfigurationException e) {
>            e.printStackTrace();
>        }
> 
>    }
> 
>    private MakeGameTileSets(String[] games) throws ConfigurationException
{
> 
>        Element inputTopElement =
>                XmlUtils.findElementInFile(tilesFilePath, "Tiles");
> 
>        Map<String, Element> tileMap = new HashMap<String, Element>();
>        Element tileSpec;
>        String tileName;
>        NodeList tList = inputTopElement.getElementsByTagName("Tile");
>        for (int i = 0; i < tList.getLength(); i++) {
>            tileSpec = (Element) tList.item(i);
>            tileName = tileSpec.getAttribute("id");
>            tileMap.put(tileName, tileSpec);
>        }
> 
>        for (int i = 0; i < games.length; i++) {
> 
>            makeTileSet(games[i], tileMap);
> 
>        }
> 
>    }
> 
>    private void makeTileSet(String gameName, Map<String, Element> tileMap)
>            throws ConfigurationException {
> 
>        // Open and read the tile set for this rails.game
>        String tileSetPath = "data/" + gameName + "/TileSet.xml";
>        Element tileSet =
>                XmlUtils.findElementInFile(tileSetPath, "TileManager");
>        if (tileSet == null) return;
>        NodeList tiles = tileSet.getElementsByTagName("Tile");
>        Map<String, Object> tilesInSet = new HashMap<String, Object>();
> 
>        // Also open and read the map tiles.
>        String mapPath = "data/" + gameName + "/Map.xml";
>        Element mapHexes = XmlUtils.findElementInFile(mapPath, "Map");
>        NodeList hexes = mapHexes.getElementsByTagName("Hex");
> 
>        String tilesPath = "data/" + gameName + "/Tiles.xml";
>        Document outputDoc;
>        String tileName;
> 
>        try {
>            DocumentBuilderFactory factory =
>                    DocumentBuilderFactory.newInstance();
>            DocumentBuilder builder = factory.newDocumentBuilder();
>            DOMImplementation impl = builder.getDOMImplementation();
>            outputDoc = impl.createDocument(null, "Tiles", null);
> 
>            // Scan the TileSet
>            for (int i = 0; i < tiles.getLength(); i++) {
> 
>                tileName = ((Element) tiles.item(i)).getAttribute("id");
>                // Save the tile in a Map so that we can check completeness
>                // later.
>                tilesInSet.put(tileName, null);
> 
>                // Get the Tile specification
>                Element tileSpec = tileMap.get(tileName);
>                if (tileSpec != null) {
>                    // Copy it to the subset document
>                    Element copy =
>                            (Element) outputDoc.importNode(
>                                    (tileMap.get(tileName)), true);
>                    outputDoc.getDocumentElement().appendChild(copy);
>                } else {
>                    System.out.println("ERROR: specified " + gameName
>                                       + " tile " + tileName
>                                       + " not found in Tiles.xml.");
>                }
>            }
> 
>            // Scan the map, and add any missing tiles, with a warning.
>            for (int i = 0; i < hexes.getLength(); i++) {
> 
>                tileName = ((Element) hexes.item(i)).getAttribute("tile");
>                // Does the preprinted tile occur in TileSet?
>                if (tilesInSet.containsKey(tileName)) continue;
> 
>                // No, warn and add it to the tiles document.
>                System.out.println("WARNING: " + gameName
>                                   + " preprinted map tile " + tileName
>                                   + " does not occur in TileSet!");
> 
>                // Get the Tile specification
>                // Element tileSpec = (Element) tileMap.get(tileName);
>                // Copy it to the subset document
>                Element copy =
>                        (Element) outputDoc.importNode(
>                                (tileMap.get(tileName)), true);
>                outputDoc.getDocumentElement().appendChild(copy);
> 
>            }
> 
>            TransformerFactory.newInstance().newTransformer().transform(
>                    new DOMSource(outputDoc),
>                    new StreamResult(new FileOutputStream(new
File(tilesPath))));
> 
>        } catch (Exception e) {
>            throw new ConfigurationException("Document build error", e);
>        }
> 
>    }
> 
> }
> 
> 
> 
> 
> ------------------------------
> 
>
----------------------------------------------------------------------------
--
> The Planet: dedicated and managed hosting, cloud storage, colocation
> Stay online with enterprise data centers and the best network in the
business
> Choose flexible plans and management services without long-term contracts
> Personal 24x7 support from experience hosting pros just a phone call away.
> http://p.sf.net/sfu/theplanet-com
> 
> ------------------------------
> 
> _______________________________________________
> Rails-commits mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-commits
> 
> 
> End of Rails-commits Digest, Vol 13, Issue 5
> ********************************************


----------------------------------------------------------------------------
--
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the
business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Rails-commits mailing list
Rai...@li...
https://lists.sourceforge.net/lists/listinfo/rails-commits

Re: [Rails-devel] Idea: migrating away from cvs.

[Erik V. <eri...@xs...>]

	1.  Test out the Git plugin for Eclipse. If the UI is similar enough
	to the CVS integration, we'll go with Git.
-------------

[EV] While reading around on Git an Egit, the following worried me:

	  Pulling (merge or rebase) new changes from upstream

	This is not yet available. Available alternatives currently include:

	    * run "git pull" from outside eclipse (but beware on Windows)
	    * if you did no local change or want to discard your local
changes, use "Team/Reset To..." 

	Retrieved from "http://wiki.eclipse.org/EGit/User_Guide/Remote"

Does this mean that Egit (the Eclipse plugin) has no equivalent for CVS
update from a remote repository? 
That would rule it out for me. I don't want to be condemned to use the
(Windows) command line.

For the rest, I don't care for the distributed model - I don't see why I
would need a local repository.
But I trust you if you say that it can be easily bypassed.

Erik.

Re: [Rails-devel] Selling back down to cert limit

[brett l. <wak...@gm...>]

On Thu, Feb 4, 2010 at 9:14 AM, Phil Davies <de...@gm...> wrote:
> Wanted to get peoples opinions before I state this as a bug.  We're
> playing 1830, It's my turn in an SR and I have 90% of a company,
> having bought the shares during the previous SR when they were in the
> orange zone.  Rails is NOT enforcing that I sell shares to get myself
> below 60% ownership.  Is this just not implemented yet or should this
> be happening and I've somehow come across a case where it is not
> picking up that I am illegally holding shares?  For what it's worth,
> they are still in the yellow zone and I'm not over cert limit (saved
> game attached)
>
> Phil
>

1830 is supposed to be fully implemented.  So, in any case, it's a bug.

---Brett.

[Rails-devel] Selling back down to cert limit

[Phil D. <de...@gm...>]

Wanted to get peoples opinions before I state this as a bug.  We're
playing 1830, It's my turn in an SR and I have 90% of a company,
having bought the shares during the previous SR when they were in the
orange zone.  Rails is NOT enforcing that I sell shares to get myself
below 60% ownership.  Is this just not implemented yet or should this
be happening and I've somehow come across a case where it is not
picking up that I am illegally holding shares?  For what it's worth,
they are still in the yellow zone and I'm not over cert limit (saved
game attached)

Phil

[Rails-devel] 1830: Exchange option not offered

[Phil D. <de...@gm...>]

See the saved game file.  PRR to run, it just bought the 5 train off
NYC, it should be able to exchange that for a D for $800, yet it isn't
given the option to do so.  I've tested this on both 1.1.3 and 1.1.2
and it seems to be an issue in both vesions

Phil

Re: [Rails-devel] Idea: migrating away from cvs.

[Freek D. <sf_...@ma...>]

Freek Dijkstra wrote:
> The naming of commands is a bit different in CVS and git. (while SVN is 
> very similar to git).

I meant to say "very similar to CVS", of course.

Re: [Rails-devel] Idea: migrating away from cvs.

[Freek D. <sf_...@ma...>]

Erik Vos wrote:

> I have only a little experience with SVN, and none with Git, so I can't
> offer much help in this decision.

I have experiences in both subversion and git. Mercurial and Bazaar are 
new to me. Like most people, getting to understand git took a little 
while, but once I got it running, I like it.

For most of my personal projects, I still use subversion, but in my view 
subversion is lacking the ability for branching and tagging.

The naming of commands is a bit different in CVS and git. (while SVN is 
very similar to git). I made this page for my own personal reference:
http://www.macfreek.nl/mindmaster/Version_Control_Basics

There are two things to keep in mind:
- git stores the full repository locally, not just the latest
   revision like svn and cvs do.
- in order to "upload" a file with git, you first have to add the
   file to register changes, then commit (which is local), finally push.
This seemed complex to me at first, but over time I grew to like it.

Regards,
Freek

Re: [Rails-devel] Idea: migrating away from cvs.

[brett l. <wak...@gm...>]

OK.   The thoughts are generally favorable, so I'll start planning a migration.

My basic plan is going to be something like this:

1.  Test out the Git plugin for Eclipse. If the UI is similar enough
to the CVS integration, we'll go with Git.
2.  If Git doesn't work out for some reason, my second choice would be
Mercurial.  So, I'd look into that.
3.  If both options fail for some reason, I'll punt and go with
Subversion.  It at least sucks marginally less than CVS.  (you can
actually delete directories in SVN!)

---Brett.



On Wed, Feb 3, 2010 at 3:10 PM, Erik Vos <eri...@xs...> wrote:
> I have only a little experience with SVN, and none with Git, so I can't
> offer much help in this decision.
>
> Most important for me is ease of use from Eclipse and the quality of the
> integration with Eclipse.
> With SVN, I have found that I also needed TortoiseSVN to resolve some
> conflicts that I could't fix from Eclipse
> (these problems were probably caused by my own undisciplined use of SVN).
>
> Erik.
>
>
> -----Original Message-----
> From: brett lentz [mailto:wak...@gm...]
> Sent: Wednesday 03 February 2010 23:03
> To: Development list for Rails: an 18xx game
> Subject: [Rails-devel] Idea: migrating away from cvs.
>
> As we're all probably aware, CVS is ancient technology.   Rails is
> only really using it because it was the default for a Sourceforge
> project when I signed up.
>
> After nearly 5 years of development, our repository has gotten a bit
> crufty and is starting to show some of it's warts. Performance doing
> checkouts has started to suffer a bit.
>
> What do you guys think about looking at other options?
>
> For the last year at $dayjob, I've been using Git (http://git-scm.com)
> a lot, and I really enjoy it.  Looks like there's an Eclipse plugin
> for git (http://www.eclipse.org/egit/).
>
> Sourceforge supports using Subversion, Git, Mercurial, Bazaar, and CVS.
>
> I've personally got experience with CVS, Subversion, and Git. I've
> only used Mercurial once or twice, which isn't enough to really have
> an opinion of it.
>
> Overall, my experience is that Git is light years ahead of CVS and
> Subversion.
>
> What are everyone else's thoughts and experiences?
> Is this something worth doing?
> Do you want to stay with CVS?
> Do you hate me because you're a new committer and you just got your
> environment set up, and now I'm proposing changing it?  ;-)
>
> ---Brett.
>
> ----------------------------------------------------------------------------
> --
> The Planet: dedicated and managed hosting, cloud storage, colocation
> Stay online with enterprise data centers and the best network in the
> business
> Choose flexible plans and management services without long-term contracts
> Personal 24x7 support from experience hosting pros just a phone call away.
> http://p.sf.net/sfu/theplanet-com
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
>
>
> ------------------------------------------------------------------------------
> The Planet: dedicated and managed hosting, cloud storage, colocation
> Stay online with enterprise data centers and the best network in the business
> Choose flexible plans and management services without long-term contracts
> Personal 24x7 support from experience hosting pros just a phone call away.
> http://p.sf.net/sfu/theplanet-com
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
>

Re: [Rails-devel] Idea: migrating away from cvs.

[Phil D. <de...@gm...>]

I have better familiarity with SVN than anything else but frankly if
you point me in the direction of an appropriate guide that's decently
written I'll happily go with whatever anyone else wants

On 3 February 2010 23:10, Erik Vos <eri...@xs...> wrote:
> I have only a little experience with SVN, and none with Git, so I can't
> offer much help in this decision.
>
> Most important for me is ease of use from Eclipse and the quality of the
> integration with Eclipse.
> With SVN, I have found that I also needed TortoiseSVN to resolve some
> conflicts that I could't fix from Eclipse
> (these problems were probably caused by my own undisciplined use of SVN).
>
> Erik.
>
>
> -----Original Message-----
> From: brett lentz [mailto:wak...@gm...]
> Sent: Wednesday 03 February 2010 23:03
> To: Development list for Rails: an 18xx game
> Subject: [Rails-devel] Idea: migrating away from cvs.
>
> As we're all probably aware, CVS is ancient technology.   Rails is
> only really using it because it was the default for a Sourceforge
> project when I signed up.
>
> After nearly 5 years of development, our repository has gotten a bit
> crufty and is starting to show some of it's warts. Performance doing
> checkouts has started to suffer a bit.
>
> What do you guys think about looking at other options?
>
> For the last year at $dayjob, I've been using Git (http://git-scm.com)
> a lot, and I really enjoy it.  Looks like there's an Eclipse plugin
> for git (http://www.eclipse.org/egit/).
>
> Sourceforge supports using Subversion, Git, Mercurial, Bazaar, and CVS.
>
> I've personally got experience with CVS, Subversion, and Git. I've
> only used Mercurial once or twice, which isn't enough to really have
> an opinion of it.
>
> Overall, my experience is that Git is light years ahead of CVS and
> Subversion.
>
> What are everyone else's thoughts and experiences?
> Is this something worth doing?
> Do you want to stay with CVS?
> Do you hate me because you're a new committer and you just got your
> environment set up, and now I'm proposing changing it?  ;-)
>
> ---Brett.
>
> ----------------------------------------------------------------------------
> --
> The Planet: dedicated and managed hosting, cloud storage, colocation
> Stay online with enterprise data centers and the best network in the
> business
> Choose flexible plans and management services without long-term contracts
> Personal 24x7 support from experience hosting pros just a phone call away.
> http://p.sf.net/sfu/theplanet-com
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
>
>
> ------------------------------------------------------------------------------
> The Planet: dedicated and managed hosting, cloud storage, colocation
> Stay online with enterprise data centers and the best network in the business
> Choose flexible plans and management services without long-term contracts
> Personal 24x7 support from experience hosting pros just a phone call away.
> http://p.sf.net/sfu/theplanet-com
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
>

Re: [Rails-devel] 1889

[Aliza P. <ali...@gm...>]

On Wed, Feb 3, 2010 at 12:40 PM, John A. Tamplin <ja...@ja...> wrote:
>
> Also, companies float at 50%.
>

That's a difference from 1830, certainly, but I was trying to think of
things that might stress the software. If Rails can handle the
variable-float in 1856 it can certainly handle a fixed float of 50%.

Not that I have a reputation for breaking software or anything. ;-)

Aliza f/k/a "The Bug Lady"

Re: [Rails-devel] Idea: migrating away from cvs.

[Erik V. <eri...@xs...>]

I have only a little experience with SVN, and none with Git, so I can't
offer much help in this decision.

Most important for me is ease of use from Eclipse and the quality of the
integration with Eclipse.
With SVN, I have found that I also needed TortoiseSVN to resolve some
conflicts that I could't fix from Eclipse 
(these problems were probably caused by my own undisciplined use of SVN).

Erik.


-----Original Message-----
From: brett lentz [mailto:wak...@gm...] 
Sent: Wednesday 03 February 2010 23:03
To: Development list for Rails: an 18xx game
Subject: [Rails-devel] Idea: migrating away from cvs.

As we're all probably aware, CVS is ancient technology.   Rails is
only really using it because it was the default for a Sourceforge
project when I signed up.

After nearly 5 years of development, our repository has gotten a bit
crufty and is starting to show some of it's warts. Performance doing
checkouts has started to suffer a bit.

What do you guys think about looking at other options?

For the last year at $dayjob, I've been using Git (http://git-scm.com)
a lot, and I really enjoy it.  Looks like there's an Eclipse plugin
for git (http://www.eclipse.org/egit/).

Sourceforge supports using Subversion, Git, Mercurial, Bazaar, and CVS.

I've personally got experience with CVS, Subversion, and Git. I've
only used Mercurial once or twice, which isn't enough to really have
an opinion of it.

Overall, my experience is that Git is light years ahead of CVS and
Subversion.

What are everyone else's thoughts and experiences?
Is this something worth doing?
Do you want to stay with CVS?
Do you hate me because you're a new committer and you just got your
environment set up, and now I'm proposing changing it?  ;-)

---Brett.

----------------------------------------------------------------------------
--
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the
business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Rails-devel mailing list
Rai...@li...
https://lists.sourceforge.net/lists/listinfo/rails-devel

Re: [Rails-devel] Idea: migrating away from cvs.

[Chris B. <bro...@co...>]

On Wed, Feb 3, 2010 at 2:34 PM, brett lentz <wak...@gm...> wrote:

> That's actually what we do at $dayjob. We have a central git
> repository server that everyone pushes their changes into.  We don't
> publish our personal repositories for merging our various development
> trees.  We can, we just don't.  For our use case, it just wouldn't
> help us any.
>

My experience is the same as yours Brett, and I'm a big fan of git. It takes
a while to "get git" but once you do the model is very compelling.  And
having the easy *option* to commit/share/branch peer-to-peer without a
central server can be very handy in circumstances where you need it.

-Chris

Re: [Rails-devel] Idea: migrating away from cvs.

[brett l. <wak...@gm...>]

On Wed, Feb 3, 2010 at 2:17 PM, John A. Tamplin <ja...@ja...> wrote:
> On Wed, Feb 3, 2010 at 5:02 PM, brett lentz <wak...@gm...> wrote:
>>
>> I've personally got experience with CVS, Subversion, and Git. I've
>> only used Mercurial once or twice, which isn't enough to really have
>> an opinion of it.
>>
>> Overall, my experience is that Git is light years ahead of CVS and
>> Subversion.
>
> I would agree CVS is ancient and to be avoided in anything but personal
> projects.
> Between git and svn, I would say it depends on what you are doing.  I am a
> long time Unix user, and to me git feels like the Unix command line
> philosophy -- lots of small tools that you piece together to get what you
> want.  That is good in some ways in that you gain a lot of flexibility in
> how you put the pieces together, but it is bad in that it feels lower level
> and you have to do more steps for common tasks.  The other big difference is
> it is more of a distributed model, where individual people can have their
> own repositories and commit to them, which is good when they aren't
> contributors in the main project.  I don't know about Sourceforge's svn
> controls, but at least on code.google.com you can't have people with commit
> access to subtrees of the repository, which is how svn users accomplish
> similar tasks by having their own change branches for large changes.  That
> means you have to give them commit access anyway and trust that they won't
> commit elsewhere without proper review, but you can always rollback any
> changes that shouldn't have been made and revoke commit access if they do.
>
> --
> John A. Tamplin


It seems that many people get hung up on the "distributed" piece when
talking about git, hg, and bzr.

Really, the only thing being "distributed" means, is that there's no
technical restrictions that enforce a client/server model.

However, it's still very easy to have a development model that
designates one repository as "master" or "authoritative", and have
everyone's commits funnel through that repository.

That's actually what we do at $dayjob. We have a central git
repository server that everyone pushes their changes into.  We don't
publish our personal repositories for merging our various development
trees.  We can, we just don't.  For our use case, it just wouldn't
help us any.

So... other than being able to share your work before it goes into the
"master" tree, the whole distributed thing isn't really a big deal.


---Brett.

Re: [Rails-devel] Idea: migrating away from cvs.

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

one of the new ones: Moving away from CVS seems to be a good idea. I use 
subversion at work, git was not available at the time of setting up. 
From my point of view I am quite happy with it, but I am not a power user and 
I do not need distributed repos.
As I am not a regular user of eclipse a seamless and reliable integration 
would help a lot.
Stefan

On Wednesday 03 February 2010 23:12:49 Rick Westerman wrote:
> > Overall, my experience is that Git is light years ahead of CVS and
> > Subversion.
> >
> > What are everyone else's thoughts and experiences?
> > Is this something worth doing?
> > Do you want to stay with CVS?
> > Do you hate me because you're a new committer and you just got your
> > environment set up, and now I'm proposing changing it?  ;-)
>
> I suspect that this is something that needs to be done sooner or
> later.  So sooner is better before even more people have to make the
> change.  Personally I have not used git -- only subversion and cvs --
> but have heard good things about git.
>
> -- Rick
>
>
> ---------------------------------------------------------------------------
>--- The Planet: dedicated and managed hosting, cloud storage, colocation
> Stay online with enterprise data centers and the best network in the
> business Choose flexible plans and management services without long-term
> contracts Personal 24x7 support from experience hosting pros just a phone
> call away. http://p.sf.net/sfu/theplanet-com
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel

Re: [Rails-devel] Idea: migrating away from cvs.

[John A. T. <ja...@ja...>]

On Wed, Feb 3, 2010 at 5:02 PM, brett lentz <wak...@gm...> wrote:

> I've personally got experience with CVS, Subversion, and Git. I've
> only used Mercurial once or twice, which isn't enough to really have
> an opinion of it.
>
> Overall, my experience is that Git is light years ahead of CVS and
> Subversion.
>

I would agree CVS is ancient and to be avoided in anything but personal
projects.

Between git and svn, I would say it depends on what you are doing.  I am a
long time Unix user, and to me git feels like the Unix command line
philosophy -- lots of small tools that you piece together to get what you
want.  That is good in some ways in that you gain a lot of flexibility in
how you put the pieces together, but it is bad in that it feels lower level
and you have to do more steps for common tasks.  The other big difference is
it is more of a distributed model, where individual people can have their
own repositories and commit to them, which is good when they aren't
contributors in the main project.  I don't know about Sourceforge's svn
controls, but at least on code.google.com you can't have people with commit
access to subtrees of the repository, which is how svn users accomplish
similar tasks by having their own change branches for large changes.  That
means you have to give them commit access anyway and trust that they won't
commit elsewhere without proper review, but you can always rollback any
changes that shouldn't have been made and revoke commit access if they do.


> What are everyone else's thoughts and experiences?
> Is this something worth doing?
> Do you want to stay with CVS?
> Do you hate me because you're a new committer and you just got your
> environment set up, and now I'm proposing changing it?  ;-)
>

I think either svn or git would be fine and both have good Eclipse plugins.
 I haven't used Hg, so I don't know if it would be better or worse.  The
last time I used Bazaar it was buggy, which is far from what you want in
your version control system.  I personally use svn for most everything, but
if you don't have commit access for change branches it can be a pain to work
on large changes that you want to checkpoint status on before it is ready to
send for review.

-- 
John A. Tamplin

Re: [Rails-devel] Idea: migrating away from cvs.

[Rick W. <wes...@pu...>]

>
> Overall, my experience is that Git is light years ahead of CVS and  
> Subversion.
>
> What are everyone else's thoughts and experiences?
> Is this something worth doing?
> Do you want to stay with CVS?
> Do you hate me because you're a new committer and you just got your
> environment set up, and now I'm proposing changing it?  ;-)

I suspect that this is something that needs to be done sooner or  
later.  So sooner is better before even more people have to make the  
change.  Personally I have not used git -- only subversion and cvs --  
but have heard good things about git.

-- Rick

[Rails-devel] Idea: migrating away from cvs.

[brett l. <wak...@gm...>]

As we're all probably aware, CVS is ancient technology.   Rails is
only really using it because it was the default for a Sourceforge
project when I signed up.

After nearly 5 years of development, our repository has gotten a bit
crufty and is starting to show some of it's warts. Performance doing
checkouts has started to suffer a bit.

What do you guys think about looking at other options?

For the last year at $dayjob, I've been using Git (http://git-scm.com)
a lot, and I really enjoy it.  Looks like there's an Eclipse plugin
for git (http://www.eclipse.org/egit/).

Sourceforge supports using Subversion, Git, Mercurial, Bazaar, and CVS.

I've personally got experience with CVS, Subversion, and Git. I've
only used Mercurial once or twice, which isn't enough to really have
an opinion of it.

Overall, my experience is that Git is light years ahead of CVS and Subversion.

What are everyone else's thoughts and experiences?
Is this something worth doing?
Do you want to stay with CVS?
Do you hate me because you're a new committer and you just got your
environment set up, and now I'm proposing changing it?  ;-)

---Brett.

Re: [Rails-devel] 1889

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

Aliza,
the standard game with nearly all features below should also work. Some 
comments and caveats see below.
I hope you will not run into any serious issues during your tests. In any case 
keep me updated if you need a fix.
Stefan

>  One of the privates controls a restricted tile that can go in several
>  locations; it can be sold in before the 3-trains, though with a
>  smaller price range.

Actually in my rules (1.0c 12 July 2006) there is no exception to be sold 
before phase 3 for the B private. But the token lay is attributed to the 
owning player only.
However in rails it can (currently) only be done in the tile laying of a 
company of that player. If the owner of B does not own any public company, he 
cannot lay a port so far.

>
>  One of the privates survives the 5-trains, at which point its income
> changes.

Only if still owned by player, implemented in Rails.

>
>  One of the majors only has a single token. (For obvious reasons, this
>  is typically the last major to be started.)
>
>  Several of the major cities cost money to upgrade. (The big one is 80
>  yen(*) every single time. Ouch!)

Implemented.

>
>  One of the privates affects terrain costs; another private allows an
>  unconnected tile lay when it is bought in, which is not necessarily in
>  the tile-lay phase.

The first private is the D (no mountain costs), that is implemented. The 
latter is the C, here the current implementation only allows the tile lay in 
the tile laying step of the buying company. Thus if the private is bought 
after the tile laying step (usually only if that company buys the first 3 
train), there is a deviation on the board until the next OR.

>
>  One private can be *swapped* for a share of a certain company.

That is the E. Actually checking the rules I realized that it is different to 
1830 in that the rules only allow to change for shares from the IPO. 
Currently Rails would exchange from the Pool if none are available from IPO.
(Actually if I remember correctly in the 1830 rules it is undefined and some 
AH ruling later allowed the private owner to choose?)

Other things:

The remaining caveat is that if the owner adds additional funding to a train 
purchase only the cheapest train from the bank or the pool.

I also realized looking into the rules again, that 1889 is 
SELL-BUY-or-BUY-SELL, will change that in the game.xml file asap.


>
>  - Aliza

Re: [Rails-devel] Start orientation of THB

[Erik V. <eri...@xs...>]

This has now been fixed.
If the 1856 THB (or the 1830 Erie, for that matter) 
starts, the token city is left undefined. 

If there is already a green OO tile on the home hex,
the player is asked to assign the home city at the
start of the first OR turn of the company.
This is irrespective of what the rules say about
when home tokens are laid.

Normally the home token is laid at the moment that the rules
prescribe (at start, at floating or in the first OR turn),
but in this case there is no easy way to accomplish that.

Erik.

-----Original Message-----
From: Erik Vos [mailto:eri...@xs...] 
Sent: Monday 01 February 2010 22:22
To: 'brett lentz'; 'Arne Östlund'
Subject: RE: Start orientation of THB

Arne,

You're right. This case is not covered yet.
I'll try to fix it later this week.

Erik.

-----Original Message-----
From: brett lentz [mailto:wak...@gm...] 
Sent: Monday 01 February 2010 18:53
To: Erik Vos
Subject: Fwd: Start orientation of THB

---------- Forwarded message ----------
From: Arne Östlund <arn...@gl...>
Date: Mon, Feb 1, 2010 at 9:14 AM
Subject: Re: Start orientation of THB
To: rai...@li...


Hi Erik

We are playing an 1856 PBeM campaigne and discovered that THB has no
option to choose start position if the green #59 is already placed. In
our game #59 @ L15 has legs N and SW and Rails forces THB to start at
the towm with leg SW even though it would have been more natural to
start northwards. I have sent a save file to show the problem.

Yours,
Arne Östlund

Re: [Rails-devel] 1889

[John A. T. <ja...@ja...>]

On Wed, Feb 3, 2010 at 3:21 PM, Aliza Panitz <ali...@gm...> wrote:

> (*) I don't remember whether the base currency in 1889 is one yen or
> one million yen.  We play with poker chips. :-)
>

It's Yen.

Also, companies float at 50%.

-- 
John A. Tamplin

[Rails-devel] 1889

[Aliza P. <ali...@gm...>]

The big differences from 1830, in a programmatic way (off the top of my head):

One of the privates controls a restricted tile that can go in several
locations; it can be sold in before the 3-trains, though with a
smaller price range.

One of the privates survives the 5-trains, at which point its income changes.

One of the majors only has a single token. (For obvious reasons, this
is typically the last major to be started.)

Several of the major cities cost money to upgrade. (The big one is 80
yen(*) every single time.  Ouch!)

One of the privates affects terrain costs; another private allows an
unconnected tile lay when it is bought in, which is not necessarily in
the tile-lay phase.

One private can be *swapped* for a share of a certain company.

 - Aliza

(*) I don't remember whether the base currency in 1889 is one yen or
one million yen.  We play with poker chips. :-)

On Wed, Feb 3, 2010 at 1:56 AM, Phil Davies <de...@gm...> wrote:
> I've not yet played 1889 but I'll happily cram the rules and playtest it :)
>
> On 2 February 2010 22:38, Aliza Panitz <ali...@gm...> wrote:
>> On Tue, Feb 2, 2010 at 1:04 PM, Erik Vos <eri...@xs...> wrote:
>>> [...] get the new release out. [...]
>>>
>>> However, the most pressing need for me to get it out is that Stefan Frey has
>>> sent me a whole load of patches that together implement most of 1889, in any
>>> case the "Beginners Game". On first sight it seems to work well, but I'm not
>>> the right person to judge this game as I don't own it and have never played
>>> it.
>>
>>
>> I have played 1889 many times; we use it to teach beginners over here.
>> I'd be happy to playtest it with a few of my imaginary friends, if you
>> can get me a built version (I still don't have a development
>> environment here.)
>>
>> The "beginner's game" for 1889 just has a few extra tiles (so it's
>> harder to run out of the tile you need) and some slight changes in the
>> privates.
>>
>>  - Aliza
>>
>> ------------------------------------------------------------------------------
>> The Planet: dedicated and managed hosting, cloud storage, colocation
>> Stay online with enterprise data centers and the best network in the business
>> Choose flexible plans and management services without long-term contracts
>> Personal 24x7 support from experience hosting pros just a phone call away.
>> http://p.sf.net/sfu/theplanet-com
>> _______________________________________________
>> Rails-devel mailing list
>> Rai...@li...
>> https://lists.sourceforge.net/lists/listinfo/rails-devel
>>
>
> ------------------------------------------------------------------------------
> The Planet: dedicated and managed hosting, cloud storage, colocation
> Stay online with enterprise data centers and the best network in the business
> Choose flexible plans and management services without long-term contracts
> Personal 24x7 support from experience hosting pros just a phone call away.
> http://p.sf.net/sfu/theplanet-com
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
>

Re: [Rails-devel] Rails.1.1.3 to get out?

[Phil D. <de...@gm...>]

I've not yet played 1889 but I'll happily cram the rules and playtest it :)

On 2 February 2010 22:38, Aliza Panitz <ali...@gm...> wrote:
> On Tue, Feb 2, 2010 at 1:04 PM, Erik Vos <eri...@xs...> wrote:
>> [...] get the new release out. [...]
>>
>> However, the most pressing need for me to get it out is that Stefan Frey has
>> sent me a whole load of patches that together implement most of 1889, in any
>> case the "Beginners Game". On first sight it seems to work well, but I'm not
>> the right person to judge this game as I don't own it and have never played
>> it.
>
>
> I have played 1889 many times; we use it to teach beginners over here.
> I'd be happy to playtest it with a few of my imaginary friends, if you
> can get me a built version (I still don't have a development
> environment here.)
>
> The "beginner's game" for 1889 just has a few extra tiles (so it's
> harder to run out of the tile you need) and some slight changes in the
> privates.
>
>  - Aliza
>
> ------------------------------------------------------------------------------
> The Planet: dedicated and managed hosting, cloud storage, colocation
> Stay online with enterprise data centers and the best network in the business
> Choose flexible plans and management services without long-term contracts
> Personal 24x7 support from experience hosting pros just a phone call away.
> http://p.sf.net/sfu/theplanet-com
> _______________________________________________
> Rails-devel mailing list
> Rai...@li...
> https://lists.sourceforge.net/lists/listinfo/rails-devel
>

[Rails-devel] Rails.1.1.3 is available.

[brett l. <wak...@gm...>]

Another month, another bugfix release.

Come and get it!

http://rails.sourceforge.net/

---Brett.

Re: [Rails-devel] Rails.1.1.3 to get out?

[brett l. <wak...@gm...>]

On Tue, Feb 2, 2010 at 1:04 PM, Erik Vos <eri...@xs...> wrote:
> Brett & all,
>
> I think the current code base is now stable enough to get the new release
> out.
>
> There are a few open issues that I will look at, but can't tell when I can
> get those done.
>
> However, the most pressing need for me to get it out is that Stefan Frey has
> sent me a whole load of patches that together implement most of 1889, in any
> case the "Beginners Game". On first sight it seems to work well, but I'm not
> the right person to judge this game as I don't own it and have never played
> it.
>
> As these patches affect some of the old code, I don't want to commit it
> before 1.1.3 is out, so I'm running greatly out of sync now...
>
> Erik.
>
>

Ok.  I'll roll out a new version, then commit Stefan's patches.

---Brett.