[Rails-commits] 18xx/data/1835 Game.xml, 1.25, 1.26 CompanyManager.xml, 1.25, 1.26

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

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

Modified Files:
	Game.xml CompanyManager.xml 
Log Message:
Implemented 1835 token lay cost calculation

Index: CompanyManager.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1835/CompanyManager.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** CompanyManager.xml	6 Feb 2010 23:45:55 -0000	1.25
--- CompanyManager.xml	20 Feb 2010 12:34:43 -0000	1.26
***************
*** 6,14 ****
  		<ShareUnit percentage="100"/>
  		<Certificate type="President" shares="1"/>
! 	<StockPrice market="no"/>
! 	<BaseTokens>
! 		<LayCost method="distance" cost="20"/>
! 	</BaseTokens>
! 	<Payout split="always"/>
  	<Trains number="2,2,1" mandatory="no"/>
  	</CompanyType>
--- 6,11 ----
  		<ShareUnit percentage="100"/>
  		<Certificate type="President" shares="1"/>
! 		<StockPrice market="no"/>
! 		<Payout split="always"/>
  	<Trains number="2,2,1" mandatory="no"/>
  	</CompanyType>
***************
*** 22,29 ****
  		<!--NumberOfTileLays colour="yellow" phase="2" number="2"/-->
  		<TileLays>
! 		<Number colour="yellow" phase="2" number="2"/>
  		</TileLays>
! 	<Capitalisation type="incremental"/>
! 	<Trains number="4,4,3,2"/>
  	</CompanyType>
  	
--- 19,29 ----
  		<!--NumberOfTileLays colour="yellow" phase="2" number="2"/-->
  		<TileLays>
! 			<Number colour="yellow" phase="2" number="2"/>
  		</TileLays>
! 		<BaseTokens>
! 			<LayCost method="distance" cost="20"/>
! 		</BaseTokens>
! 		<Capitalisation type="incremental"/>
! 		<Trains number="4,4,3,2"/>
  	</CompanyType>
  	

Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1835/Game.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Game.xml	31 Jan 2010 22:15:57 -0000	1.25
--- Game.xml	20 Feb 2010 12:34:34 -0000	1.26
***************
*** 1,13 ****
  <?xml version="1.0"?>
  <ComponentManager>
! 	<Component name="GameManager" class="rails.game.GameManager">
  		<Game name="1835"/>
  		<GameOption name="Variant" values="Standard,Clemens,Snake"/>
  		<GameOption name="UnlimitedTiles" type="toggle" default="no"/>
  		<GameParameters>
  			<PlayerShareLimit percentage="60"/>
  			<BankPoolLimit percentage="50"/>
! 			<StockRound class="rails.game.specific._1835.StockRound_1835" 
  				sequence="SellBuySell">
  				<NoSaleInFirstSR/>
  				<NoSaleIfNotOperated/>
--- 1,17 ----
  <?xml version="1.0"?>
  <ComponentManager>
! 	<Component name="GameManager"  class="rails.game.GameManager">
! 	<!--Component name="GameManager"  class="rails.game.specific._1835.GameManager_1835"-->
  		<Game name="1835"/>
  		<GameOption name="Variant" values="Standard,Clemens,Snake"/>
+ 		<GameOption name="NoMapMode" type="toggle" default="no" />
  		<GameOption name="UnlimitedTiles" type="toggle" default="no"/>
  		<GameParameters>
  			<PlayerShareLimit percentage="60"/>
  			<BankPoolLimit percentage="50"/>
! 			<StockRound class="rails.game.StockRound" 
  				sequence="SellBuySell">
+ 			<!--StockRound class="rails.game.specific._1835.StockRound_1835" 
+ 				sequence="SellBuySell"-->
  				<NoSaleInFirstSR/>
  				<NoSaleIfNotOperated/>
***************
*** 49,53 ****
  			rustedTrain="2"/>
  		<Train name="4+4" majorStops="4" minorStops="4" cost="440" amount="1"
! 			rustedTrain="2+2"/>
  		<Train name="5" majorStops="5" cost="500" amount="2" startPhase="5"/>
  		<Train name="5+5" majorStops="5" minorStops="5" cost="600" amount="1"/>
--- 53,57 ----
  			rustedTrain="2"/>
  		<Train name="4+4" majorStops="4" minorStops="4" cost="440" amount="1"
! 			startPhase="4+4" rustedTrain="2+2"/>
  		<Train name="5" majorStops="5" cost="500" amount="2" startPhase="5"/>
  		<Train name="5+5" majorStops="5" minorStops="5" cost="600" amount="1"/>
***************
*** 71,74 ****
--- 75,81 ----
  			<Tiles colour="yellow,green"/>
  		</Phase>
+ 		<Phase name="4+4">
+ 			<Tiles colour="yellow,green"/>
+ 		</Phase>
  		<Phase name="5">
  			<Tiles colour="yellow,green,brown"/>