[Rails-commits] 18xx/data/1889 Game.xml, 1.6, 1.7 CompanyManager.xml, 1.3, 1.4

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

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

Modified Files:
	Game.xml CompanyManager.xml 
Log Message:
Added better support for B and C privates
Minor fix to boolean conversion of GameOptions

Index: CompanyManager.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1889/CompanyManager.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CompanyManager.xml	20 Feb 2010 23:06:38 -0000	1.3
--- CompanyManager.xml	23 Feb 2010 22:21:39 -0000	1.4
***************
*** 50,61 ****
  		<Company name="B" type="Private" basePrice="30" revenue="5"
  			longName="Mitsubishi Ferry">
  			<SpecialProperties>
  				<SpecialProperty condition="ifOwnedByPlayer" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
  					<SpecialTileLay location="B11,G10,I12,J9" tile="437" extra="yes" free="yes"/>
  				</SpecialProperty>
- <!-- 				TODO: Additional Property required: -->
- <!--				<SpecialProperty condition="ifOwnedByPlayer" when="betweenOR" class="rails.game.special.SpecialTileLay">
- 					<SpecialTileLay location="B11,G10,I12,J9" tile="437" extra="yes" free="yes"/>
- 				</SpecialProperty>  -->
  			</SpecialProperties>
  		</Company>
--- 50,58 ----
  		<Company name="B" type="Private" basePrice="30" revenue="5"
  			longName="Mitsubishi Ferry">
+ <!-- 			Handling of special property outside of players public company turn is done in OperatingRound_1889, coded against name "B" -->
  			<SpecialProperties>
  				<SpecialProperty condition="ifOwnedByPlayer" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
  					<SpecialTileLay location="B11,G10,I12,J9" tile="437" extra="yes" free="yes"/>
  				</SpecialProperty>
  			</SpecialProperties>
  		</Company>
***************
*** 64,74 ****
  			<Blocking hex="C4"/>
  			<SpecialProperties>
! 				<SpecialProperty condition="ifOwnedByCompany" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
  					<SpecialTileLay location="C4" extra="yes" free="yes"/>
  				</SpecialProperty>
- <!-- 				TODO: Correct Property would look like: -->
- <!--				<SpecialProperty condition="PlayerAfterSellToPublic" when="immediate" class="rails.game.special.SpecialTileLay">
- 					<SpecialTileLay location="C4" extra="yes" free="yes"/>
- 				</SpecialProperty>-->
  			</SpecialProperties>
  		</Company>
--- 61,68 ----
  			<Blocking hex="C4"/>
  			<SpecialProperties>
! <!-- 			Timing of special property is done in OperatingRound_1889, coded against name "C" -->
! 				<SpecialProperty condition="specific" when="tileLayingStep" class="rails.game.special.SpecialTileLay">
  					<SpecialTileLay location="C4" extra="yes" free="yes"/>
  				</SpecialProperty>
  			</SpecialProperties>
  		</Company>

Index: Game.xml
===================================================================
RCS file: /cvsroot/rails/18xx/data/1889/Game.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Game.xml	17 Feb 2010 00:34:52 -0000	1.6
--- Game.xml	23 Feb 2010 22:21:39 -0000	1.7
***************
*** 32,35 ****
--- 32,36 ----
  				<NoSaleInFirstSR/>
  			</StockRound>
+ 			<OperatingRound class="rails.game.specific._1889.OperatingRound_1889"/>
  		</GameParameters>
  		<EndOfGame>