Menu
▾
▴
rails-commits
|
From: Erik V. <ev...@us...> - 2012-03-25 15:59:00
|
data/1830/Map.xml | 8 ++++++--
data/1830/TileSet.xml | 1 -
data/1830/Tiles.xml | 5 -----
data/1856/Map.xml | 2 +-
data/1856/TileSet.xml | 1 -
data/1856/Tiles.xml | 6 ------
data/18EU/Map.xml | 2 +-
data/18EU/TileSet.xml | 1 -
data/18EU/Tiles.xml | 6 ------
9 files changed, 8 insertions(+), 24 deletions(-)
New commits:
commit 9f3447e845563b218d7505bde4c88513b62e9bc4
Author: Erik Vos <eri...@xs...>
Date: Sun Mar 25 17:57:05 2012 +0200
Final fix for routes through Goderich tile -939
XML description now uses tile -903, tile -939 is image only.
So XML regeneration of Tiles.xml should no longer break correct working.
Affects 1856, 18EU and 1830 Coalfields (etc)
Bug reported by Arne Ãstlund for 1830 Coalfields
(the other games had customized XML, but that is not a persistent solution)
diff --git a/data/1830/Map.xml b/data/1830/Map.xml
index ecc6404..d30dfa1 100644
--- a/data/1830/Map.xml
+++ b/data/1830/Map.xml
@@ -63,7 +63,9 @@
<Hex name="F2" tile="-903" orientation="5" value="40,70" city="Chicago"/>
</IfOption>
<IfOption name="Variant" value="Coalfields,Coalfields&Reading">
- <Hex name="F2" tile="-939" orientation="5" value="40,70" city="Chicago"/>
+ <Hex name="F2" tile="-903" pic="-939" orientation="5" value="40,70" city="Chicago">
+ <Access runThrough="yes"/>
+ </Hex>
</IfOption>
<IfOption name="Variant" value="Wabash">
<Hex name="F2" tile="0"/>
@@ -181,7 +183,9 @@
<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="L2" tile="-903" pic="-939" orientation="4" value="30,60" city="Gulf">
+ <Access runThrough="yes"/>
+ </Hex>
<Hex name="L4" tile="0"/>
<Hex name="L6" tile="0" cost="120"/>
<Hex name="L8" tile="0" cost="120"/>
diff --git a/data/1830/TileSet.xml b/data/1830/TileSet.xml
index a50a2b0..75ed736 100644
--- a/data/1830/TileSet.xml
+++ b/data/1830/TileSet.xml
@@ -42,7 +42,6 @@
<Tile id="-902"/>
<Tile id="-903"/>
<Tile id="-908"/><!-- Coalfields: K1 -->
- <Tile id="-939"/><!-- Coalfields: Chicago -->
<Tile id="-25007"/><!-- Wabash: D20-->
<Tile id="-30001"/><!-- Coalfields: N of Boston -->
<Tile id="-30003" pic="-30002"/><!-- Coalfields: Altoona -->
diff --git a/data/1830/Tiles.xml b/data/1830/Tiles.xml
index c082f65..a5a52e2 100644
--- a/data/1830/Tiles.xml
+++ b/data/1830/Tiles.xml
@@ -88,11 +88,6 @@
<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="-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"/>
diff --git a/data/1856/Map.xml b/data/1856/Map.xml
index 2818de8..eb5cff6 100644
--- a/data/1856/Map.xml
+++ b/data/1856/Map.xml
@@ -18,7 +18,7 @@
<Hex name="E14" tile="0"/>
<Hex name="E16" tile="0"/>
<Hex name="E18" tile="-2" port="yes"/>
- <Hex name="F9" tile="-939" port="yes" value="30,50,40" city="Goderich">
+ <Hex name="F9" tile="-903" pic="-939" port="yes" value="30,50,40" city="Goderich">
<Access runThrough="yes"/>
</Hex>
<Hex name="F11" tile="0"/>
diff --git a/data/1856/TileSet.xml b/data/1856/TileSet.xml
index f926f6f..17fd4df 100644
--- a/data/1856/TileSet.xml
+++ b/data/1856/TileSet.xml
@@ -24,7 +24,6 @@
<Tile id="-901"/>
<Tile id="-902"/>
<Tile id="-903"/>
- <Tile id="-939"/>
<!-- Yellow tiles -->
<Tile id="1" quantity="1">
diff --git a/data/1856/Tiles.xml b/data/1856/Tiles.xml
index bd8a8d0..7edb9f7 100644
--- a/data/1856/Tiles.xml
+++ b/data/1856/Tiles.xml
@@ -41,12 +41,6 @@
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city1" gauge="normal" to="side1"/>
</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="yellow" id="1" name="1">
<Station id="city1" position="408" type="Town" value="10"/>
<Station id="city2" position="108" type="Town" value="10"/>
diff --git a/data/18EU/Map.xml b/data/18EU/Map.xml
index 30e6b19..3d4462c 100644
--- a/data/18EU/Map.xml
+++ b/data/18EU/Map.xml
@@ -2,7 +2,7 @@
<Image file="18EU/MapImage.svg" x="16" y="15" scale="0.955"/>
<!-- Hex name="" tile="" orientation="" value="" impassable="" label="" cost="" value="" port="yes/no" -->
<Hex name="A4" port="yes" value="10" tile="-800" orientation="0"/>
- <Hex name="B7" value="30,50" tile="-939" orientation="1" city="Hamburg">
+ <Hex name="B7" value="30,50" tile="-903" pic="-939" orientation="1" city="Hamburg">
<Access runThrough="yes"/>
</Hex>
<Hex name="C4" label="Y" tile="-3007" city="Amsterdam"/>
diff --git a/data/18EU/TileSet.xml b/data/18EU/TileSet.xml
index c439f20..773f132 100644
--- a/data/18EU/TileSet.xml
+++ b/data/18EU/TileSet.xml
@@ -17,7 +17,6 @@
<Tile id="-901"/>
<Tile id="-902"/>
<Tile id="-903"/>
- <Tile id="-939"/>
<Tile id="-3005"><!--Berlin/Vienna-->
<Upgrade id="581"/>
<AllowsMultipleBasesOfOneCompany/>
diff --git a/data/18EU/Tiles.xml b/data/18EU/Tiles.xml
index bd9cd81..083ec4f 100644
--- a/data/18EU/Tiles.xml
+++ b/data/18EU/Tiles.xml
@@ -34,12 +34,6 @@
<Track from="city1" gauge="normal" to="side2"/>
<Track from="city1" gauge="normal" to="side1"/>
</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="yellow" id="-3005" name="B/V">
<Station id="city1" position="102" slots="1" type="City" city="B/V" value="30"/>
<Station id="city2" position="402" slots="1" type="City" city="B/V" value="30"/>
|
Thanks for helping keep SourceForge clean.
X