Menu
▾
▴
rails-commits
|
From: Erik V. <ev...@us...> - 2011-10-07 12:44:18
|
data/1825/Tiles.xml | 2
data/1830/Tiles.xml | 60 ++++++------
data/1835/Tiles.xml | 34 +++----
tiles/Tiles.xml | 210 ++++++++++++++++++++++-----------------------
tools/ConvertTilesXML.java | 98 ++++++++++-----------
tools/formatxml.pl | 23 ++++
6 files changed, 227 insertions(+), 200 deletions(-)
New commits:
commit 9fd64c124f5f348217c0273bf54250707b8b2dd1
Author: Erik Vos <eri...@xs...>
Date: Fri Oct 7 14:41:44 2011 +0200
Fixed positioning bug of base tokens on corner-facing cities.
This was a bug in ConvertXML.java.
Replaced Tiles.xml: generic, 1825, 1830 and 1835 versions.
Added "universal" XML formatting Perl script under tools.
diff --git a/data/1825/Tiles.xml b/data/1825/Tiles.xml
index 0c98c87..dcb52ce 100644
--- a/data/1825/Tiles.xml
+++ b/data/1825/Tiles.xml
@@ -396,4 +396,4 @@
<Track from="city2" gauge="normal" to="side5"/>
<Track from="city1" gauge="normal" to="side0"/>
</Tile>
-</Tiles>
\ No newline at end of file
+</Tiles>
diff --git a/data/1830/Tiles.xml b/data/1830/Tiles.xml
index be5762d..c082f65 100644
--- a/data/1830/Tiles.xml
+++ b/data/1830/Tiles.xml
@@ -9,7 +9,7 @@
<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"/>
+ <Station id="city1" position="252" type="Town" value="10"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city1" gauge="normal" to="side3"/>
</Tile>
@@ -51,7 +51,7 @@
<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"/>
+ <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"/>
@@ -88,12 +88,11 @@
<Tile colour="red" id="-908" name="OM wide curve">
<Track from="side0" gauge="normal" to="side2"/>
</Tile>
- <Tile colour="red" id="-939" name="Goderich">
- <Station id="city1" position="0" slots="0" type="City" value="-1"/>
- <Track from="side1" gauge="normal" to="city1"/>
- <Track from="side2" gauge="normal" to="city1"/>
- <Track from="side3" gauge="normal" to="city1"/>
- </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="-25007" name="Bournemouth">
<Station id="city1" position="0" slots="1" type="City" value="20"/>
<Station id="city2" position="0" slots="1" type="City" value="20"/>
@@ -106,7 +105,7 @@
<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"/>
+ <Station id="city1" position="552" 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"/>
@@ -128,7 +127,7 @@
<Track from="city1" gauge="normal" to="side5"/>
</Tile>
<Tile colour="fixed" id="-30007" name="Reading intern">
- <Station id="city1" position="052" slots="1" type="City" value="10"/>
+ <Station id="city1" position="552" 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="side3"/>
@@ -155,7 +154,7 @@
<Track from="city2" gauge="normal" to="side2"/>
</Tile>
<Tile colour="yellow" id="3" name="3">
- <Station id="city1" position="452" type="Town" value="10"/>
+ <Station id="city1" position="352" type="Town" value="10"/>
<Track from="city1" gauge="normal" to="side3"/>
<Track from="city1" gauge="normal" to="side4"/>
</Tile>
@@ -278,16 +277,16 @@
<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"/>
+ <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="152" slots="1" type="City" value="40"/>
- <Station id="city2" position="452" slots="1" type="City" value="40"/>
+ <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>
@@ -389,7 +388,7 @@
</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"/>
+ <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"/>
@@ -397,7 +396,7 @@
</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"/>
+ <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"/>
@@ -405,7 +404,7 @@
</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"/>
+ <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"/>
@@ -433,26 +432,27 @@
<Track from="side5" gauge="normal" to="side0"/>
<Track from="side4" gauge="normal" to="side0"/>
</Tile>
- <Tile colour="gray" id="124" name="124">
- <Station id="city1" position="0" slots="4" type="City" value="100"/>
- <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"/>
- </Tile>
- <Tile colour="brown" id="368" name="1889 dc K brown">
- <Station id="city1" position="0" slots="2" type="City" value="40"/>
+ <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>
- <Tile colour="brown" id="1717" name="G17">
- <Station id="city1" position="0" type="Town" value="20"/>
+ <Tile colour="gray" id="124" name="124">
+ <Station id="city1" position="0" slots="4" type="City" value="100"/>
<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"/>
+ </Tile>
+ <Tile colour="gray" id="368" name="368">
+ <Station id="city1" position="0" slots="2" type="City" value="70"/>
+ <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="side3"/>
<Track from="city1" gauge="normal" to="side4"/>
</Tile>
<Tile colour="brown" id="448" name="1889 dc K brown">
@@ -462,4 +462,4 @@
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city1" gauge="normal" to="side3"/>
</Tile>
-</Tiles>
\ No newline at end of file
+</Tiles>
diff --git a/data/1835/Tiles.xml b/data/1835/Tiles.xml
index dd53c67..fb95273 100644
--- a/data/1835/Tiles.xml
+++ b/data/1835/Tiles.xml
@@ -9,7 +9,7 @@
<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"/>
+ <Station id="city1" position="252" type="Town" value="10"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city1" gauge="normal" to="side3"/>
</Tile>
@@ -55,7 +55,7 @@
<Track from="city1" gauge="normal" to="side3"/>
</Tile>
<Tile colour="fixed" id="-801" name="Emden">
- <Station id="city1" position="452" type="Town" value="10"/>
+ <Station id="city1" position="352" type="Town" value="10"/>
<Station id="city2" position="202" type="Town" value="10"/>
<Track from="city1" gauge="normal" to="side4"/>
<Track from="city1" gauge="normal" to="side3"/>
@@ -69,7 +69,7 @@
</Tile>
<Tile colour="green" id="-803" name="Hamburg">
<Station id="city1" position="502" slots="1" type="City" value="20"/>
- <Station id="city2" position="152" slots="1" type="City" value="40"/>
+ <Station id="city2" position="052" slots="1" type="City" value="40"/>
<Station id="city3" position="302" slots="1" type="City" value="40"/>
<Track from="city1" gauge="normal" to="side5"/>
<Track from="city2" gauge="normal" to="side0"/>
@@ -84,7 +84,7 @@
<Track from="city1" gauge="normal" to="side2"/>
</Tile>
<Tile colour="fixed" id="-805" name="Oldenburg">
- <Station id="city1" position="151" slots="1" type="City" value="10"/>
+ <Station id="city1" position="051" slots="1" type="City" value="10"/>
<Track from="city1" gauge="normal" to="side5"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side1"/>
@@ -114,8 +114,8 @@
<Track from="city1" gauge="normal" to="side3"/>
</Tile>
<Tile colour="green" id="-810" name="Nurnberg">
- <Station id="city1" position="052" slots="1" type="City" value="30"/>
- <Station id="city2" position="352" slots="1" type="City" value="30"/>
+ <Station id="city1" position="552" slots="1" type="City" value="30"/>
+ <Station id="city2" position="252" slots="1" type="City" value="30"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side5"/>
<Track from="city2" gauge="normal" to="side2"/>
@@ -145,7 +145,7 @@
<Track from="city2" gauge="normal" to="side2"/>
</Tile>
<Tile colour="yellow" id="3" name="3">
- <Station id="city1" position="452" type="Town" value="10"/>
+ <Station id="city1" position="352" type="Town" value="10"/>
<Track from="city1" gauge="normal" to="side3"/>
<Track from="city1" gauge="normal" to="side4"/>
</Tile>
@@ -350,39 +350,39 @@
</Tile>
<Tile colour="green" id="210" name="210">
<Station id="city1" position="502" slots="1" type="City" value="30"/>
- <Station id="city2" position="152" slots="1" type="City" value="30"/>
+ <Station id="city2" position="052" slots="1" type="City" value="30"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city1" gauge="normal" to="side5"/>
<Track from="city2" gauge="normal" to="side0"/>
<Track from="city2" gauge="normal" to="side1"/>
</Tile>
<Tile colour="green" id="211" name="211">
- <Station id="city1" position="352" slots="1" type="City" value="30"/>
- <Station id="city2" position="552" slots="1" type="City" value="30"/>
+ <Station id="city1" position="252" slots="1" type="City" value="30"/>
+ <Station id="city2" position="452" slots="1" type="City" value="30"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city1" gauge="normal" to="side3"/>
<Track from="city2" gauge="normal" to="side4"/>
<Track from="city2" gauge="normal" to="side5"/>
</Tile>
<Tile colour="green" id="212" name="212">
- <Station id="city1" position="252" slots="1" type="City" value="30"/>
- <Station id="city2" position="552" slots="1" type="City" value="30"/>
+ <Station id="city1" position="152" slots="1" type="City" value="30"/>
+ <Station id="city2" position="452" slots="1" type="City" value="30"/>
<Track from="city1" gauge="normal" to="side1"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city2" gauge="normal" to="side4"/>
<Track from="city2" gauge="normal" to="side5"/>
</Tile>
<Tile colour="green" id="213" name="213">
- <Station id="city1" position="251" slots="1" type="City" value="30"/>
- <Station id="city2" position="552" slots="1" type="City" value="30"/>
+ <Station id="city1" position="151" slots="1" type="City" value="30"/>
+ <Station id="city2" position="452" slots="1" type="City" value="30"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city2" gauge="normal" to="side4"/>
<Track from="city2" gauge="normal" to="side5"/>
</Tile>
<Tile colour="green" id="214" name="214">
- <Station id="city1" position="351" slots="1" type="City" value="30"/>
- <Station id="city2" position="052" slots="1" type="City" value="30"/>
+ <Station id="city1" position="251" slots="1" type="City" value="30"/>
+ <Station id="city2" position="552" slots="1" type="City" value="30"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city1" gauge="normal" to="side4"/>
<Track from="city2" gauge="normal" to="side0"/>
@@ -508,4 +508,4 @@
<Track from="city1" gauge="normal" to="side4"/>
<Track from="city1" gauge="normal" to="side5"/>
</Tile>
-</Tiles>
\ No newline at end of file
+</Tiles>
diff --git a/tiles/Tiles.xml b/tiles/Tiles.xml
index 0e12a27..fc210d3 100644
--- a/tiles/Tiles.xml
+++ b/tiles/Tiles.xml
@@ -25,7 +25,7 @@
<Track from="city1" gauge="normal" to="side2"/>
</Tile>
<Tile colour="fixed" id="-102" name="-102">
- <Station id="city1" position="351" slots="1" type="City" value="20"/>
+ <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"/>
@@ -79,7 +79,7 @@
<Track from="city2" gauge="normal" to="side2"/>
</Tile>
<Tile colour="yellow" id="3" name="3">
- <Station id="city1" position="452" type="Town" value="10"/>
+ <Station id="city1" position="352" type="Town" value="10"/>
<Track from="city1" gauge="normal" to="side3"/>
<Track from="city1" gauge="normal" to="side4"/>
</Tile>
@@ -118,8 +118,8 @@
<Track from="side3" gauge="normal" to="side0"/>
</Tile>
<Tile colour="green" id="10" name="10">
- <Station id="city1" position="052" slots="1" type="City" value="30"/>
- <Station id="city2" position="352" slots="1" type="City" value="30"/>
+ <Station id="city1" position="552" slots="1" type="City" value="30"/>
+ <Station id="city2" position="252" slots="1" type="City" value="30"/>
<Track from="city1" gauge="normal" to="side5"/>
<Track from="city2" gauge="normal" to="side2"/>
</Tile>
@@ -261,8 +261,8 @@
<Track from="city3" gauge="normal" to="side4"/>
</Tile>
<Tile colour="brown" id="34" name="34">
- <Station id="city1" position="452" slots="1" type="City" value="50"/>
- <Station id="city2" position="152" slots="1" type="City" value="50"/>
+ <Station id="city1" position="352" slots="1" type="City" value="50"/>
+ <Station id="city2" position="052" slots="1" type="City" value="50"/>
<Station id="city3" position="502" slots="1" type="City" value="50"/>
<Track from="city2" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side4"/>
@@ -286,8 +286,8 @@
<Track from="city2" gauge="normal" to="side5"/>
</Tile>
<Tile colour="brown" id="37" name="37">
- <Station id="city1" position="152" slots="1" type="City" value="40"/>
- <Station id="city2" position="452" slots="1" type="City" value="40"/>
+ <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="side2"/>
<Track from="city2" gauge="normal" to="side5"/>
<Track from="side2" gauge="normal" to="side5"/>
@@ -378,8 +378,8 @@
</Tile>
<Tile colour="gray" id="50" name="50">
<Station id="city1" position="502" slots="1" type="City" value="70"/>
- <Station id="city2" position="152" slots="1" type="City" value="70"/>
- <Station id="city3" position="452" slots="1" type="City" value="70"/>
+ <Station id="city2" position="052" slots="1" type="City" value="70"/>
+ <Station id="city3" position="352" slots="1" type="City" value="70"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city1" gauge="normal" to="side5"/>
<Track from="city2" gauge="normal" to="side0"/>
@@ -416,8 +416,8 @@
<Track from="city1" gauge="normal" to="side4"/>
</Tile>
<Tile colour="green" id="1052" name="52">
- <Station id="city1" position="252" slots="1" type="City" value="40"/>
- <Station id="city2" position="552" slots="1" type="City" value="40"/>
+ <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="side2"/>
<Track from="city2" gauge="normal" to="side4"/>
</Tile>
@@ -434,8 +434,8 @@
<Track from="city1" gauge="normal" to="side4"/>
</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"/>
+ <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"/>
@@ -468,8 +468,8 @@
<Track from="city1" gauge="normal" to="side3"/>
</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"/>
+ <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>
@@ -538,7 +538,7 @@
</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"/>
+ <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"/>
@@ -546,7 +546,7 @@
</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"/>
+ <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"/>
@@ -554,7 +554,7 @@
</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"/>
+ <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"/>
@@ -617,7 +617,7 @@
<Track from="side5" gauge="normal" to="side3"/>
</Tile>
<Tile colour="yellow" id="72" name="72">
- <Station id="city1" position="352" type="Town" value="10"/>
+ <Station id="city1" position="252" type="Town" value="10"/>
<Track from="city1" gauge="narrow" to="side2"/>
<Track from="city1" gauge="narrow" to="side3"/>
</Tile>
@@ -1144,7 +1144,7 @@
<Track from="city1" gauge="normal" to="side5"/>
</Tile>
<Tile colour="green" id="2116" name="116">
- <Station id="city1" position="452" type="Town" value="20"/>
+ <Station id="city1" position="352" type="Town" value="20"/>
<Track from="side5" gauge="normal" to="side2"/>
<Track from="city1" gauge="normal" to="side3"/>
<Track from="city1" gauge="normal" to="side4"/>
@@ -1168,8 +1168,8 @@
<Track from="side2" gauge="normal" to="side5"/>
</Tile>
<Tile colour="green" id="120" name="120">
- <Station id="city1" position="152" slots="1" type="City" value="60"/>
- <Station id="city2" position="352" slots="1" type="City" value="60"/>
+ <Station id="city1" position="052" slots="1" type="City" value="60"/>
+ <Station id="city2" position="252" slots="1" type="City" value="60"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side1"/>
<Track from="city2" gauge="normal" to="side2"/>
@@ -1236,14 +1236,14 @@
<Track from="city1" gauge="normal" to="side5"/>
</Tile>
<Tile colour="yellow" id="128" name="128">
- <Station id="city1" position="252" slots="1" type="City" value="30"/>
- <Station id="city2" position="552" slots="1" type="City" value="30"/>
+ <Station id="city1" position="152" slots="1" type="City" value="30"/>
+ <Station id="city2" position="452" slots="1" type="City" value="30"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city2" gauge="normal" to="side4"/>
</Tile>
<Tile colour="green" id="129" name="129">
<Station id="city1" position="002" slots="2" type="City" value="50"/>
- <Station id="city2" position="352" slots="1" type="City" value="50"/>
+ <Station id="city2" position="252" slots="1" type="City" value="50"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side1"/>
<Track from="city2" gauge="normal" to="side2"/>
@@ -1506,39 +1506,39 @@
</Tile>
<Tile colour="green" id="210" name="210">
<Station id="city1" position="502" slots="1" type="City" value="30"/>
- <Station id="city2" position="152" slots="1" type="City" value="30"/>
+ <Station id="city2" position="052" slots="1" type="City" value="30"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city1" gauge="normal" to="side5"/>
<Track from="city2" gauge="normal" to="side0"/>
<Track from="city2" gauge="normal" to="side1"/>
</Tile>
<Tile colour="green" id="211" name="211">
- <Station id="city1" position="352" slots="1" type="City" value="30"/>
- <Station id="city2" position="552" slots="1" type="City" value="30"/>
+ <Station id="city1" position="252" slots="1" type="City" value="30"/>
+ <Station id="city2" position="452" slots="1" type="City" value="30"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city1" gauge="normal" to="side3"/>
<Track from="city2" gauge="normal" to="side4"/>
<Track from="city2" gauge="normal" to="side5"/>
</Tile>
<Tile colour="green" id="212" name="212">
- <Station id="city1" position="252" slots="1" type="City" value="30"/>
- <Station id="city2" position="552" slots="1" type="City" value="30"/>
+ <Station id="city1" position="152" slots="1" type="City" value="30"/>
+ <Station id="city2" position="452" slots="1" type="City" value="30"/>
<Track from="city1" gauge="normal" to="side1"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city2" gauge="normal" to="side4"/>
<Track from="city2" gauge="normal" to="side5"/>
</Tile>
<Tile colour="green" id="213" name="213">
- <Station id="city1" position="251" slots="1" type="City" value="30"/>
- <Station id="city2" position="552" slots="1" type="City" value="30"/>
+ <Station id="city1" position="151" slots="1" type="City" value="30"/>
+ <Station id="city2" position="452" slots="1" type="City" value="30"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city2" gauge="normal" to="side4"/>
<Track from="city2" gauge="normal" to="side5"/>
</Tile>
<Tile colour="green" id="214" name="214">
- <Station id="city1" position="351" slots="1" type="City" value="30"/>
- <Station id="city2" position="052" slots="1" type="City" value="30"/>
+ <Station id="city1" position="251" slots="1" type="City" value="30"/>
+ <Station id="city2" position="552" slots="1" type="City" value="30"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city1" gauge="normal" to="side4"/>
<Track from="city2" gauge="normal" to="side0"/>
@@ -1624,8 +1624,8 @@
</Tile>
<Tile colour="green" id="1221" name="221">
<Station id="city1" position="202" slots="1" type="City" value="60"/>
- <Station id="city2" position="152" slots="1" type="City" value="60"/>
- <Station id="city3" position="552" slots="1" type="City" value="60"/>
+ <Station id="city2" position="052" slots="1" type="City" value="60"/>
+ <Station id="city3" position="452" slots="1" type="City" value="60"/>
<Track from="city2" gauge="normal" to="side1"/>
<Track from="city2" gauge="normal" to="side0"/>
<Track from="city3" gauge="normal" to="side5"/>
@@ -1633,9 +1633,9 @@
<Track from="city1" gauge="normal" to="side2"/>
</Tile>
<Tile colour="brown" id="262" name="262">
- <Station id="city1" position="052" slots="2" type="City" value="80"/>
- <Station id="city2" position="252" slots="2" type="City" value="80"/>
- <Station id="city3" position="452" slots="1" type="City" value="80"/>
+ <Station id="city1" position="552" slots="2" type="City" value="80"/>
+ <Station id="city2" position="152" slots="2" type="City" value="80"/>
+ <Station id="city3" position="352" slots="1" type="City" value="80"/>
<Track from="city1" gauge="normal" to="side5"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city2" gauge="normal" to="side1"/>
@@ -1643,34 +1643,34 @@
<Track from="city3" gauge="normal" to="side3"/>
</Tile>
<Tile colour="yellow" id="301" name="301">
- <Station id="city1" position="152" slots="1" type="City" value="50"/>
- <Station id="city2" position="352" slots="1" type="City" value="50"/>
- <Station id="city3" position="552" slots="1" type="City" value="50"/>
+ <Station id="city1" position="052" slots="1" type="City" value="50"/>
+ <Station id="city2" position="252" slots="1" type="City" value="50"/>
+ <Station id="city3" position="452" slots="1" type="City" value="50"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city2" gauge="normal" to="side2"/>
<Track from="city3" gauge="normal" to="side4"/>
<Track from="city3" gauge="normal" to="side5"/>
</Tile>
<Tile colour="yellow" id="302" name="302">
- <Station id="city1" position="052" slots="1" type="City" value="50"/>
- <Station id="city2" position="252" slots="1" type="City" value="50"/>
- <Station id="city3" position="452" slots="1" type="City" value="50"/>
+ <Station id="city1" position="552" slots="1" type="City" value="50"/>
+ <Station id="city2" position="152" slots="1" type="City" value="50"/>
+ <Station id="city3" position="352" slots="1" type="City" value="50"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side5"/>
<Track from="city2" gauge="normal" to="side2"/>
<Track from="city3" gauge="normal" to="side4"/>
</Tile>
<Tile colour="green" id="311" name="311">
- <Station id="city1" position="152" slots="1" type="City" value="60"/>
- <Station id="city2" position="451" slots="2" type="City" value="60"/>
+ <Station id="city1" position="052" slots="1" type="City" value="60"/>
+ <Station id="city2" position="351" slots="2" type="City" value="60"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city2" gauge="normal" to="side2"/>
<Track from="city2" gauge="normal" to="side4"/>
<Track from="city2" gauge="normal" to="side5"/>
</Tile>
<Tile colour="green" id="312" name="312">
- <Station id="city1" position="151" slots="2" type="City" value="60"/>
- <Station id="city2" position="452" slots="1" type="City" value="60"/>
+ <Station id="city1" position="051" slots="2" type="City" value="60"/>
+ <Station id="city2" position="352" slots="1" type="City" value="60"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city1" gauge="normal" to="side5"/>
@@ -1792,8 +1792,8 @@
<Track from="city1" gauge="normal" to="side3"/>
</Tile>
<Tile colour="brown" id="362" name="362">
- <Station id="city1" position="251" slots="2" type="City" value="70"/>
- <Station id="city2" position="552" slots="1" type="City" value="70"/>
+ <Station id="city1" position="151" slots="2" type="City" value="70"/>
+ <Station id="city2" position="452" slots="1" type="City" value="70"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side1"/>
<Track from="city2" gauge="normal" to="side5"/>
@@ -2394,7 +2394,7 @@
</Tile>
<Tile colour="yellow" id="630" name="630">
<Station id="city1" position="101" type="Town" value="10"/>
- <Station id="city2" position="552" type="Town" value="10"/>
+ <Station id="city2" position="452" type="Town" value="10"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city2" gauge="normal" to="side4"/>
@@ -2402,23 +2402,23 @@
</Tile>
<Tile colour="yellow" id="631" name="631">
<Station id="city1" position="301" type="Town" value="10"/>
- <Station id="city2" position="052" type="Town" value="10"/>
+ <Station id="city2" position="552" 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="side5"/>
</Tile>
<Tile colour="yellow" id="632" name="632">
- <Station id="city1" position="252" type="Town" value="10"/>
- <Station id="city2" position="452" type="Town" value="10"/>
+ <Station id="city1" position="152" type="Town" value="10"/>
+ <Station id="city2" position="352" type="Town" value="10"/>
<Track from="city1" gauge="normal" to="side1"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city2" gauge="normal" to="side3"/>
<Track from="city2" gauge="normal" to="side4"/>
</Tile>
<Tile colour="yellow" id="633" name="633">
- <Station id="city1" position="152" type="Town" value="10"/>
- <Station id="city2" position="452" type="Town" value="10"/>
+ <Station id="city1" position="052" type="Town" value="10"/>
+ <Station id="city2" position="352" type="Town" value="10"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side1"/>
<Track from="city2" gauge="normal" to="side3"/>
@@ -2874,8 +2874,8 @@
<Track from="city1" gauge="normal" to="side5"/>
</Tile>
<Tile colour="brown" id="984" name="984">
- <Station id="city1" position="352" slots="1" type="City" value="50"/>
- <Station id="city2" position="552" slots="1" type="City" value="50"/>
+ <Station id="city1" position="252" slots="1" type="City" value="50"/>
+ <Station id="city2" position="452" slots="1" type="City" value="50"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city1" gauge="normal" to="side3"/>
<Track from="city2" gauge="normal" to="side4"/>
@@ -2953,7 +2953,7 @@
<Track from="city1" gauge="normal" to="side5"/>
</Tile>
<Tile colour="fixed" id="-3" name="MF 3">
- <Station id="city1" position="352" type="Town" value="10"/>
+ <Station id="city1" position="252" type="Town" value="10"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city1" gauge="normal" to="side3"/>
</Tile>
@@ -3074,7 +3074,7 @@
<Track from="city1" gauge="normal" to="side3"/>
</Tile>
<Tile colour="fixed" id="-801" name="Emden">
- <Station id="city1" position="452" type="Town" value="10"/>
+ <Station id="city1" position="352" type="Town" value="10"/>
<Station id="city2" position="202" type="Town" value="10"/>
<Track from="city1" gauge="normal" to="side4"/>
<Track from="city1" gauge="normal" to="side3"/>
@@ -3088,7 +3088,7 @@
</Tile>
<Tile colour="green" id="-803" name="Hamburg">
<Station id="city1" position="502" slots="1" type="City" value="20"/>
- <Station id="city2" position="152" slots="1" type="City" value="40"/>
+ <Station id="city2" position="052" slots="1" type="City" value="40"/>
<Station id="city3" position="302" slots="1" type="City" value="40"/>
<Track from="city1" gauge="normal" to="side5"/>
<Track from="city2" gauge="normal" to="side0"/>
@@ -3103,7 +3103,7 @@
<Track from="city1" gauge="normal" to="side2"/>
</Tile>
<Tile colour="fixed" id="-805" name="Oldenburg">
- <Station id="city1" position="151" slots="1" type="City" value="10"/>
+ <Station id="city1" position="051" slots="1" type="City" value="10"/>
<Track from="city1" gauge="normal" to="side5"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side1"/>
@@ -3156,8 +3156,8 @@
<Track from="side4" gauge="normal" to="side3"/>
</Tile>
<Tile colour="green" id="-810" name="Nurnberg">
- <Station id="city1" position="052" slots="1" type="City" value="30"/>
- <Station id="city2" position="352" slots="1" type="City" value="30"/>
+ <Station id="city1" position="552" slots="1" type="City" value="30"/>
+ <Station id="city2" position="252" slots="1" type="City" value="30"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side5"/>
<Track from="city2" gauge="normal" to="side2"/>
@@ -3258,17 +3258,17 @@
<Track from="city1" gauge="normal" to="side1"/>
</Tile>
<Tile colour="green" id="580" name="580">
- <Station id="city1" position="152" slots="1" type="City" value="60"/>
- <Station id="city2" position="352" slots="1" type="City" value="60"/>
+ <Station id="city1" position="052" slots="1" type="City" value="60"/>
+ <Station id="city2" position="252" slots="1" type="City" value="60"/>
<Track from="city1" gauge="normal" to="side1"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city2" gauge="normal" to="side2"/>
<Track from="city2" gauge="normal" to="side3"/>
</Tile>
<Tile colour="green" id="581" name="581">
- <Station id="city1" position="252" slots="1" type="City" value="50"/>
- <Station id="city2" position="452" slots="1" type="City" value="50"/>
- <Station id="city3" position="052" slots="1" type="City" value="50"/>
+ <Station id="city1" position="152" slots="1" type="City" value="50"/>
+ <Station id="city2" position="352" slots="1" type="City" value="50"/>
+ <Station id="city3" position="552" slots="1" type="City" value="50"/>
<Track from="city3" gauge="normal" to="side0"/>
<Track from="city3" gauge="normal" to="side5"/>
<Track from="city1" gauge="normal" to="side1"/>
@@ -3331,7 +3331,7 @@
<Track from="city1" gauge="normal" to="side1"/>
</Tile>
<Tile colour="fixed" id="-89030" name="1889 B3">
- <Station id="city1" position="352" type="Town" value="20"/>
+ <Station id="city1" position="252" type="Town" value="20"/>
<Track from="city1" gauge="normal" to="side3"/>
<Track from="city1" gauge="normal" to="side2"/>
</Tile>
@@ -3349,7 +3349,7 @@
<Track from="city1" gauge="normal" to="side2"/>
</Tile>
<Tile colour="fixed" id="-89031" name="1889 G14">
- <Station id="city1" position="152" type="Town" value="20"/>
+ <Station id="city1" position="052" type="Town" value="20"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side1"/>
</Tile>
@@ -3478,8 +3478,8 @@
<Track from="side0" gauge="normal" to="city2"/>
</Tile>
<Tile colour="fixed" id="-25008" name="Barrow">
- <Station id="city1" position="052" slots="1" type="City" value="10"/>
- <Station id="city2" position="252" type="Town" value="10"/>
+ <Station id="city1" position="552" slots="1" type="City" value="10"/>
+ <Station id="city2" position="152" type="Town" value="10"/>
<Track from="side5" gauge="normal" to="city1"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city2" gauge="normal" to="side1"/>
@@ -3492,8 +3492,8 @@
<Track from="city2" gauge="normal" to="side2"/>
</Tile>
<Tile colour="fixed" id="-25010" name="Doncaster">
- <Station id="city1" position="451" slots="1" type="City" value="20"/>
- <Station id="city2" position="151" slots="1" type="City" value="20"/>
+ <Station id="city1" position="351" slots="1" type="City" value="20"/>
+ <Station id="city2" position="051" slots="1" type="City" value="20"/>
<Track from="city1" gauge="normal" to="side4"/>
<Track from="city1" gauge="normal" to="side3"/>
<Track from="city1" gauge="normal" to="side2"/>
@@ -3517,18 +3517,18 @@
<Track from="city1" gauge="normal" to="side5"/>
</Tile>
<Tile colour="fixed" id="-25014" name="Maryport">
- <Station id="city1" position="151" slots="1" type="City" value="10"/>
+ <Station id="city1" position="051" slots="1" type="City" value="10"/>
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side1"/>
</Tile>
<Tile colour="fixed" id="-25015" name="Milford H.">
- <Station id="city1" position="152" slots="1" type="City" value="10"/>
+ <Station id="city1" position="052" slots="1" type="City" value="10"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side1"/>
</Tile>
<Tile colour="fixed" id="-25016" name="Highbridge">
- <Station id="city1" position="251" slots="1" type="City" value="10"/>
+ <Station id="city1" position="151" slots="1" type="City" value="10"/>
<Track from="side0" gauge="normal" to="side3"/>
<Track from="city1" gauge="normal" to="side0"/>
<Track from="city1" gauge="normal" to="side1"/>
@@ -3594,13 +3594,13 @@
<Track from="side3" gauge="normal" to="side4"/>
</Tile>
<Tile colour="fixed" id="-30002" name="Altoona">
- <Station id="city1" position="052" slots="1" type="City" value="10"/>
+ <Station id="city1" position="552" slots="1" type="City" value="10"/>
<Track from="side4" gauge="normal" to="side1"/>
<Track from="side4" gauge="normal" to="side2"/>
<Track from="side2" gauge="normal" to="side1"/>
</Tile>
<Tile colour="fixed" id="-30003" name="Altoon intern">
- <Station id="city1" position="052" slots="1" type="City" value="10"/>
+ <Station id="city1" position="552" 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"/>
@@ -3745,9 +3745,9 @@
<Track from="city1" gauge="normal" to="side5"/>
</Tile>
<Tile colour="white" id="-30" name="3 cities">
- <Station id="city1" position="052" slots="1" type="City"/>
- <Station id="city2" position="252" slots="1" type="City"/>
- <Station id="city3" position="452" slots="1" type="City"/>
+ <Station id="city1" position="552" slots="1" type="City"/>
+ <Station id="city2" position="152" slots="1" type="City"/>
+ <Station id="city3" position="352" slots="1" type="City"/>
</Tile>
<Tile colour="fixed" id="-10001" name="TNLouisville">
<Station id="city1" position="501" slots="1" type="City" value="30"/>
@@ -3757,7 +3757,7 @@
</Tile>
<Tile colour="yellow" id="235" name="235">
<Station id="city1" position="502" slots="1" type="City" value="20"/>
- <Station id="city2" position="352" slots="1" type="City" value="20"/>
+ <Station id="city2" position="252" slots="1" type="City" value="20"/>
<Track from="city1" gauge="normal" to="side5"/>
</Tile>
<Tile colour="yellow" id="8858" name="8858">
@@ -3770,7 +3770,7 @@
</Tile>
<Tile colour="yellow" id="8854" name="8854">
<Station id="city1" position="0" type="Town" value="20"/>
- <Station id="city2" position="252" type="Town" value="20"/>
+ <Station id="city2" position="152" type="Town" value="20"/>
<Track from="side2" gauge="normal" to="city2"/>
<Track from="side2" gauge="normal" to="side1"/>
<Track from="side3" gauge="normal" to="city1"/>
@@ -3837,16 +3837,16 @@
<Track from="side2" gauge="normal" to="city2"/>
</Tile>
<Tile colour="green" id="8861" name="8861">
- <Station id="city1" position="452" slots="1" type="City" value="40"/>
- <Station id="city2" position="152" slots="1" type="City" value="40"/>
+ <Station id="city1" position="352" slots="1" type="City" value="40"/>
+ <Station id="city2" position="052" slots="1" type="City" value="40"/>
<Track from="side4" gauge="normal" to="city1"/>
<Track from="side3" gauge="normal" to="city1"/>
<Track from="side0" gauge="normal" to="city2"/>
<Track from="side1" gauge="normal" to="city2"/>
</Tile>
<Tile colour="green" id="8862" name="8862">
- <Station id="city1" position="452" slots="1" type="City" value="40"/>
- <Station id="city2" position="052" slots="1" type="City" value="40"/>
+ <Station id="city1" position="352" slots="1" type="City" value="40"/>
+ <Station id="city2" position="552" slots="1" type="City" value="40"/>
<Track from="side0" gauge="normal" to="city2"/>
<Track from="side5" gauge="normal" to="city2"/>
<Track from="side4" gauge="normal" to="city1"/>
@@ -3854,7 +3854,7 @@
</Tile>
<Tile colour="green" id="8863" name="8863">
<Station id="city1" position="0" slots="1" type="City" value="40"/>
- <Station id="city2" position="552" slots="1" type="City" value="40"/>
+ <Station id="city2" position="452" slots="1" type="City" value="40"/>
<Track from="side0" gauge="normal" to="city1"/>
<Track from="side3" gauge="normal" to="city1"/>
<Track from="side4" gauge="normal" to="city2"/>
@@ -3862,15 +3862,15 @@
</Tile>
<Tile colour="green" id="8864" name="8864">
<Station id="city1" position="308" slots="1" type="City" value="40"/>
- <Station id="city2" position="152" slots="1" type="City" value="40"/>
+ <Station id="city2" position="052" slots="1" type="City" value="40"/>
<Track from="side0" gauge="normal" to="city2"/>
<Track from="city2" gauge="normal" to="side1"/>
<Track from="side3" gauge="normal" to="city1"/>
<Track from="city1" gauge="normal" to="side5"/>
</Tile>
<Tile colour="green" id="8865" name="8865">
- <Station id="city1" position="252" slots="1" type="City" value="40"/>
- <Station id="city2" position="551" slots="1" type="City" value="40"/>
+ <Station id="city1" position="152" slots="1" type="City" value="40"/>
+ <Station id="city2" position="451" slots="1" type="City" value="40"/>
<Track from="side1" gauge="normal" to="city1"/>
<Track from="side5" gauge="normal" to="city2"/>
<Track from="city2" gauge="normal" to="side3"/>
@@ -3987,7 +3987,7 @@
<Track from="city1" gauge="normal" to="side5"/>
</Tile>
<Tile colour="yellow" id="8850" name="8850">
- <Station id="city1" position="352" type="Town" value="20"/>
+ <Station id="city1" position="252" type="Town" value="20"/>
<Track from="side3" gauge="normal" to="city1"/>
<Track from="city1" gauge="normal" to="side2"/>
</Tile>
@@ -4016,14 +4016,14 @@
<Track from="city4" gauge="normal" to="side5"/>
</Tile>
<Tile colour="white" id="-80003" name="Shanghai">
- <Station id="city1" position="052" slots="1" type="City"/>
+ <Station id="city1" position="552" slots="1" type="City"/>
</Tile>
<Tile colour="white" id="-80002" name="2 Medium Cities">
<Station id="city1" position="002" slots="1" type="City"/>
<Station id="city2" position="302" slots="1" type="City"/>
</Tile>
<Tile colour="white" id="-80001" name="Medium City">
- <Station id="city1" position="052" slots="1" type="City"/>
+ <Station id="city1" position="552" slots="1" type="City"/>
</Tile>
<Tile colour="gray" id="8888" name="Beijing">
<Station id="city1" position="403" slots="1" type="City" value="80"/>
@@ -4071,7 +4071,7 @@
<Track from="city1" gauge="normal" to="side5"/>
</Tile>
<Tile colour="fixed" id="-503" name="-503">
- <Station id="city1" position="452" type="Town"/>
+ <Station id="city1" position="352" type="Town"/>
<Track from="side3" gauge="normal" to="city1"/>
<Track from="city1" gauge="normal" to="side4"/>
</Tile>
@@ -4129,14 +4129,14 @@
<Track from="city1" gauge="normal" to="side4"/>
</Tile>
<Tile colour="fixed" id="-30006" name="Reading">
- <Station id="city1" position="052" slots="1" type="City" value="10"/>
+ <Station id="city1" position="552" 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="side3"/>
<Track from="side3" gauge="normal" to="side2"/>
</Tile>
<Tile colour="fixed" id="-30007" name="Reading intern">
- <Station id="city1" position="052" slots="1" type="City" value="10"/>
+ <Station id="city1" position="552" 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="side3"/>
@@ -4147,8 +4147,8 @@
<Track from="side2" gauge="normal" to="city1"/>
</Tile>
<Tile colour="yellow" id="-10004" name="Stockholm">
- <Station id="city1" position="052" slots="1" type="City" value="30"/>
- <Station id="city2" position="452" slots="1" type="City" value="30"/>
+ <Station id="city1" position="552" slots="1" type="City" value="30"/>
+ <Station id="city2" position="352" slots="1" type="City" value="30"/>
<Track from="city1" gauge="normal" to="side5"/>
<Track from="city2" gauge="normal" to="side4"/>
</Tile>
@@ -4208,4 +4208,6 @@
<Track from="city1" gauge="normal" to="side1"/>
<Track from="city1" gauge="normal" to="side3"/>
</Tile>
-</Tiles>
\ No newline at end of file
+</Tiles>
+
+
diff --git a/tools/ConvertTilesXML.java b/tools/ConvertTilesXML.java
index 7014d68..35f0c8f 100644
--- a/tools/ConvertTilesXML.java
+++ b/tools/ConvertTilesXML.java
@@ -1,19 +1,21 @@
package tools;
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
import java.util.*;
-import java.util.regex.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
-import javax.xml.parsers.*;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import org.w3c.dom.*;
import rails.common.parser.ConfigurationException;
import rails.util.Util;
-import tools.XmlUtils;
/**
* Convert an XML tile dictionary, as created by Marco Rocci's Tile Designer, to
@@ -82,41 +84,41 @@ public class ConvertTilesXML {
cityMap = new HashMap<String, String>();
cityMap.put("tpCenter", "0");
cityMap.put("tp1SideA", "001");
- cityMap.put("tp1CornerA", "051");
+ cityMap.put("tp1CornerB", "051");
cityMap.put("tp1SideB", "101");
- cityMap.put("tp1CornerB", "151");
+ cityMap.put("tp1CornerC", "151");
cityMap.put("tp1SideC", "201");
- cityMap.put("tp1CornerC", "251");
+ cityMap.put("tp1CornerD", "251");
cityMap.put("tp1SideD", "301");
- cityMap.put("tp1CornerD", "351");
+ cityMap.put("tp1CornerE", "351");
cityMap.put("tp1SideE", "401");
- cityMap.put("tp1CornerE", "451");
+ cityMap.put("tp1CornerF", "451");
cityMap.put("tp1SideF", "501");
- cityMap.put("tp1CornerF", "551");
+ cityMap.put("tp1CornerA", "551");
cityMap.put("tp2SideA", "002");
- cityMap.put("tp2CornerA", "052");
+ cityMap.put("tp2CornerB", "052");
cityMap.put("tp2SideB", "102");
- cityMap.put("tp2CornerB", "152");
+ cityMap.put("tp2CornerC", "152");
cityMap.put("tp2SideC", "202");
- cityMap.put("tp2CornerC", "252");
+ cityMap.put("tp2CornerD", "252");
cityMap.put("tp2SideD", "302");
- cityMap.put("tp2CornerD", "352");
+ cityMap.put("tp2CornerE", "352");
cityMap.put("tp2SideE", "402");
- cityMap.put("tp2CornerE", "452");
+ cityMap.put("tp2CornerF", "452");
cityMap.put("tp2SideF", "502");
- cityMap.put("tp2CornerF", "552");
+ cityMap.put("tp2CornerA", "552");
cityMap.put("tp3SideA", "003");
- cityMap.put("tp3CornerA", "053");
+ cityMap.put("tp3CornerB", "053");
cityMap.put("tp3SideB", "103");
- cityMap.put("tp3CornerB", "153");
+ cityMap.put("tp3CornerC", "153");
cityMap.put("tp3SideC", "203");
- cityMap.put("tp3CornerC", "253");
+ cityMap.put("tp3CornerD", "253");
cityMap.put("tp3SideD", "303");
- cityMap.put("tp3CornerD", "353");
+ cityMap.put("tp3CornerE", "353");
cityMap.put("tp3SideE", "403");
- cityMap.put("tp3CornerE", "453");
+ cityMap.put("tp3CornerF", "453");
cityMap.put("tp3SideF", "503");
- cityMap.put("tp3CornerF", "553");
+ cityMap.put("tp3CornerA", "553");
cityMap.put("tpCurve1RightA", "006");
cityMap.put("tpCurve2RightA", "007");
cityMap.put("tpCurve2LeftA", "008");
@@ -164,11 +166,11 @@ public class ConvertTilesXML {
System.out.println("Input file path: "+(new File(inputFilePath).getAbsolutePath()));
System.out.println("Output file path: "+(new File(outputFilePath).getAbsolutePath()));
Element inputTopElement =
- XmlUtils.findElementInFile(inputFilePath, "tiles");
+ XmlUtils.findElementInFile(inputFilePath, "tiles");
try {
DocumentBuilderFactory factory =
- DocumentBuilderFactory.newInstance();
+ DocumentBuilderFactory.newInstance();
DocumentBuilder builder = factory.newDocumentBuilder();
DOMImplementation impl = builder.getDOMImplementation();
outputDoc = impl.createDocument(null, "Tiles", null);
@@ -187,7 +189,7 @@ public class ConvertTilesXML {
}
private void convertXML(Element inputElement, Document outputDoc)
- throws ConfigurationException {
+ throws ConfigurationException {
NodeList children = inputElement.getElementsByTagName("tile");
for (int i = 0; i < children.getLength(); i++) {
@@ -200,10 +202,10 @@ public class ConvertTilesXML {
}
private void convertTile(Element inputTile, Element outputTile)
- throws ConfigurationException {
+ throws ConfigurationException {
String id =
- inputTile.getElementsByTagName("ID").item(0).getFirstChild().getNodeValue();
+ inputTile.getElementsByTagName("ID").item(0).getFirstChild().getNodeValue();
System.out.println(id);
tileNo = id;
outputTile.setAttribute("id", id);
@@ -215,7 +217,7 @@ public class ConvertTilesXML {
}
String level =
- inputTile.getElementsByTagName("level").item(0).getFirstChild().getNodeValue();
+ inputTile.getElementsByTagName("level").item(0).getFirstChild().getNodeValue();
colour = colourMap.get(level);
if (colour == null) {
throw new ConfigurationException("Unknown level: " + level);
@@ -224,7 +226,7 @@ public class ConvertTilesXML {
}
String name =
- inputTile.getElementsByTagName("name").item(0).getFirstChild().getNodeValue();
+ inputTile.getElementsByTagName("name").item(0).getFirstChild().getNodeValue();
Matcher m = namePattern.matcher(name);
if (m.matches()) {
outputTile.setAttribute("name", m.group(1));
@@ -244,7 +246,7 @@ public class ConvertTilesXML {
outputJunction = null;
Element junctions =
- (Element) inputTile.getElementsByTagName("junctions").item(0);
+ (Element) inputTile.getElementsByTagName("junctions").item(0);
NodeList children = junctions.getElementsByTagName("junction");
for (int i = 0; i < children.getLength(); i++) {
Element inputJunction = (Element) children.item(i);
@@ -258,7 +260,7 @@ public class ConvertTilesXML {
resolvedTrack = new HashMap<Element, String>();
Element connections =
- (Element) inputTile.getElementsByTagName("connections").item(0);
+ (Element) inputTile.getElementsByTagName("connections").item(0);
children = connections.getElementsByTagName("connection");
for (int i = 0; i < children.getLength(); i++) {
Element inputConnection = (Element) children.item(i);
@@ -274,19 +276,19 @@ public class ConvertTilesXML {
Element[] ends = list.toArray(new Element[0]);
if (ends.length <= 1) {
throw new ConfigurationException("Loose end " + ends[0]
- + " in tile " + tileNo);
+ + " in tile " + tileNo);
}
for (int i = 1; i < ends.length; i++) {
end1 = resolvedTrack.get(ends[i]);
if (end1 == null) {
throw new ConfigurationException("Loose end " + ends[i]
- + " in tile " + tileNo);
+ + " in tile " + tileNo);
}
for (int j = 0; j < i; j++) {
end2 = resolvedTrack.get(ends[j]);
if (end2 == null) {
throw new ConfigurationException("Loose end " + ends[j]
- + " in tile " + tileNo);
+ + " in tile " + tileNo);
}
Element outputConnection = outputDoc.createElement("Track");
outputConnection.setAttribute("gauge",
@@ -307,7 +309,7 @@ public class ConvertTilesXML {
outputJunction.setAttribute("id", cityId);
String type =
- inputJunction.getElementsByTagName("junType").item(0).getFirstChild().getNodeValue();
+ inputJunction.getElementsByTagName("junType").item(0).getFirstChild().getNodeValue();
String[] station = stationMap.get(type);
if (station == null) {
@@ -333,16 +335,16 @@ public class ConvertTilesXML {
// Junction revenue
Element revenue =
- (Element) inputJunction.getElementsByTagName("revenue").item(0);
+ (Element) inputJunction.getElementsByTagName("revenue").item(0);
if (revenue != null) {
String value =
- revenue.getElementsByTagName("value").item(0).getFirstChild().getNodeValue();
+ revenue.getElementsByTagName("value").item(0).getFirstChild().getNodeValue();
outputJunction.setAttribute("value", value);
}
// Junction position
String junctionPos =
- inputJunction.getElementsByTagName("position").item(0).getFirstChild().getNodeValue();
+ inputJunction.getElementsByTagName("position").item(0).getFirstChild().getNodeValue();
junctionPosition.put(junctionPos, cityId);
String jName = cityMap.get(junctionPos);
if (Util.hasValue(jName)) {
@@ -353,10 +355,10 @@ public class ConvertTilesXML {
}
private void convertConnection(Element inputConnection, Element outputTile)
- throws ConfigurationException {
+ throws ConfigurationException {
String type =
- inputConnection.getElementsByTagName("conType").item(0).getFirstChild().getNodeValue();
+ inputConnection.getElementsByTagName("conType").item(0).getFirstChild().getNodeValue();
String gauge = gaugeMap.get(type);
Element outputConnection;
if (gauge == null) {
@@ -371,11 +373,11 @@ public class ConvertTilesXML {
outputJunction.setAttribute("type", "pass");
boolean fromOK =
- convertTrackEnd(inputConnection, outputConnection, "position1",
- "from");
+ convertTrackEnd(inputConnection, outputConnection, "position1",
+ "from");
boolean toOK =
- convertTrackEnd(inputConnection, outputConnection, "position2",
- "to");
+ convertTrackEnd(inputConnection, outputConnection, "position2",
+ "to");
if (fromOK && toOK) outputTile.appendChild(outputConnection);
@@ -383,10 +385,10 @@ public class ConvertTilesXML {
private boolean convertTrackEnd(Element inputConnection,
Element outputConnection, String inputName, String outputName)
- throws ConfigurationException {
+ throws ConfigurationException {
String position =
- inputConnection.getElementsByTagName(inputName).item(0).getFirstChild().getNodeValue();
+ inputConnection.getElementsByTagName(inputName).item(0).getFirstChild().getNodeValue();
String end = sidesMap.get(position);
if (end == null) end = junctionPosition.get(position);
diff --git a/tools/formatxml.pl b/tools/formatxml.pl
new file mode 100644
index 0000000..1dcecc0
--- /dev/null
+++ b/tools/formatxml.pl
@@ -0,0 +1,23 @@
+# Formats XML files using tabs and newlines only.
+#
+# In its current form, this script is (or should be) platform- and machine-independent.
+# Please leave it so!
+#
+$ARGV[0] or die "Usage: perl formatxml.pl <filepath>...\n";
+for $filename (@ARGV) {
+ open (IN,$filename) or die "Cannot open file '$filename' for reading: $!\n";
+ $xml = join ('', <IN>);
+ close IN;
+
+ @elements = split /(?<=>)\s*(?=<)/, $xml;
+
+ open (OUT, ">$filename") or die "Cannot open file '$filename' for writing: $!\n";
+ binmode OUT;
+ $indent = 0;
+ for (@elements) {
+ $indent-- if /^<\//;
+ print OUT "\t" x $indent, $_, "\n";
+ $indent++ unless /^<\?/ || /^<\// || /\/\s*>$/;
+ }
+ close OUT;
+}
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X