Menu
▾
▴
[Rails-commits] SF.net SVN: rails:[1538] trunk/18xx/data
|
From: <ev...@us...> - 2011-04-28 19:07:14
|
Revision: 1538
http://rails.svn.sourceforge.net/rails/?rev=1538&view=rev
Author: evos
Date: 2011-04-28 19:07:07 +0000 (Thu, 28 Apr 2011)
Log Message:
-----------
1830 Coalfields+Reading
Modified Paths:
--------------
trunk/18xx/data/1830/CompanyManager.xml
trunk/18xx/data/1830/Game.xml
trunk/18xx/data/1830/Map.xml
trunk/18xx/data/1830/TileSet.xml
trunk/18xx/data/GamesList.xml
Modified: trunk/18xx/data/1830/CompanyManager.xml
===================================================================
--- trunk/18xx/data/1830/CompanyManager.xml 2011-04-27 22:45:34 UTC (rev 1537)
+++ trunk/18xx/data/1830/CompanyManager.xml 2011-04-28 19:07:07 UTC (rev 1538)
@@ -71,39 +71,21 @@
<!-- Note two supported colour specification formats:
RGB decimal with commas and RGB hexadecimal without commas -->
+ <Company name="B&M" type="Public" tokens="2" fgColour="000000" bgColour="60E060"
+ longname="Boston & Maine">
+ <Home hex="E23"/>
+ </Company>
<Company name="B&O" type="Public" tokens="3" fgColour="255,255,255" bgColour="0,0,255"
longname="Baltimore & Ohio">
<FirstTrainCloses type="Private" name="B&O"/>
<Home hex="I15"/>
</Company>
- <Company name="PRR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="008000"
- longname="Pennsylvania Railroad">
- <Home hex="H12"/>
- </Company>
- <Company name="NYNH" type="Public" tokens="2" fgColour="000000" bgColour="FF8000"
- longname="New York, New Haven & Hartford">
- <Home hex="G19" city="2"/>
- </Company>
- <Company name="NYC" type="Public" tokens="4" fgColour="FFFFFF" bgColour="000000"
- longname="New York Central">
- <Home hex="E19"/>
- </Company>
- <Company name="Erie" type="Public" tokens="3" fgColour="000000" bgColour="FFFF00"
- longname="Erie Railroad">
- <!-- city = 0 implies that this is not yet decided (OO-tiles), blocks means that
- in each city one slot has to be available -->
- <Home hex="E11" city="0" allCitiesBlocked="yes"/>
- </Company>
- <Company name="B&M" type="Public" tokens="2" fgColour="000000" bgColour="60E060"
- longname="Boston & Maine">
- <Home hex="E23"/>
- </Company>
<Company name="C&O" type="Public" tokens="3" fgColour="000000" bgColour="A0E0FF"
longname="Chesapeake & Ohio">
<IfOption name="Variant" value="Basegame,Pere Marquette">
<Home hex="F6"/>
</IfOption>
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Home hex="K13"/>
</IfOption>
</Company>
@@ -111,19 +93,37 @@
longname="Canadian Pacific Railroad">
<Home hex="A19"/>
</Company>
+ <Company name="Erie" type="Public" tokens="3" fgColour="000000" bgColour="FFFF00"
+ longname="Erie Railroad">
+ <!-- city = 0 implies that this is not yet decided (OO-tiles), blocks means that
+ in each city one slot has to be available -->
+ <Home hex="E11" city="0" allCitiesBlocked="yes"/>
+ </Company>
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
+ <Company name="N&W" type="Public" tokens="3" fgColour="FFFF00" bgColour="000080"
+ longname="Norfolk & Western">
+ <Home hex="L16" city="0" allCitiesBlocked="yes" />
+ </Company>
+ </IfOption>
+ <Company name="NYC" type="Public" tokens="4" fgColour="FFFFFF" bgColour="000000"
+ longname="New York Central">
+ <Home hex="E19"/>
+ </Company>
+ <Company name="NYNH" type="Public" tokens="2" fgColour="000000" bgColour="FF8000"
+ longname="New York, New Haven & Hartford">
+ <Home hex="G19" city="2"/>
+ </Company>
<IfOption name="Variant" value="Pere Marquette">
<Company name="PM" type="Public" tokens="3" fgColour="FFFF00" bgColour="000080"
longname="Pere Marquette">
<Home hex="E5" city="0" allCitiesBlocked="yes" />
</Company>
</IfOption>
- <IfOption name="Variant" value="Coalfields">
- <Company name="N&W" type="Public" tokens="3" fgColour="FFFF00" bgColour="000080"
- longname="Norfolk & Western">
- <Home hex="L16" city="0" allCitiesBlocked="yes" />
- </Company>
- </IfOption>
- <IfOption name="Variant" value="Reading">
+ <Company name="PRR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="008000"
+ longname="Pennsylvania Railroad">
+ <Home hex="H12"/>
+ </Company>
+ <IfOption name="Variant" value="Reading,Coalfields&Reading">
<Company name="RDG" type="Public" tokens="2" fgColour="000000" bgColour="C8F526"
longname="Reading Railroad">
<Home hex="H14"/>
Modified: trunk/18xx/data/1830/Game.xml
===================================================================
--- trunk/18xx/data/1830/Game.xml 2011-04-27 22:45:34 UTC (rev 1537)
+++ trunk/18xx/data/1830/Game.xml 2011-04-28 19:07:07 UTC (rev 1538)
@@ -15,7 +15,7 @@
<!-- The options in Game.xml are not currently used.
See GamesList.xml for the real ones.
-->
- <GameOption name="Variant" values="Basegame,Pere Marquette,Coalfields,Reading" default="Basegame" />
+ <GameOption name="Variant" values="Basegame,Pere Marquette,Coalfields,Reading,Coalfields&Reading" default="Basegame" />
<GameOption name="NoMapMode" type="toggle" default="no" />
<GameOption name="RouteAwareness" values="Highlight,Deactivate" default="Deactivate" />
<GameOption name="RevenueCalculation" values="Suggest,Deactivate" default="Deactivate" />
@@ -80,9 +80,21 @@
<Players number="5" cash="480" certLimit="14"/>
<Players number="6" cash="400" certLimit="12"/>
</IfOption>
+ <IfOption name="Variant" value="Coalfields&Reading">
+ <Players number="2" cash="1200" certLimit="30"/>
+ <Players number="3" cash="800" certLimit="22"/>
+ <Players number="4" cash="600" certLimit="18"/>
+ <Players number="5" cash="480" certLimit="15"/>
+ <Players number="6" cash="400" certLimit="13"/>
+ </IfOption>
</Component>
<Component name="Bank" class="rails.game.Bank">
- <Bank amount="12000"/>
+ <IfOption name="Variant" value="Basegame,Pere Marquette,Coalfields,Reading">
+ <Bank amount="12000"/>
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields&Reading">
+ <Bank amount="20000"/>
+ </IfOption>
<Money format="$@"/>
</Component>
<Component name="TileManager" class="rails.game.TileManager"
@@ -109,12 +121,12 @@
-->
</Defaults>
<Train name="2" majorStops="2" cost="80" amount="6">
- <IfOption name="Variant" value="Coalfields,Reading">
+ <IfOption name="Variant" value="Coalfields,Reading,Coalfields&Reading">
<Attributes obsoleting="yes"/>
</IfOption>
</Train>
<Train name="3" majorStops="3" cost="180" amount="5" startPhase="3">
- <IfOption name="Variant" value="Coalfields,Reading">
+ <IfOption name="Variant" value="Coalfields,Reading,Coalfields&Reading">
<Attributes obsoleting="yes"/>
</IfOption>
</Train>
@@ -123,6 +135,9 @@
<IfOption name="Variant" value="Coalfields,Reading">
<Attributes obsoleting="yes" amount="5"/>
</IfOption>
+ <IfOption name="Variant" value="Coalfields&Reading">
+ <Attributes obsoleting="yes" amount="6"/>
+ </IfOption>
</Train>
<Train name="5" majorStops="5" cost="450" amount="3" startPhase="5"/>
<Train name="6" majorStops="6" cost="630" startPhase="6"
@@ -136,8 +151,11 @@
<IfOption name="Variant" value="Pere Marquette,Coalfields,Reading">
<Attributes amount="3" releasedTrain="7,D"/>
</IfOption>
+ <IfOption name="Variant" value="Coalfields&Reading">
+ <Attributes amount="4" releasedTrain="7,D"/>
+ </IfOption>
</Train>
- <IfOption name="Variant" value="Coalfields,Reading">
+ <IfOption name="Variant" value="Coalfields,Reading,Coalfields&Reading">
<Train name="7" majorStops="7" cost="710" amount="2"/>
</IfOption>
<Train name="D" majorStops="99" startPhase="D" rustedTrain="4">
@@ -145,7 +163,7 @@
<Attributes cost="1100"/>
<Exchange cost="800"/>
</IfOption>
- <IfOption name="Variant" value="Coalfields,Reading">
+ <IfOption name="Variant" value="Coalfields,Reading,Coalfields&Reading">
<Attributes cost="900"/>
<Exchange cost="750"/>
</IfOption>
Modified: trunk/18xx/data/1830/Map.xml
===================================================================
--- trunk/18xx/data/1830/Map.xml 2011-04-27 22:45:34 UTC (rev 1537)
+++ trunk/18xx/data/1830/Map.xml 2011-04-28 19:07:07 UTC (rev 1538)
@@ -35,7 +35,7 @@
<IfOption name="Variant" value="Basegame,Pere Marquette">
<Hex name="D24" tile="-7" orientation="2"/>
</IfOption>
- <IfOption name="Variant" value="Coalfields,Reading">
+ <IfOption name="Variant" value="Coalfields,Reading,Coalfields&Reading">
<Hex name="D24" tile="-30001"/>
</IfOption>
<Hex name="E3" tile="0"/>
@@ -52,7 +52,7 @@
<IfOption name="Variant" value="Basegame,Pere Marquette,Reading">
<Hex name="F2" tile="-903" orientation="5" value="40,70" city="Chicago"/>
</IfOption>
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Hex name="F2" tile="-939" orientation="5" value="40,70" city="Chicago"/>
</IfOption>
<Hex name="F4" tile="-10" cost="80"/>
@@ -66,7 +66,7 @@
<IfOption name="Variant" value="Basegame,Pere Marquette,Reading">
<Hex name="F20" tile="-2"/>
</IfOption>
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Hex name="F20" tile="-10"/>
</IfOption>
<Hex name="F22" tile="-10" cost="80"/>
@@ -88,13 +88,13 @@
<IfOption name="Variant" value="Basegame,Pere Marquette">
<Hex name="H12" tile="-101" city="Altoona"/>
</IfOption>
- <IfOption name="Variant" value="Coalfields,Reading">
+ <IfOption name="Variant" value="Coalfields,Reading,Coalfields&Reading">
<Hex name="H12" tile="-30003" pic="-30002" city="Altoona"/>
</IfOption>
<IfOption name="Variant" value="Basegame,Pere Marquette,Coalfields">
<Hex name="H14" tile="0"/>
</IfOption>
- <IfOption name="Variant" value="Reading">
+ <IfOption name="Variant" value="Reading,Coalfields&Reading">
<Hex name="H14" tile="-30007" pic="-30006" city="Reading"/>
</IfOption>
@@ -103,7 +103,7 @@
<IfOption name="Variant" value="Basegame,Pere Marquette,Reading">
<Hex name="I1" tile="-901" orientation="5" value="30,60" city="Gulf"/>
</IfOption>
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Hex name="I1" tile="0"/>
</IfOption>
<Hex name="I3" tile="0"/>
@@ -118,7 +118,7 @@
<IfOption name="Variant" value="Basegame,Pere Marquette,Reading">
<Hex name="J2" tile="-902" orientation="5" value="30,60" city="Gulf"/>
</IfOption>
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Hex name="J2" tile="0"/>
</IfOption>
<Hex name="J4" tile="0"/>
@@ -135,7 +135,7 @@
<Hex name="K13" tile="-903" orientation="4" value="30,40" city="Deep South"/>
<Hex name="K15" tile="-30005" value="20" city="Norfolk"/>
</IfOption>
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Hex name="K1" tile="-908"/>
<Hex name="K3" tile="-10" city="Lexington"/>
<Hex name="K5" tile="0"/>
Modified: trunk/18xx/data/1830/TileSet.xml
===================================================================
--- trunk/18xx/data/1830/TileSet.xml 2011-04-27 22:45:34 UTC (rev 1537)
+++ trunk/18xx/data/1830/TileSet.xml 2011-04-28 19:07:07 UTC (rev 1538)
@@ -19,7 +19,7 @@
<IfOption name="Variant" value="Basegame,Pere Marquette">
<Upgrade id="53"/>
</IfOption>
- <IfOption name="Variant" value="Coalfields,Reading">
+ <IfOption name="Variant" value="Coalfields,Reading,Coalfields&Reading">
<Upgrade id="2053"/>
</IfOption>
</Tile>
@@ -48,12 +48,12 @@
<!-- Yellow tiles -->
<Tile id="1" quantity="1">
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Upgrade id="1717" hex="G17" />
</IfOption>
</Tile>
<Tile id="2" quantity="1">
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Upgrade id="1717" hex="G17" />
</IfOption>
</Tile>
@@ -69,12 +69,12 @@
<Upgrade id="18,19,20,23,24,26,27" />
</Tile>
<Tile id="55" quantity="1">
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Upgrade id="1717" hex="G17" />
</IfOption>
</Tile>
<Tile id="56" quantity="1">
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Upgrade id="1717" hex="G17" />
</IfOption>
</Tile>
@@ -82,14 +82,14 @@
<IfOption name="Variant" value="Basegame,Pere Marquette,Reading">
<Attributes quantity="4"/>
</IfOption>
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Attributes quantity="6"/>
</IfOption>
<Upgrade id="14,15" />
</Tile>
<Tile id="58" quantity="2" />
<Tile id="69" quantity="1">
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Upgrade id="1717" hex="G17" />
</IfOption>
</Tile>
@@ -99,7 +99,7 @@
<IfOption name="Variant" value="Basegame,Pere Marquette,Reading">
<Attributes quantity="3"/>
</IfOption>
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Attributes quantity="4"/>
</IfOption>
<Upgrade id="63" />
@@ -108,7 +108,7 @@
<IfOption name="Variant" value="Basegame,Pere Marquette,Reading">
<Attributes quantity="2"/>
</IfOption>
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Attributes quantity="3"/>
</IfOption>
<Upgrade id="63" />
@@ -156,7 +156,7 @@
<Upgrade id="1061"/>
</Tile>
</IfOption>
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Tile id="2053" extId="53" quantity="2">
<Upgrade id="1061" hex="E23" />
<Upgrade id="2061" hex="I15" />
@@ -166,7 +166,7 @@
<IfOption name="Variant" value="Basegame,Pere Marquette,Reading">
<Upgrade id="62" />
</IfOption>
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Upgrade id="1062" extId="62"/>
</IfOption>
</Tile>
@@ -190,21 +190,21 @@
<IfOption name="Variant" value="Reading">
<Tile id="1061" quantity="2" />
</IfOption>
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Tile id="1061" extId="61" quantity="1" />
<Tile id="2061" extId="BA" quantity="1" />
</IfOption>
<IfOption name="Variant" value="Basegame,Pere Marquette,Reading">
<Tile id="62" quantity="1" />
</IfOption>
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Tile id="1062" extId="62" quantity="1" />
</IfOption>
<Tile id="63">
<IfOption name="Variant" value="Basegame,Pere Marquette,Reading">
<Attributes quantity="3"/>
</IfOption>
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Attributes quantity="4"/>
</IfOption>
</Tile>
@@ -214,7 +214,7 @@
<Tile id="67" quantity="1" />
<Tile id="68" quantity="1" />
<Tile id="70" quantity="1" />
- <IfOption name="Variant" value="Coalfields">
+ <IfOption name="Variant" value="Coalfields,Coalfields&Reading">
<Tile id="1717" extId="G17" quantity="1" />
</IfOption>
</TileManager>
\ No newline at end of file
Modified: trunk/18xx/data/GamesList.xml
===================================================================
--- trunk/18xx/data/GamesList.xml 2011-04-27 22:45:34 UTC (rev 1537)
+++ trunk/18xx/data/GamesList.xml 2011-04-28 19:07:07 UTC (rev 1538)
@@ -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" default="Basegame" />
+ <Option name="Variant" values="Basegame,Pere Marquette,Coalfields,Reading,Coalfields&Reading" 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" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
