Menu
▾
▴
[Rails-commits] SF.net SVN: rails:[1580] trunk/18xx/data
|
From: <ev...@us...> - 2011-06-21 21:21:50
|
Revision: 1580
http://rails.svn.sourceforge.net/rails/?rev=1580&view=rev
Author: evos
Date: 2011-06-21 21:21:43 +0000 (Tue, 21 Jun 2011)
Log Message:
-----------
Train management refactoring II - data
<Train> is now <TrainType> and represents train certificate types
<Train> is used for the types of a dual train certificate
Modified Paths:
--------------
trunk/18xx/data/1825/Game.xml
trunk/18xx/data/1830/Game.xml
trunk/18xx/data/1835/Game.xml
trunk/18xx/data/1851/Game.xml
trunk/18xx/data/1856/Game.xml
trunk/18xx/data/1870/Game.xml
trunk/18xx/data/1880/Game.xml
trunk/18xx/data/1889/Game.xml
trunk/18xx/data/18AL/Game.xml
trunk/18xx/data/18EU/Game.xml
trunk/18xx/data/18GA/Game.xml
trunk/18xx/data/18Scan/CompanyManager.xml
trunk/18xx/data/18Scan/Game.xml
trunk/18xx/data/18TN/Game.xml
trunk/18xx/data/18VA/Game.xml
Modified: trunk/18xx/data/1825/Game.xml
===================================================================
--- trunk/18xx/data/1825/Game.xml 2011-06-18 21:11:45 UTC (rev 1579)
+++ trunk/18xx/data/1825/Game.xml 2011-06-21 21:21:43 UTC (rev 1580)
@@ -70,14 +70,14 @@
cities="double" if city-revenue is doubled (e.g. 1826 TGV).
-->
</Defaults>
- <Train name="2" majorStops="2" cost="180" quantity="6"/>
- <Train name="3" majorStops="3" cost="300" quantity="4" startPhase="2"/>
- <Train name="4" majorStops="4" cost="430" quantity="3"/>
- <Train name="5" majorStops="5" cost="550" quantity="4"
+ <TrainType name="2" majorStops="2" cost="180" quantity="6"/>
+ <TrainType name="3" majorStops="3" cost="300" quantity="4" startPhase="2"/>
+ <TrainType name="4" majorStops="4" cost="430" quantity="3"/>
+ <TrainType name="5" majorStops="5" cost="550" quantity="4"
startPhase="3" rustedTrain="2" />
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
- <!-- Note: released and rusted trains are now specified per Train
+ <!-- Note: released and rusted trains are now specified per TrainType
but could as well be moved here. To be sorted out when we do 18US. -->
<!-- Each Phase's defaults are the previous one's values -->
<Phase name="1" >
Modified: trunk/18xx/data/1830/Game.xml
===================================================================
--- trunk/18xx/data/1830/Game.xml 2011-06-18 21:11:45 UTC (rev 1579)
+++ trunk/18xx/data/1830/Game.xml 2011-06-21 21:21:43 UTC (rev 1580)
@@ -130,7 +130,7 @@
cities="double" if city-revenue is doubled (e.g. 1826 TGV).
-->
</Defaults>
- <Train name="2" majorStops="2" cost="80" quantity="6">
+ <TrainType name="2" majorStops="2" cost="80" quantity="6">
<IfOption name="Variant" value="Coalfields,Reading,Coalfields&Reading">
<Attributes obsoleting="yes"/>
</IfOption>
@@ -139,16 +139,16 @@
<!-- NOTE: An alternative way to configure an extra train is: quantityIncrement="+1"
(the '+' is optional) -->
</IfOption>
- </Train>
- <Train name="3" majorStops="3" cost="180" quantity="5" startPhase="3">
+ </TrainType>
+ <TrainType name="3" majorStops="3" cost="180" quantity="5" startPhase="3">
<IfOption name="Variant" value="Coalfields,Reading,Coalfields&Reading">
<Attributes obsoleting="yes"/>
</IfOption>
<IfOption name="Variant" value="Wabash">
<Attributes quantity="6"/>
</IfOption>
- </Train>
- <Train name="4" majorStops="4" cost="300" quantity="4" startPhase="4"
+ </TrainType>
+ <TrainType name="4" majorStops="4" cost="300" quantity="4" startPhase="4"
rustedTrain="2">
<IfOption name="Variant" value="Coalfields,Reading">
<Attributes obsoleting="yes" quantity="5"/>
@@ -159,13 +159,13 @@
<IfOption name="Variant" value="Wabash">
<Attributes quantity="5"/>
</IfOption>
- </Train>
- <Train name="5" majorStops="5" cost="450" quantity="3" startPhase="5">
+ </TrainType>
+ <TrainType name="5" majorStops="5" cost="450" quantity="3" startPhase="5">
<IfOption name="Variant" value="Wabash">
<Attributes quantity="4"/>
</IfOption>
- </Train>
- <Train name="6" majorStops="6" cost="630" startPhase="6"
+ </TrainType>
+ <TrainType name="6" majorStops="6" cost="630" startPhase="6"
rustedTrain="3" releasedTrain="D">
<IfOption name="WithOptional6Train" value="yes">
<Attributes quantity="3"/>
@@ -182,15 +182,15 @@
<IfOption name="Variant" value="Simple,Wabash">
<Attributes quantity="3"/>
</IfOption>
- </Train>
+ </TrainType>
<IfOption name="Variant" value="Coalfields,Reading,Coalfields&Reading">
- <Train name="7" majorStops="7" cost="710" quantity="2"/>
+ <TrainType name="7" majorStops="7" cost="710" quantity="2"/>
</IfOption>
<IfOption name="Variant" value="Wabash">
- <Train name="7" majorStops="7" cost="830" quantity="-1"/>
+ <TrainType name="7" majorStops="7" cost="830" quantity="-1"/>
</IfOption>
<IfOption name="Variant" value="Basegame,Pere Marquette,Reading,Coalfields,Coalfields&Reading,Simple">
- <Train name="D" majorStops="99" startPhase="D" rustedTrain="4">
+ <TrainType name="D" majorStops="99" startPhase="D" rustedTrain="4">
<IfOption name="Variant" value="Basegame,Pere Marquette,Simple">
<Attributes cost="1100"/>
<Exchange cost="800"/>
@@ -206,11 +206,11 @@
<Attributes quantity="6"/>
</IfOption>
<Exchange cost="800"/>
- </Train>
+ </TrainType>
</IfOption>
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
- <!-- Note: released and rusted trains are now specified per Train
+ <!-- Note: released and rusted trains are now specified per TrainType
but could as well be moved here. To be sorted out when we do 18US. -->
<!-- Each Phase's defaults are the previous one's values -->
<Phase name="2" >
Modified: trunk/18xx/data/1835/Game.xml
===================================================================
--- trunk/18xx/data/1835/Game.xml 2011-06-18 21:11:45 UTC (rev 1579)
+++ trunk/18xx/data/1835/Game.xml 2011-06-21 21:21:43 UTC (rev 1580)
@@ -53,19 +53,19 @@
<Reach base="stops" countTowns="yes"/>
<Score towns="yes"/>
</Defaults>
- <Train name="2" majorStops="2" cost="80" quantity="9"/>
- <Train name="2+2" majorStops="2" minorStops="2" cost="120" quantity="4"/>
- <Train name="3" majorStops="3" cost="180" quantity="4" startPhase="3"/>
- <Train name="3+3" majorStops="3" minorStops="3" cost="270" quantity="3"/>
- <Train name="4" majorStops="4" cost="360" quantity="3" startPhase="4"
+ <TrainType name="2" majorStops="2" cost="80" quantity="9"/>
+ <TrainType name="2+2" majorStops="2" minorStops="2" cost="120" quantity="4"/>
+ <TrainType name="3" majorStops="3" cost="180" quantity="4" startPhase="3"/>
+ <TrainType name="3+3" majorStops="3" minorStops="3" cost="270" quantity="3"/>
+ <TrainType name="4" majorStops="4" cost="360" quantity="3" startPhase="4"
rustedTrain="2"/>
- <Train name="4+4" majorStops="4" minorStops="4" cost="440" quantity="1"
+ <TrainType name="4+4" majorStops="4" minorStops="4" cost="440" quantity="1"
startPhase="4+4" rustedTrain="2+2"/>
- <Train name="5" majorStops="5" cost="500" quantity="2" startPhase="5"/>
- <Train name="5+5" majorStops="5" minorStops="5" cost="600" quantity="1"/>
- <Train name="6" majorStops="6" cost="600" quantity="2" startPhase="6"
+ <TrainType name="5" majorStops="5" cost="500" quantity="2" startPhase="5"/>
+ <TrainType name="5+5" majorStops="5" minorStops="5" cost="600" quantity="1"/>
+ <TrainType name="6" majorStops="6" cost="600" quantity="2" startPhase="6"
rustedTrain="3"/>
- <Train name="6+6" majorStops="6" minorStops="6" cost="720" quantity="4"
+ <TrainType name="6+6" majorStops="6" minorStops="6" cost="720" quantity="4"
rustedTrain="3+3"/>
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
Modified: trunk/18xx/data/1851/Game.xml
===================================================================
--- trunk/18xx/data/1851/Game.xml 2011-06-18 21:11:45 UTC (rev 1579)
+++ trunk/18xx/data/1851/Game.xml 2011-06-21 21:21:43 UTC (rev 1580)
@@ -54,14 +54,14 @@
cities="double" if city-revenue is doubled (e.g. 1826 TGV).
-->
</Defaults>
- <Train name="2" majorStops="2" cost="100" quantity="5"/>
- <Train name="3" majorStops="3" cost="200" quantity="4" startPhase="3"/>
- <Train name="4" majorStops="4" cost="300" quantity="3" startPhase="4"
+ <TrainType name="2" majorStops="2" cost="100" quantity="5"/>
+ <TrainType name="3" majorStops="3" cost="200" quantity="4" startPhase="3"/>
+ <TrainType name="4" majorStops="4" cost="300" quantity="3" startPhase="4"
rustedTrain="2"/>
- <Train name="5" majorStops="5" cost="500" quantity="2" startPhase="5"/>
- <Train name="6" majorStops="6" cost="600" quantity="2" startPhase="6"
+ <TrainType name="5" majorStops="5" cost="500" quantity="2" startPhase="5"/>
+ <TrainType name="6" majorStops="6" cost="600" quantity="2" startPhase="6"
rustedTrain="3"/>
- <Train name="8" majorStops="8" cost="800" startPhase="8"
+ <TrainType name="8" majorStops="8" cost="800" startPhase="8"
rustedTrain="4">
<IfOption name="UnlimitedTopTrains" value="yes">
<Attributes quantity="-1"/>
@@ -69,13 +69,13 @@
<IfOption name="UnlimitedTopTrains" value="no">
<Attributes quantity="4"/>
</IfOption>
- </Train>
+ </TrainType>
<TrainBuyingRules>
<FaceValueIfDifferentPresidents/>
</TrainBuyingRules>
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
- <!-- Note: released and rusted trains are now specified per Train
+ <!-- Note: released and rusted trains are now specified per TrainType
but could as well be moved here. To be sorted out when we do 18US. -->
<!-- Each Phase's defaults are the previous one's values -->
<Phase name="2" >
Modified: trunk/18xx/data/1856/Game.xml
===================================================================
--- trunk/18xx/data/1856/Game.xml 2011-06-18 21:11:45 UTC (rev 1579)
+++ trunk/18xx/data/1856/Game.xml 2011-06-21 21:21:43 UTC (rev 1580)
@@ -51,17 +51,17 @@
<Reach base="stops" countTowns="major"/>
<Score towns="yes"/>
</Defaults>
- <Train name="2" majorStops="2" cost="100" quantity="6"/>
- <Train name="3" majorStops="3" cost="225" quantity="5" startPhase="2"/>
- <Train name="4" majorStops="4" cost="350" quantity="4" startPhase="3"
+ <TrainType name="2" majorStops="2" cost="100" quantity="6"/>
+ <TrainType name="3" majorStops="3" cost="225" quantity="5" startPhase="2"/>
+ <TrainType name="4" majorStops="4" cost="350" quantity="4" startPhase="3"
rustedTrain="2"/>
- <Train name="5" majorStops="5" cost="550" quantity="3" startPhase="4"/>
- <Train name="6" majorStops="6" cost="700" quantity="2" startPhase="5"
+ <TrainType name="5" majorStops="5" cost="550" quantity="3" startPhase="4"/>
+ <TrainType name="6" majorStops="6" cost="700" quantity="2" startPhase="5"
rustedTrain="3" releasedTrain="D"/>
- <Train name="D" majorStops="99" cost="1100" quantity="-1" startPhase="6"
+ <TrainType name="D" majorStops="99" cost="1100" quantity="-1" startPhase="6"
rustedTrain="4">
<Exchange cost="750"/>
- </Train>
+ </TrainType>
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
<Phase name="1">
Modified: trunk/18xx/data/1870/Game.xml
===================================================================
--- trunk/18xx/data/1870/Game.xml 2011-06-18 21:11:45 UTC (rev 1579)
+++ trunk/18xx/data/1870/Game.xml 2011-06-21 21:21:43 UTC (rev 1580)
@@ -43,17 +43,17 @@
<Reach base="stops" countTowns="major"/>
<Score towns="yes"/>
</Defaults>
- <Train name="2" majorStops="2" cost="80" quantity="7"/>
- <Train name="3" majorStops="3" cost="180" quantity="6" startPhase="2"/>
- <Train name="4" majorStops="4" cost="300" quantity="5" startPhase="3"
+ <TrainType name="2" majorStops="2" cost="80" quantity="7"/>
+ <TrainType name="3" majorStops="3" cost="180" quantity="6" startPhase="2"/>
+ <TrainType name="4" majorStops="4" cost="300" quantity="5" startPhase="3"
rustedTrain="2"/>
- <Train name="5" majorStops="5" cost="450" quantity="4" startPhase="4"/>
- <Train name="6" majorStops="6" cost="630" quantity="3" startPhase="5"
+ <TrainType name="5" majorStops="5" cost="450" quantity="4" startPhase="4"/>
+ <TrainType name="6" majorStops="6" cost="630" quantity="3" startPhase="5"
rustedTrain="3"/>
- <Train name="8" majorStops="8" cost="800" quantity="3" startPhase="6"
+ <TrainType name="8" majorStops="8" cost="800" quantity="3" startPhase="6"
rustedTrain="4"/>
- <Train name="10" majorStops="10" cost="950" quantity="2" startPhase="7"/>
- <Train name="12" majorStops="12" cost="1100" quantity="-1" startPhase="8"
+ <TrainType name="10" majorStops="10" cost="950" quantity="2" startPhase="7"/>
+ <TrainType name="12" majorStops="12" cost="1100" quantity="-1" startPhase="8"
rustedTrain="5"/>
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
Modified: trunk/18xx/data/1880/Game.xml
===================================================================
--- trunk/18xx/data/1880/Game.xml 2011-06-18 21:11:45 UTC (rev 1579)
+++ trunk/18xx/data/1880/Game.xml 2011-06-21 21:21:43 UTC (rev 1580)
@@ -14,7 +14,7 @@
<OperatingRound class="rails.game.specific._1880.OperatingRound_1880"/>
</GameParameters>
<EndOfGame/>
- <!-- need to implement the 3 OR set limit after purchase of first 8 Train -->
+ <!-- need to implement the 3 OR set limit after purchase of first 8 TrainType -->
</Component>
<Component name="PlayerManager" class="rails.game.PlayerManager">
<Players number="3" cash="600" certLimit="20"/>
@@ -38,21 +38,21 @@
<Reach base="stops" countTowns="major"/>
<Score towns="yes"/>
</Defaults>
- <Train name="2" majorStops="2" cost="100" quantity="10"/>
- <Train name="2+2" majorStops="2" minorStops="2" cost="180" quantity="5"/>
- <Train name="3" majorStops="3" cost="180" quantity="6" startPhase="2"/>
- <Train name="3+3" majorStops="3" minorStops="3" cost="300" quantity="5" startPhase="3"/>
- <Train name="4" majorStops="4" cost="300" quantity="5" startPhase="4" rustedTrain="2"/>
- <Train name="4+4" majorStops="4" minorStops="4" cost="450" quantity="5" startPhase="5" rustedTrain="2+2"/>
- <Train name="6" majorStops="6" cost="600" quantity="5" startPhase="6" rustedTrain="3"/>
- <Train name="6e" majorStops="-1" cost="700" quantity="5" startPhase="7" rustedTrain="3+3"/>
+ <TrainType name="2" majorStops="2" cost="100" quantity="10"/>
+ <TrainType name="2+2" majorStops="2" minorStops="2" cost="180" quantity="5"/>
+ <TrainType name="3" majorStops="3" cost="180" quantity="6" startPhase="2"/>
+ <TrainType name="3+3" majorStops="3" minorStops="3" cost="300" quantity="5" startPhase="3"/>
+ <TrainType name="4" majorStops="4" cost="300" quantity="5" startPhase="4" rustedTrain="2"/>
+ <TrainType name="4+4" majorStops="4" minorStops="4" cost="450" quantity="5" startPhase="5" rustedTrain="2+2"/>
+ <TrainType name="6" majorStops="6" cost="600" quantity="5" startPhase="6" rustedTrain="3"/>
+ <TrainType name="6e" majorStops="-1" cost="700" quantity="5" startPhase="7" rustedTrain="3+3"/>
<!-- majorStops="-1" indicates that this not a normally running train-->
<!-- The e-type trains are express trains that can ignore towns/cities on their way for a maximum payout-->
- <Train name="8" majorStops="8" cost="800" quantity="2" startPhase="8" rustedTrain="4"/>
- <Train name="8e" majorStops="-1" cost="900" quantity="2" rustedTrain="4+4"/>
+ <TrainType name="8" majorStops="8" cost="800" quantity="2" startPhase="8" rustedTrain="4"/>
+ <TrainType name="8e" majorStops="-1" cost="900" quantity="2" rustedTrain="4+4"/>
<!-- majorStops="-1" indicates that this not a normally running train-->
<!-- The e-type trains are express trains that can ignore towns/cities on their way for a maximum payout-->
- <Train name="10" majorStops="10" cost="1000" quantity="-1"/>
+ <TrainType name="10" majorStops="10" cost="1000" quantity="-1"/>
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
<Phase name="A1">
Modified: trunk/18xx/data/1889/Game.xml
===================================================================
--- trunk/18xx/data/1889/Game.xml 2011-06-18 21:11:45 UTC (rev 1579)
+++ trunk/18xx/data/1889/Game.xml 2011-06-21 21:21:43 UTC (rev 1580)
@@ -80,12 +80,12 @@
cities="double" if city-revenue is doubled (e.g. 1826 TGV).
-->
</Defaults>
- <Train name="2" majorStops="2" cost="80" quantity="6"/>
- <Train name="3" majorStops="3" cost="180" quantity="5" startPhase="3"/>
- <Train name="4" majorStops="4" cost="300" quantity="4" startPhase="4"
+ <TrainType name="2" majorStops="2" cost="80" quantity="6"/>
+ <TrainType name="3" majorStops="3" cost="180" quantity="5" startPhase="3"/>
+ <TrainType name="4" majorStops="4" cost="300" quantity="4" startPhase="4"
rustedTrain="2"/>
- <Train name="5" majorStops="5" cost="450" quantity="3" startPhase="5"/>
- <Train name="6" majorStops="6" cost="630" startPhase="6"
+ <TrainType name="5" majorStops="5" cost="450" quantity="3" startPhase="5"/>
+ <TrainType name="6" majorStops="6" cost="630" startPhase="6"
rustedTrain="3" releasedTrain="D">
<IfOption name="WithOptional6Train" value="yes">
<Attributes quantity="3"/>
@@ -93,8 +93,8 @@
<IfOption name="WithOptional6Train" value="no">
<Attributes quantity="2"/>
</IfOption>
- </Train>
- <Train name="D" majorStops="99" cost="1100" startPhase="D"
+ </TrainType>
+ <TrainType name="D" majorStops="99" cost="1100" startPhase="D"
rustedTrain="4">
<IfOption name="UnlimitedTopTrains" value="yes">
<Attributes quantity="-1"/>
@@ -103,10 +103,10 @@
<Attributes quantity="6"/>
</IfOption>
<Exchange cost="800"/>
- </Train>
+ </TrainType>
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
- <!-- Note: released and rusted trains are now specified per Train
+ <!-- Note: released and rusted trains are now specified per TrainType
but could as well be moved here. To be sorted out when we do 18US. -->
<!-- Each Phase's defaults are the previous one's values -->
<Phase name="2" >
Modified: trunk/18xx/data/18AL/Game.xml
===================================================================
--- trunk/18xx/data/18AL/Game.xml 2011-06-18 21:11:45 UTC (rev 1579)
+++ trunk/18xx/data/18AL/Game.xml 2011-06-21 21:21:43 UTC (rev 1580)
@@ -49,9 +49,9 @@
<Reach base="stops" countTowns="no"/>
<Score towns="yes"/>
</Defaults>
- <Train name="2" majorStops="2" cost="100" quantity="5"/>
- <Train name="3" majorStops="3" cost="180" quantity="4" startPhase="3"/>
- <Train name="4" majorStops="4" cost="300" quantity="3" startPhase="4"
+ <TrainType name="2" majorStops="2" cost="100" quantity="5"/>
+ <TrainType name="3" majorStops="3" cost="180" quantity="4" startPhase="3"/>
+ <TrainType name="4" majorStops="4" cost="300" quantity="3" startPhase="4"
rustedTrain="2" >
<IfOption name="Obsolete4Trains" value="yes">
<Attributes obsoleting="yes"/>
@@ -59,13 +59,13 @@
<IfOption name="Obsolete4Trains" value="no">
<Attributes obsoleting="no"/>
</IfOption>
- </Train>/>
- <Train name="5" majorStops="5" cost="450" quantity="2" startPhase="5"/>
- <Train name="6" majorStops="6" cost="630" quantity="1" startPhase="6"
+ </TrainType>/>
+ <TrainType name="5" majorStops="5" cost="450" quantity="2" startPhase="5"/>
+ <TrainType name="6" majorStops="6" cost="630" quantity="1" startPhase="6"
rustedTrain="3"/>
- <Train name="7" majorStops="7" cost="700" quantity="1" startPhase="7"
+ <TrainType name="7" majorStops="7" cost="700" quantity="1" startPhase="7"
rustedTrain="4"/>
- <Train name="4D" majorStops="4" cost="800" startPhase="4D">
+ <TrainType name="4D" majorStops="4" cost="800" startPhase="4D">
<IfOption name="UnlimitedTopTrains" value="yes">
<Attributes quantity="-1"/>
</IfOption>
@@ -75,7 +75,7 @@
<Reach countTowns="no"/>
<Score scoreCities="double"/>
<Exchange cost="800"/>
- </Train>
+ </TrainType>
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
<Phase name="2" >
Modified: trunk/18xx/data/18EU/Game.xml
===================================================================
--- trunk/18xx/data/18EU/Game.xml 2011-06-18 21:11:45 UTC (rev 1579)
+++ trunk/18xx/data/18EU/Game.xml 2011-06-21 21:21:43 UTC (rev 1580)
@@ -54,8 +54,8 @@
<Reach base="stops" countTowns="no"/>
<Score towns="yes"/>
</Defaults>
- <Train name="2" majorStops="2" cost="100" quantity="15"/>
- <Train name="3" majorStops="3" cost="200" startPhase="3" releasedTrain="P">
+ <TrainType name="2" majorStops="2" cost="100" quantity="15"/>
+ <TrainType name="3" majorStops="3" cost="200" startPhase="3" releasedTrain="P">
<IfOption name="Extra3Trains" value="0">
<Attributes quantity="5"/>
</IfOption>
@@ -65,8 +65,8 @@
<IfOption name="Extra3Trains" value="2">
<Attributes quantity="7"/>
</IfOption>
- </Train>
- <Train name="4" majorStops="4" cost="300" startPhase="4"
+ </TrainType>
+ <TrainType name="4" majorStops="4" cost="300" startPhase="4"
rustedTrain="2">
<IfOption name="Extra4Trains" value="0">
<Attributes quantity="4"/>
@@ -74,14 +74,14 @@
<IfOption name="Extra4Trains" value="1">
<Attributes quantity="5"/>
</IfOption>
- </Train>
- <Train name="5" majorStops="5" cost="500" quantity="3" startPhase="5"/>
- <Train name="6" majorStops="6" cost="600" quantity="2" startPhase="6"
+ </TrainType>
+ <TrainType name="5" majorStops="5" cost="500" quantity="3" startPhase="5"/>
+ <TrainType name="6" majorStops="6" cost="600" quantity="2" startPhase="6"
rustedTrain="3"/>
- <Train name="8" majorStops="8" cost="800" quantity="-1" startPhase="8"
+ <TrainType name="8" majorStops="8" cost="800" quantity="-1" startPhase="8"
rustedTrain="4"/>
<!-- majorStops="-1" indicates that this not a normally running train-->
- <Train name="P" initialPortfolio="Pool" majorStops="-1" cost="100" quantity="5"/>
+ <TrainType name="P" initialPortfolio="Pool" majorStops="-1" cost="100" quantity="5"/>
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
<Phase name="2" >
Modified: trunk/18xx/data/18GA/Game.xml
===================================================================
--- trunk/18xx/data/18GA/Game.xml 2011-06-18 21:11:45 UTC (rev 1579)
+++ trunk/18xx/data/18GA/Game.xml 2011-06-21 21:21:43 UTC (rev 1580)
@@ -54,14 +54,14 @@
<Reach base="stops" countTowns="no"/>
<Score towns="yes"/>
</Defaults>
- <Train name="2" majorStops="2" cost="100" quantity="5"/>
- <Train name="3" majorStops="3" cost="180" quantity="4" startPhase="3"/>
- <Train name="4" majorStops="4" cost="300" quantity="3" startPhase="4"
+ <TrainType name="2" majorStops="2" cost="100" quantity="5"/>
+ <TrainType name="3" majorStops="3" cost="180" quantity="4" startPhase="3"/>
+ <TrainType name="4" majorStops="4" cost="300" quantity="3" startPhase="4"
rustedTrain="2" />
- <Train name="5" majorStops="5" cost="450" quantity="2" startPhase="5"/>
- <Train name="6" majorStops="6" cost="630" quantity="2" startPhase="6"
+ <TrainType name="5" majorStops="5" cost="450" quantity="2" startPhase="5"/>
+ <TrainType name="6" majorStops="6" cost="630" quantity="2" startPhase="6"
rustedTrain="3"/>
- <Train name="8" majorStops="8" cost="800" startPhase="8"
+ <TrainType name="8" majorStops="8" cost="800" startPhase="8"
rustedTrain="4">
<IfOption name="UnlimitedTopTrains" value="yes">
<Attributes quantity="-1"/>
@@ -69,7 +69,7 @@
<IfOption name="UnlimitedTopTrains" value="no">
<Attributes quantity="5"/>
</IfOption>
- </Train>
+ </TrainType>
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
<Phase name="2" >
Modified: trunk/18xx/data/18Scan/CompanyManager.xml
===================================================================
--- trunk/18xx/data/18Scan/CompanyManager.xml 2011-06-18 21:11:45 UTC (rev 1579)
+++ trunk/18xx/data/18Scan/CompanyManager.xml 2011-06-21 21:21:43 UTC (rev 1580)
@@ -38,14 +38,14 @@
<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)">
+ <Company name="1" type="Minor" price="260" 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 name="2" type="Minor" price="220" tokens="2" longname="Nordvästra Stambanan (Northwestern Mainline)">
+ <Home hex="F11" city="1"/>
</Company>
- <Company name="3" type="Minor" tokens="2" longname="Södra Stambanan (Southern Mainline)">
- <Home hex="F11" />
+ <Company name="3" type="Minor" price="200" tokens="2" longname="Södra Stambanan (Southern Mainline)">
+ <Home hex="F11" city="2"/>
</Company>
<Company name="DSB" type="Public" tokens="3" fgColour="FFFFFF"
Modified: trunk/18xx/data/18Scan/Game.xml
===================================================================
--- trunk/18xx/data/18Scan/Game.xml 2011-06-18 21:11:45 UTC (rev 1579)
+++ trunk/18xx/data/18Scan/Game.xml 2011-06-21 21:21:43 UTC (rev 1580)
@@ -44,16 +44,26 @@
<Reach base="stops" countTowns="no"/>
<Score towns="yes"/>
</Defaults>
- <Train name="2" majorStops="2" cost="100" quantity="6"/>
- <Train name="3" majorStops="3" cost="200" quantity="4" startPhase="3"/>
- <Train name="4" majorStops="4" cost="300" quantity="3" startPhase="4"
- rustedTrain="2" />
- <Train name="5" majorStops="5" cost="500" quantity="2" startPhase="5" releasedTrain="5E"/>
- <Train name="5E" majorStops="5" cost="600" quantity="2" startPhase="6" releasedTrain="4D"
- rustedTrain="3"/>
- <Train name="4D" majorStops="4" cost="800" quantity="6" startPhase="4D"
- rustedTrain="4">
- </Train>
+ <TrainType name="2/1+1" quantity="6">
+ <Train name="2" majorStops="2" cost="100"/>
+ <Train name="1+1" majorStops="1" minorStops="1" cost="80"/>
+ </TrainType>
+ <TrainType name="3/2+2" quantity="4" startPhase="3">
+ <Train name="3" majorStops="3" cost="200"/>
+ <Train name="2+2" majorStops="2" minorStops="2" cost="180"/>
+ </TrainType>
+ <TrainType name="4/3+3" quantity="3" startPhase="4" rustedTrain="2/1+1">
+ <Train name="4" majorStops="4" cost="300"/>
+ <Train name="3+3" majorStops="3" minorStops="3" cost="280"/>
+ </TrainType>
+ <TrainType name="5/4+4" quantity="2" startPhase="5" releasedTrain="5E">
+ <Train name="5" majorStops="5" cost="500"/>
+ <Train name="4+4" majorStops="4" minorStops="4" cost="480"/>
+ </TrainType>
+ <TrainType name="5E" majorStops="5" cost="600" quantity="2" startPhase="6" releasedTrain="4D"
+ rustedTrain="3/2+2"/>
+ <TrainType name="4D" majorStops="4" cost="800" quantity="6" startPhase="4D"
+ rustedTrain="4/3+3"/>
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
<Phase name="2" >
Modified: trunk/18xx/data/18TN/Game.xml
===================================================================
--- trunk/18xx/data/18TN/Game.xml 2011-06-18 21:11:45 UTC (rev 1579)
+++ trunk/18xx/data/18TN/Game.xml 2011-06-21 21:21:43 UTC (rev 1580)
@@ -66,20 +66,20 @@
cities="double" if city-revenue is doubled (e.g. 1826 TGV).
-->
</Defaults>
- <Train name="2" majorStops="2" cost="80" quantity="5" obsoleting="yes"/>
- <Train name="3" majorStops="3" cost="180" quantity="5" obsoleting="yes" startPhase="3"/>
- <Train name="4" majorStops="4" cost="300" quantity="3" obsoleting="yes" startPhase="4"
+ <TrainType name="2" majorStops="2" cost="80" quantity="5" obsoleting="yes"/>
+ <TrainType name="3" majorStops="3" cost="180" quantity="5" obsoleting="yes" startPhase="3"/>
+ <TrainType name="4" majorStops="4" cost="300" quantity="3" obsoleting="yes" startPhase="4"
rustedTrain="2" />
- <Train name="5" majorStops="5" cost="450" quantity="2" startPhase="5"/>
- <Train name="6" majorStops="6" cost="630" quantity="2" startPhase="6"
+ <TrainType name="5" majorStops="5" cost="450" quantity="2" startPhase="5"/>
+ <TrainType name="6" majorStops="6" cost="630" quantity="2" startPhase="6"
rustedTrain="3">
<Sub index="2" rustedTrain="4"/>
- </Train>
- <Train name="8" majorStops="8" cost="700" quantity="7" startPhase="8"
+ </TrainType>
+ <TrainType name="8" majorStops="8" cost="700" quantity="7" startPhase="8"
rustedTrain="4" />
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
- <!-- Note: released and rusted trains are now specified per Train
+ <!-- Note: released and rusted trains are now specified per TrainType
but could as well be moved here. To be sorted out when we do 18US. -->
<!-- Each Phase's defaults are the previous one's values -->
<Phase name="2" >
Modified: trunk/18xx/data/18VA/Game.xml
===================================================================
--- trunk/18xx/data/18VA/Game.xml 2011-06-18 21:11:45 UTC (rev 1579)
+++ trunk/18xx/data/18VA/Game.xml 2011-06-21 21:21:43 UTC (rev 1580)
@@ -71,21 +71,21 @@
cities="double" if city-revenue is doubled (e.g. 1826 TGV).
-->
</Defaults>
- <Train name="2" majorStops="2" cost="100" quantity="6"/>
- <Train name="3" majorStops="3" cost="200" quantity="5" startPhase="3"/>
- <Train name="4" majorStops="4" cost="300" quantity="4" startPhase="4"
+ <TrainType name="2" majorStops="2" cost="100" quantity="6"/>
+ <TrainType name="3" majorStops="3" cost="200" quantity="5" startPhase="3"/>
+ <TrainType name="4" majorStops="4" cost="300" quantity="4" startPhase="4"
rustedTrain="2"/>
- <Train name="5" majorStops="5" cost="500" quantity="3" startPhase="5"
+ <TrainType name="5" majorStops="5" cost="500" quantity="3" startPhase="5"
rustedTrain="3"/>
- <Train name="6" majorStops="6" cost="600" startPhase="6"
+ <TrainType name="6" majorStops="6" cost="600" startPhase="6"
releasedTrain="4D">
- </Train>
- <Train name="4D" majorStops="99" cost="800" quantity="10" startPhase="4D"
+ </TrainType>
+ <TrainType name="4D" majorStops="99" cost="800" quantity="10" startPhase="4D"
rustedTrain="4">
- </Train>
+ </TrainType>
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
- <!-- Note: released and rusted trains are now specified per Train
+ <!-- Note: released and rusted trains are now specified per TrainType
but could as well be moved here. To be sorted out when we do 18US. -->
<!-- Each Phase's defaults are the previous one's values -->
<Phase name="2" >
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
