[Rails-commits] SF.net SVN: rails:[1559] trunk/18xx/data/18Scan

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1559
          http://rails.svn.sourceforge.net/rails/?rev=1559&view=rev
Author:   evos
Date:     2011-05-12 20:26:14 +0000 (Thu, 12 May 2011)

Log Message:
-----------
18Scan: companies and Game.xml

Modified Paths:
--------------
    trunk/18xx/data/18Scan/CompanyManager.xml
    trunk/18xx/data/18Scan/Game.xml

Modified: trunk/18xx/data/18Scan/CompanyManager.xml
===================================================================

--- trunk/18xx/data/18Scan/CompanyManager.xml	2011-05-11 20:58:45 UTC (rev 1558)
+++ trunk/18xx/data/18Scan/CompanyManager.xml	2011-05-12 20:26:14 UTC (rev 1559)
@@ -4,12 +4,23 @@
 		<ClosingConditions>
 			<Phase>5</Phase>
 		</ClosingConditions>
-		<Tradeable toCompany="yes" lowerPriceFactor="0.5" upperPriceFactor="1.5"/>
-		<Tradeable toPlayer="yes"/>
 	</CompanyType>
+
+	<CompanyType name="Minor" class="rails.game.PublicCompany" fgColour="FFCC11" bgColour="9370DB">
+		<ShareUnit percentage="100"/>
+		<Certificate type="President" shares="1"/>
+	<StockPrice market="no"/>
+	<Payout split="always"/>
+	<BaseTokens>
+		<HomeBase lay="whenStarted"/>
+	</BaseTokens>
+	<Trains number="2,2,1,0" mandatory="no"/>
+	</CompanyType>
+	
 	<CompanyType name="Public" class="rails.game.PublicCompany">
-		<PoolPaysOut/>
-		<Float percentage="60"/>
+		<Capitalisation type="incremental"/>
+		<Float percentage="20"/>
+		<StockPrice par="no"/>
 		<ShareUnit percentage="10"/>
 		<Certificate type="President" shares="2"/>
 		<Certificate shares="1" number="8"/>
@@ -18,17 +29,59 @@
 			<LayCost method="sequence" cost="0,40,100"/>
 		</BaseTokens>
 		<Trains number="4,4,3,2"/>
-		<CanBuyPrivates/>
 		<CanUseSpecialProperties/>
 	</CompanyType>
-	<Company name="P1" type="Private" basePrice="20" revenue="5"
-		longname="Private 1"></Company>
-	
+	<Company name="Ferry" type="Private" basePrice="120" revenue="20"
+		longname="Stockholm-Åbo Ferry Company (Ferry)"></Company>
+	<Company name="Mine" type="Private" basePrice="150" revenue="25"
+		longname="Lapland Ore Line (Mine)"></Company>
+	<Company name="ZRC" type="Private" basePrice="180" revenue="30"
+		longname="Sjællandske Jernbaneselskab (Zeeland Railway Company)"></Company>
 
+	<Company name="1" type="Minor" tokens="2" longname="Västra Stambanan (Western Mainline)">
+		<Home hex="G4" />
+	</Company>
+	<Company name="2" type="Minor" tokens="2" longname="Nordvästra Stambanan (Northwestern Mainline)">
+		<Home hex="F11" />
+	</Company>
+	<Company name="3" type="Minor" tokens="2" longname="Södra Stambanan (Southern Mainline)">
+		<Home hex="F11" />
+	</Company>
+
+	<Company name="DSB" type="Public" tokens="3" fgColour="FFFFFF"
+		bgColour="EE2C2C" longname="Danske Statsbaner">
+		<Home hex="F3" />
+	</Company>
+	<Company name="NSB" type="Public" tokens="4" fgColour="FFFFFF"
+		bgColour="23238E" longname="Norges Statsbaner">
+		<Home hex="D7" />
+	</Company>
+	<Company name="S&amp;NJ" type="Public" tokens="3" fgColour="FFFFFF"
+		bgColour="228B22" longname="Sveriges &amp; Norges Järnvägar">
+		<Home hex="B19" />
+	</Company>
+	<Company name="VR" type="Public" tokens="4" fgColour="FFFFFF"
+		bgColour="1464F4" longname="Valtionrautatiet">
+		<Home hex="G14" />
+	</Company>
+	<Company name="SJ" type="Public" tokens="6" fgColour="FFCC11"
+		bgColour="9370DB" longname="Statens Järnvägar">
+	<Trains number="3"/>
+	</Company>
+
 	<StartPacket roundClass="rails.game.StartRound_1830">
 		<Bidding initial="5" minimum="5" increment="1"/>
