Menu
▾
▴
[Rails-commits] SF.net SVN: rails:[1422] trunk/18xx
|
From: <ev...@us...> - 2010-09-16 21:04:16
|
Revision: 1422
http://rails.svn.sourceforge.net/rails/?rev=1422&view=rev
Author: evos
Date: 2010-09-16 21:04:10 +0000 (Thu, 16 Sep 2010)
Log Message:
-----------
1825: Replaced extra Q row by white tiles.
18EU: used centered city tiles -3007 (Y) and -3008 instead of -10
Modified Paths:
--------------
trunk/18xx/data/1825/Map.xml
trunk/18xx/data/1825/TileSet.xml
trunk/18xx/data/1825/Tiles.xml
trunk/18xx/data/18EU/Map.xml
trunk/18xx/data/18EU/TileSet.xml
trunk/18xx/data/18EU/Tiles.xml
trunk/18xx/tiles/Tiles.xml
Added Paths:
-----------
trunk/18xx/tiles/svg/tile-10000.svg
Modified: trunk/18xx/data/1825/Map.xml
===================================================================
--- trunk/18xx/data/1825/Map.xml 2010-09-16 20:12:37 UTC (rev 1421)
+++ trunk/18xx/data/1825/Map.xml 2010-09-16 21:04:10 UTC (rev 1422)
@@ -1,15 +1,16 @@
<Map mapClass="rails.ui.swing.hexmap.EWHexMap" tileOrientation="EW" letterOrientation="vertical" even="R">
- <!-- The Q row doesn't exist on the board - it is there to facilitate edge tile placement-->
- <Hex name="Q9" tile="0"/>
- <Hex name="Q11" tile="0"/>
- <Hex name="Q13" tile="0"/>
- <Hex name="Q15" tile="0"/>
- <Hex name="Q17" tile="0"/>
- <Hex name="Q19" tile="0"/>
- <Hex name="Q21" tile="0"/>
- <Hex name="Q23" tile="0"/>
- <Hex name="Q25" tile="0"/>
- <Hex name="Q27" tile="0"/>
+ <!-- The Q row doesn't exist on the board - it is there to facilitate edge tile placement.
+ The tiles are not upgradable, i.e. no tiles can be laid here-->
+ <Hex name="Q9" tile="-10000"/>
+ <Hex name="Q11" tile="-10000"/>
+ <Hex name="Q13" tile="-10000"/>
+ <Hex name="Q15" tile="-10000"/>
+ <Hex name="Q17" tile="-10000"/>
+ <Hex name="Q19" tile="-10000"/>
+ <Hex name="Q21" tile="-10000"/>
+ <Hex name="Q23" tile="-10000"/>
+ <Hex name="Q25" tile="-10000"/>
+ <Hex name="Q27" tile="-10000"/>
<!-- End of nonexistent Q row -->
<Hex name="R8" tile="0"/>
<Hex name="R10" tile="-1" city="Shrewsbury" orientation="3" />
Modified: trunk/18xx/data/1825/TileSet.xml
===================================================================
--- trunk/18xx/data/1825/TileSet.xml 2010-09-16 20:12:37 UTC (rev 1421)
+++ trunk/18xx/data/1825/TileSet.xml 2010-09-16 21:04:10 UTC (rev 1422)
@@ -1,8 +1,9 @@
<TileManager tiles="Tiles.xml">
<!-- Preprinted tiles -->
<Tile id="0"><!-- Empty space -->
- <Upgrade id="7,8,9" hex="-Q9,Q11,Q13,Q15,Q17,Q19,Q21,Q23,Q25,Q27"/>
+ <Upgrade id="7,8,9"/>
</Tile>
+ <Tile id="-10000"/><!-- Empty space, not upgradeable (for borders between units and kits) -->
<Tile id="-1"><!-- 1 town -->
<Upgrade id="3,4"/>
</Tile>
Modified: trunk/18xx/data/1825/Tiles.xml
===================================================================
--- trunk/18xx/data/1825/Tiles.xml 2010-09-16 20:12:37 UTC (rev 1421)
+++ trunk/18xx/data/1825/Tiles.xml 2010-09-16 21:04:10 UTC (rev 1422)
@@ -1,4 +1,8 @@
-<?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">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Tiles>
+ <Tile colour="white" id="0" name="empty"/>
+ <Tile colour="white" id="-10000" 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"/>
Modified: trunk/18xx/data/18EU/Map.xml
===================================================================
--- trunk/18xx/data/18EU/Map.xml 2010-09-16 20:12:37 UTC (rev 1421)
+++ trunk/18xx/data/18EU/Map.xml 2010-09-16 21:04:10 UTC (rev 1422)
@@ -2,7 +2,7 @@
<!-- 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="C4" label="Y" tile="-10" city="Amsterdam"/>
+ <Hex name="C4" label="Y" tile="-3007" city="Amsterdam"/>
<Hex name="C6" tile="-1" city="Bremen"/>
<Hex name="C8" tile="0" />
<Hex name="C10" tile="0" />
@@ -19,19 +19,19 @@
<Hex name="E14" value="20,30" tile="-901" orientation="2" city="Warsaw"/>
<Hex name="F1" value="40,70" tile="-902" orientation="1" city="London"/>
<Hex name="F3" tile="-1" city="Antwerp"/>
- <Hex name="F5" tile="-10" city="Dortmund"/>
+ <Hex name="F5" tile="-3008" city="Dortmund"/>
<Hex name="F7" tile="-1" city="Hannover"/>
<Hex name="F9" tile="0" />
<Hex name="F11" tile="0" />
<Hex name="F13" tile="0" />
<Hex name="G2" tile="-1" city="Lille"/>
- <Hex name="G4" tile="-10" city="Cologne"/>
+ <Hex name="G4" tile="-3008" city="Cologne"/>
<Hex name="G6" tile="0" />
<Hex name="G8" tile="-1" city="Magdeburg"/>
- <Hex name="G10" label="Y" tile="-10" city="Dresden"/>
+ <Hex name="G10" label="Y" tile="-3007" city="Dresden"/>
<Hex name="G12" tile="0" />
<Hex name="H1" tile="0" />
- <Hex name="H3" label="Y" tile="-10" city="Brussels"/>
+ <Hex name="H3" label="Y" tile="-3007" city="Brussels"/>
<Hex name="H5" tile="0" />
<Hex name="H7" tile="0" />
<Hex name="H9" tile="-1" city="Leipzig"/>
@@ -39,7 +39,7 @@
<Hex name="H13" tile="0" />
<Hex name="I2" tile="0" />
<Hex name="I4" cost="60" tile="0" />
- <Hex name="I6" tile="-10" city="Frankfurt"/>
+ <Hex name="I6" tile="-3008" city="Frankfurt"/>
<Hex name="I8" tile="0" />
<Hex name="I10" cost="60" tile="0" />
<Hex name="I12" cost="60" tile="0" />
@@ -54,17 +54,17 @@
<Hex name="K4" cost="60" tile="0" />
<Hex name="K6" tile="-1" city="Augsburg"/>
<Hex name="K8" tile="0" />
- <Hex name="K10" tile="-10" city="Prague"/>
+ <Hex name="K10" tile="-3008" city="Prague"/>
<Hex name="K12" tile="0" />
<Hex name="L1" tile="0" />
<Hex name="L3" tile="0" />
<Hex name="L5" tile="-1" city="Stuttgart"/>
- <Hex name="L7" tile="-10" city="Munich"/>
+ <Hex name="L7" tile="-3007" label="Y" city="Munich"/>
<Hex name="L9" cost="60" tile="0" />
<Hex name="L11" tile="-1" city="Brünn"/>
<Hex name="L13" tile="0" />
<Hex name="M2" tile="-1" city="Dijon"/>
- <Hex name="M4" label="Y" tile="-10" city="Strasbourg"/>
+ <Hex name="M4" label="Y" tile="-3007" city="Strasbourg"/>
<Hex name="M6" tile="0" />
<Hex name="M8" tile="0" />
<Hex name="M10" cost="60" tile="0" />
@@ -91,8 +91,8 @@
<Hex name="P7" cost="60" tile="0" />
<Hex name="P9" cost="120,60" label="M" tile="0" /><!-- Arlberg -->
<Hex name="P11" cost="60" label="M" tile="8" orientation="1"/><!-- Semmering -->
- <Hex name="P13" label="Y" tile="-10" city="Budapest"/>
- <Hex name="Q2" label="Y" tile="-10" city="Lyon"/>
+ <Hex name="P13" label="Y" tile="-3007" city="Budapest"/>
+ <Hex name="Q2" label="Y" tile="-3007" city="Lyon"/>
<Hex name="Q4" cost="120,60" label="M" tile="0" /><!-- Lotschberg -->
<Hex name="Q6" cost="120,60" label="M" tile="0" /><!-- Gotthard -->
<Hex name="Q8" cost="120,60" label="M" tile="0" /><!-- Brenner -->
@@ -101,18 +101,18 @@
<Hex name="Q14" value="30,50" tile="-901" orientation="3" city="Bucharest"/>
<Hex name="R1" tile="0" />
<Hex name="R3" cost="120,60" label="M" tile="0" /><!-- Frejus -->
- <Hex name="R5" label="Y" tile="-10" city="Milan"/>
+ <Hex name="R5" label="Y" tile="-3007" city="Milan"/>
<Hex name="R7" cost="120,60" label="M" tile="0" /><!-- Albula -->
- <Hex name="R9" tile="-10" orientation="4" city="Trieste"/>
+ <Hex name="R9" tile="-3008" orientation="4" city="Trieste"/>
<Hex name="R11" tile="0" />
- <Hex name="S2" tile="-10" city="Marseille"/>
- <Hex name="S4" tile="-10" city="Turin"/>
+ <Hex name="S2" tile="-3008" city="Marseille"/>
+ <Hex name="S4" tile="-3008" city="Turin"/>
<Hex name="S6" tile="0" />
- <Hex name="S8" label="Y" tile="-10" city="Venice"/>
+ <Hex name="S8" label="Y" tile="-3007" city="Venice"/>
<Hex name="S10" tile="0" />
<Hex name="T1" tile="0" />
<Hex name="T3" cost="60" tile="-1" city="Nice"/>
- <Hex name="T5" tile="-10" city="Genoa"/>
+ <Hex name="T5" tile="-3008" city="Genoa"/>
<Hex name="T7" tile="-1" city="Bologna"/>
<Hex name="T9" port="yes" value="10" tile="-800" orientation="3"/>
<Hex name="U2" port="yes" value="10" tile="-800" orientation="3"/>
Modified: trunk/18xx/data/18EU/TileSet.xml
===================================================================
--- trunk/18xx/data/18EU/TileSet.xml 2010-09-16 20:12:37 UTC (rev 1421)
+++ trunk/18xx/data/18EU/TileSet.xml 2010-09-16 21:04:10 UTC (rev 1422)
@@ -6,10 +6,12 @@
<Tile id="-1"><!-- 1 town -->
<Upgrade id="3,4,58"/>
</Tile>
- <Tile id="-10"><!-- 1 city -->
- <Upgrade id="57" hex="F5,G4,I6,K10,R9,S2,S4,T5" />
- <Upgrade id="201,202" hex="C4,G10,H3,L7,M4,P13,Q2,R5,S8" />
+ <Tile id="-3008"><!-- 1 city -->
+ <Upgrade id="57"/>
</Tile>
+ <Tile id="-3007"><!-- 1 Y city -->
+ <Upgrade id="201,202"/>
+ </Tile>
<Tile id="-3"/>
<Tile id="-800"/>
<Tile id="-901"/>
Modified: trunk/18xx/data/18EU/Tiles.xml
===================================================================
--- trunk/18xx/data/18EU/Tiles.xml 2010-09-16 20:12:37 UTC (rev 1421)
+++ trunk/18xx/data/18EU/Tiles.xml 2010-09-16 21:04:10 UTC (rev 1422)
@@ -4,9 +4,12 @@
<Tile colour="white" id="-1" name="1 village">
<Station id="city1" position="002" type="Town"/>
</Tile>
- <Tile colour="white" id="-10" name="1 city">
- <Station id="city1" position="302" slots="1" type="City"/>
+ <Tile colour="white" id="-3007" name="Y city (cent)">
+ <Station id="city1" position="0" slots="1" type="City"/>
</Tile>
+ <Tile colour="white" id="-3008" name="city (cent.)">
+ <Station id="city1" position="0" slots="1" type="City"/>
+ </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"/>
Modified: trunk/18xx/tiles/Tiles.xml
===================================================================
--- trunk/18xx/tiles/Tiles.xml 2010-09-16 20:12:37 UTC (rev 1421)
+++ trunk/18xx/tiles/Tiles.xml 2010-09-16 21:04:10 UTC (rev 1422)
@@ -62,6 +62,7 @@
<Station id="city1" position="002" type="Town"/>
</Tile>
<Tile colour="white" id="0" name="empty"/>
+ <Tile colour="white" id="-10000" name="empty"/>
<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"/>
Added: trunk/18xx/tiles/svg/tile-10000.svg
===================================================================
--- trunk/18xx/tiles/svg/tile-10000.svg (rev 0)
+++ trunk/18xx/tiles/svg/tile-10000.svg 2010-09-16 21:04:10 UTC (rev 1422)
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z"
+ fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1"
+ stroke-linejoin="round"/>
+</svg>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
