Menu
▾
▴
[Rails-commits] SF.net SVN: rails:[1562] trunk/18xx
|
From: <ev...@us...> - 2011-05-19 12:14:03
|
Revision: 1562
http://rails.svn.sourceforge.net/rails/?rev=1562&view=rev
Author: evos
Date: 2011-05-19 12:13:55 +0000 (Thu, 19 May 2011)
Log Message:
-----------
Minor train configuration changes:
- <InitialTrain> is now a separate tag. Cost can be specified (for 1825), as well as type and tradability.
- Attribute name 'number' changed to 'limit' (max. trains per company)
- Attribute name 'amount' changed to 'quantity' (buyable trains per type).
Modified Paths:
--------------
trunk/18xx/LocalisedText.properties
trunk/18xx/data/1825/CompanyManager.xml
trunk/18xx/data/1825/Game.xml
trunk/18xx/data/1830/CompanyManager.xml
trunk/18xx/data/1830/Game.xml
trunk/18xx/data/1835/CompanyManager.xml
trunk/18xx/data/1835/Game.xml
trunk/18xx/data/1851/CompanyManager.xml
trunk/18xx/data/1851/Game.xml
trunk/18xx/data/1856/CompanyManager.xml
trunk/18xx/data/1856/Game.xml
trunk/18xx/data/1870/CompanyManager.xml
trunk/18xx/data/1870/Game.xml
trunk/18xx/data/1880/CompanyManager.xml
trunk/18xx/data/1880/Game.xml
trunk/18xx/data/1889/CompanyManager.xml
trunk/18xx/data/1889/Game.xml
trunk/18xx/data/18AL/CompanyManager.xml
trunk/18xx/data/18AL/Game.xml
trunk/18xx/data/18EU/CompanyManager.xml
trunk/18xx/data/18EU/Game.xml
trunk/18xx/data/18GA/CompanyManager.xml
trunk/18xx/data/18GA/Game.xml
trunk/18xx/data/18JR/CompanyManager.xml
trunk/18xx/data/18JR/Game.xml
trunk/18xx/data/18Kaas/CompanyManager.xml
trunk/18xx/data/18Kaas/Game.xml
trunk/18xx/data/18Scan/CompanyManager.xml
trunk/18xx/data/18Scan/Game.xml
trunk/18xx/data/18TN/CompanyManager.xml
trunk/18xx/data/18TN/Game.xml
trunk/18xx/data/18VA/CompanyManager.xml
trunk/18xx/data/18VA/Game.xml
trunk/18xx/data/GamesList.xml
trunk/18xx/rails/game/PublicCompany.java
trunk/18xx/rails/game/Train.java
trunk/18xx/rails/game/TrainI.java
trunk/18xx/rails/game/TrainType.java
Modified: trunk/18xx/LocalisedText.properties
===================================================================
--- trunk/18xx/LocalisedText.properties 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/LocalisedText.properties 2011-05-19 12:13:55 UTC (rev 1562)
@@ -320,12 +320,12 @@
ITEM_PRICE_REDUCED=Price of {0} is now reduced to {1}
InvalidAction=Invalid action in this game
InvalidAllocationTypeIndex=Invalid allocation type index: {0}
-InvalidAmount=Invalid or zero amount specified
InvalidBid=Invalid bid by {0} on {1}: {2}
InvalidCost=Invalid or zero cost specified
InvalidDoneAction=Invalid Done action
InvalidParPriceSetting=Invalid par price {0} set by {1} for {2}: {3}
InvalidPass=Invalid pass by {0}: {1}
+InvalidQuantity=Invalid quantity specified: {0}
InvalidStartPrice=Invalid start price {0} for {1}
InvalidStops=Invalid or zero major stops specified
InvalidTileColourName=Invalid colour name {1} for tile {0}
Modified: trunk/18xx/data/1825/CompanyManager.xml
===================================================================
--- trunk/18xx/data/1825/CompanyManager.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/1825/CompanyManager.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -14,7 +14,7 @@
</BaseTokens>
<Certificate type="President" shares="2"/>
<Certificate shares="1" number="8"/>
- <Trains number="4,4,3"/>
+ <Trains limit="4,4,3"/>
<TileLays>
<Number colour="yellow" number="2" phase="1,2,3,4,5"></Number></TileLays></CompanyType>
<Company name="S&M" type="Private" basePrice="30" revenue="5" longname="Swansea and Mumbles">
Modified: trunk/18xx/data/1825/Game.xml
===================================================================
--- trunk/18xx/data/1825/Game.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/1825/Game.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -70,10 +70,10 @@
cities="double" if city-revenue is doubled (e.g. 1826 TGV).
-->
</Defaults>
- <Train name="2" majorStops="2" cost="180" amount="6"/>
- <Train name="3" majorStops="3" cost="300" amount="4" startPhase="2"/>
- <Train name="4" majorStops="4" cost="430" amount="3"/>
- <Train name="5" majorStops="5" cost="550" amount="4"
+ <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"
startPhase="3" rustedTrain="2" />
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
Modified: trunk/18xx/data/1830/CompanyManager.xml
===================================================================
--- trunk/18xx/data/1830/CompanyManager.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/1830/CompanyManager.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -20,7 +20,7 @@
</BaseTokens>
<Certificate type="President" shares="2"/>
<Certificate shares="1" number="8"/>
- <Trains number="4,4,3,2"/>
+ <Trains limit="4,4,3,2"/>
<CanUseSpecialProperties/>
</CompanyType>
<Company name="SVNRR" type="Private" basePrice="20" revenue="5"
Modified: trunk/18xx/data/1830/Game.xml
===================================================================
--- trunk/18xx/data/1830/Game.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/1830/Game.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -130,62 +130,62 @@
cities="double" if city-revenue is doubled (e.g. 1826 TGV).
-->
</Defaults>
- <Train name="2" majorStops="2" cost="80" amount="6">
+ <Train name="2" majorStops="2" cost="80" quantity="6">
<IfOption name="Variant" value="Coalfields,Reading,Coalfields&Reading">
<Attributes obsoleting="yes"/>
</IfOption>
<IfOption name="Variant" value="Wabash">
- <Attributes amount="7"/>
+ <Attributes quantity="7"/>
</IfOption>
</Train>
- <Train name="3" majorStops="3" cost="180" amount="5" startPhase="3">
+ <Train 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 amount="6"/>
+ <Attributes quantity="6"/>
</IfOption>
</Train>
- <Train name="4" majorStops="4" cost="300" amount="4" startPhase="4"
+ <Train name="4" majorStops="4" cost="300" quantity="4" startPhase="4"
rustedTrain="2">
<IfOption name="Variant" value="Coalfields,Reading">
- <Attributes obsoleting="yes" amount="5"/>
+ <Attributes obsoleting="yes" quantity="5"/>
</IfOption>
<IfOption name="Variant" value="Coalfields&Reading">
- <Attributes obsoleting="yes" amount="6"/>
+ <Attributes obsoleting="yes" quantity="6"/>
</IfOption>
<IfOption name="Variant" value="Wabash">
- <Attributes amount="5"/>
+ <Attributes quantity="5"/>
</IfOption>
</Train>
- <Train name="5" majorStops="5" cost="450" amount="3" startPhase="5">
+ <Train name="5" majorStops="5" cost="450" quantity="3" startPhase="5">
<IfOption name="Variant" value="Wabash">
- <Attributes amount="4"/>
+ <Attributes quantity="4"/>
</IfOption>
</Train>
<Train name="6" majorStops="6" cost="630" startPhase="6"
rustedTrain="3" releasedTrain="D">
<IfOption name="WithOptional6Train" value="yes">
- <Attributes amount="3"/>
+ <Attributes quantity="3"/>
</IfOption>
<IfOption name="WithOptional6Train" value="no">
- <Attributes amount="2"/>
+ <Attributes quantity="2"/>
</IfOption>
<IfOption name="Variant" value="Pere Marquette,Coalfields,Reading">
- <Attributes amount="3" releasedTrain="7,D"/>
+ <Attributes quantity="3" releasedTrain="7,D"/>
</IfOption>
<IfOption name="Variant" value="Coalfields&Reading">
- <Attributes amount="4" releasedTrain="7,D"/>
+ <Attributes quantity="4" releasedTrain="7,D"/>
</IfOption>
<IfOption name="Variant" value="Simple,Wabash">
- <Attributes amount="3"/>
+ <Attributes quantity="3"/>
</IfOption>
</Train>
<IfOption name="Variant" value="Coalfields,Reading,Coalfields&Reading">
- <Train name="7" majorStops="7" cost="710" amount="2"/>
+ <Train name="7" majorStops="7" cost="710" quantity="2"/>
</IfOption>
<IfOption name="Variant" value="Wabash">
- <Train name="7" majorStops="7" cost="830" amount="-1"/>
+ <Train 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">
@@ -198,10 +198,10 @@
<Exchange cost="750"/>
</IfOption>
<IfOption name="UnlimitedTopTrains" value="yes">
- <Attributes amount="-1"/>
+ <Attributes quantity="-1"/>
</IfOption>
<IfOption name="UnlimitedTopTrains" value="no">
- <Attributes amount="6"/>
+ <Attributes quantity="6"/>
</IfOption>
<Exchange cost="800"/>
</Train>
Modified: trunk/18xx/data/1835/CompanyManager.xml
===================================================================
--- trunk/18xx/data/1835/CompanyManager.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/1835/CompanyManager.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -10,7 +10,7 @@
<HomeBase lay="whenFloated"/>
</BaseTokens>
<Payout split="always"/>
- <Trains number="2,2,1" mandatory="no"/>
+ <Trains limit="2,2,1" mandatory="no"/>
</CompanyType>
<CompanyType name="Major" class="rails.game.PublicCompany" capitalisation="incremental">
<PoolPaysOut/>
@@ -28,7 +28,7 @@
<HomeBase lay="whenFloated"/>
</BaseTokens>
<Capitalisation type="incremental"/>
- <Trains number="4,4,3,2"/>
+ <Trains limit="4,4,3,2"/>
<CanUseSpecialProperties/>
</CompanyType>
@@ -211,7 +211,7 @@
<Certificate shares="2" number="3"/>
<Certificate shares="2" number="4" status="reserved"/>
<Certificate shares="1" number="4" status="reserved"/>
- <Trains number="0,0,4,3"/>
+ <Trains limit="0,0,4,3"/>
</Company>
<StartPacket roundClass="rails.game.StartRound_1835" variant="Snake">
Modified: trunk/18xx/data/1835/Game.xml
===================================================================
--- trunk/18xx/data/1835/Game.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/1835/Game.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -53,19 +53,19 @@
<Reach base="stops" countTowns="yes"/>
<Score towns="yes"/>
</Defaults>
- <Train name="2" majorStops="2" cost="80" amount="9"/>
- <Train name="2+2" majorStops="2" minorStops="2" cost="120" amount="4"/>
- <Train name="3" majorStops="3" cost="180" amount="4" startPhase="3"/>
- <Train name="3+3" majorStops="3" minorStops="3" cost="270" amount="3"/>
- <Train name="4" majorStops="4" cost="360" amount="3" startPhase="4"
+ <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"
rustedTrain="2"/>
- <Train name="4+4" majorStops="4" minorStops="4" cost="440" amount="1"
+ <Train name="4+4" majorStops="4" minorStops="4" cost="440" quantity="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"/>
- <Train name="6" majorStops="6" cost="600" amount="2" startPhase="6"
+ <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"
rustedTrain="3"/>
- <Train name="6+6" majorStops="6" minorStops="6" cost="720" amount="4"
+ <Train 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/CompanyManager.xml
===================================================================
--- trunk/18xx/data/1851/CompanyManager.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/1851/CompanyManager.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -10,7 +10,7 @@
<ShareUnit percentage="10"/>
<Certificate type="President" shares="2"/>
<Certificate shares="1" number="8"/>
- <Trains number="4,4,3,2"/>
+ <Trains limit="4,4,3,2"/>
<BaseTokens>
<BuyCost initialTokenCost="100"/>
<HomeBase lay="whenFloated"/>
Modified: trunk/18xx/data/1851/Game.xml
===================================================================
--- trunk/18xx/data/1851/Game.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/1851/Game.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -54,20 +54,20 @@
cities="double" if city-revenue is doubled (e.g. 1826 TGV).
-->
</Defaults>
- <Train name="2" majorStops="2" cost="100" amount="5"/>
- <Train name="3" majorStops="3" cost="200" amount="4" startPhase="3"/>
- <Train name="4" majorStops="4" cost="300" amount="3" startPhase="4"
+ <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"
rustedTrain="2"/>
- <Train name="5" majorStops="5" cost="500" amount="2" startPhase="5"/>
- <Train name="6" majorStops="6" cost="600" amount="2" startPhase="6"
+ <Train name="5" majorStops="5" cost="500" quantity="2" startPhase="5"/>
+ <Train name="6" majorStops="6" cost="600" quantity="2" startPhase="6"
rustedTrain="3"/>
<Train name="8" majorStops="8" cost="800" startPhase="8"
rustedTrain="4">
<IfOption name="UnlimitedTopTrains" value="yes">
- <Attributes amount="-1"/>
+ <Attributes quantity="-1"/>
</IfOption>
<IfOption name="UnlimitedTopTrains" value="no">
- <Attributes amount="4"/>
+ <Attributes quantity="4"/>
</IfOption>
</Train>
<TrainBuyingRules>
Modified: trunk/18xx/data/1856/CompanyManager.xml
===================================================================
--- trunk/18xx/data/1856/CompanyManager.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/1856/CompanyManager.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -13,7 +13,7 @@
<BaseTokens>
<LayCost method="sequence" cost="0,40,100"/>
</BaseTokens>
- <Trains number="4,4,3,2"/>
+ <Trains limit="4,4,3,2"/>
<Loans value="100" perRound="1" interest="10"/>
<!-- Number of loans is undefined and handled in the code -->
<CanUseSpecialProperties/>
@@ -26,7 +26,7 @@
<BaseTokens>
<LayCost method="sequence" cost="0,40,100"/>
</BaseTokens>
- <Trains number="0,0,0,3"/>
+ <Trains limit="0,0,0,3"/>
<Options mustTradeTrainsAtFixedPrice="yes" canClose="no"/>
</CompanyType>
Modified: trunk/18xx/data/1856/Game.xml
===================================================================
--- trunk/18xx/data/1856/Game.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/1856/Game.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -51,14 +51,14 @@
<Reach base="stops" countTowns="major"/>
<Score towns="yes"/>
</Defaults>
- <Train name="2" majorStops="2" cost="100" amount="6"/>
- <Train name="3" majorStops="3" cost="225" amount="5" startPhase="2"/>
- <Train name="4" majorStops="4" cost="350" amount="4" startPhase="3"
+ <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"
rustedTrain="2"/>
- <Train name="5" majorStops="5" cost="550" amount="3" startPhase="4"/>
- <Train name="6" majorStops="6" cost="700" amount="2" startPhase="5"
+ <Train name="5" majorStops="5" cost="550" quantity="3" startPhase="4"/>
+ <Train name="6" majorStops="6" cost="700" quantity="2" startPhase="5"
rustedTrain="3" releasedTrain="D"/>
- <Train name="D" majorStops="99" cost="1100" amount="-1" startPhase="6"
+ <Train name="D" majorStops="99" cost="1100" quantity="-1" startPhase="6"
rustedTrain="4">
<Exchange cost="750"/>
</Train>
Modified: trunk/18xx/data/1870/CompanyManager.xml
===================================================================
--- trunk/18xx/data/1870/CompanyManager.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/1870/CompanyManager.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -21,7 +21,7 @@
<BaseTokens>
<LayCost method="sequence" cost="0,40,100"/>
</BaseTokens>
- <Trains number="4,4,3,2"/>
+ <Trains limit="4,4,3,2"/>
<CanUseSpecialProperties/>
</CompanyType>
Modified: trunk/18xx/data/1870/Game.xml
===================================================================
--- trunk/18xx/data/1870/Game.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/1870/Game.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -43,17 +43,17 @@
<Reach base="stops" countTowns="major"/>
<Score towns="yes"/>
</Defaults>
- <Train name="2" majorStops="2" cost="80" amount="7"/>
- <Train name="3" majorStops="3" cost="180" amount="6" startPhase="2"/>
- <Train name="4" majorStops="4" cost="300" amount="5" startPhase="3"
+ <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"
rustedTrain="2"/>
- <Train name="5" majorStops="5" cost="450" amount="4" startPhase="4"/>
- <Train name="6" majorStops="6" cost="630" amount="3" startPhase="5"
+ <Train name="5" majorStops="5" cost="450" quantity="4" startPhase="4"/>
+ <Train name="6" majorStops="6" cost="630" quantity="3" startPhase="5"
rustedTrain="3"/>
- <Train name="8" majorStops="8" cost="800" amount="3" startPhase="6"
+ <Train name="8" majorStops="8" cost="800" quantity="3" startPhase="6"
rustedTrain="4"/>
- <Train name="10" majorStops="10" cost="950" amount="2" startPhase="7"/>
- <Train name="12" majorStops="12" cost="1100" amount="-1" startPhase="8"
+ <Train name="10" majorStops="10" cost="950" quantity="2" startPhase="7"/>
+ <Train 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/CompanyManager.xml
===================================================================
--- trunk/18xx/data/1880/CompanyManager.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/1880/CompanyManager.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -20,7 +20,7 @@
<HomeBase lay="whenFloated"/>
</BaseTokens>
<Payout split="no"/>
- <Trains number="1" mandatory="no"/>
+ <Trains limit="1" mandatory="no"/>
</CompanyType>
<CompanyType name="Private" class="rails.game.PrivateCompany"/>
@@ -41,7 +41,7 @@
<LayCost method="sequence" cost="0,40,100"/>
</BaseTokens>
<Capitalisation type="incremental"/>
- <Trains number="4,4,4,3,3,3,3,3,2,2,2"/>
+ <Trains limit="4,4,4,3,3,3,3,3,2,2,2"/>
<CanUseSpecialProperties/>
</CompanyType>
Modified: trunk/18xx/data/1880/Game.xml
===================================================================
--- trunk/18xx/data/1880/Game.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/1880/Game.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -38,21 +38,21 @@
<Reach base="stops" countTowns="major"/>
<Score towns="yes"/>
</Defaults>
- <Train name="2" majorStops="2" cost="100" amount="10"/>
- <Train name="2+2" majorStops="2" minorStops="2" cost="180" amount="5"/>
- <Train name="3" majorStops="3" cost="180" amount="6" startPhase="2"/>
- <Train name="3+3" majorStops="3" minorStops="3" cost="300" amount="5" startPhase="3"/>
- <Train name="4" majorStops="4" cost="300" amount="5" startPhase="4" rustedTrain="2"/>
- <Train name="4+4" majorStops="4" minorStops="4" cost="450" amount="5" startPhase="5" rustedTrain="2+2"/>
- <Train name="6" majorStops="6" cost="600" amount="5" startPhase="6" rustedTrain="3"/>
- <Train name="6e" majorStops="-1" cost="700" amount="5" startPhase="7" rustedTrain="3+3"/>
+ <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"/>
<!-- 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" amount="2" startPhase="8" rustedTrain="4"/>
- <Train name="8e" majorStops="-1" cost="900" amount="2" rustedTrain="4+4"/>
+ <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"/>
<!-- 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" amount="-1"/>
+ <Train name="10" majorStops="10" cost="1000" quantity="-1"/>
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
<Phase name="A1">
Modified: trunk/18xx/data/1889/CompanyManager.xml
===================================================================
--- trunk/18xx/data/1889/CompanyManager.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/1889/CompanyManager.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -19,7 +19,7 @@
</BaseTokens>
<Certificate type="President" shares="2"/>
<Certificate shares="1" number="8"/>
- <Trains number="4,4,3,2"/>
+ <Trains limit="4,4,3,2"/>
<CanUseSpecialProperties/>
</CompanyType>
<IfOption name="BeginnerGame" value="yes">
Modified: trunk/18xx/data/1889/Game.xml
===================================================================
--- trunk/18xx/data/1889/Game.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/1889/Game.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -80,27 +80,27 @@
cities="double" if city-revenue is doubled (e.g. 1826 TGV).
-->
</Defaults>
- <Train name="2" majorStops="2" cost="80" amount="6"/>
- <Train name="3" majorStops="3" cost="180" amount="5" startPhase="3"/>
- <Train name="4" majorStops="4" cost="300" amount="4" startPhase="4"
+ <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"
rustedTrain="2"/>
- <Train name="5" majorStops="5" cost="450" amount="3" startPhase="5"/>
+ <Train name="5" majorStops="5" cost="450" quantity="3" startPhase="5"/>
<Train name="6" majorStops="6" cost="630" startPhase="6"
rustedTrain="3" releasedTrain="D">
<IfOption name="WithOptional6Train" value="yes">
- <Attributes amount="3"/>
+ <Attributes quantity="3"/>
</IfOption>
<IfOption name="WithOptional6Train" value="no">
- <Attributes amount="2"/>
+ <Attributes quantity="2"/>
</IfOption>
</Train>
<Train name="D" majorStops="99" cost="1100" startPhase="D"
rustedTrain="4">
<IfOption name="UnlimitedTopTrains" value="yes">
- <Attributes amount="-1"/>
+ <Attributes quantity="-1"/>
</IfOption>
<IfOption name="UnlimitedTopTrains" value="no">
- <Attributes amount="6"/>
+ <Attributes quantity="6"/>
</IfOption>
<Exchange cost="800"/>
</Train>
Modified: trunk/18xx/data/18AL/CompanyManager.xml
===================================================================
--- trunk/18xx/data/18AL/CompanyManager.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/18AL/CompanyManager.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -13,7 +13,7 @@
<BaseTokens>
<LayCost method="sequence" cost="0,40,100"/>
</BaseTokens>
- <Trains number="4,4,3,2"/>
+ <Trains limit="4,4,3,2"/>
<CanUseSpecialProperties/>
</CompanyType>
<Company name="Tusc" type="Private" basePrice="20" revenue="5" longname="Tuscumbia Railway"/>
Modified: trunk/18xx/data/18AL/Game.xml
===================================================================
--- trunk/18xx/data/18AL/Game.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/18AL/Game.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -49,9 +49,9 @@
<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="4" majorStops="4" cost="300" amount="3" startPhase="4"
+ <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"
rustedTrain="2" >
<IfOption name="Obsolete4Trains" value="yes">
<Attributes obsoleting="yes"/>
@@ -60,17 +60,17 @@
<Attributes obsoleting="no"/>
</IfOption>
</Train>/>
- <Train name="5" majorStops="5" cost="450" amount="2" startPhase="5"/>
- <Train name="6" majorStops="6" cost="630" amount="1" startPhase="6"
+ <Train name="5" majorStops="5" cost="450" quantity="2" startPhase="5"/>
+ <Train name="6" majorStops="6" cost="630" quantity="1" startPhase="6"
rustedTrain="3"/>
- <Train name="7" majorStops="7" cost="700" amount="1" startPhase="7"
+ <Train name="7" majorStops="7" cost="700" quantity="1" startPhase="7"
rustedTrain="4"/>
<Train name="4D" majorStops="4" cost="800" startPhase="4D">
<IfOption name="UnlimitedTopTrains" value="yes">
- <Attributes amount="-1"/>
+ <Attributes quantity="-1"/>
</IfOption>
<IfOption name="UnlimitedTopTrains" value="no">
- <Attributes amount="5"/>
+ <Attributes quantity="5"/>
</IfOption>
<Reach countTowns="no"/>
<Score scoreCities="double"/>
Modified: trunk/18xx/data/18EU/CompanyManager.xml
===================================================================
--- trunk/18xx/data/18EU/CompanyManager.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/18EU/CompanyManager.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -1,118 +1,130 @@
-<?xml version="1.0"?>
-<CompanyManager>
- <CompanyType name="Minor" class="rails.game.PublicCompany" fgColour="000000" bgColour="CCCCCC">
- <ShareUnit percentage="100"/>
- <Certificate type="President" shares="1"/>
- <StockPrice market="no"/>
- <Payout split="always"/>
- <TileLays>
- <Number colour="yellow" phase="2" number="2" occurrences="1"/>
- <Number colour="green" phase="3,4,5,6,8" number="0"/>
- <Number colour="brown" phase="5,6,8" number="0"/>
- <Number colour="grey" phase="8" number="0"/>
- </TileLays>
- <BaseTokens>
- <HomeBase lay="whenStarted"/>
- </BaseTokens>
- <Trains initial="2" number="2,2,1" mandatory="no"/>
- </CompanyType>
- <CompanyType name="Major" class="rails.game.PublicCompany" capitalisation="incremental" restartable="yes">
- <Float percentage="50"/>
- <TreasuryCanHoldOwnShares maxPerc="80"/>
- <HomeBase lay="whenStarted"/>
- <StockPrice par="no"/>
- <ShareUnit percentage="10"/>
- <Certificate type="President" shares="2"/>
- <Certificate shares="1" number="8"/>
- <Capitalisation type="incremental"/>
- <BaseTokens>
- <BuyCost initialTokenCost="100"/>
- <HomeBase lay="whenStarted"/>
- </BaseTokens>
- <Payout split="allowed" mustExceedPriceToMove="yes"/>
- <Trains number="4,4,3,2"/>
- <TradeShares mustHaveOperated="yes"/>
- </CompanyType>
-
- <Company name="1" longname="Chemin de Fer du Nord" type="Minor">
- <Home hex="J1" city="1"/>
- </Company>
- <Company name="2" longname="État Belge" type="Minor">
- <Home hex="H3"/>
- </Company>
- <Company name="3" longname="Paris-Lyon-Méditerranée" type="Minor">
- <Home hex="J1" city="2"/>
- </Company>
- <Company name="4" longname="Leipzig-Dresdner-Bahn" type="Minor">
- <Home hex="G10"/>
- </Company>
- <Company name="5" longname="Ferrovia Adriatica" type="Minor">
- <Home hex="S8"/>
- </Company>
- <Company name="6" longname="Kaiser-Ferdinand-Nordbahn" type="Minor">
- <Home hex="N11" city="1"/>
- </Company>
- <Company name="7" longname="Berlin-Potsdamer-Bahn" type="Minor">
- <Home hex="E10" city="2"/>
- </Company>
- <Company name="8" longname="Ungarische Staatsbahn" type="Minor">
- <Home hex="P13"/>
- </Company>
- <Company name="9" longname="Berlin-Stettiner-Bahn" type="Minor">
- <Home hex="E10" city="1"/>
- </Company>
- <Company name="10" longname="Strade Ferrate Alta Italia" type="Minor">
- <Home hex="R5"/>
- </Company>
- <Company name="11" longname="Südbahn" type="Minor">
- <Home hex="N11" city="2"/>
- </Company>
- <Company name="12" longname="Hollandsche Maatschappij" type="Minor">
- <Home hex="C4"/>
- </Company>
- <Company name="13" longname="Ludwigsbahn" type="Minor">
- <Home hex="L7"/>
- </Company>
- <Company name="14" longname="Ligne Strasbourg-Bâle" type="Minor">
- <Home hex="M4"/>
- </Company>
- <Company name="15" longname="Grand Central" type="Minor">
- <Home hex="Q2"/>
- </Company>
-
- <Company name="SNCB" longname="Société Nationale des Chemins de Fer Belges " type="Major" tokens="5" fgColour="000000" bgColour="DDAA00">
- </Company>
- <Company name="NS" longname="Nederlandsche Spoorwegen" type="Major" tokens="5" fgColour="0000FF" bgColour="FFDD00">
- </Company>
- <Company name="KBS" longname="Königlich-Bayerische Staatseisenbahn" type="Major" tokens="5" fgColour="000000" bgColour="C0E0FF">
- </Company>
- <Company name="KPEV" longname="Königlich-Preussische Eisenbahn-Verwaltung" type="Major" tokens="5" fgColour="000000" bgColour="2255FF">
- </Company>
- <Company name="KKÖB" longname="Kaiserlich-Königliche Österreichische Staatsbahn" type="Major" tokens="5" fgColour="000000" bgColour="FFFF00">
- </Company>
- <Company name="FS" longname="Ferrovie dello Stato" type="Major" tokens="5" fgColour="FFFFFF" bgColour="00AA00">
- </Company>
- <Company name="SNCF" longname="Société Nationale des Chemins de Fer Français" type="Major" tokens="5" fgColour="FFFFFF" bgColour="FF0000">
- </Company>
- <Company name="DR" longname="Deutsche Reichsbahn" type="Major" tokens="5" fgColour="FFFFFF" bgColour="000000">
- </Company>
-
- <StartPacket roundClass="rails.game.specific._18EU.StartRound_18EU">
- <Bidding initial="0" minimum="5" increment="5"/>
- <Item name="1" type="Minor" basePrice="100"/>
- <Item name="2" type="Minor" basePrice="100"/>
- <Item name="3" type="Minor" basePrice="100"/>
- <Item name="4" type="Minor" basePrice="100"/>
- <Item name="5" type="Minor" basePrice="100"/>
- <Item name="6" type="Minor" basePrice="100"/>
- <Item name="7" type="Minor" basePrice="100"/>
- <Item name="8" type="Minor" basePrice="100"/>
- <Item name="9" type="Minor" basePrice="100"/>
- <Item name="10" type="Minor" basePrice="100"/>
- <Item name="11" type="Minor" basePrice="100"/>
- <Item name="12" type="Minor" basePrice="100"/>
- <Item name="13" type="Minor" basePrice="100"/>
- <Item name="14" type="Minor" basePrice="100"/>
- <Item name="15" type="Minor" basePrice="100"/>
- </StartPacket>
-</CompanyManager>
+<?xml version="1.0"?>
+<CompanyManager>
+ <CompanyType name="Minor" class="rails.game.PublicCompany" fgColour="000000"
+ bgColour="CCCCCC">
+ <ShareUnit percentage="100"/>
+ <Certificate type="President" shares="1"/>
+ <StockPrice market="no"/>
+ <Payout split="always"/>
+ <TileLays>
+ <Number colour="yellow" phase="2" number="2" occurrences="1"/>
+ <Number colour="green" phase="3,4,5,6,8" number="0"/>
+ <Number colour="brown" phase="5,6,8" number="0"/>
+ <Number colour="grey" phase="8" number="0"/>
+ </TileLays>
+ <BaseTokens>
+ <HomeBase lay="whenStarted"/>
+ </BaseTokens>
+ <Trains limit="2,2,1" mandatory="no"/>
+ <InitialTrain type="2" cost="0" tradeable="yes"/>
+ </CompanyType>
+ <CompanyType name="Major" class="rails.game.PublicCompany"
+ capitalisation="incremental" restartable="yes">
+ <Float percentage="50"/>
+ <TreasuryCanHoldOwnShares maxPerc="80"/>
+ <HomeBase lay="whenStarted"/>
+ <StockPrice par="no"/>
+ <ShareUnit percentage="10"/>
+ <Certificate type="President" shares="2"/>
+ <Certificate shares="1" number="8"/>
+ <Capitalisation type="incremental"/>
+ <BaseTokens>
+ <BuyCost initialTokenCost="100"/>
+ <HomeBase lay="whenStarted"/>
+ </BaseTokens>
+ <Payout split="allowed" mustExceedPriceToMove="yes"/>
+ <Trains limit="4,4,3,2"/>
+ <TradeShares mustHaveOperated="yes"/>
+ </CompanyType>
+
+ <Company name="1" longname="Chemin de Fer du Nord" type="Minor">
+ <Home hex="J1" city="1"/>
+ </Company>
+ <Company name="2" longname="État Belge" type="Minor">
+ <Home hex="H3"/>
+ </Company>
+ <Company name="3" longname="Paris-Lyon-Méditerranée" type="Minor">
+ <Home hex="J1" city="2"/>
+ </Company>
+ <Company name="4" longname="Leipzig-Dresdner-Bahn" type="Minor">
+ <Home hex="G10"/>
+ </Company>
+ <Company name="5" longname="Ferrovia Adriatica" type="Minor">
+ <Home hex="S8"/>
+ </Company>
+ <Company name="6" longname="Kaiser-Ferdinand-Nordbahn" type="Minor">
+ <Home hex="N11" city="1"/>
+ </Company>
+ <Company name="7" longname="Berlin-Potsdamer-Bahn" type="Minor">
+ <Home hex="E10" city="2"/>
+ </Company>
+ <Company name="8" longname="Ungarische Staatsbahn" type="Minor">
+ <Home hex="P13"/>
+ </Company>
+ <Company name="9" longname="Berlin-Stettiner-Bahn" type="Minor">
+ <Home hex="E10" city="1"/>
+ </Company>
+ <Company name="10" longname="Strade Ferrate Alta Italia" type="Minor">
+ <Home hex="R5"/>
+ </Company>
+ <Company name="11" longname="Südbahn" type="Minor">
+ <Home hex="N11" city="2"/>
+ </Company>
+ <Company name="12" longname="Hollandsche Maatschappij" type="Minor">
+ <Home hex="C4"/>
+ </Company>
+ <Company name="13" longname="Ludwigsbahn" type="Minor">
+ <Home hex="L7"/>
+ </Company>
+ <Company name="14" longname="Ligne Strasbourg-Bâle" type="Minor">
+ <Home hex="M4"/>
+ </Company>
+ <Company name="15" longname="Grand Central" type="Minor">
+ <Home hex="Q2"/>
+ </Company>
+
+ <Company name="SNCB" longname="Société Nationale des Chemins de Fer Belges "
+ type="Major" tokens="5" fgColour="000000" bgColour="DDAA00">
+ </Company>
+ <Company name="NS" longname="Nederlandsche Spoorwegen" type="Major" tokens="5"
+ fgColour="0000FF" bgColour="FFDD00">
+ </Company>
+ <Company name="KBS" longname="Königlich-Bayerische Staatseisenbahn"
+ type="Major" tokens="5" fgColour="000000" bgColour="C0E0FF">
+ </Company>
+ <Company name="KPEV" longname="Königlich-Preussische Eisenbahn-Verwaltung"
+ type="Major" tokens="5" fgColour="000000" bgColour="2255FF">
+ </Company>
+ <Company name="KKÖB"
+ longname="Kaiserlich-Königliche Österreichische Staatsbahn" type="Major"
+ tokens="5" fgColour="000000" bgColour="FFFF00">
+ </Company>
+ <Company name="FS" longname="Ferrovie dello Stato" type="Major" tokens="5"
+ fgColour="FFFFFF" bgColour="00AA00">
+ </Company>
+ <Company name="SNCF" longname="Société Nationale des Chemins de Fer Français"
+ type="Major" tokens="5" fgColour="FFFFFF" bgColour="FF0000">
+ </Company>
+ <Company name="DR" longname="Deutsche Reichsbahn" type="Major" tokens="5"
+ fgColour="FFFFFF" bgColour="000000">
+ </Company>
+
+ <StartPacket roundClass="rails.game.specific._18EU.StartRound_18EU">
+ <Bidding initial="0" minimum="5" increment="5"/>
+ <Item name="1" type="Minor" basePrice="100"/>
+ <Item name="2" type="Minor" basePrice="100"/>
+ <Item name="3" type="Minor" basePrice="100"/>
+ <Item name="4" type="Minor" basePrice="100"/>
+ <Item name="5" type="Minor" basePrice="100"/>
+ <Item name="6" type="Minor" basePrice="100"/>
+ <Item name="7" type="Minor" basePrice="100"/>
+ <Item name="8" type="Minor" basePrice="100"/>
+ <Item name="9" type="Minor" basePrice="100"/>
+ <Item name="10" type="Minor" basePrice="100"/>
+ <Item name="11" type="Minor" basePrice="100"/>
+ <Item name="12" type="Minor" basePrice="100"/>
+ <Item name="13" type="Minor" basePrice="100"/>
+ <Item name="14" type="Minor" basePrice="100"/>
+ <Item name="15" type="Minor" basePrice="100"/>
+ </StartPacket>
+</CompanyManager>
\ No newline at end of file
Modified: trunk/18xx/data/18EU/Game.xml
===================================================================
--- trunk/18xx/data/18EU/Game.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/18EU/Game.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -54,34 +54,34 @@
<Reach base="stops" countTowns="no"/>
<Score towns="yes"/>
</Defaults>
- <Train name="2" majorStops="2" cost="100" amount="15"/>
+ <Train name="2" majorStops="2" cost="100" quantity="15"/>
<Train name="3" majorStops="3" cost="200" startPhase="3" releasedTrain="P">
<IfOption name="Extra3Trains" value="0">
- <Attributes amount="5"/>
+ <Attributes quantity="5"/>
</IfOption>
<IfOption name="Extra3Trains" value="1">
- <Attributes amount="6"/>
+ <Attributes quantity="6"/>
</IfOption>
<IfOption name="Extra3Trains" value="2">
- <Attributes amount="7"/>
+ <Attributes quantity="7"/>
</IfOption>
</Train>
<Train name="4" majorStops="4" cost="300" startPhase="4"
rustedTrain="2">
<IfOption name="Extra4Trains" value="0">
- <Attributes amount="4"/>
+ <Attributes quantity="4"/>
</IfOption>
<IfOption name="Extra4Trains" value="1">
- <Attributes amount="5"/>
+ <Attributes quantity="5"/>
</IfOption>
</Train>
- <Train name="5" majorStops="5" cost="500" amount="3" startPhase="5"/>
- <Train name="6" majorStops="6" cost="600" amount="2" startPhase="6"
+ <Train name="5" majorStops="5" cost="500" quantity="3" startPhase="5"/>
+ <Train name="6" majorStops="6" cost="600" quantity="2" startPhase="6"
rustedTrain="3"/>
- <Train name="8" majorStops="8" cost="800" amount="-1" startPhase="8"
+ <Train 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" amount="5"/>
+ <Train 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/CompanyManager.xml
===================================================================
--- trunk/18xx/data/18GA/CompanyManager.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/18GA/CompanyManager.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -17,7 +17,7 @@
<HomeBase lay="firstOR"/>
<LayCost method="sequence" cost="0,40,100"/>
</BaseTokens>
- <Trains number="4,4,3,2"/>
+ <Trains limit="4,4,3,2"/>
<CanBuyPrivates/>
<CanUseSpecialProperties/>
</CompanyType>
Modified: trunk/18xx/data/18GA/Game.xml
===================================================================
--- trunk/18xx/data/18GA/Game.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/18GA/Game.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -54,20 +54,20 @@
<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="4" majorStops="4" cost="300" amount="3" startPhase="4"
+ <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"
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="450" quantity="2" startPhase="5"/>
+ <Train name="6" majorStops="6" cost="630" quantity="2" startPhase="6"
rustedTrain="3"/>
<Train name="8" majorStops="8" cost="800" startPhase="8"
rustedTrain="4">
<IfOption name="UnlimitedTopTrains" value="yes">
- <Attributes amount="-1"/>
+ <Attributes quantity="-1"/>
</IfOption>
<IfOption name="UnlimitedTopTrains" value="no">
- <Attributes amount="5"/>
+ <Attributes quantity="5"/>
</IfOption>
</Train>
</Component>
Modified: trunk/18xx/data/18JR/CompanyManager.xml
===================================================================
--- trunk/18xx/data/18JR/CompanyManager.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/18JR/CompanyManager.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -18,7 +18,7 @@
</BaseTokens>
<Certificate type="President" shares="2"/>
<Certificate shares="1" number="8"/>
- <Trains number="4,4,3,2"/>
+ <Trains limit="4,4,3,2"/>
<CanUseSpecialProperties/>
</CompanyType>
<Company name="SVNRR" type="Private" basePrice="20" revenue="5"
Modified: trunk/18xx/data/18JR/Game.xml
===================================================================
--- trunk/18xx/data/18JR/Game.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/18JR/Game.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -91,32 +91,32 @@
cities="double" if city-revenue is doubled (e.g. 1826 TGV).
-->
</Defaults>
- <Train name="2" majorStops="2" cost="80" amount="6"/>
- <Train name="3" majorStops="3" cost="180" amount="5" startPhase="3"/>
- <Train name="4" majorStops="4" cost="300" amount="4" startPhase="4"
+ <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"
rustedTrain="2"/>
- <Train name="5" majorStops="5" cost="450" amount="3" startPhase="5"/>
- <!--Train name="6" majorStops="6" cost="630" amount="2" startPhase="6"
+ <Train name="5" majorStops="5" cost="450" quantity="3" startPhase="5"/>
+ <!--Train name="6" majorStops="6" cost="630" quantity="2" startPhase="6"
rustedTrain="3" releasedTrain="D"/-->
<Train name="6" majorStops="6" cost="630" startPhase="6"
rustedTrain="3" releasedTrain="D">
<IfOption name="WithOptional6Train" value="yes">
- <Attributes amount="3"/>
+ <Attributes quantity="3"/>
</IfOption>
<IfOption name="WithOptional6Train" value="no">
- <Attributes amount="2"/>
+ <Attributes quantity="2"/>
</IfOption>
<IfOption name="Variant" value="Pere Marquette">
- <Attributes amount="3"/>
+ <Attributes quantity="3"/>
</IfOption>
</Train>
<Train name="D" majorStops="99" cost="1100" startPhase="D"
rustedTrain="4">
<IfOption name="UnlimitedTopTrains" value="yes">
- <Attributes amount="-1"/>
+ <Attributes quantity="-1"/>
</IfOption>
<IfOption name="UnlimitedTopTrains" value="no">
- <Attributes amount="6"/>
+ <Attributes quantity="6"/>
</IfOption>
<Exchange cost="800"/>
</Train>
Modified: trunk/18xx/data/18Kaas/CompanyManager.xml
===================================================================
--- trunk/18xx/data/18Kaas/CompanyManager.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/18Kaas/CompanyManager.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -13,7 +13,7 @@
<BaseTokens>
<LayCost method="sequence" cost="0,40,100"/>
</BaseTokens>
- <Trains number="4,4,3,2"/>
+ <Trains limit="4,4,3,2"/>
<CanUseSpecialProperties/>
</CompanyType>
<Company name="SVNRR" type="Private" basePrice="20" revenue="5">
Modified: trunk/18xx/data/18Kaas/Game.xml
===================================================================
--- trunk/18xx/data/18Kaas/Game.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/18Kaas/Game.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -57,21 +57,21 @@
cities="double" if city-revenue is doubled (e.g. 1826 TGV).
-->
</Defaults>
- <Train name="2" majorStops="2" cost="80" amount="6"/>
- <Train name="3" majorStops="3" cost="180" amount="5" startPhase="3"/>
- <Train name="4" majorStops="4" cost="300" amount="4" startPhase="4"
+ <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"
rustedTrain="2"/>
- <Train name="5" majorStops="5" cost="450" amount="3" startPhase="5"/>
+ <Train name="5" majorStops="5" cost="450" quantity="3" startPhase="5"/>
<Train name="6" majorStops="6" cost="630" startPhase="6"
rustedTrain="3" releasedTrain="D">
<IfOption name="WithOptional6Train" value="yes">
- <Attributes amount="3"/>
+ <Attributes quantity="3"/>
</IfOption>
<IfOption name="WithOptional6Train" value="no">
- <Attributes amount="2"/>
+ <Attributes quantity="2"/>
</IfOption>
</Train>
- <Train name="D" majorStops="99" cost="1100" amount="6" startPhase="D"
+ <Train name="D" majorStops="99" cost="1100" quantity="6" startPhase="D"
rustedTrain="4">
<Exchange cost="800"/>
</Train>
Modified: trunk/18xx/data/18Scan/CompanyManager.xml
===================================================================
--- trunk/18xx/data/18Scan/CompanyManager.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/18Scan/CompanyManager.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -14,7 +14,7 @@
<BaseTokens>
<HomeBase lay="whenStarted"/>
</BaseTokens>
- <Trains number="2,2,1,0" mandatory="no"/>
+ <Trains limit="2,2,1,0" mandatory="no"/>
</CompanyType>
<CompanyType name="Public" class="rails.game.PublicCompany">
@@ -28,7 +28,7 @@
<HomeBase lay="firstOR"/>
<LayCost method="sequence" cost="0,40,100"/>
</BaseTokens>
- <Trains number="4,4,3,2"/>
+ <Trains limit="4,4,3,2"/>
<CanUseSpecialProperties/>
</CompanyType>
<Company name="Ferry" type="Private" basePrice="120" revenue="20"
@@ -66,7 +66,7 @@
</Company>
<Company name="SJ" type="Public" tokens="6" fgColour="FFCC11"
bgColour="9370DB" longname="Statens Järnvägar">
- <Trains number="3"/>
+ <Trains limit="3"/>
</Company>
<StartPacket roundClass="rails.game.StartRound_1830">
Modified: trunk/18xx/data/18Scan/Game.xml
===================================================================
--- trunk/18xx/data/18Scan/Game.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/18Scan/Game.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -44,14 +44,14 @@
<Reach base="stops" countTowns="no"/>
<Score towns="yes"/>
</Defaults>
- <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"
+ <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" amount="2" startPhase="5" releasedTrain="5E"/>
- <Train name="5E" majorStops="5" cost="600" amount="2" startPhase="6" releasedTrain="4D"
+ <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" amount="6" startPhase="4D"
+ <Train name="4D" majorStops="4" cost="800" quantity="6" startPhase="4D"
rustedTrain="4">
</Train>
</Component>
Modified: trunk/18xx/data/18TN/CompanyManager.xml
===================================================================
--- trunk/18xx/data/18TN/CompanyManager.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/18TN/CompanyManager.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -20,7 +20,7 @@
</BaseTokens>
<Certificate type="President" shares="2"/>
<Certificate shares="1" number="8"/>
- <Trains number="4,4,3,2"/>
+ <Trains limit="4,4,3,2"/>
<CanUseSpecialProperties/>
<TileLays>
<Number colour="yellow" phase="3,4,5,6,8" number="2"/>
Modified: trunk/18xx/data/18TN/Game.xml
===================================================================
--- trunk/18xx/data/18TN/Game.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/18TN/Game.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -66,14 +66,14 @@
cities="double" if city-revenue is doubled (e.g. 1826 TGV).
-->
</Defaults>
- <Train name="2" majorStops="2" cost="80" amount="5" obsoleting="yes"/>
- <Train name="3" majorStops="3" cost="180" amount="5" obsoleting="yes" startPhase="3"/>
- <Train name="4" majorStops="4" cost="300" amount="3" obsoleting="yes" startPhase="4"
+ <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"
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="450" quantity="2" startPhase="5"/>
+ <Train name="6" majorStops="6" cost="630" quantity="2" startPhase="6"
rustedTrain="3" />
- <Train name="8" majorStops="8" cost="700" amount="7" startPhase="8"
+ <Train name="8" majorStops="8" cost="700" quantity="7" startPhase="8"
rustedTrain="4" />
</Component>
<Component name="PhaseManager" class="rails.game.PhaseManager">
Modified: trunk/18xx/data/18VA/CompanyManager.xml
===================================================================
--- trunk/18xx/data/18VA/CompanyManager.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/18VA/CompanyManager.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -19,7 +19,7 @@
</BaseTokens>
<Certificate type="President" shares="2"/>
<Certificate shares="1" number="8"/>
- <Trains number="4,4,3,2"/>
+ <Trains limit="4,4,3,2"/>
<CanUseSpecialProperties/>
</CompanyType>
Modified: trunk/18xx/data/18VA/Game.xml
===================================================================
--- trunk/18xx/data/18VA/Game.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/18VA/Game.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -71,16 +71,16 @@
cities="double" if city-revenue is doubled (e.g. 1826 TGV).
-->
</Defaults>
- <Train name="2" majorStops="2" cost="100" amount="6"/>
- <Train name="3" majorStops="3" cost="200" amount="5" startPhase="3"/>
- <Train name="4" majorStops="4" cost="300" amount="4" startPhase="4"
+ <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"
rustedTrain="2"/>
- <Train name="5" majorStops="5" cost="500" amount="3" startPhase="5"
+ <Train name="5" majorStops="5" cost="500" quantity="3" startPhase="5"
rustedTrain="3"/>
<Train name="6" majorStops="6" cost="600" startPhase="6"
releasedTrain="4D">
</Train>
- <Train name="4D" majorStops="99" cost="800" amount="10" startPhase="4D"
+ <Train name="4D" majorStops="99" cost="800" quantity="10" startPhase="4D"
rustedTrain="4">
</Train>
</Component>
Modified: trunk/18xx/data/GamesList.xml
===================================================================
--- trunk/18xx/data/GamesList.xml 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/data/GamesList.xml 2011-05-19 12:13:55 UTC (rev 1562)
@@ -28,7 +28,7 @@
- optionally, a default value (only affects a toggle;
in a dropdown the first item is always the default).
-->
- <Option name="Variant" values="Basegame,Pere Marquette,Coalfields,Reading,Coalfields&Reading,Wabash" default="Basegame" />
+ <Option name="Variant" values="Basegame,Pere Marquette,Coalfields,Reading,Coalfields&Reading,Simple,Wabash" default="Basegame" />
<Option name="RouteAwareness" values="Highlight,Deactivate" default="Highlight" />
<Option name="RevenueCalculation" values="Suggest,Deactivate" default="Suggest" />
<Option name="NoMapMode" type="toggle" default="no" />
Modified: trunk/18xx/rails/game/PublicCompany.java
===================================================================
--- trunk/18xx/rails/game/PublicCompany.java 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/rails/game/PublicCompany.java 2011-05-19 12:13:55 UTC (rev 1562)
@@ -256,7 +256,9 @@
protected boolean canClose = true;
/** Initial train at floating time */
- protected String initialTrain = null;
+ protected String initialTrainType = null;
+ protected int initialTrainCost = 0;
+ protected boolean initialTrainTradeable = true;
/* Loans */
protected int maxNumberOfLoans = 0;
@@ -396,11 +398,19 @@
Tag trainsTag = tag.getChild("Trains");
if (trainsTag != null) {
- trainLimit = trainsTag.getAttributeAsIntegerArray("number");
+ trainLimit = trainsTag.getAttributeAsIntegerArray("limit");
mustOwnATrain =
trainsTag.getAttributeAsBoolean("mandatory", mustOwnATrain);
- initialTrain = trainsTag.getAttributeAsString("initial");
}
+
+ Tag initialTrainTag = tag.getChild("InitialTrain");
+ if (initialTrainTag != null) {
+ initialTrainType = initialTrainTag.getAttributeAsString("type");
+ initialTrainCost = initialTrainTag.getAttributeAsInteger("cost",
+ initialTrainCost);
+ initialTrainTradeable = initialTrainTag.getAttributeAsBoolean("tradeable",
+ initialTrainTradeable);
+ }
Tag firstTrainTag = tag.getChild("FirstTrainCloses");
if (firstTrainTag != null) {
@@ -961,11 +971,12 @@
layHomeBaseTokens();
}
- if (initialTrain != null) {
+ if (initialTrainType != null) {
TrainManager trainManager = gameManager.getTrainManager();
- TrainTypeI type = trainManager.getTypeByName(initialTrain);
+ TrainTypeI type = trainManager.getTypeByName(initialTrainType);
TrainI train = bank.getIpo().getTrainOfType(type);
- buyTrain(train, 0);
+ buyTrain(train, initialTrainCost);
+ train.setTradeable(initialTrainTradeable);
trainManager.checkTrainAvailability(train, bank.getIpo());
}
}
Modified: trunk/18xx/rails/game/Train.java
===================================================================
--- trunk/18xx/rails/game/Train.java 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/rails/game/Train.java 2011-05-19 12:13:55 UTC (rev 1562)
@@ -17,6 +17,9 @@
protected int cityScoreFactor;
protected int townScoreFactor;
protected int townCountIndicator;
+
+ /** Some specific trains cannot be traded between companies */
+ protected boolean tradeable = true;
protected String uniqueId;
@@ -142,4 +145,12 @@
return getName();
}
+ public boolean isTradeable() {
+ return tradeable;
+ }
+
+ public void setTradeable(boolean tradeable) {
+ this.tradeable = tradeable;
+ }
+
}
Modified: trunk/18xx/rails/game/TrainI.java
===================================================================
--- trunk/18xx/rails/game/TrainI.java 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/rails/game/TrainI.java 2011-05-19 12:13:55 UTC (rev 1562)
@@ -64,5 +64,7 @@
public boolean canBeExchanged();
public String toDisplay();
-
+
+ public boolean isTradeable();
+ public void setTradeable(boolean tradeable);
}
Modified: trunk/18xx/rails/game/TrainType.java
===================================================================
--- trunk/18xx/rails/game/TrainType.java 2011-05-16 23:17:44 UTC (rev 1561)
+++ trunk/18xx/rails/game/TrainType.java 2011-05-19 12:13:55 UTC (rev 1562)
@@ -22,7 +22,7 @@
protected Class<? extends Train> trainClass;
protected String name;
- protected int amount;
+ protected int quantity;
protected boolean infiniteAmount = false;
/** Index: used for sorting trains lists in configured order. */
@@ -117,12 +117,12 @@
}
// Amount
- amount = tag.getAttributeAsInteger("amount");
- if (amount == -1) {
+ quantity = tag.getAttributeAsInteger("quantity");
+ if (quantity == -1) {
infiniteAmount = true;
- } else if (amount <= 0) {
+ } else if (quantity <= 0) {
throw new ConfigurationException(
- LocalText.getText("InvalidAmount"));
+ LocalText.getText("InvalidQuantity", String.valueOf(quantity)));
}
// Major stops
@@ -153,7 +153,7 @@
initialPortfolio);
} else {
name = "";
- amount = 0;
+ quantity = 0;
}
// Reach
@@ -209,7 +209,7 @@
train = createTrain();
trains.add(train);
} else {
- for (int i = 0; i < amount; i++) {
+ for (int i = 0; i < quantity; i++) {
train = createTrain ();
trains.add(train);
}
@@ -479,7 +479,7 @@
public String getInfo() {
StringBuilder b = new StringBuilder ("<html>");
- b.append(LocalText.getText("TrainInfo", name, Bank.format(cost), amount));
+ b.append(LocalText.getText("TrainInfo", name, Bank.format(cost), quantity));
if (Util.hasValue(startedPhaseName)) {
appendInfoText(b, LocalText.getText("StartsPhase", startedPhaseName));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
