Menu
▾
▴
[Rails-commits] SF.net SVN: rails:[1485] trunk/18xx
|
From: <ev...@us...> - 2011-02-13 18:07:43
|
Revision: 1485
http://rails.svn.sourceforge.net/rails/?rev=1485&view=rev
Author: evos
Date: 2011-02-13 18:07:34 +0000 (Sun, 13 Feb 2011)
Log Message:
-----------
Initial commit for 1830 Coalfields
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/1830/Tiles.xml
trunk/18xx/data/GamesList.xml
trunk/18xx/rails/game/TileManager.java
trunk/18xx/rails/util/Tag.java
trunk/18xx/tiles/TileDictionary.18t
trunk/18xx/tiles/TileDictionary.xml
trunk/18xx/tiles/Tiles.xml
trunk/18xx/tools/ConvertTilesXML.java
Added Paths:
-----------
trunk/18xx/tiles/svg/tile-30001.svg
trunk/18xx/tiles/svg/tile-30002.svg
trunk/18xx/tiles/svg/tile-30003.svg
trunk/18xx/tiles/svg/tile-30004.svg
trunk/18xx/tiles/svg/tile-30005.svg
trunk/18xx/tiles/svg/tile1061.svg
trunk/18xx/tiles/svg/tile1062.svg
trunk/18xx/tiles/svg/tile1717.svg
trunk/18xx/tiles/svg/tile2053.svg
trunk/18xx/tiles/svg/tile2061.svg
Property Changed:
----------------
trunk/18xx/
trunk/18xx/tiles/
Property changes on: trunk/18xx
___________________________________________________________________
Modified: svn:ignore
- *.bat
*.txt
.cvsignore
.classpath
.externalToolBuilders
18xx.zip
deploy.xml
.project
zip.xml
NewUIstuff.zip
COMP.WPS
rails.jar
rails.jardesc
Rails-1.0.1.jar
my_my.properties
log
rails-1.0.1.jar
rails*.zip
rails-*.jar
tools
rails-?.*.*
jar/*
classes/*
18xx_autosave.rails
18xx_autosave.rails.tmp
user.profiles
+ *.bat
*.txt
.cvsignore
.classpath
.externalToolBuilders
18xx.zip
deploy.xml
.project
zip.xml
NewUIstuff.zip
COMP.WPS
rails.jar
rails.jardesc
Rails-1.0.1.jar
my_my.properties
log
rails-1.0.1.jar
rails*.zip
rails-*.jar
tools
rails-?.*.*
jar/*
classes/*
18xx_autosave.rails
18xx_autosave.rails.tmp
user.profiles
o
Modified: trunk/18xx/data/1830/CompanyManager.xml
===================================================================
--- trunk/18xx/data/1830/CompanyManager.xml 2011-02-11 22:53:26 UTC (rev 1484)
+++ trunk/18xx/data/1830/CompanyManager.xml 2011-02-13 18:07:34 UTC (rev 1485)
@@ -97,7 +97,12 @@
</Company>
<Company name="C&O" type="Public" tokens="3" fgColour="000000" bgColour="A0E0FF"
longname="Chesapeake & Ohio">
- <Home hex="F6"/>
+ <IfOption name="Variant" value="Basegame,Pere Marquette">
+ <Home hex="F6"/>
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Home hex="K13"/>
+ </IfOption>
</Company>
<Company name="CPR" type="Public" tokens="4" fgColour="FFFFFF" bgColour="FF0000"
longname="Canadian Pacific Railroad">
@@ -109,7 +114,14 @@
<Home hex="E5" city="0" allCitiesBlocked="yes" />
</Company>
</IfOption>
- <StartPacket roundClass="rails.game.StartRound_1830">
+ <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>
+
+ <StartPacket roundClass="rails.game.StartRound_1830">
<Bidding initial="5" minimum="5" increment="1"/>
<Item name="SVNRR" type="Private" basePrice="20"/>
<Item name="C&StL" type="Private" basePrice="40"/>
Modified: trunk/18xx/data/1830/Game.xml
===================================================================
--- trunk/18xx/data/1830/Game.xml 2011-02-11 22:53:26 UTC (rev 1484)
+++ trunk/18xx/data/1830/Game.xml 2011-02-13 18:07:34 UTC (rev 1485)
@@ -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" default="Basegame" />
+ <GameOption name="Variant" values="Basegame,Pere Marquette,Coalfields" 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" />
@@ -48,7 +48,7 @@
</EndOfGame>
</Component>
<Component name="PlayerManager" class="rails.game.PlayerManager">
- <IfOption name="Variant" value="Basegame">
+ <IfOption name="Variant" value="Basegame,">
<Players number="2" cash="1200" certLimit="28"/>
<Players number="3" cash="800" certLimit="20"/>
<Players number="4" cash="600" certLimit="16"/>
@@ -63,6 +63,14 @@
<Players number="6" cash="400" certLimit="12"/>
<Players number="7" cash="360" certLimit="11"/>
</IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Players number="2" cash="1200" certLimit="29"/>
+ <Players number="3" cash="800" certLimit="21"/>
+ <Players number="4" cash="600" certLimit="17"/>
+ <Players number="5" cash="480" certLimit="14"/>
+ <Players number="6" cash="400" certLimit="12"/>
+ <Players number="7" cash="360" certLimit="11"/>
+ </IfOption>
</Component>
<Component name="Bank" class="rails.game.Bank">
<Bank amount="12000"/>
Modified: trunk/18xx/data/1830/Map.xml
===================================================================
--- trunk/18xx/data/1830/Map.xml 2011-02-11 22:53:26 UTC (rev 1484)
+++ trunk/18xx/data/1830/Map.xml 2011-02-13 18:07:34 UTC (rev 1485)
@@ -1,96 +1,149 @@
-<Map mapClass="rails.ui.swing.hexmap.EWHexMap" tileOrientation="EW" letterOrientation="vertical" even="B">
- <Hex name="A9" tile="-901" orientation="0" value="30,50" city="Canadian West"/>
- <Hex name="A11" tile="-902" orientation="1" value="30,50" city="Canadian West"/>
- <Hex name="A17" tile="-7" orientation="1" city="Montreal"/>
- <Hex name="A19" tile="-103" orientation="0"/>
- <Hex name="B10" tile="-10"/>
- <Hex name="B12" tile="0"/>
- <Hex name="B14" tile="0"/>
- <Hex name="B16" tile="-10" impassable="C17"/>
- <Hex name="B18" tile="0" cost="80"/>
- <Hex name="B20" tile="-1"/>
- <Hex name="B22" tile="0"/>
- <Hex name="B24" tile="-902" orientation="2" value="20,30"/>
- <Hex name="C7" tile="0"/>
- <Hex name="C9" tile="0"/>
- <Hex name="C11" tile="0" impassable="D12"/>
- <Hex name="C13" tile="0" impassable="D12"/>
- <Hex name="C15" tile="-58" orientation="2"/>
- <Hex name="C17" tile="0" cost="120"/>
- <Hex name="C19" tile="0" cost="80"/>
- <Hex name="C21" tile="0" cost="120"/>
- <Hex name="C23" tile="0"/>
- <Hex name="D2" tile="-5"/>
- <Hex name="D4" tile="-1"/>
- <Hex name="D6" tile="0" cost="80"/>
- <Hex name="D8" tile="0"/>
- <Hex name="D10" tile="-20" cost="80" label="OO"/>
- <Hex name="D12" tile="0"/>
- <Hex name="D14" tile="-102" value="20"/>
- <Hex name="D16" tile="0"/>
- <Hex name="D18" tile="0"/>
- <Hex name="D20" tile="0"/>
- <Hex name="D22" tile="0" cost="120"/>
- <Hex name="D24" tile="-7" orientation="2"/>
- <Hex name="E3" tile="0"/>
- <Hex name="E5" tile="-20" label="OO" cost="80"/>
- <Hex name="E7" tile="-1" impassable="F8"/>
- <Hex name="E9" tile="-7" orientation="4"/>
- <Hex name="E11" tile="-20" label="OO"/>
- <Hex name="E13" tile="0"/>
- <Hex name="E15" tile="0"/>
- <Hex name="E17" tile="0" cost="120"/>
- <Hex name="E19" tile="-10"/>
- <Hex name="E21" tile="0" cost="120"/>
- <Hex name="E23" tile="-11" orientation="5" label="B" city="Boston"/>
- <Hex name="F2" tile="-903" orientation="5" value="40,70" city="Chicago"/>
- <Hex name="F4" tile="-10" cost="80"/>
- <Hex name="F6" tile="-105" city="Cleveland"/>
- <Hex name="F8" tile="0"/>
- <Hex name="F10" tile="-1"/>
- <Hex name="F12" tile="0"/>
- <Hex name="F14" tile="0"/>
- <Hex name="F16" tile="-10" cost="120"/>
- <Hex name="F18" tile="0"/>
- <Hex name="F20" tile="-2"/>
- <Hex name="F22" tile="-10" cost="80"/>
- <Hex name="F24" tile="-3" orientation="2"/>
- <Hex name="G3" tile="0"/>
- <Hex name="G5" tile="0"/>
- <Hex name="G7" tile="-2"/>
- <Hex name="G9" tile="0"/>
- <Hex name="G11" tile="0"/>
- <Hex name="G13" tile="0" cost="120"/>
- <Hex name="G15" tile="0" cost="120"/>
- <Hex name="G17" tile="-2"/>
- <Hex name="G19" tile="-21" orientation="1" cost="80" city="New York"/>
- <Hex name="H2" tile="0"/>
- <Hex name="H4" tile="-10"/>
- <Hex name="H6" tile="0"/>
- <Hex name="H8" tile="0"/>
- <Hex name="H10" tile="-10"/>
- <Hex name="H12" tile="-101" home="PRR"/>
- <Hex name="H14" tile="0"/>
- <Hex name="H16" tile="-10"/>
- <Hex name="H18" tile="-20" label="OO"/>
- <Hex name="I1" tile="-901" orientation="5" value="30,60" city="Gulf"/>
- <Hex name="I3" tile="0"/>
- <Hex name="I5" tile="0"/>
- <Hex name="I7" tile="0"/>
- <Hex name="I9" tile="0"/>
- <Hex name="I11" tile="0" cost="120"/>
- <Hex name="I13" tile="0"/>
- <Hex name="I15" tile="-11" label="B" city="Baltimore"/>
- <Hex name="I17" tile="0" cost="80"/>
- <Hex name="I19" tile="-3" orientation="2"/>
- <Hex name="J2" tile="-902" orientation="5" value="30,60" city="Gulf"/>
- <Hex name="J4" tile="0"/>
- <Hex name="J6" tile="0"/>
- <Hex name="J8" tile="0"/>
- <Hex name="J10" tile="0" cost="120"/>
- <Hex name="J12" tile="0" cost="120"/>
- <Hex name="J14" tile="-10" cost="80" city="Washington"/>
- <Hex name="K13" tile="-902" orientation="4" value="30,40" city="Deep South"/>
- <Hex name="K15" tile="-104" orientation="3"/>
-
-</Map>
+<Map mapClass="rails.ui.swing.hexmap.EWHexMap" tileOrientation="EW"
+ letterOrientation="vertical" even="B">
+ <Hex name="A9" tile="-901" orientation="0" value="30,50" city="Canadian West"/>
+ <Hex name="A11" tile="-902" orientation="1" value="30,50" city="Canadian West"/>
+ <Hex name="A17" tile="-7" orientation="1" city="Montreal"/>
+ <Hex name="A19" tile="-103" orientation="0"/>
+ <Hex name="B10" tile="-10"/>
+ <Hex name="B12" tile="0"/>
+ <Hex name="B14" tile="0"/>
+ <Hex name="B16" tile="-10" impassable="C17"/>
+ <Hex name="B18" tile="0" cost="80"/>
+ <Hex name="B20" tile="-1"/>
+ <Hex name="B22" tile="0"/>
+ <Hex name="B24" tile="-902" orientation="2" value="20,30"/>
+ <Hex name="C7" tile="0"/>
+ <Hex name="C9" tile="0"/>
+ <Hex name="C11" tile="0" impassable="D12"/>
+ <Hex name="C13" tile="0" impassable="D12"/>
+ <Hex name="C15" tile="-58" orientation="2"/>
+ <Hex name="C17" tile="0" cost="120"/>
+ <Hex name="C19" tile="0" cost="80"/>
+ <Hex name="C21" tile="0" cost="120"/>
+ <Hex name="C23" tile="0"/>
+ <Hex name="D2" tile="-5"/>
+ <Hex name="D4" tile="-1"/>
+ <Hex name="D6" tile="0" cost="80"/>
+ <Hex name="D8" tile="0"/>
+ <Hex name="D10" tile="-20" cost="80" label="OO"/>
+ <Hex name="D12" tile="0"/>
+ <Hex name="D14" tile="-102" value="20"/>
+ <Hex name="D16" tile="0"/>
+ <Hex name="D18" tile="0"/>
+ <Hex name="D20" tile="0"/>
+ <Hex name="D22" tile="0" cost="120"/>
+ <IfOption name="Variant" value="Basegame,Pere Marquette">
+ <Hex name="D24" tile="-7" orientation="2"/>
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Hex name="D24" tile="-30001"/>
+ </IfOption>
+ <Hex name="E3" tile="0"/>
+ <Hex name="E5" tile="-20" label="OO" cost="80"/>
+ <Hex name="E7" tile="-1" impassable="F8"/>
+ <Hex name="E9" tile="-7" orientation="4"/>
+ <Hex name="E11" tile="-20" label="OO"/>
+ <Hex name="E13" tile="0"/>
+ <Hex name="E15" tile="0"/>
+ <Hex name="E17" tile="0" cost="120"/>
+ <Hex name="E19" tile="-10"/>
+ <Hex name="E21" tile="0" cost="120"/>
+ <Hex name="E23" tile="-11" orientation="5" label="B" city="Boston"/>
+ <IfOption name="Variant" value="Basegame,Pere Marquette">
+ <Hex name="F2" tile="-903" orientation="5" value="40,70" city="Chicago"/>
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Hex name="F2" tile="-939" orientation="5" value="40,70" city="Chicago"/>
+ </IfOption>
+ <Hex name="F4" tile="-10" cost="80"/>
+ <Hex name="F6" tile="-105" city="Cleveland"/>
+ <Hex name="F8" tile="0"/>
+ <Hex name="F10" tile="-1"/>
+ <Hex name="F12" tile="0"/>
+ <Hex name="F14" tile="0"/>
+ <Hex name="F16" tile="-10" cost="120"/>
+ <Hex name="F18" tile="0"/>
+ <IfOption name="Variant" value="Basegame,Pere Marquette">
+ <Hex name="F20" tile="-2"/>
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Hex name="F20" tile="-10"/>
+ </IfOption>
+ <Hex name="F22" tile="-10" cost="80"/>
+ <Hex name="F24" tile="-3" orientation="2"/>
+ <Hex name="G3" tile="0"/>
+ <Hex name="G5" tile="0"/>
+ <Hex name="G7" tile="-2"/>
+ <Hex name="G9" tile="0"/>
+ <Hex name="G11" tile="0"/>
+ <Hex name="G13" tile="0" cost="120"/>
+ <Hex name="G15" tile="0" cost="120"/>
+ <Hex name="G17" tile="-2"/>
+ <Hex name="G19" tile="-21" orientation="1" cost="80" city="New York"/>
+ <Hex name="H2" tile="0"/>
+ <Hex name="H4" tile="-10"/>
+ <Hex name="H6" tile="0"/>
+ <Hex name="H8" tile="0"/>
+ <Hex name="H10" tile="-10"/>
+ <IfOption name="Variant" value="Basegame,Pere Marquette">
+ <Hex name="H12" tile="-101" city="Altoona"/>
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Hex name="H12" tile="-30003" pic="-30002" city="Altoona"/>
+ </IfOption>
+ <Hex name="H14" tile="0"/>
+ <Hex name="H16" tile="-10"/>
+ <Hex name="H18" tile="-20" label="OO"/>
+ <IfOption name="Variant" value="Basegame,Pere Marquette">
+ <Hex name="I1" tile="-901" orientation="5" value="30,60" city="Gulf"/>
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Hex name="I1" tile="0"/>
+ </IfOption>
+ <Hex name="I3" tile="0"/>
+ <Hex name="I5" tile="0"/>
+ <Hex name="I7" tile="0"/>
+ <Hex name="I9" tile="0"/>
+ <Hex name="I11" tile="0" cost="120"/>
+ <Hex name="I13" tile="0"/>
+ <Hex name="I15" tile="-11" label="B" city="Baltimore"/>
+ <Hex name="I17" tile="0" cost="80"/>
+ <Hex name="I19" tile="-3" orientation="2"/>
+ <IfOption name="Variant" value="Basegame,Pere Marquette">
+ <Hex name="J2" tile="-902" orientation="5" value="30,60" city="Gulf"/>
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Hex name="J2" tile="0"/>
+ </IfOption>
+ <Hex name="J4" tile="0"/>
+ <Hex name="J6" tile="0"/>
+ <Hex name="J8" tile="0"/>
+ <Hex name="J10" tile="0" cost="120"/>
+ <Hex name="J12" tile="0" cost="120"/>
+ <Hex name="J14" tile="-10" cost="80" city="Washington"/>
+ <IfOption name="Variant" value="Basegame,Pere Marquette">
+ <Hex name="K13" tile="-902" orientation="4" value="30,40" city="Deep South"/>
+ <Hex name="K15" tile="-104" orientation="3"/>
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Hex name="K1" tile="-908"/>
+ <Hex name="K3" tile="-10" city="Lexington"/>
+ <Hex name="K5" tile="0"/>
+ <Hex name="K7" tile="0"/>
+ <Hex name="K9" tile="-10" cost="120" city="Christiansburg"/>
+ <Hex name="K11" tile="0" cost="120"/>
+ <Hex name="K13" tile="-10" city="Richmond"/>
+ <Hex name="K15" tile="0" cost="40"/>
+ <Hex name="L2" tile="-939" orientation="4" value="30,60" city="Gulf"/>
+ <Hex name="L4" tile="0"/>
+ <Hex name="L6" tile="0" cost="120"/>
+ <Hex name="L8" tile="0" cost="120"/>
+ <Hex name="L10" tile="-30004" value="40,60" city="Coalfields"/>
+ <Hex name="L12" tile="0"/>
+ <Hex name="L14" tile="0"/>
+ <Hex name="L16" tile="-30005" value="30,50" city="Norfolk"/>
+ <Hex name="M11" tile="0"/>
+ <Hex name="M13" tile="-903" orientation="3" value="30,40" city="Deep South"/>
+ </IfOption>
+
+</Map>
\ No newline at end of file
Modified: trunk/18xx/data/1830/TileSet.xml
===================================================================
--- trunk/18xx/data/1830/TileSet.xml 2011-02-11 22:53:26 UTC (rev 1484)
+++ trunk/18xx/data/1830/TileSet.xml 2011-02-13 18:07:34 UTC (rev 1485)
@@ -16,7 +16,12 @@
<Upgrade id="57"/>
</Tile>
<Tile id="-11"><!-- B yellow -->
- <Upgrade id="53"/>
+ <IfOption name="Variant" value="Basegame,Pere Marquette">
+ <Upgrade id="53"/>
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Upgrade id="2053"/>
+ </IfOption>
</Tile>
<Tile id="-20"><!-- 2 OO cities -->
<Upgrade id="59" relayBaseTokens="yes"/>
@@ -28,15 +33,29 @@
<Tile id="-101"/><!-- Altoona -->
<Tile id="-102"/><!-- Rochester -->
<Tile id="-103"/><!-- Montreal -->
- <Tile id="-104"/><!-- Norwich -->
+ <Tile id="-104"/><!-- Norfolk -->
<Tile id="-105"/><!-- Cleveland -->
<Tile id="-901"/>
<Tile id="-902"/>
<Tile id="-903"/>
+ <Tile id="-908"/><!-- Coalfields: K1 -->
+ <Tile id="-939"/><!-- Coalfields: Chicago -->
+ <Tile id="-30001"/><!-- Coalfields: N of Boston -->
+ <Tile id="-30003" pic="-30002"/><!-- Coalfields: Altoona -->
+ <Tile id="-30004"/><!-- Coalfields: Coalfields -->
+ <Tile id="-30005"/><!-- Coalfields: Norfolk -->
<!-- Yellow tiles -->
- <Tile id="1" quantity="1" />
- <Tile id="2" quantity="1" />
+ <Tile id="1" quantity="1">
+ <IfOption name="Variant" value="Coalfields">
+ <Upgrade id="1717" hex="G17" />
+ </IfOption>
+ </Tile>
+ <Tile id="2" quantity="1">
+ <IfOption name="Variant" value="Coalfields">
+ <Upgrade id="1717" hex="G17" />
+ </IfOption>
+ </Tile>
<Tile id="3" quantity="2" />
<Tile id="4" quantity="2" />
<Tile id="7" quantity="4">
@@ -48,19 +67,49 @@
<Tile id="9" quantity="7">
<Upgrade id="18,19,20,23,24,26,27" />
</Tile>
- <Tile id="55" quantity="1" />
- <Tile id="56" quantity="1" />
- <Tile id="57" quantity="4">
+ <Tile id="55" quantity="1">
+ <IfOption name="Variant" value="Coalfields">
+ <Upgrade id="1717" hex="G17" />
+ </IfOption>
+ </Tile>
+ <Tile id="56" quantity="1">
+ <IfOption name="Variant" value="Coalfields">
+ <Upgrade id="1717" hex="G17" />
+ </IfOption>
+ </Tile>
+ <Tile id="57">
+ <IfOption name="Variant" value="Basegame,Pere Marquette">
+ <Attributes quantity="4"/>
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Attributes quantity="6"/>
+ </IfOption>
<Upgrade id="14,15" />
</Tile>
<Tile id="58" quantity="2" />
- <Tile id="69" quantity="1" />
+ <Tile id="69" quantity="1">
+ <IfOption name="Variant" value="Coalfields">
+ <Upgrade id="1717" hex="G17" />
+ </IfOption>
+ </Tile>
<!-- Green tiles -->
- <Tile id="14" quantity="3">
+ <Tile id="14">
+ <IfOption name="Variant" value="Basegame,Pere Marquette">
+ <Attributes quantity="3"/>
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Attributes quantity="4"/>
+ </IfOption>
<Upgrade id="63" />
</Tile>
<Tile id="15" quantity="2">
+ <IfOption name="Variant" value="Basegame,Pere Marquette">
+ <Attributes quantity="2"/>
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Attributes quantity="3"/>
+ </IfOption>
<Upgrade id="63" />
</Tile>
<Tile id="16" quantity="1">
@@ -96,15 +145,29 @@
<Tile id="29" quantity="1">
<Upgrade id="39,43,45,70" />
</Tile>
- <Tile id="53" quantity="2">
- <Upgrade id="61" />
- </Tile>
+ <IfOption name="Variant" value="Basegame,Pere Marquette">
+ <Tile id="53" quantity="2">
+ <Upgrade id="61" />
+ </Tile>
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Tile id="2053" extId="53" quantity="2">
+ <Upgrade id="1061" hex="E23" />
+ <Upgrade id="2061" hex="I15" />
+ </Tile>
+ </IfOption>
<Tile id="54" quantity="1">
- <Upgrade id="62" />
+ <IfOption name="Variant" value="Basegame,Pere Marquette">
+ <Upgrade id="62" />
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Upgrade id="1062" extId="62"/>
+ </IfOption>
</Tile>
<Tile id="59" quantity="2">
<Upgrade id="64,65,66,67,68" />
</Tile>
+
<!-- Brown tiles -->
<Tile id="39" quantity="1" />
<Tile id="40" quantity="1" />
@@ -115,13 +178,34 @@
<Tile id="45" quantity="2" />
<Tile id="46" quantity="2" />
<Tile id="47" quantity="1" />
- <Tile id="61" quantity="2" />
- <Tile id="62" quantity="1" />
- <Tile id="63" quantity="3" />
+ <IfOption name="Variant" value="Basegame,Pere Marquette">
+ <Tile id="61" quantity="2" />
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Tile id="1061" extId="61" quantity="1" />
+ <Tile id="2061" extId="BA" quantity="1" />
+ </IfOption>
+ <IfOption name="Variant" value="Basegame,Pere Marquette">
+ <Tile id="62" quantity="1" />
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Tile id="1062" extId="62" quantity="1" />
+ </IfOption>
+ <Tile id="63">
+ <IfOption name="Variant" value="Basegame,Pere Marquette">
+ <Attributes quantity="3"/>
+ </IfOption>
+ <IfOption name="Variant" value="Coalfields">
+ <Attributes quantity="4"/>
+ </IfOption>
+ </Tile>
<Tile id="64" quantity="1" />
<Tile id="65" quantity="1" />
<Tile id="66" quantity="1" />
<Tile id="67" quantity="1" />
<Tile id="68" quantity="1" />
<Tile id="70" quantity="1" />
+ <IfOption name="Variant" value="Coalfields">
+ <Tile id="1717" extId="G17" quantity="1" />
+ </IfOption>
</TileManager>
Modified: trunk/18xx/data/1830/Tiles.xml
===================================================================
--- trunk/18xx/data/1830/Tiles.xml 2011-02-11 22:53:26 UTC (rev 1484)
+++ trunk/18xx/data/1830/Tiles.xml 2011-02-13 18:07:34 UTC (rev 1485)
@@ -1,288 +1,425 @@
-<?xml version="1.0" encoding="UTF-8"?><Tiles><Tile colour="white" id="0" name="empty"/><Tile colour="white" id="-1" name="1 village">
- <Station id="city1" position="002" type="Town"/>
- </Tile><Tile colour="white" id="-2" name="2 villages">
- <Station id="city1" position="102" type="Town"/>
- <Station id="city2" position="302" type="Town"/>
- </Tile><Tile colour="fixed" id="-3" name="MF 3">
- <Station id="city1" position="252" type="Town" value="10"/>
- <Track from="city1" gauge="normal" to="side2"/>
- <Track from="city1" gauge="normal" to="side3"/>
- </Tile><Tile colour="fixed" id="-5" name="MF 5">
- <Station id="city1" position="0" slots="1" type="City" value="20"/>
- <Track from="city1" gauge="normal" to="side2"/>
- <Track from="city1" gauge="normal" to="side1"/>
- </Tile><Tile colour="fixed" id="-7" name="MF 7">
- <Track from="side2" gauge="normal" to="side1"/>
- </Tile><Tile colour="white" id="-10" name="1 city">
- <Station id="city1" position="302" slots="1" type="City"/>
- </Tile><Tile colour="yellow" id="-11" name="B">
- <Station id="city1" position="0" slots="1" type="City" value="30"/>
- <Track from="city1" gauge="normal" to="side1"/>
- <Track from="city1" gauge="normal" to="side3"/>
- </Tile><Tile colour="yellow" id="-20" name="2 cities">
- <Station id="city1" position="002" slots="1" type="City"/>
- <Station id="city2" position="302" slots="1" type="City"/>
- </Tile><Tile colour="yellow" id="-21" name="NY">
- <Station id="city1" position="202" slots="1" type="City" value="40"/>
- <Station id="city2" position="502" slots="1" type="City" value="40"/>
- <Track from="city1" gauge="normal" to="side2"/>
- <Track from="city2" gauge="normal" to="side5"/>
- </Tile><Tile colour="fixed" id="-58" name="MF 58">
- <Station id="city1" position="301" type="Town" value="10"/>
- <Track from="city1" gauge="normal" to="side2"/>
- <Track from="city1" gauge="normal" to="side4"/>
- </Tile><Tile colour="fixed" id="-101" name="Philadelphia">
- <Station id="city1" position="0" slots="1" type="City" value="10"/>
- <Track from="city1" gauge="normal" to="side1"/>
- <Track from="city1" gauge="normal" to="side4"/>
- <Track from="side4" gauge="normal" to="side1"/>
- </Tile><Tile colour="fixed" id="-102" name="-102">
- <Station id="city1" position="251" slots="1" type="City" value="20"/>
- <Track from="city1" gauge="normal" to="side1"/>
- <Track from="city1" gauge="normal" to="side3"/>
- <Track from="city1" gauge="normal" to="side4"/>
- </Tile><Tile colour="fixed" id="-103" name="MF 103">
- <Station id="city1" position="0" slots="1" type="City" value="40"/>
- <Track from="city1" gauge="normal" to="side2"/>
- <Track from="city1" gauge="normal" to="side3"/>
- </Tile><Tile colour="fixed" id="-104" name="MF 104">
- <Station id="city1" position="0" slots="1" type="City" value="20"/>
- <Track from="city1" gauge="normal" to="side2"/>
- </Tile><Tile colour="fixed" id="-105" name="MF 105">
- <Station id="city1" position="0" slots="1" type="City" value="30"/>
- <Track from="city1" gauge="normal" to="side2"/>
- <Track from="city1" gauge="normal" to="side3"/>
- </Tile><Tile colour="red" id="-901" name="OM 1 way">
- <Station id="city1" position="0" type="OffMapCity" value="-1"/>
- <Track from="city1" gauge="normal" to="side2"/>
- </Tile><Tile colour="red" id="-902" name="OM 2 way">
- <Station id="city1" position="0" type="OffMapCity" value="-1"/>
- <Track from="city1" gauge="normal" to="side2"/>
- <Track from="city1" gauge="normal" to="side1"/>
- </Tile><Tile colour="red" id="-903" name="OM 3 way">
- <Station id="city1" position="0" type="OffMapCity" value="-1"/>
- <Track from="city1" gauge="normal" to="side3"/>
- <Track from="city1" gauge="normal" to="side2"/>
- <Track from="city1" gauge="normal" to="side1"/>
- </Tile><Tile colour="yellow" id="1" name="1">
- <Station id="city1" position="408" type="Town" value="10"/>
- <Station id="city2" position="108" type="Town" value="10"/>
- <Track from="city1" gauge="normal" to="side0"/>
- <Track from="city1" gauge="normal" to="side4"/>
- <Track from="city2" gauge="normal" to="side1"/>
- <Track from="city2" gauge="normal" to="side3"/>
- </Tile><Tile colour="yellow" id="2" name="2">
- <Station id="city1" position="302" type="Town" value="10"/>
- <Station id="city2" position="109" type="Town" value="10"/>
- <Track from="city1" gauge="normal" to="side3"/>
- <Track from="city1" gauge="normal" to="side0"/>
- <Track from="city2" gauge="normal" to="side1"/>
- <Track from="city2" gauge="normal" to="side2"/>
- </Tile><Tile colour="yellow" id="3" name="3">
- <Station id="city1" position="352" type="Town" value="10"/>
- <Track from="city1" gauge="normal" to="side3"/>
- <Track from="city1" gauge="normal" to="side4"/>
- </Tile><Tile colour="yellow" id="4" name="4">
- <Station id="city1" position="0" type="Town" value="10"/>
- <Track from="city1" gauge="normal" to="side3"/>
- <Track from="city1" gauge="normal" to="side0"/>
- </Tile><Tile colour="yellow" id="7" name="7">
- <Track from="side3" gauge="normal" to="side4"/>
- </Tile><Tile colour="yellow" id="8" name="8">
- <Track from="side3" gauge="normal" to="side5"/>
- </Tile><Tile colour="yellow" id="9" name="9">
- <Track from="side3" gauge="normal" to="side0"/>
- </Tile><Tile colour="yellow" id="55" name="55">
- <Station id="city1" position="202" type="Town" value="10"/>
- <Station id="city2" position="302" type="Town" value="10"/>
- <Track from="city1" gauge="normal" to="side2"/>
- <Track from="city1" gauge="normal" to="side5"/>
- <Track from="city2" gauge="normal" to="side3"/>
- <Track from="city2" gauge="normal" to="side0"/>
- </Tile><Tile colour="yellow" id="56" name="56">
- <Station id="city1" position="407" type="Town" value="10"/>
- <Station id="city2" position="108" type="Town" value="10"/>
- <Track from="city2" gauge="normal" to="side1"/>
- <Track from="city2" gauge="normal" to="side3"/>
- <Track from="city1" gauge="normal" to="side4"/>
- <Track from="city1" gauge="normal" to="side2"/>
- </Tile><Tile colour="yellow" id="57" name="57">
- <Station id="city1" position="0" slots="1" type="City" value="20"/>
- <Track from="city1" gauge="normal" to="side3"/>
- <Track from="city1" gauge="normal" to="side0"/>
- </Tile><Tile colour="yellow" id="58" name="58">
- <Station id="city1" position="401" type="Town" value="10"/>
- <Track from="city1" gauge="normal" to="side5"/>
- <Track from="city1" gauge="normal" to="side3"/>
- </Tile><Tile colour="yellow" id="69" name="69">
- <Station id="city1" position="407" type="Town" value="10"/>
- <Station id="city2" position="002" type="Town" value="10"/>
- <Track from="city1" gauge="normal" to="side2"/>
- <Track from="city1" gauge="normal" to="side4"/>
- <Track from="city2" gauge="normal" to="side0"/>
- <Track from="city2" gauge="normal" to="side3"/>
- </Tile><Tile colour="green" id="14" name="14">
- <Station id="city1" position="0" slots="2" type="City" value="30"/>
- <Track from="city1" gauge="normal" to="side1"/>
- <Track from="city1" gauge="normal" to="side3"/>
- <Track from="city1" gauge="normal" to="side4"/>
- <Track from="city1" gauge="normal" to="side0"/>
- </Tile><Tile colour="green" id="15" name="15">
- <Station id="city1" position="0" slots="2" type="City" value="30"/>
- <Track from="city1" gauge="normal" to="side3"/>
- <Track from="city1" gauge="normal" to="side4"/>
- <Track from="city1" gauge="normal" to="side5"/>
- <Track from="city1" gauge="normal" to="side0"/>
- </Tile><Tile colour="green" id="16" name="16">
- <Track from="side3" gauge="normal" to="side5"/>
- <Track from="side4" gauge="normal" to="side0"/>
- </Tile><Tile colour="green" id="18" name="18">
- <Track from="side3" gauge="normal" to="side0"/>
- <Track from="side4" gauge="normal" to="side5"/>
- </Tile><Tile colour="green" id="19" name="19">
- <Track from="side5" gauge="normal" to="side1"/>
- <Track from="side0" gauge="normal" to="side3"/>
- </Tile><Tile colour="green" id="20" name="20">
- <Track from="side1" gauge="normal" to="side4"/>
- <Track from="side3" gauge="normal" to="side0"/>
- </Tile><Tile colour="green" id="23" name="23">
- <Track from="side4" gauge="normal" to="side0"/>
- <Track from="side0" gauge="normal" to="side3"/>
- </Tile><Tile colour="green" id="24" name="24">
- <Track from="side3" gauge="normal" to="side5"/>
- <Track from="side3" gauge="normal" to="side0"/>
- </Tile><Tile colour="green" id="25" name="25">
- <Track from="side1" gauge="normal" to="side3"/>
- <Track from="side3" gauge="normal" to="side5"/>
- </Tile><Tile colour="green" id="26" name="26">
- <Track from="side5" gauge="normal" to="side0"/>
- <Track from="side0" gauge="normal" to="side3"/>
- </Tile><Tile colour="green" id="27" name="27">
- <Track from="side3" gauge="normal" to="side4"/>
- <Track from="side3" gauge="normal" to="side0"/>
- </Tile><Tile colour="green" id="28" name="28">
- <Track from="side3" gauge="normal" to="side5"/>
- <Track from="side4" gauge="normal" to="side5"/>
- </Tile><Tile colour="green" id="29" name="29">
- <Track from="side3" gauge="normal" to="side4"/>
- <Track from="side3" gauge="normal" to="side5"/>
- </Tile><Tile colour="green" id="53" name="53">
- <Station id="city1" position="0" slots="1" type="City" value="50"/>
- <Track from="city1" gauge="normal" to="side1"/>
- <Track from="city1" gauge="normal" to="side3"/>
- <Track from="city1" gauge="normal" to="side5"/>
- </Tile><Tile colour="green" id="54" name="54">
- <Station id="city1" position="352" slots="1" type="City" value="60"/>
- <Station id="city2" position="552" slots="1" type="City" value="60"/>
- <Track from="city1" gauge="normal" to="side3"/>
- <Track from="city1" gauge="normal" to="side4"/>
- <Track from="city2" gauge="normal" to="side5"/>
- <Track from="city2" gauge="normal" to="side0"/>
- </Tile><Tile colour="green" id="59" name="59">
- <Station id="city1" position="052" slots="1" type="City" value="40"/>
- <Station id="city2" position="352" slots="1" type="City" value="40"/>
- <Track from="city1" gauge="normal" to="side1"/>
- <Track from="city2" gauge="normal" to="side3"/>
- </Tile><Tile colour="brown" id="39" name="39">
- <Track from="side3" gauge="normal" to="side4"/>
- <Track from="side3" gauge="normal" to="side5"/>
- <Track from="side4" gauge="normal" to="side5"/>
- </Tile><Tile colour="brown" id="40" name="40">
- <Track from="side1" gauge="normal" to="side3"/>
- <Track from="side1" gauge="normal" to="side5"/>
- <Track from="side3" gauge="normal" to="side5"/>
- </Tile><Tile colour="brown" id="41" name="41">
- <Track from="side4" gauge="normal" to="side0"/>
- <Track from="side4" gauge="normal" to="side3"/>
- <Track from="side0" gauge="normal" to="side3"/>
- </Tile><Tile colour="brown" id="42" name="42">
- <Track from="side3" gauge="normal" to="side5"/>
- <Track from="side3" gauge="normal" to="side0"/>
- <Track from="side5" gauge="normal" to="side0"/>
- </Tile><Tile colour="brown" id="43" name="43">
- <Track from="side3" gauge="normal" to="side5"/>
- <Track from="side3" gauge="normal" to="side0"/>
- <Track from="side4" gauge="normal" to="side5"/>
- <Track from="side4" gauge="normal" to="side0"/>
- </Tile><Tile colour="brown" id="44" name="44">
- <Track from="side3" gauge="normal" to="side0"/>
- <Track from="side1" gauge="normal" to="side0"/>
- <Track from="side3" gauge="normal" to="side4"/>
- <Track from="side1" gauge="normal" to="side4"/>
- </Tile><Tile colour="brown" id="45" name="45">
- <Track from="side1" gauge="normal" to="side5"/>
- <Track from="side1" gauge="normal" to="side3"/>
- <Track from="side5" gauge="normal" to="side0"/>
- <Track from="side3" gauge="normal" to="side0"/>
- </Tile><Tile colour="brown" id="46" name="46">
- <Track from="side1" gauge="normal" to="side5"/>
- <Track from="side1" gauge="normal" to="side0"/>
- <Track from="side3" gauge="normal" to="side5"/>
- <Track from="side3" gauge="normal" to="side0"/>
- </Tile><Tile colour="brown" id="47" name="47">
- <Track from="side3" gauge="normal" to="side0"/>
- <Track from="side3" gauge="normal" to="side1"/>
- <Track from="side4" gauge="normal" to="side0"/>
- <Track from="side4" gauge="normal" to="side1"/>
- </Tile><Tile colour="brown" id="61" name="61">
- <Station id="city1" position="0" slots="1" type="City" value="60"/>
- <Track from="city1" gauge="normal" to="side1"/>
- <Track from="city1" gauge="normal" to="side3"/>
- <Track from="city1" gauge="normal" to="side5"/>
- <Track from="city1" gauge="normal" to="side0"/>
- </Tile><Tile colour="brown" id="62" name="62">
- <Station id="city1" position="302" slots="2" type="City" value="80"/>
- <Station id="city2" position="002" slots="2" type="City" value="80"/>
- <Track from="city1" gauge="normal" to="side3"/>
- <Track from="city1" gauge="normal" to="side4"/>
- <Track from="city2" gauge="normal" to="side5"/>
- <Track from="city2" gauge="normal" to="side0"/>
- </Tile><Tile colour="brown" id="63" name="63">
- <Station id="city1" position="0" slots="2" type="City" value="40"/>
- <Track from="city1" gauge="normal" to="side0"/>
- <Track from="city1" gauge="normal" to="side1"/>
- <Track from="city1" gauge="normal" to="side2"/>
- <Track from="city1" gauge="normal" to="side3"/>
- <Track from="city1" gauge="normal" to="side4"/>
- <Track from="city1" gauge="normal" to="side5"/>
- </Tile><Tile colour="brown" id="64" name="64">
- <Station id="city1" position="401" slots="1" type="City" value="50"/>
- <Station id="city2" position="052" slots="1" type="City" value="50"/>
- <Track from="city1" gauge="normal" to="side3"/>
- <Track from="city1" gauge="normal" to="side5"/>
- <Track from="city2" gauge="normal" to="side1"/>
- <Track from="city2" gauge="normal" to="side0"/>
- </Tile><Tile colour="brown" id="65" name="65">
- <Station id="city1" position="501" slots="1" type="City" value="50"/>
- <Station id="city2" position="252" slots="1" type="City" value="50"/>
- <Track from="city1" gauge="normal" to="side4"/>
- <Track from="city1" gauge="normal" to="side0"/>
- <Track from="city2" gauge="normal" to="side2"/>
- <Track from="city2" gauge="normal" to="side3"/>
- </Tile><Tile colour="brown" id="66" name="66">
- <Station id="city1" position="002" slots="1" type="City" value="50"/>
- <Station id="city2" position="452" slots="1" type="City" value="50"/>
- <Track from="city1" gauge="normal" to="side3"/>
- <Track from="city1" gauge="normal" to="side0"/>
- <Track from="city2" gauge="normal" to="side4"/>
- <Track from="city2" gauge="normal" to="side5"/>
- </Tile><Tile colour="brown" id="67" name="67">
- <Station id="city1" position="307" slots="1" type="City" value="50"/>
- <Station id="city2" position="502" slots="1" type="City" value="50"/>
- <Track from="city1" gauge="normal" to="side1"/>
- <Track from="city1" gauge="normal" to="side3"/>
- <Track from="city2" gauge="normal" to="side5"/>
- <Track from="city2" gauge="normal" to="side2"/>
- </Tile><Tile colour="brown" id="68" name="68">
- <Station id="city1" position="302" slots="1" type="City" value="50"/>
- <Station id="city2" position="502" slots="1" type="City" value="50"/>
- <Track from="city1" gauge="normal" to="side3"/>
- <Track from="city2" gauge="normal" to="side2"/>
- <Track from="city2" gauge="normal" to="side5"/>
- <Track from="city1" gauge="normal" to="side0"/>
- </Tile><Tile colour="brown" id="70" name="70">
- <Track from="side3" gauge="normal" to="side5"/>
- <Track from="side3" gauge="normal" to="side4"/>
- <Track from="side5" gauge="normal" to="side0"/>
- <Track from="side4" gauge="normal" to="side0"/>
- </Tile></Tiles>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Tiles>
+ <Tile colour="white" id="0" name="empty"/>
+ <Tile colour="white" id="-1" name="1 village">
+ <Station id="city1" position="002" type="Town"/>
+ </Tile>
+ <Tile colour="white" id="-2" name="2 villages">
+ <Station id="city1" position="102" type="Town"/>
+ <Station id="city2" position="302" type="Town"/>
+ </Tile>
+ <Tile colour="fixed" id="-3" name="MF 3">
+ <Station id="city1" position="352" type="Town" value="10"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ </Tile>
+ <Tile colour="fixed" id="-5" name="MF 5">
+ <Station id="city1" position="0" slots="1" type="City" value="20"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ </Tile>
+ <Tile colour="fixed" id="-7" name="MF 7">
+ <Track from="side2" gauge="normal" to="side1"/>
+ </Tile>
+ <Tile colour="white" id="-10" name="1 city">
+ <Station id="city1" position="302" slots="1" type="City"/>
+ </Tile>
+ <Tile colour="yellow" id="-11" name="B">
+ <Station id="city1" position="0" slots="1" type="City" value="30"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ </Tile>
+ <Tile colour="yellow" id="-20" name="2 cities">
+ <Station id="city1" position="002" slots="1" type="City"/>
+ <Station id="city2" position="302" slots="1" type="City"/>
+ </Tile>
+ <Tile colour="yellow" id="-21" name="NY">
+ <Station id="city1" position="202" slots="1" type="City" value="40"/>
+ <Station id="city2" position="502" slots="1" type="City" value="40"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ <Track from="city2" gauge="normal" to="side5"/>
+ </Tile>
+ <Tile colour="fixed" id="-58" name="MF 58">
+ <Station id="city1" position="301" type="Town" value="10"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ <Track from="city1" gauge="normal" to="side4"/>
+ </Tile>
+ <Tile colour="fixed" id="-101" name="Philadelphia">
+ <Station id="city1" position="0" slots="1" type="City" value="10"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ <Track from="city1" gauge="normal" to="side4"/>
+ <Track from="side4" gauge="normal" to="side1"/>
+ </Tile>
+ <Tile colour="fixed" id="-102" name="-102">
+ <Station id="city1" position="351" slots="1" type="City" value="20"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side4"/>
+ </Tile>
+ <Tile colour="fixed" id="-103" name="MF 103">
+ <Station id="city1" position="0" slots="1" type="City" value="40"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ </Tile>
+ <Tile colour="fixed" id="-104" name="MF 104">
+ <Station id="city1" position="0" slots="1" type="City" value="20"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ </Tile>
+ <Tile colour="fixed" id="-105" name="MF 105">
+ <Station id="city1" position="0" slots="1" type="City" value="30"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ </Tile>
+ <Tile colour="red" id="-901" name="OM 1 way">
+ <Station id="city1" position="0" type="OffMapCity" value="-1"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ </Tile>
+ <Tile colour="red" id="-902" name="OM 2 way">
+ <Station id="city1" position="0" type="OffMapCity" value="-1"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ </Tile>
+ <Tile colour="red" id="-903" name="OM 3 way">
+ <Station id="city1" position="0" type="OffMapCity" value="-1"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ </Tile>
+ <Tile colour="red" id="-908" name="OM wide curve">
+ <Track from="side0" gauge="normal" to="side2"/>
+ </Tile>
+ <Tile colour="red" id="-939" name="Goderich">
+ <Track from="side3" gauge="normal" to="side1"/>
+ <Track from="side3" gauge="normal" to="side2"/>
+ <Track from="side2" gauge="normal" to="side1"/>
+ </Tile>
+ <Tile colour="fixed" id="-30001" name="N of Boston">
+ <Track from="side3" gauge="normal" to="side5"/>
+ <Track from="side3" gauge="normal" to="side4"/>
+ </Tile>
+ <Tile colour="fixed" id="-30003" name="Altoon intern">
+ <Station id="city1" position="052" slots="1" type="City" value="10"/>
+ <Track from="side4" gauge="normal" to="side1"/>
+ <Track from="side4" gauge="normal" to="side2"/>
+ <Track from="side1" gauge="normal" to="side2"/>
+ <Track from="side4" gauge="normal" to="city1"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ </Tile>
+ <Tile colour="fixed" id="-30004" name="Coalfields">
+ <Station id="city1" position="0" type="Town"/>
+ <Track from="city1" gauge="normal" to="side4"/>
+ <Track from="city1" gauge="normal" to="side5"/>
+ <Track from="city1" gauge="normal" to="side0"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ </Tile>
+ <Tile colour="fixed" id="-30005" name="Norfolk">
+ <Station id="city1" position="0" slots="1" type="City"/>
+ <Track from="city1" gauge="normal" to="side4"/>
+ <Track from="city1" gauge="normal" to="side5"/>
+ </Tile>
+ <Tile colour="yellow" id="1" name="1">
+ <Station id="city1" position="408" type="Town" value="10"/>
+ <Station id="city2" position="108" type="Town" value="10"/>
+ <Track from="city1" gauge="normal" to="side0"/>
+ <Track from="city1" gauge="normal" to="side4"/>
+ <Track from="city2" gauge="normal" to="side1"/>
+ <Track from="city2" gauge="normal" to="side3"/>
+ </Tile>
+ <Tile colour="yellow" id="2" name="2">
+ <Station id="city1" position="302" type="Town" value="10"/>
+ <Station id="city2" position="109" type="Town" value="10"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side0"/>
+ <Track from="city2" gauge="normal" to="side1"/>
+ <Track from="city2" gauge="normal" to="side2"/>
+ </Tile>
+ <Tile colour="yellow" id="3" name="3">
+ <Station id="city1" position="452" type="Town" value="10"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side4"/>
+ </Tile>
+ <Tile colour="yellow" id="4" name="4">
+ <Station id="city1" position="0" type="Town" value="10"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="yellow" id="7" name="7">
+ <Track from="side3" gauge="normal" to="side4"/>
+ </Tile>
+ <Tile colour="yellow" id="8" name="8">
+ <Track from="side3" gauge="normal" to="side5"/>
+ </Tile>
+ <Tile colour="yellow" id="9" name="9">
+ <Track from="side3" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="yellow" id="55" name="55">
+ <Station id="city1" position="202" type="Town" value="10"/>
+ <Station id="city2" position="302" type="Town" value="10"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ <Track from="city1" gauge="normal" to="side5"/>
+ <Track from="city2" gauge="normal" to="side3"/>
+ <Track from="city2" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="yellow" id="56" name="56">
+ <Station id="city1" position="407" type="Town" value="10"/>
+ <Station id="city2" position="108" type="Town" value="10"/>
+ <Track from="city2" gauge="normal" to="side1"/>
+ <Track from="city2" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side4"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ </Tile>
+ <Tile colour="yellow" id="57" name="57">
+ <Station id="city1" position="0" slots="1" type="City" value="20"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="yellow" id="58" name="58">
+ <Station id="city1" position="401" type="Town" value="10"/>
+ <Track from="city1" gauge="normal" to="side5"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ </Tile>
+ <Tile colour="yellow" id="69" name="69">
+ <Station id="city1" position="407" type="Town" value="10"/>
+ <Station id="city2" position="002" type="Town" value="10"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ <Track from="city1" gauge="normal" to="side4"/>
+ <Track from="city2" gauge="normal" to="side0"/>
+ <Track from="city2" gauge="normal" to="side3"/>
+ </Tile>
+ <Tile colour="green" id="14" name="14">
+ <Station id="city1" position="0" slots="2" type="City" value="30"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side4"/>
+ <Track from="city1" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="green" id="15" name="15">
+ <Station id="city1" position="0" slots="2" type="City" value="30"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side4"/>
+ <Track from="city1" gauge="normal" to="side5"/>
+ <Track from="city1" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="green" id="16" name="16">
+ <Track from="side3" gauge="normal" to="side5"/>
+ <Track from="side4" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="green" id="18" name="18">
+ <Track from="side3" gauge="normal" to="side0"/>
+ <Track from="side4" gauge="normal" to="side5"/>
+ </Tile>
+ <Tile colour="green" id="19" name="19">
+ <Track from="side5" gauge="normal" to="side1"/>
+ <Track from="side0" gauge="normal" to="side3"/>
+ </Tile>
+ <Tile colour="green" id="20" name="20">
+ <Track from="side1" gauge="normal" to="side4"/>
+ <Track from="side3" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="green" id="23" name="23">
+ <Track from="side4" gauge="normal" to="side0"/>
+ <Track from="side0" gauge="normal" to="side3"/>
+ </Tile>
+ <Tile colour="green" id="24" name="24">
+ <Track from="side3" gauge="normal" to="side5"/>
+ <Track from="side3" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="green" id="25" name="25">
+ <Track from="side1" gauge="normal" to="side3"/>
+ <Track from="side3" gauge="normal" to="side5"/>
+ </Tile>
+ <Tile colour="green" id="26" name="26">
+ <Track from="side5" gauge="normal" to="side0"/>
+ <Track from="side0" gauge="normal" to="side3"/>
+ </Tile>
+ <Tile colour="green" id="27" name="27">
+ <Track from="side3" gauge="normal" to="side4"/>
+ <Track from="side3" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="green" id="28" name="28">
+ <Track from="side3" gauge="normal" to="side5"/>
+ <Track from="side4" gauge="normal" to="side5"/>
+ </Tile>
+ <Tile colour="green" id="29" name="29">
+ <Track from="side3" gauge="normal" to="side4"/>
+ <Track from="side3" gauge="normal" to="side5"/>
+ </Tile>
+ <Tile colour="green" id="53" name="53">
+ <Station id="city1" position="0" slots="1" type="City" value="50"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side5"/>
+ </Tile>
+ <Tile colour="green" id="2053" name="B Coalfields">
+ <Station id="city1" position="0" slots="2" type="City" value="50"/>
+ <Track from="city1" gauge="normal" to="side5"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ </Tile>
+ <Tile colour="green" id="54" name="54">
+ <Station id="city1" position="452" slots="1" type="City" value="60"/>
+ <Station id="city2" position="052" slots="1" type="City" value="60"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side4"/>
+ <Track from="city2" gauge="normal" to="side5"/>
+ <Track from="city2" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="green" id="59" name="59">
+ <Station id="city1" position="152" slots="1" type="City" value="40"/>
+ <Station id="city2" position="452" slots="1" type="City" value="40"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ <Track from="city2" gauge="normal" to="side3"/>
+ </Tile>
+ <Tile colour="brown" id="39" name="39">
+ <Track from="side3" gauge="normal" to="side4"/>
+ <Track from="side3" gauge="normal" to="side5"/>
+ <Track from="side4" gauge="normal" to="side5"/>
+ </Tile>
+ <Tile colour="brown" id="40" name="40">
+ <Track from="side1" gauge="normal" to="side3"/>
+ <Track from="side1" gauge="normal" to="side5"/>
+ <Track from="side3" gauge="normal" to="side5"/>
+ </Tile>
+ <Tile colour="brown" id="41" name="41">
+ <Track from="side4" gauge="normal" to="side0"/>
+ <Track from="side4" gauge="normal" to="side3"/>
+ <Track from="side0" gauge="normal" to="side3"/>
+ </Tile>
+ <Tile colour="brown" id="42" name="42">
+ <Track from="side3" gauge="normal" to="side5"/>
+ <Track from="side3" gauge="normal" to="side0"/>
+ <Track from="side5" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="brown" id="43" name="43">
+ <Track from="side3" gauge="normal" to="side5"/>
+ <Track from="side3" gauge="normal" to="side0"/>
+ <Track from="side4" gauge="normal" to="side5"/>
+ <Track from="side4" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="brown" id="44" name="44">
+ <Track from="side3" gauge="normal" to="side0"/>
+ <Track from="side1" gauge="normal" to="side0"/>
+ <Track from="side3" gauge="normal" to="side4"/>
+ <Track from="side1" gauge="normal" to="side4"/>
+ </Tile>
+ <Tile colour="brown" id="45" name="45">
+ <Track from="side1" gauge="normal" to="side5"/>
+ <Track from="side1" gauge="normal" to="side3"/>
+ <Track from="side5" gauge="normal" to="side0"/>
+ <Track from="side3" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="brown" id="46" name="46">
+ <Track from="side1" gauge="normal" to="side5"/>
+ <Track from="side1" gauge="normal" to="side0"/>
+ <Track from="side3" gauge="normal" to="side5"/>
+ <Track from="side3" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="brown" id="47" name="47">
+ <Track from="side3" gauge="normal" to="side0"/>
+ <Track from="side3" gauge="normal" to="side1"/>
+ <Track from="side4" gauge="normal" to="side0"/>
+ <Track from="side4" gauge="normal" to="side1"/>
+ </Tile>
+ <Tile colour="brown" id="61" name="61">
+ <Station id="city1" position="0" slots="1" type="City" value="60"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side5"/>
+ <Track from="city1" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="brown" id="1061" name="B Coalfields">
+ <Station id="city1" position="0" slots="2" type="City" value="60"/>
+ <Track from="city1" gauge="normal" to="side0"/>
+ <Track from="city1" gauge="normal" to="side5"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ </Tile>
+ <Tile colour="brown" id="2061" name="BA Coalfields">
+ <Station id="city1" position="0" slots="3" type="City" value="60"/>
+ <Track from="city1" gauge="normal" to="side0"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side4"/>
+ </Tile>
+ <Tile colour="brown" id="62" name="62">
+ <Station id="city1" position="302" slots="2" type="City" value="80"/>
+ <Station id="city2" position="002" slots="2" type="City" value="80"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side4"/>
+ <Track from="city2" gauge="normal" to="side5"/>
+ <Track from="city2" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="brown" id="1062" name="NY Coalfields">
+ <Station id="city1" position="0" slots="4" type="City" value="80"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ <Track from="city1" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="brown" id="63" name="63">
+ <Station id="city1" position="0" slots="2" type="City" value="40"/>
+ <Track from="city1" gauge="normal" to="side0"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side4"/>
+ <Track from="city1" gauge="normal" to="side5"/>
+ </Tile>
+ <Tile colour="brown" id="64" name="64">
+ <Station id="city1" position="401" slots="1" type="City" value="50"/>
+ <Station id="city2" position="152" slots="1" type="City" value="50"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side5"/>
+ <Track from="city2" gauge="normal" to="side1"/>
+ <Track from="city2" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="brown" id="65" name="65">
+ <Station id="city1" position="501" slots="1" type="City" value="50"/>
+ <Station id="city2" position="352" slots="1" type="City" value="50"/>
+ <Track from="city1" gauge="normal" to="side4"/>
+ <Track from="city1" gauge="normal" to="side0"/>
+ <Track from="city2" gauge="normal" to="side2"/>
+ <Track from="city2" gauge="normal" to="side3"/>
+ </Tile>
+ <Tile colour="brown" id="66" name="66">
+ <Station id="city1" position="002" slots="1" type="City" value="50"/>
+ <Station id="city2" position="552" slots="1" type="City" value="50"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side0"/>
+ <Track from="city2" gauge="normal" to="side4"/>
+ <Track from="city2" gauge="normal" to="side5"/>
+ </Tile>
+ <Tile colour="brown" id="67" name="67">
+ <Station id="city1" position="307" slots="1" type="City" value="50"/>
+ <Station id="city2" position="502" slots="1" type="City" value="50"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city2" gauge="normal" to="side5"/>
+ <Track from="city2" gauge="normal" to="side2"/>
+ </Tile>
+ <Tile colour="brown" id="68" name="68">
+ <Station id="city1" position="302" slots="1" type="City" value="50"/>
+ <Station id="city2" position="502" slots="1" type="City" value="50"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city2" gauge="normal" to="side2"/>
+ <Track from="city2" gauge="normal" to="side5"/>
+ <Track from="city1" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="brown" id="70" name="70">
+ <Track from="side3" gauge="normal" to="side5"/>
+ <Track from="side3" gauge="normal" to="side4"/>
+ <Track from="side5" gauge="normal" to="side0"/>
+ <Track from="side4" gauge="normal" to="side0"/>
+ </Tile>
+ <Tile colour="brown" id="1717" name="G17">
+ <Station id="city1" position="0" type="Town" value="20"/>
+ <Track from="city1" gauge="normal" to="side0"/>
+ <Track from="city1" gauge="normal" to="side1"/>
+ <Track from="city1" gauge="normal" to="side2"/>
+ <Track from="city1" gauge="normal" to="side3"/>
+ <Track from="city1" gauge="normal" to="side4"/>
+ </Tile>
+</Tiles>
\ No newline at end of file
Modified: trunk/18xx/data/GamesList.xml
===================================================================
--- trunk/18xx/data/GamesList.xml 2011-02-11 22:53:26 UTC (rev 1484)
+++ trunk/18xx/data/GamesList.xml 2011-02-13 18:07:34 UTC (rev 1485)
@@ -10,6 +10,7 @@
Limitations:
- The M&H/NYC share swap can only be executed in the SR, in the owning player's turn.
- Privates cannot be traded between players.
+- The Coalfields variant is currently in development stage.
</Description>
<!-- GAME OPTIONS must have:
- a name, which must also exist as an entry in LocalText.properties,
@@ -21,7 +22,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" default="Basegame" />
+ <Option name="Variant" values="Basegame,Pere Marquette,Coalfields" 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/TileManager.java
===================================================================
--- trunk/18xx/rails/game/TileManager.java 2011-02-11 22:53:26 UTC (rev 1484)
+++ trunk/18xx/rails/game/TileManager.java 2011-02-13 18:07:34 UTC (rev 1485)
@@ -3,6 +3,8 @@
import java.util.*;
+import org.apache.log4j.Logger;
+
import rails.util.LocalText;
import rails.util.Tag;
@@ -14,6 +16,9 @@
// private static List<String> directories = new ArrayList<String>();
private List<String> directories = new ArrayList<String>();
+ protected static Logger log =
+ Logger.getLogger(TileManager.class.getPackage().getName());
+
/**
* No-args constructor.
*/
@@ -85,8 +90,7 @@
throw new ConfigurationException(LocalText.getText(
"DuplicateTileID", String.valueOf(tileId)));
} else if (!tileSetMap.containsKey(tileId)) {
- throw new ConfigurationException(LocalText.getText(
- "TileMissingInTileSet", String.valueOf(tileId)));
+ log.warn ("Tile #"+tileId+" exists in Tiles.xml but not in TileSet.xml (this can be OK if the tile only exists in some variants");
}
tileDefMap.put(tileId, tileDefTag);
}
Modified: trunk/18xx/rails/util/Tag.java
===================================================================
--- trunk/18xx/rails/util/Tag.java 2011-02-11 22:53:26 UTC (rev 1484)
+++ trunk/18xx/rails/util/Tag.java 2011-02-13 18:07:34 UTC (rev 1485)
@@ -265,6 +265,8 @@
String childTagName;
Node attribute;
String name, value;
+ List<String> valueList;
+ String[] valueArray;
StringBuffer textBuffer = new StringBuffer();
for (int i = 0; i < childNodes.getLength(); i++) {
@@ -297,6 +299,7 @@
throw new ConfigurationException(
"IfOption has no optionValue attribute");
value = valueAttr.getNodeValue();
+ valueList = Arrays.asList(value.split(","));
// Check if the option has been chosen; if not, skip the
// rest
@@ -327,7 +330,8 @@
}
- if (optionValue.equalsIgnoreCase(value)) {
+ //if (optionValue.equalsIgnoreCase(value)) {
+ if (valueList.contains(optionValue)) {
parseSubTags(childElement);
}
} else {
Property changes on: trunk/18xx/tiles
___________________________________________________________________
Modified: svn:ignore
- Copy of TileDictionary.18t
handmade
TDwithID
TDwoID
xml
tileimages.xml
Copy (2) of TileDictionary.18t
Copy (3) of TileDictionary.18t
Rails18xx.ini
UserGridStyle.ini
UserTileStyle.ini
+ Copy of TileDictionary.18t
handmade
TDwithID
TDwoID
xml
tileimages.xml
Copy (2) of TileDictionary.18t
Copy (3) of TileDictionary.18t
Rails18xx.ini
UserGridStyle.ini
UserTileStyle.ini
*.exe
o
Modified: trunk/18xx/tiles/TileDictionary.18t
===================================================================
(Binary files differ)
Modified: trunk/18xx/tiles/TileDictionary.xml
===================================================================
--- trunk/18xx/tiles/TileDictionary.xml 2011-02-11 22:53:26 UTC (rev 1484)
+++ trunk/18xx/tiles/TileDictionary.xml 2011-02-13 18:07:34 UTC (rev 1485)
@@ -20197,7 +20197,7 @@
<ID>119</ID>
...
[truncated message content] |
