From: Erik V. <ev...@us...> - 2011-11-11 13:20:51
|
data/1825/CompanyManager.xml | 198 ++++++++++++++++++++++++++++++------------- data/1825/Map.xml | 64 +++++++++++-- data/1825/TileSet.xml | 1 data/1825/Tiles.xml | 5 - tiles/HandmadeTiles.xml | 1 tiles/svg/tile-25000.svg | 19 ++++ tiles/svg/tile-25017.svg | 12 ++ tiles/svg/tile-25018.svg | 10 ++ 8 files changed, 238 insertions(+), 72 deletions(-) New commits: commit bf8e71df4227accdc78650e141340596aa499005 Author: Erik Vos <eri...@xs...> Date: Fri Nov 11 14:20:07 2011 +0100 Applied non-upgradable but approachable empty hexes to all 1825 units and regional kits. Using Stefan's new shaded tile and half-tiles. diff --git a/data/1825/CompanyManager.xml b/data/1825/CompanyManager.xml index 1493f2e..65c5a10 100644 --- a/data/1825/CompanyManager.xml +++ b/data/1825/CompanyManager.xml @@ -5,74 +5,158 @@ <CompanyType name="Public" class="rails.game.specific._1825.PublicCompany_1825"> <Float percentage="60"/> - <StockPrice par="yes"></StockPrice><ShareUnit percentage="10"/> - <BaseTokens> + <StockPrice par="yes"/> + <ShareUnit percentage="10"/> + <BaseTokens> <!-- HomeBase lay options: "whenStarted", "whenFloated", "firstOR" (default) --> -` <HomeBase lay="firstOR"/> + <HomeBase lay="firstOR"/> <!-- LayCost methods: only "sequence" (1830 style) implemented so far (default) --> - <LayCost method="sequence" cost="0,40,100"/> - </BaseTokens> + <LayCost method="sequence" cost="0,40,100"/> + </BaseTokens> <Certificate type="President" shares="2"/> <Certificate shares="1" number="8"/> <Trains limit="4,3"/> <!--TileLays> - <Number colour="yellow" number="2" phase="1,2,3,4"></Number></TileLays--></CompanyType> - <Company name="S&M" type="Private" basePrice="30" revenue="5" longname="Swansea and Mumbles"> - </Company> - <Company name="CHP" type="Private" basePrice="75" revenue="12" - longname="Cromford and High Peak"> - </Company> - <Company name="C&W" type="Private" basePrice="130" revenue="20" - longname="Canterbury and Whitstable"> - </Company> - <Company name="L&M" type="Private" basePrice="210" revenue="30" - longname="Liverpool and Manchester"> - </Company> + <Number colour="yellow" number="2" phase="1,2,3,4"></Number></TileLays--> + </CompanyType> + + <IfOption name="Include" parm="Unit1" value="yes"> - <!-- Note two supported colour specification formats: - RGB decimal with commas and RGB hexadecimal without commas --> - <Company name="LNWR" type="Public" tokens="6" fgColour="FFFFFF" - bgColour="000000" longname="London & North Western Railway" startspace="P1"> - <Home hex="T16" /> - </Company> - <Company name="GWR" type="Public" tokens="6" fgColour="FFFFFF" - bgColour="006600" longname="Great Western Railway" available="no" - startspace="O1"> - <Home hex="V14" /> - </Company> + <!-- Private companies --> + <Company name="S&M" type="Private" basePrice="30" revenue="5" longname="Swansea and Mumbles"> + </Company> + <Company name="CHP" type="Private" basePrice="75" revenue="12" + longname="Cromford and High Peak"> + </Company> + <Company name="C&W" type="Private" basePrice="130" revenue="20" + longname="Canterbury and Whitstable"> + </Company> + <Company name="L&M" type="Private" basePrice="210" revenue="30" + longname="Liverpool and Manchester"> + </Company> + + <!-- Public companies --> + <Company name="LNWR" type="Public" tokens="6" fgColour="FFFFFF" + bgColour="000000" longname="London & North Western Railway" startspace="P1"> + <IfOption name="Include" parm="Unit2" value="yes"> + <Home hex="T16,Q11" /> + </IfOption> + <IfOption name="Include" parm="Unit2" value="no"> + <Home hex="T16" /> + </IfOption> + </Company> + <Company name="GWR" type="Public" tokens="6" fgColour="FFFFFF" + bgColour="006600" longname="Great Western Railway" available="no" + startspace="O1"> + <Home hex="V14" /> + </Company> + <Company name="LSWR" type="Public" tokens="5" fgColour="000000" + bgColour="99FF66" longname="London & South Western Railway" + available="no" startspace="M1"> + <Home hex="V20" city="6" /> + </Company> + <Company name="GER" type="Public" tokens="5" fgColour="FFFFFF" + bgColour="000066" longname="Great Eastern" available="no" + startspace="M1"> + <Home hex="V20" city="4" /> + </Company> + <Company name="SECR" type="Public" tokens="5" fgColour="000000" + bgColour="FFFF00" longname="South Eastern & Chatham Railway" + available="no" startspace="L1"> + <Home hex="W23"></Home> + </Company> + <Company name="LBSC" type="Public" tokens="4" fgColour="000000" + bgColour="FF9900" + longname="London, Brighton & South Coast Railway" available="no" + startspace="K1"> + <Home hex="X20"></Home> + </Company> + </IfOption> + <!-- UNIT 2 COMPANIES --> + <IfOption name="Include" parm="Unit2" value="yes"> - <Company name="LSWR" type="Public" tokens="5" fgColour="000000" - bgColour="99FF66" longname="London & South Western Railway" - available="no" startspace="M1"> - <Home hex="V20" city="6" /> - </Company> - <Company name="GER" type="Public" tokens="5" fgColour="FFFFFF" - bgColour="000066" longname="Great Eastern" available="no" - startspace="M1"> - <Home hex="V20" city="4" /> - </Company> - <Company name="SECR" type="Public" tokens="5" fgColour="000000" - bgColour="FFFF00" longname="South Eastern & Chatham Railway" - available="no" startspace="L1"> - <Home hex="W23"></Home> - </Company> - <Company name="LBSC" type="Public" tokens="4" fgColour="000000" - bgColour="FF9900" - longname="London, Brighton & South Coast Railway" available="no" - startspace="K1"> - <Home hex="X20"></Home> - </Company> + <!-- Private companies --> + <Company name="Lds&M" type="Private" basePrice="30" revenue="5" longname="Leeds and Middleton"> + </Company> + <IfOption name="Include" parm="Unit1" value="no"> + <Company name="CHP" type="Private" basePrice="75" revenue="12" + longname="Cromford and High Peak"> + </Company> + </IfOption> + <Company name="S&D" type="Private" basePrice="160" revenue="25" + longname="Stockton&Darlington"> + </Company> + <IfOption name="Include" parm="Unit1" value="no"> + <Company name="L&M" type="Private" basePrice="210" revenue="30" + longname="Liverpool and Manchester"> + </Company> + </IfOption> + <!-- Public companies --> + <IfOption name="Include" parm="Unit1" value="no"> + <Company name="LNWR" type="Public" tokens="6" fgColour="FFFFFF" + bgColour="000000" longname="London & North Western Railway" startspace="P1"> + <Home hex="Q11" /> + </Company> + </IfOption> + <Company name="MR" type="Public" tokens="5" fgColour="FFFFFF" + bgColour="FF0000" longname="Midland Railway" available="no" + startspace="N1"> + <Home hex="Q15" /> + </Company> + <Company name="NER" type="Public" tokens="5" fgColour="FFFFFF" + bgColour="00BB00" longname="North Eastern Railway" + available="no" startspace="N1"> + <Home hex="L14"/> + </Company> + <Company name="GCR" type="Public" tokens="4" fgColour="000000" + bgColour="8888FF" longname="Great Central Railway" available="no" + startspace="L1"> + <Home hex="O15" city="1"/> + </Company> + <Company name="GNR" type="Public" tokens="4" fgColour="008800" + bgColour="FFFFFF" longname="Great Eastern Railway" + available="no" startspace="L1"> + <Home hex="O15" city="2"/> + </Company> + <Company name="L&Y" type="Public" tokens="4" fgColour="FFFFFF" + bgColour="880088" + longname="Lancashire and Yorkshire Railway" available="no" + startspace="L1"> + <Home hex="O11" city="1"></Home> + </Company> + + </IfOption> + <StartPacket roundClass="rails.game.specific._1825.StartRound_1825"> - <Item name="S&M" type="Private" basePrice="30"/> - <Item name="CHP" type="Private" basePrice="75"/> - <Item name="C&W" type="Private" basePrice="130"/> - <Item name="L&M" type="Private" basePrice="210"/> - <IfOption name="NumberOfPlayers" value="5"> - <Item name="LNWR" type="Public" president="yes" - basePrice="200"> - </Item></IfOption></StartPacket> + <IfOption name="Include" parm="Unit1" value="yes"> + <Item name="S&M" type="Private" basePrice="30"/> + <Item name="CHP" type="Private" basePrice="75"/> + <Item name="C&W" type="Private" basePrice="130"/> + <Item name="L&M" type="Private" basePrice="210"/> + <IfOption name="NumberOfPlayers" value="5"> + <Item name="LNWR" type="Public" president="yes" + basePrice="200"> + </Item> + </IfOption> + </IfOption> + <IfOption name="Include" parm="Unit2" value="yes"> + <Item name="Lds&M" type="Private" basePrice="30"/> + <IfOption name="Include" parm="Unit1" value="no"> + <Item name="CHP" type="Private" basePrice="75"/> + </IfOption> + <Item name="S&D" type="Private" basePrice="130"/> + <IfOption name="Include" parm="Unit1" value="no"> + <Item name="L&M" type="Private" basePrice="210"/> + <IfOption name="NumberOfPlayers" value="5"> + <Item name="LNWR" type="Public" president="yes" + basePrice="200"> + </Item> + </IfOption> + </IfOption> + </IfOption> + </StartPacket> <StockRoundRules> <!-- Will probably move later to a GameManager XML--> <NoSaleInFirstSR/> diff --git a/data/1825/Map.xml b/data/1825/Map.xml index eff4b92..553ce04 100644 --- a/data/1825/Map.xml +++ b/data/1825/Map.xml @@ -1,4 +1,6 @@ <Map tileOrientation="EW" letterOrientation="vertical" even="R"> + + <!-- UNIT 3 --> <IfOption name="Include" parm="Unit3" value="yes"> <Hex name="B8" tile="-5" orientation="1" city="Inverness"/> <Hex name="B12" tile="-25011" city="Aberdeen"/> @@ -46,16 +48,32 @@ <Hex name="J12" tile="0" cost="100"/> <Hex name="J14" tile="-20" cost="40" city="Newcastle u/T, Sunderland"/> <Hex name="K7" tile="-25014" orientation="2" city="Maryport"/> - <Hex name="K9" tile="0" cost="100" open="0,5"/> - <Hex name="K11" tile="0" cost="100" open="0,5"/> - <Hex name="K13" tile="-1" city="Durham" open="0,5"/> - <Hex name="K15" tile="-2" city="Stockton, Middlesbro" open="0,5"/> + <Hex name="K9" tile="0" cost="100"/> + <Hex name="K11" tile="0" cost="100"/> + <Hex name="K13" tile="-1" city="Durham"/> + <Hex name="K15" tile="-2" city="Stockton, Middlesbro"/> + <IfOption name="Include" parm="Unit2" value="yes"> + <Hex name="L8" tile="-25017" orientation="4"/> + <Hex name="L10" tile="-25017" orientation="4"/> + <Hex name="L12" tile="-25017" orientation="4"/> + <Hex name="L14" tile="-25017" orientation="4"/> + <Hex name="L16" tile="-25017" orientation="4"/> + </IfOption> </IfOption> + + <!-- UNIT 2 --> <IfOption name="Include" parm="Unit2" value="yes"> - <Hex name="L8" tile="0" open="2,3"/> - <Hex name="L10" tile="0" open="2,3"/> - <Hex name="L12" tile="0" cost="100" open="2,3"/> - <Hex name="L14" tile="-10" city="Darlington" open="2,3" reserved="NER"/> + <IfOption name="Include" parm="Unit3" value="no"> + <Hex name="K7" tile="-25017" orientation="4"/> + <Hex name="K9" tile="-25017" orientation="4"/> + <Hex name="K11" tile="-25017" orientation="4"/> + <Hex name="K13" tile="-25017" orientation="4"/> + <Hex name="K15" tile="-25017" orientation="4"/> + </IfOption> + <Hex name="L8" tile="0"/> + <Hex name="L10" tile="0"/> + <Hex name="L12" tile="0" cost="100"/> + <Hex name="L14" tile="-10" city="Darlington" reserved="NER"/> <Hex name="L16" tile="0" open="2"/> <Hex name="L18" tile="-1" city="Scarborough"/> <Hex name="M9" tile="-25008" city="Barrow"/> @@ -88,11 +106,30 @@ <Hex name="Q15" tile="-10" city="Derby" open="0,5" reserved="MR"/> <Hex name="Q17" tile="-10" city="Nottingham" open="0,5"/> <Hex name="Q19" tile="0" open="0,5"/> + <IfOption name="Include" parm="Unit1" value="no"> + <IfOption name="Include" parm="R1" value="no"> + <Hex name="Q7" tile="-25018" orientation="1"/> + </IfOption> + <Hex name="R8" tile="-25017" orientation="1"/> + <Hex name="R10" tile="-25017" orientation="1"/> + <Hex name="R12" tile="-25017" orientation="1"/> + <Hex name="R14" tile="-25017" orientation="1"/> + <Hex name="R16" tile="-25017" orientation="1"/> + <Hex name="R18" tile="-25017" orientation="1"/> + <Hex name="R20" tile="-25017" orientation="1"/> + </IfOption> </IfOption> + + <!-- UNIT 1 --> <IfOption name="Include" parm="Unit1" value="yes"> <IfOption name="Include" parm="R1" value="no"> - <Hex name="Q7" tile="-25017" orientation="4"/> - <Hex name="Q9" tile="-25017" orientation="4"/> + <IfOption name="Include" parm="Unit2" value="no"> + <Hex name="Q7" tile="-25017" orientation="4"/> + <Hex name="Q9" tile="-25017" orientation="4"/> + </IfOption> + <IfOption name="Include" parm="Unit2" value="yes"> + <Hex name="Q7" tile="-25000"/> + </IfOption> </IfOption> <IfOption name="Include" parm="Unit2" value="no"> <Hex name="Q11" tile="-25017" orientation="4" impassable="R10"/> @@ -107,14 +144,14 @@ </IfOption> <IfOption name="Include" parm="R1" value="no"> <Hex name="R6" tile="-25018" orientation="1"/> - <Hex name="S7" tile="-25018" orientation="1"/> + <Hex name="S7" tile="-25000" orientation="1"/> <Hex name="T6" tile="-25018" orientation="1"/> - <Hex name="U7" tile="-25018" orientation="1"/> + <Hex name="U7" tile="-25000" orientation="1"/> <Hex name="V6" tile="-25018" orientation="1"/> </IfOption> <IfOption name="Include" parm="R2" value="no"> <Hex name="X6" tile="-25018" orientation="1"/> - <Hex name="Y7" tile="-25018" orientation="1"/> + <Hex name="Y7" tile="-25000" orientation="1"/> </IfOption> <Hex name="R8" tile="0" open="0,1,2,3"/> <Hex name="R10" tile="-1" city="Shrewsbury" orientation="3"/> @@ -200,6 +237,7 @@ <Hex name="P6" tile="0" cost="40"/> <IfOption name="Include" parm="Unit2" value="no"> <Hex name="P8" tile="-25018" orientation="4"/> + <Hex name="Q9" tile="-25017" orientation="4"/> </IfOption> <Hex name="Q5" tile="-1" city="Portmadoc"/> <Hex name="Q7" tile="0" cost="100"/> diff --git a/data/1825/TileSet.xml b/data/1825/TileSet.xml index 70cbdb0..4ab3605 100644 --- a/data/1825/TileSet.xml +++ b/data/1825/TileSet.xml @@ -20,6 +20,7 @@ <Tile id="-7"><!--Preprinted tight bend--></Tile> <Tile id="-41"/> <Tile id="-104"><!--Harwich--></Tile> + <Tile id="-25000"/> <Tile id="-25001"><!--London--><Upgrade id="32" relayBaseTokens="yes"></Upgrade></Tile> <Tile id="-25002"><!--Birmingham--><Upgrade id="34" relayBaseTokens="yes"></Upgrade></Tile> <Tile id="-25003"><!--Bristol--><Upgrade id="38" relayBaseTokens="yes"/></Tile> diff --git a/data/1825/Tiles.xml b/data/1825/Tiles.xml index aae97f9..bbd1dc6 100644 --- a/data/1825/Tiles.xml +++ b/data/1825/Tiles.xml @@ -32,6 +32,7 @@ <Station id="city1" position="0" slots="1" type="City" value="20"/> <Track from="city1" gauge="normal" to="side2"/> </Tile> + <Tile colour="white" id="-25000" name="empty tile, unlayable"/> <Tile colour="green" id="-25001" name="London"> <Station id="city1" position="403" slots="1" type="City" value="50"/> <Station id="city2" position="503" slots="1" type="City" value="50"/> @@ -143,8 +144,8 @@ <Track from="city1" gauge="normal" to="side1"/> <Track from="city1" gauge="normal" to="side2"/> </Tile> - <Tile colour="white" id="-25017" name="empty half-tile (W)"/> - <Tile colour="white" id="-25018" name="empty half-tile (N)"/> + <Tile colour="white" id="-25017" name="empty half-tile (W)"/> + <Tile colour="white" id="-25018" name="empty half-tile (N)"/> <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/tiles/HandmadeTiles.xml b/tiles/HandmadeTiles.xml index 7de8ff0..7da6aae 100644 --- a/tiles/HandmadeTiles.xml +++ b/tiles/HandmadeTiles.xml @@ -51,6 +51,7 @@ <Track from="city2" gauge="normal" to="side3"/> <Track from="city2" gauge="normal" to="side2"/> </Tile> + <Tile colour="white" id="-25000" name="empty tile, unlayable"/> <Tile colour="white" id="-25017" name="empty half-tile (W)"/> <Tile colour="white" id="-25018" name="empty half-tile (N)"/> </Tiles> diff --git a/tiles/svg/tile-25000.svg b/tiles/svg/tile-25000.svg new file mode 100644 index 0000000..e66abb6 --- /dev/null +++ b/tiles/svg/tile-25000.svg @@ -0,0 +1,19 @@ +<?xml version="1.0"?> +<svg version="1.1" xmlns="http://www.w3.org/2000/svg"> + + + <defs> + <pattern id="hatch" patternUnits="userSpaceOnUse" x="0" y="0" width="25" height="25"> + <g style="fill:none; stroke:black; stroke-width:1"> + <path d="M0,0 l25,25"/> + <path d="M25,0 l-25,25"/> + </g> + </pattern> + </defs> + + <path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" + fill="#C0DCC0" stroke="black" stroke-width="1" + stroke-linejoin="round"/> + <path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" + fill="url(#hatch)" /> +</svg> \ No newline at end of file diff --git a/tiles/svg/tile-25017.svg b/tiles/svg/tile-25017.svg index 2ec1ed9..fc90bac 100644 --- a/tiles/svg/tile-25017.svg +++ b/tiles/svg/tile-25017.svg @@ -1,6 +1,18 @@ <?xml version="1.0"?> <svg version="1.1" xmlns="http://www.w3.org/2000/svg"> + + <defs> + <pattern id="hatch" patternUnits="userSpaceOnUse" x="0" y="0" width="25" height="25"> + <g style="fill:none; stroke:black; stroke-width:1"> + <path d="M0,0 l25,25"/> + <path d="M25,0 l-25,25"/> + </g> + </pattern> + </defs> + <path d=" M 98,0 L 196,0 L 196,340 L 98,340 L 0,170 Z" fill="#C0DCC0" stroke="black" stroke-width="1" stroke-linejoin="round"/> + <path d=" M 98,0 L 196,0 L 196,340 L 98,340 L 0,170 Z" + fill="url(#hatch)" /> </svg> \ No newline at end of file diff --git a/tiles/svg/tile-25018.svg b/tiles/svg/tile-25018.svg index 2975772..d155d42 100644 --- a/tiles/svg/tile-25018.svg +++ b/tiles/svg/tile-25018.svg @@ -1,6 +1,16 @@ <?xml version="1.0"?> <svg version="1.1" xmlns="http://www.w3.org/2000/svg"> + <defs> + <pattern id="hatch" patternUnits="userSpaceOnUse" x="0" y="0" width="25" height="25"> + <g style="fill:none; stroke:black; stroke-width:1"> + <path d="M0,0 l25,25"/> + <path d="M25,0 l-25,25"/> + </g> + </pattern> + </defs> <path d=" M 98,0 L 294,0 L 392,170 L 0,170 Z" fill="#C0DCC0" stroke="black" stroke-width="1" stroke-linejoin="round"/> + <path d=" M 98,0 L 294,0 L 392,170 L 0,170 Z" + fill="url(#hatch)" /> </svg> \ No newline at end of file |
From: Erik V. <ev...@us...> - 2011-11-11 21:41:01
|
data/1825/Map.xml | 79 ++++++++++++++++++++++++++++++++++++++++++++++-- data/1825/TileSet.xml | 3 + data/1825/Tiles.xml | 3 + tiles/HandmadeTiles.xml | 3 + tiles/svg/tile-4000.svg | 6 +++ tiles/svg/tile-4004.svg | 6 +++ tiles/svg/tile-4005.svg | 6 +++ 7 files changed, 104 insertions(+), 2 deletions(-) New commits: commit 8f9b2d141ab02bfb31b78c4f4063116fc88fd7eb Author: Erik Vos <eri...@xs...> Date: Fri Nov 11 22:39:34 2011 +0100 Added blue water tile -4000 and half tiles -4004 and -4005. Applied to 1825 (all units and regional kits). The tiles have type "fixed", so that no track can be laid towards any of them. diff --git a/data/1825/Map.xml b/data/1825/Map.xml index 9143a6b..ee91879 100644 --- a/data/1825/Map.xml +++ b/data/1825/Map.xml @@ -10,39 +10,52 @@ <Hex name="C7" tile="-1" cost="100" city="Pitlochry" open="1,2"/> <Hex name="C9" tile="0" cost="100" open="3"/> <Hex name="C11" tile="0" open="2"/> + <Hex name="C13" tile="-4004" orientation="4"/> + <Hex name="D0" tile="-4004" orientation="1"/> <Hex name="D2" tile="0" cost="100"/> <Hex name="D4" tile="0" cost="100"/> <Hex name="D6" tile="0" cost="100"/> <Hex name="D8" tile="0" cost="100"/> <Hex name="D10" tile="-1" city="Montrose"/> + <Hex name="D12" tile="-4000"/> <Hex name="E1" tile="-5" orientation="5" cost="40" city="Oban"/> <Hex name="E3" tile="0" cost="100"/> <Hex name="E5" tile="0" cost="100"/> <Hex name="E7" tile="-25005" orientation="1" city="Perth"/> <Hex name="E9" tile="-10" cost="80" city="Dundee"/> + <Hex name="E11" tile="-4000"/> <Hex name="F2" tile="-25012" city="Helensburgh, Gourock"/> <Hex name="F4" tile="-1" cost="40" city="Dumbarton"/> <Hex name="F6" tile="-1" city="Stirling"/> <Hex name="F8" tile="-2" orientation="3" cost="120" city="Dumfermline, Kirkaldy"/> <Hex name="F10" tile="-25013" city="Anstruther"/> + <Hex name="F12" tile="-4000"/> + <Hex name="G1" tile="-4004" orientation="1"/> <Hex name="G3" tile="-10" city="Greenock"/> <Hex name="G5" tile="-25002" city="Glasgow"/> <Hex name="G7" tile="-2" city="Coatbridge, Airdrie"/> <Hex name="G9" tile="-20" city="Edinburgh, Leith"/> <Hex name="G11" tile="0"/> + <Hex name="G13" tile="-4000"/> + <Hex name="G15" tile="-4000"/> + <Hex name="H2" tile="-4000"/> <Hex name="H4" tile="-2" city="Ayr, Kilmarnock" reserved="GSWR"/> <Hex name="H6" tile="-10" city="Motherwell"/> <Hex name="H8" tile="0" cost="100"/> <Hex name="H10" tile="0" cost="100"/> <Hex name="H12" tile="0"/> <Hex name="H14" tile="0"/> + <Hex name="H16" tile="-4004" orientation="4"/> + <Hex name="I1" tile="-4000"/> <Hex name="I3" tile="0" cost="100"/> <Hex name="I5" tile="0"/> <Hex name="I7" tile="0" cost="100"/> <Hex name="I9" tile="0" cost="100"/> <Hex name="I11" tile="0" cost="100"/> <Hex name="I13" tile="-2"/> + <Hex name="I15" tile="-4000"/> + <Hex name="J0" tile="-4004" orientation="1"/> <Hex name="J2" tile="-10" city="Stranraer"/> <Hex name="J4" tile="0" cost="100"/> <Hex name="J6" tile="-10" city="Dumfries"/> @@ -50,11 +63,16 @@ <Hex name="J10" tile="-10" ciry="Carlisle"/> <Hex name="J12" tile="0" cost="100"/> <Hex name="J14" tile="-20" cost="40" city="Newcastle u/T, Sunderland"/> - <Hex name="K7" tile="-25014" orientation="2" city="Maryport"/> + <Hex name="J16" tile="-4000"/> + <Hex name="K1" tile="-4005" orientation="1"/> + <Hex name="K3" tile="-4005" orientation="1"/> + <Hex name="K5" tile="-4005" orientation="1"/> + <Hex name="K7" tile="-25014" city="Maryport"/> <Hex name="K9" tile="0" cost="100"/> <Hex name="K11" tile="0" cost="100"/> <Hex name="K13" tile="-1" city="Durham"/> <Hex name="K15" tile="-2" city="Stockton, Middlesbro"/> + <Hex name="K17" tile="-4000"/> <IfOption name="Include" parm="Unit2" value="no"> <Hex name="L8" tile="-25017" orientation="1"/> <Hex name="L10" tile="-25017" orientation="1"/> @@ -73,29 +91,39 @@ <Hex name="K13" tile="-25017" orientation="4"/> <Hex name="K15" tile="-25017" orientation="4"/> </IfOption> + <Hex name="K17" tile="-4000"/> + <Hex name="K19" tile="-4005" orientation="4"/> + <Hex name="L6" tile="-4000"/> <Hex name="L8" tile="0"/> <Hex name="L10" tile="0"/> <Hex name="L12" tile="0" cost="100"/> <Hex name="L14" tile="-10" city="Darlington" reserved="NER"/> <Hex name="L16" tile="0" open="2"/> <Hex name="L18" tile="-1" city="Scarborough"/> + <Hex name="L20" tile="-4000"/> + <Hex name="M7" tile="-4000"/> <Hex name="M9" tile="-25008" city="Barrow"/> <Hex name="M11" tile="0" cost="100"/> <Hex name="M13" tile="0" cost="100"/> <Hex name="M15" tile="-2" city="Harrogate, York"/> <Hex name="M17" tile="0"/> <Hex name="M19" tile="0"/> + <Hex name="M21" tile="-4004" orientation="4"/> + <Hex name="N8" tile="-4000"/> <Hex name="N10" tile="-10" city="Preston" reserved="L&Y"/> <Hex name="N12" tile="-2" city="Burnley, Halifax"/> <Hex name="N14" tile="-20" city="Bradford, Leeds"/> <Hex name="N16" tile="0"/> <Hex name="N18" tile="-10" cost="40" city="Hull"/> + <Hex name="N20" tile="-4000"/> + <Hex name="O7" tile="-4004" orientation="1"/> <Hex name="O9" tile="-25009" cost="40" city="Liverpool"/> <Hex name="O11" tile="-25002" orientation="1" city="Manchester"/> <Hex name="O13" tile="0" cost="100"/> <Hex name="O15" tile="-25010" city="Barnsley, Doncaster"/> <Hex name="O17" tile="0" cost="40"/> <Hex name="O19" tile="0"/> + <Hex name="O21" tile="-4000"/> <Hex name="P8" tile="-41" orientation="4"/> <Hex name="P10" tile="0" cost="40"/> <Hex name="P12" tile="0" cost="100"/> @@ -103,12 +131,14 @@ <Hex name="P16" tile="-20" city="Sheffield, Rotherham"/> <Hex name="P18" tile="-1" city="Lincoln"/> <Hex name="P20" tile="0"/> + <Hex name="P22" tile="-4004" orientation="4"/> <Hex name="Q9" tile="0" open="0,5"/> <Hex name="Q11" tile="-25004" city="Crewe"/> <Hex name="Q13" tile="-2" city="Newcastle u/L, Hanley" open="0,5"/> <Hex name="Q15" tile="-10" city="Derby" open="0,5" reserved="MR"/> <Hex name="Q17" tile="-10" city="Nottingham" open="0,5"/> <Hex name="Q19" tile="0" open="0,5"/> + <Hex name="Q21" tile="-4000"/> <IfOption name="Include" parm="Unit1" value="no"> <IfOption name="Include" parm="R1" value="no"> <Hex name="Q7" tile="-25018" orientation="1"/> @@ -141,10 +171,12 @@ <Hex name="Q17" tile="-25017" orientation="4"/> <Hex name="Q19" tile="-25017" orientation="4"/> </IfOption> + <Hex name="Q21" tile="-4000"/> <IfOption name="Include" parm="R3" value="no"> <Hex name="Q23" tile="-25017" orientation="4"/> <Hex name="Q25" tile="-25017" orientation="4"/> </IfOption> + <Hex name="Q27" tile="-4000"/> <IfOption name="Include" parm="R1" value="no"> <Hex name="R6" tile="-25018" orientation="1"/> <Hex name="S7" tile="-25000" orientation="1"/> @@ -155,8 +187,9 @@ <IfOption name="Include" parm="R2" value="no"> <Hex name="X6" tile="-25018" orientation="1"/> <Hex name="Y7" tile="-25000" orientation="1"/> + <Hex name="Z8" tile="-4005" orientation="1"/> </IfOption> - <Hex name="R8" tile="0" open="0,1,2,3"/> + <Hex name="R8" tile="0"/> <Hex name="R10" tile="-1" city="Shrewsbury" orientation="3"/> <Hex name="R12" tile="-20" orientation="1" city="Wolverhampton, Walsall" open="2,3"/> @@ -171,6 +204,7 @@ <Hex name="R22" tile="0" open="3"/> <Hex name="R24" tile="-10" city="Norwich" orientation="4"/> <Hex name="R26" tile="-1" city="Great Yarmouth" orientation="1"/> + <Hex name="R28" tile="-4004" orientation="4"/> <Hex name="S9" tile="0" open="1"/> <Hex name="S11" tile="0"/> <Hex name="S13" tile="-25002" city="Birmingham"/> @@ -180,6 +214,7 @@ <Hex name="S21" tile="0"/> <Hex name="S23" tile="0"/> <Hex name="S25" tile="0"/> + <Hex name="S27" tile="-4000"/> <Hex name="T8" tile="0" cost="100"/> <Hex name="T10" tile="0"/> <Hex name="T12" tile="0"/> @@ -189,6 +224,7 @@ <Hex name="T20" tile="-1" city="Cambridge"/> <Hex name="T22" tile="0"/> <Hex name="T24" tile="-1" city="Ipswich" orientation="1"/> + <Hex name="T26" tile="-4000"/> <Hex name="U9" tile="0" open="1"/> <Hex name="U11" tile="-1" cost="40" city="Gloucester" orientation="1"></Hex> <Hex name="U13" tile="0"/> @@ -198,6 +234,7 @@ <Hex name="U21" tile="0"/> <Hex name="U23" tile="-1" city="Colchester" reserved="GER"/> <Hex name="U25" tile="-104" orientation="2" city="Harwich"/> + <Hex name="U27" tile="-4004" orientation="4"/> <Hex name="V8" tile="-20" city="Cardiff, Newport"/> <Hex name="V10" tile="-25003" city="Bristol"/> <Hex name="V12" tile="0"/> @@ -206,6 +243,9 @@ <Hex name="V18" tile="0" reserved="GWR"/> <Hex name="V20" tile="-25001" city="London"/> <Hex name="V22" tile="-25006" value="20" city="Southend"/> + <Hex name="V24" tile="-4000"/> + <Hex name="V26" tile="-4000"/> + <Hex name="W7" tile="-4000"/> <IfOption name="Include" parm="R2" value="no"> <Hex name="W9" tile="-41" orientation="3"/> </IfOption> @@ -221,6 +261,7 @@ <Hex name="W21" tile="0"/> <Hex name="W23" tile="-10" city="Ashford" orientation="5"/> <Hex name="W25" tile="-5" orientation="2" city="Dover"/> + <Hex name="W27" tile="-4004" orientation="4"/> <Hex name="X8" tile="0" open="0,1"/> <Hex name="X10" tile="0"/> <Hex name="X12" tile="0"/> @@ -230,45 +271,79 @@ <Hex name="X20" tile="-10" city="Brighton" orientation="5" reserved="LBSC"/> <Hex name="X22" tile="-1" city="Hastings" orientation="2"/> <Hex name="X24" tile="0"/> + <Hex name="X26" tile="-4000"/> <Hex name="Y9" tile="0" open="1"/> <Hex name="Y11" tile="-1" city="Weymouth" orientation="3"/> <Hex name="Y13" tile="-25007" city="Bournemouth"/> + <Hex name="Y15" tile="-4000"/> <Hex name="Y17" tile="-7" orientation="4"/> <Hex name="Y19" tile="-7" orientation="4"/> + <Hex name="Y21" tile="-4000"/> + <Hex name="Y23" tile="-4000"/> + <Hex name="Y25" tile="-4000"/> + <Hex name="Z10" tile="-4005" orientation="1"/> + <Hex name="Z12" tile="-4005" orientation="1"/> <IfOption name="Include" parm="R1" value="yes"> + <Hex name="O3" tile="-4005" orientation="4"/> + <Hex name="O5" tile="-4005" orientation="4"/> + <Hex name="O7" tile="-4005" orientation="4"/> + <Hex name="P2" tile="-4004" orientation="1"/> <Hex name="P4" tile="-5" city="Holyhead"/> <Hex name="P6" tile="0" cost="40"/> <IfOption name="Include" parm="Unit2" value="no"> <Hex name="P8" tile="-25018" orientation="4"/> <Hex name="Q9" tile="-25017" orientation="4"/> </IfOption> + <Hex name="Q3" tile="-4000"/> <Hex name="Q5" tile="-1" city="Portmadoc"/> <Hex name="Q7" tile="0" cost="100"/> + <Hex name="R4" tile="-4000"/> <Hex name="R6" tile="0"/> + <Hex name="S1" tile="-4000"/> + <Hex name="S3" tile="-4000"/> <Hex name="S5" tile="-1" city="Aberystwyth"/> <Hex name="S7" tile="0" cost="100"/> + <Hex name="T0" tile="-4000"/> <Hex name="T2" tile="-10" city="Fishguard"/> <Hex name="T4" tile="0"/> <Hex name="T6" tile="0" cost="100"/> + <Hex name="U99" tile="-4004" orientation="1"/> <Hex name="U1" tile="-25015" city="Milford Haven"/> <Hex name="U3" tile="0"/> <Hex name="U5" tile="0"/> <Hex name="U7" tile="-2"/> + <Hex name="V0" tile="-4000"/> + <Hex name="V2" tile="-4000"/> + <Hex name="V4" tile="-4000"/> <Hex name="V6" tile="-25007" orientation="1" city="Swansea"/> </IfOption> <IfOption name="Include" parm="R2" value="yes"> + <Hex name="W3" tile="-4000"/> + <Hex name="W5" tile="-4000"/> + <Hex name="X0" tile="-4000"/> + <Hex name="X2" tile="-4000"/> <Hex name="X4" tile="-1" city="Barnstaple"/> <Hex name="X6" tile="0" cost="100"/> + <Hex name="Y99" tile="-4000"/> <Hex name="Y1" tile="0"/> <Hex name="Y3" tile="0"/> <Hex name="Y5" tile="0" cost="100"/> <Hex name="Y7" tile="-10" city="Exeter"/> + <Hex name="Z98" tile="-4000"/> <Hex name="Z0" tile="0"/> <Hex name="Z2" tile="-1" city="Fowey"/> <Hex name="Z4" tile="-20" city="Devenport, Plymouth"/> <Hex name="Z6" tile="-1" city="Torquay"/> + <Hex name="Z8" tile="-4000"/> + <Hex name="AA97" tile="-4004" orientation="1"/> <Hex name="AA99" tile="-1" city="Penzance"/> <Hex name="AA1" tile="-10" city="Falmouth"/> + <Hex name="AA3" tile="-4000"/> + <Hex name="AA5" tile="-4005" orientation="1"/> + <Hex name="AA7" tile="-4005" orientation="1"/> + <Hex name="AB98" tile="-4005" orientation="1"/> + <Hex name="AB0" tile="-4005" orientation="1"/> + <Hex name="AB2" tile="-4005" orientation="1"/> </IfOption> <IfOption name="Include" parm="R3" value="yes"> <Hex name="Q23" tile="-25014" orientation="1" city="Melton Constable"/> diff --git a/data/1825/TileSet.xml b/data/1825/TileSet.xml index 4ab3605..c4441ef 100644 --- a/data/1825/TileSet.xml +++ b/data/1825/TileSet.xml @@ -39,6 +39,9 @@ <Tile id="-25016"/> <Tile id="-25017"/> <Tile id="-25018"/> + <Tile id="-4000"/> + <Tile id="-4004"/> + <Tile id="-4005"/> <!-- Yellow tiles --> <Tile id="1" quantity="1" > <Upgrade id="14"></Upgrade></Tile> diff --git a/data/1825/Tiles.xml b/data/1825/Tiles.xml index bbd1dc6..cdc0d7f 100644 --- a/data/1825/Tiles.xml +++ b/data/1825/Tiles.xml @@ -146,6 +146,9 @@ </Tile> <Tile colour="white" id="-25017" name="empty half-tile (W)"/> <Tile colour="white" id="-25018" name="empty half-tile (N)"/> + <Tile colour="fixed" id="-4000" name="water"/> + <Tile colour="fixed" id="-4004" name="water half-tile (W)"/> + <Tile colour="fixed" id="-4005" name="water half-tile (N)"/> <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/tiles/HandmadeTiles.xml b/tiles/HandmadeTiles.xml index 7da6aae..4282909 100644 --- a/tiles/HandmadeTiles.xml +++ b/tiles/HandmadeTiles.xml @@ -51,6 +51,9 @@ <Track from="city2" gauge="normal" to="side3"/> <Track from="city2" gauge="normal" to="side2"/> </Tile> + <Tile colour="fixed" id="-4000" name="water"/> + <Tile colour="fixed" id="-4004" name="water half-tile (W)"/> + <Tile colour="fixed" id="-4005" name="water half-tile (N)"/> <Tile colour="white" id="-25000" name="empty tile, unlayable"/> <Tile colour="white" id="-25017" name="empty half-tile (W)"/> <Tile colour="white" id="-25018" name="empty half-tile (N)"/> diff --git a/tiles/svg/tile-4000.svg b/tiles/svg/tile-4000.svg new file mode 100644 index 0000000..1abecac --- /dev/null +++ b/tiles/svg/tile-4000.svg @@ -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="#60A0FF" stroke="black" stroke-width="1" + stroke-linejoin="round"/> +</svg> \ No newline at end of file diff --git a/tiles/svg/tile-4004.svg b/tiles/svg/tile-4004.svg new file mode 100644 index 0000000..4bb210d --- /dev/null +++ b/tiles/svg/tile-4004.svg @@ -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 0,170 Z" + fill="#60A0FF" stroke="black" stroke-width="1" + stroke-linejoin="round"/> +</svg> \ No newline at end of file diff --git a/tiles/svg/tile-4005.svg b/tiles/svg/tile-4005.svg new file mode 100644 index 0000000..050af8b --- /dev/null +++ b/tiles/svg/tile-4005.svg @@ -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 196,0 L 196,340 L 98,340 L 0,170 Z" + fill="#60A0FF" stroke="black" stroke-width="1" + stroke-linejoin="round"/> +</svg> \ No newline at end of file |