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 |