-		<Item name="P1" type="Private" basePrice="20"/>
-
-		
+		<Item name="Ferry" type="Private" basePrice="120">
+			<SubItem name="VR" type="Public" />
+		</Item>
+		<Item name="Mine" type="Private" basePrice="150">
+			<SubItem name="S&amp;NJ" type="Public" />
+		</Item>
+		<Item name="ZRC" type="Private" basePrice="180">
+			<SubItem name="DSB" type="Public" president="yes"/>
+		</Item>
+		<Item name="1" type="Minor" basePrice="200"/>
+		<Item name="2" type="Minor" basePrice="220"/>
+		<Item name="3" type="Minor" basePrice="260"/>
 	</StartPacket>
 </CompanyManager>
\ No newline at end of file

Modified: trunk/18xx/data/18Scan/Game.xml
===================================================================
--- trunk/18xx/data/18Scan/Game.xml	2011-05-11 20:58:45 UTC (rev 1558)
+++ trunk/18xx/data/18Scan/Game.xml	2011-05-12 20:26:14 UTC (rev 1559)
@@ -11,15 +11,14 @@
 				</IfOption>
 			</PlayerShareLimit>
 			<BankPoolLimit percentage="50"/>
-			<StockRound>
-				 <NoSaleInFirstSR/>
+			<StockRound sequence="SellBuy">
+				<NoSaleIfNotOperated/>
 			</StockRound>
 		</GameParameters>
 		<GuiClasses>
 		</GuiClasses>
 		<EndOfGame>
-			<Bankruptcy/>
-			<BankBreaks limit="0" finish="currentOR"/>
+			<BankBreaks limit="0" finish="setOfORs"/>
 			<!-- "Runs out"; when "broken", -1 is the limit -->
 			<!-- Also when the share value reaches $300; this is configured in the stock market XML,
 				but uses the 'finish' attribute value defined above. -->
@@ -45,47 +44,36 @@
 			<Reach base="stops" countTowns="no"/>
 			<Score towns="yes"/>
 		</Defaults>
-		<Train name="2" majorStops="2" cost="100" amount="5"/>
-		<Train name="3" majorStops="3" cost="180" amount="4" startPhase="3"/>
+		<Train name="2" majorStops="2" cost="100" amount="6"/>
+		<Train name="3" majorStops="3" cost="200" amount="4" startPhase="3"/>
 		<Train name="4" majorStops="4" cost="300" amount="3" startPhase="4" 
 			rustedTrain="2" />
-		<Train name="5" majorStops="5" cost="450" amount="2" startPhase="5"/>
-		<Train name="6" majorStops="6" cost="630" amount="2" startPhase="6" 
+		<Train name="5" majorStops="5" cost="500" amount="2" startPhase="5" releasedTrain="5E"/>
+		<Train name="5E" majorStops="5" cost="600" amount="2" startPhase="6" releasedTrain="4D"
 			rustedTrain="3"/>
-		<Train name="8" majorStops="8" cost="800" startPhase="8" 
+		<Train name="4D" majorStops="4" cost="800" amount="6" startPhase="4D" 
 			rustedTrain="4">
-			<IfOption name="UnlimitedTopTrains" value="yes">
-				<Attributes amount="-1"/>
-			</IfOption>
-			<IfOption name="UnlimitedTopTrains" value="no">
-				<Attributes amount="5"/>
-			</IfOption>
 		</Train>
 	</Component>
 	<Component name="PhaseManager" class="rails.game.PhaseManager">
 		<Phase name="2" >
 			<Tiles colour="yellow"/>
-			<OperatingRounds number="1"/>
+			<OperatingRounds number="2"/>
 			<Trains onePerTurn="yes" tradingAllowed="yes"/>
 		</Phase>
 		<Phase name="3">
 			<Tiles colour="yellow,green"/>
-			<Privates sellingAllowed="yes"/>
-			<OperatingRounds number="2"/>
+			<OffBoardRevenue step="2"/>
 		</Phase>
-		<Phase name="4">
-			<Trains onePerTurn="no"/>
-		</Phase>
+		<Phase name="4"/>
 		<Phase name="5">
 			<Tiles colour="yellow,green,brown"/>
-			<OperatingRounds number="3"/>
 			<Privates close="yes"/>
-			<OffBoardRevenue step="2"/>
+			<OffBoardRevenue step="3"/>
 		</Phase>
-		<Phase name="6" />
-		<Phase name="8">
-			<Tiles colour="yellow,green,brown"/>
-		</Phase>
+		<Phase name="5E" />
+		<Phase name="4D"/>
+
 	</Component>
 	<Component name="RevenueManager" class="rails.algorithms.RevenueManager">
 	</Component>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


