Menu
▾
▴
rails-commits — CVS Commits
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
(46) |
Dec
(57) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(51) |
Feb
(10) |
Mar
|
Apr
|
May
(14) |
Jun
|
Jul
(13) |
Aug
(30) |
Sep
(83) |
Oct
(56) |
Nov
(148) |
Dec
(107) |
| 2010 |
Jan
(260) |
Feb
(164) |
Mar
(183) |
Apr
(99) |
May
(160) |
Jun
(40) |
Jul
(33) |
Aug
(48) |
Sep
(22) |
Oct
(24) |
Nov
(1) |
Dec
(12) |
| 2011 |
Jan
(6) |
Feb
(15) |
Mar
(13) |
Apr
(37) |
May
(27) |
Jun
(29) |
Jul
(33) |
Aug
(20) |
Sep
(17) |
Oct
(20) |
Nov
(33) |
Dec
(17) |
| 2012 |
Jan
(39) |
Feb
(38) |
Mar
(20) |
Apr
(21) |
May
(17) |
Jun
(22) |
Jul
(16) |
Aug
(3) |
Sep
(9) |
Oct
(10) |
Nov
|
Dec
|
|
From: Erik V. <ev...@us...> - 2009-12-18 20:02:37
|
Update of /cvsroot/rails/18xx/data/1830 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5514/data/1830 Modified Files: Tiles.xml Log Message: Changed orientation of tile #4 to get the village right Index: Tiles.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1830/Tiles.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Tiles.xml 28 Feb 2008 21:35:04 -0000 1.6 --- Tiles.xml 18 Dec 2009 20:02:21 -0000 1.7 *************** *** 38,42 **** <Track from="side4" gauge="normal" to="side1"/> </Tile><Tile colour="fixed" id="-102" name="-102"> ! <Station id="city1" position="251" slots="1" type="City"/> <Track from="city1" gauge="normal" to="side1"/> <Track from="city1" gauge="normal" to="side3"/> --- 38,42 ---- <Track from="side4" gauge="normal" to="side1"/> </Tile><Tile colour="fixed" id="-102" name="-102"> ! <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"/> *************** *** 84,90 **** <Track from="city1" gauge="normal" to="side4"/> </Tile><Tile colour="yellow" id="4" name="4"> ! <Station id="city1" position="0" type="Town" value="10"/> ! <Track from="city1" gauge="normal" to="side2"/> ! <Track from="city1" gauge="normal" to="side5"/> </Tile><Tile colour="yellow" id="7" name="7"> <Track from="side3" gauge="normal" to="side4"/> --- 84,90 ---- <Track from="city1" gauge="normal" to="side4"/> </Tile><Tile colour="yellow" id="4" name="4"> ! <Station id="city1" position="0" type="Town"/> ! <Track from="city1" gauge="normal" to="side3"/> ! <Track from="city1" gauge="normal" to="side0"/> </Tile><Tile colour="yellow" id="7" name="7"> <Track from="side3" gauge="normal" to="side4"/> |
|
From: Erik V. <ev...@us...> - 2009-12-18 20:02:36
|
Update of /cvsroot/rails/18xx/data/1835 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5514/data/1835 Modified Files: Tiles.xml Log Message: Changed orientation of tile #4 to get the village right Index: Tiles.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1835/Tiles.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Tiles.xml 6 Mar 2008 21:53:21 -0000 1.6 --- Tiles.xml 18 Dec 2009 20:02:21 -0000 1.7 *************** *** 52,56 **** <Track from="side3" gauge="normal" to="side4"/> </Tile><Tile colour="green" id="-803" name="Hamburg"> ! <Station id="city1" position="502" 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"/> --- 52,56 ---- <Track from="side3" gauge="normal" to="side4"/> </Tile><Tile colour="green" id="-803" name="Hamburg"> ! <Station id="city1" position="502" slots="1" type="City" value="20"/> <Station id="city2" position="052" slots="1" type="City" value="40"/> <Station id="city3" position="302" slots="1" type="City" value="40"/> *************** *** 63,68 **** <Track from="city1" gauge="normal" to="side0"/> <Track from="side4" gauge="normal" to="side2"/> ! <Track from="side4" gauge="normal" to="city1"/> ! <Track from="side2" gauge="normal" to="city2"/> </Tile><Tile colour="fixed" id="-805" name="Oldenburg"> <Station id="city1" position="051" slots="1" type="City" value="10"/> --- 63,68 ---- <Track from="city1" gauge="normal" to="side0"/> <Track from="side4" gauge="normal" to="side2"/> ! <Track from="city1" gauge="normal" to="side4"/> ! <Track from="city1" gauge="normal" to="side2"/> </Tile><Tile colour="fixed" id="-805" name="Oldenburg"> <Station id="city1" position="051" slots="1" type="City" value="10"/> *************** *** 119,125 **** <Track from="city1" gauge="normal" to="side4"/> </Tile><Tile colour="yellow" id="4" name="4"> ! <Station id="city1" position="0" type="Town" value="10"/> ! <Track from="city1" gauge="normal" to="side2"/> ! <Track from="city1" gauge="normal" to="side5"/> </Tile><Tile colour="yellow" id="5" name="5"> <Station id="city1" position="0" slots="1" type="City" value="20"/> --- 119,125 ---- <Track from="city1" gauge="normal" to="side4"/> </Tile><Tile colour="yellow" id="4" name="4"> ! <Station id="city1" position="0" type="Town"/> ! <Track from="city1" gauge="normal" to="side3"/> ! <Track from="city1" gauge="normal" to="side0"/> </Tile><Tile colour="yellow" id="5" name="5"> <Station id="city1" position="0" slots="1" type="City" value="20"/> |
|
From: Erik V. <ev...@us...> - 2009-12-18 20:02:35
|
Update of /cvsroot/rails/18xx/data/1870 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5514/data/1870 Modified Files: Tiles.xml Log Message: Changed orientation of tile #4 to get the village right Index: Tiles.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1870/Tiles.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Tiles.xml 28 Feb 2008 21:35:02 -0000 1.5 --- Tiles.xml 18 Dec 2009 20:02:21 -0000 1.6 *************** *** 4,9 **** --- 4,59 ---- <Station id="city1" position="102" type="Town"/> <Station id="city2" position="302" type="Town"/> + </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"/> + <Track from="city1" gauge="normal" to="side3"/> + </Tile><Tile colour="fixed" id="-5" name="MF 5"> + <Station id="city1" position="0" slots="1" type="City" value="20"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side1"/> + </Tile><Tile colour="fixed" id="-7" name="MF 7"> + <Track from="side2" gauge="normal" to="side1"/> </Tile><Tile colour="white" id="-10" name="1 city"> <Station id="city1" position="302" slots="1" type="City"/> + </Tile><Tile colour="yellow" id="-11" name="B"> + <Station id="city1" position="0" slots="1" type="City" value="30"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side3"/> + </Tile><Tile colour="yellow" id="-20" name="2 cities"> + <Station id="city1" position="002" slots="1" type="City"/> + <Station id="city2" position="302" slots="1" type="City"/> + </Tile><Tile colour="yellow" id="-21" name="NY"> + <Station id="city1" position="202" slots="1" type="City" value="40"/> + <Station id="city2" position="502" slots="1" type="City" value="40"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city2" gauge="normal" to="side5"/> + </Tile><Tile colour="fixed" id="-58" name="MF 58"> + <Station id="city1" position="301" type="Town" value="10"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side4"/> + </Tile><Tile colour="fixed" id="-101" name="Philadelphia"> + <Station id="city1" position="0" slots="1" type="City" value="10"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side4"/> + <Track from="side4" gauge="normal" to="side1"/> + </Tile><Tile colour="fixed" id="-102" name="-102"> + <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"/> + </Tile><Tile colour="fixed" id="-103" name="MF 103"> + <Station id="city1" position="0" slots="1" type="City" value="40"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side3"/> + </Tile><Tile colour="fixed" id="-104" name="MF 104"> + <Station id="city1" position="0" slots="1" type="City" value="20"/> + <Track from="city1" gauge="normal" to="side2"/> + </Tile><Tile colour="fixed" id="-105" name="MF 105"> + <Station id="city1" position="0" slots="1" type="City" value="30"/> + <Track from="city1" gauge="normal" to="side2"/> + <Track from="city1" gauge="normal" to="side3"/> + </Tile><Tile colour="red" id="-901" name="OM 1 way"> + <Station id="city1" position="0" type="OffMapCity" value="-1"/> + <Track from="city1" gauge="normal" to="side2"/> </Tile><Tile colour="red" id="-902" name="OM 2 way"> <Station id="city1" position="0" type="OffMapCity" value="-1"/> *************** *** 34,48 **** <Track from="city1" gauge="normal" to="side4"/> </Tile><Tile colour="yellow" id="4" name="4"> ! <Station id="city1" position="0" type="Town" value="10"/> ! <Track from="city1" gauge="normal" to="side2"/> ! <Track from="city1" gauge="normal" to="side5"/> ! </Tile><Tile colour="yellow" id="5" name="5"> ! <Station id="city1" position="0" slots="1" type="City" value="20"/> ! <Track from="city1" gauge="normal" to="side1"/> ! <Track from="city1" gauge="normal" to="side2"/> ! </Tile><Tile colour="yellow" id="6" name="6"> ! <Station id="city1" position="0" slots="1" type="City" value="20"/> <Track from="city1" gauge="normal" to="side0"/> - <Track from="city1" gauge="normal" to="side2"/> </Tile><Tile colour="yellow" id="7" name="7"> <Track from="side3" gauge="normal" to="side4"/> --- 84,90 ---- <Track from="city1" gauge="normal" to="side4"/> </Tile><Tile colour="yellow" id="4" name="4"> ! <Station id="city1" position="0" type="Town"/> ! <Track from="city1" gauge="normal" to="side3"/> <Track from="city1" gauge="normal" to="side0"/> </Tile><Tile colour="yellow" id="7" name="7"> <Track from="side3" gauge="normal" to="side4"/> *************** *** 95,101 **** <Track from="side3" gauge="normal" to="side5"/> <Track from="side4" gauge="normal" to="side0"/> - </Tile><Tile colour="green" id="17" name="17"> - <Track from="side0" gauge="normal" to="side2"/> - <Track from="side3" gauge="normal" to="side5"/> </Tile><Tile colour="green" id="18" name="18"> <Track from="side3" gauge="normal" to="side0"/> --- 137,140 ---- *************** *** 128,151 **** <Track from="side3" gauge="normal" to="side4"/> <Track from="side3" gauge="normal" to="side5"/> ! </Tile><Tile colour="green" id="141" name="141"> ! <Station id="city1" position="0" type="Town" value="10"/> ! <Track from="city1" gauge="normal" to="side0"/> ! <Track from="city1" gauge="normal" to="side2"/> <Track from="city1" gauge="normal" to="side5"/> ! </Tile><Tile colour="green" id="142" name="142"> ! <Station id="city1" position="0" type="Town" value="10"/> ! <Track from="city1" gauge="normal" to="side2"/> <Track from="city1" gauge="normal" to="side4"/> ! <Track from="city1" gauge="normal" to="side5"/> ! </Tile><Tile colour="green" id="143" name="143"> ! <Station id="city1" position="0" type="Town" value="10"/> ! <Track from="city1" gauge="normal" to="side0"/> <Track from="city1" gauge="normal" to="side1"/> ! <Track from="city1" gauge="normal" to="side2"/> ! </Tile><Tile colour="green" id="144" name="144"> ! <Station id="city1" position="0" type="Town" value="10"/> ! <Track from="city1" gauge="normal" to="side0"/> ! <Track from="city1" gauge="normal" to="side2"/> ! <Track from="city1" gauge="normal" to="side4"/> </Tile><Tile colour="brown" id="39" name="39"> <Track from="side3" gauge="normal" to="side4"/> --- 167,187 ---- <Track from="side3" gauge="normal" to="side4"/> <Track from="side3" gauge="normal" to="side5"/> ! </Tile><Tile colour="green" id="53" name="53"> ! <Station id="city1" position="0" slots="1" type="City" value="50"/> ! <Track from="city1" gauge="normal" to="side1"/> ! <Track from="city1" gauge="normal" to="side3"/> <Track from="city1" gauge="normal" to="side5"/> ! </Tile><Tile colour="green" id="54" name="54"> ! <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="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><Tile colour="brown" id="39" name="39"> <Track from="side3" gauge="normal" to="side4"/> *************** *** 189,245 **** <Track from="side4" gauge="normal" to="side0"/> <Track from="side4" gauge="normal" to="side1"/> ! </Tile><Tile colour="brown" id="63" name="63"> ! <Station id="city1" position="0" slots="2" type="City" value="40"/> ! <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"/> <Track from="city1" gauge="normal" to="side5"/> - </Tile><Tile colour="brown" id="70" name="70"> - <Track from="side3" gauge="normal" to="side5"/> - <Track from="side3" gauge="normal" to="side4"/> - <Track from="side5" gauge="normal" to="side0"/> - <Track from="side4" gauge="normal" to="side0"/> - </Tile><Tile colour="brown" id="145" name="145"> - <Station id="city1" position="0" type="Town" value="20"/> <Track from="city1" gauge="normal" to="side0"/> ! <Track from="city1" gauge="normal" to="side2"/> <Track from="city1" gauge="normal" to="side3"/> ! <Track from="city1" gauge="normal" to="side5"/> ! </Tile><Tile colour="brown" id="146" name="146"> ! <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="side5"/> ! </Tile><Tile colour="brown" id="147" name="147"> ! <Station id="city1" position="0" type="Town" value="20"/> ! <Track from="city1" gauge="normal" to="side0"/> ! <Track from="city1" gauge="normal" to="side2"/> <Track from="city1" gauge="normal" to="side4"/> <Track from="city1" gauge="normal" to="side5"/> ! </Tile><Tile colour="brown" id="170" name="170"> ! <Station id="city1" position="0" slots="2" type="City" value="50"/> ! <Track from="city1" gauge="normal" to="side0"/> ! <Track from="city1" gauge="normal" to="side2"/> <Track from="city1" gauge="normal" to="side3"/> - <Track from="city1" gauge="normal" to="side4"/> <Track from="city1" gauge="normal" to="side5"/> ! </Tile><Tile colour="gray" id="171" name="171"> ! <Station id="city1" position="0" slots="3" type="City" value="60"/> <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"/> - <Track from="city1" gauge="normal" to="side5"/> - </Tile><Tile colour="gray" id="172" name="172"> - <Station id="city1" position="0" slots="2" type="City" value="60"/> <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"/> ! <Track from="city1" gauge="normal" to="side5"/> </Tile></Tiles> \ No newline at end of file --- 225,288 ---- <Track from="side4" gauge="normal" to="side0"/> <Track from="side4" gauge="normal" to="side1"/> ! </Tile><Tile colour="brown" id="61" name="61"> ! <Station id="city1" position="0" slots="1" type="City" value="60"/> <Track from="city1" gauge="normal" to="side1"/> <Track from="city1" gauge="normal" to="side3"/> <Track from="city1" gauge="normal" to="side5"/> <Track from="city1" gauge="normal" to="side0"/> ! </Tile><Tile colour="brown" id="62" name="62"> ! <Station id="city1" position="302" slots="2" type="City" value="80"/> ! <Station id="city2" position="002" slots="2" type="City" value="80"/> <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="brown" id="63" name="63"> ! <Station id="city1" position="0" slots="2" type="City" value="40"/> <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"/> <Track from="city1" gauge="normal" to="side5"/> ! </Tile><Tile colour="brown" id="64" name="64"> ! <Station id="city1" position="401" 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"/> ! <Track from="city2" gauge="normal" to="side0"/> ! </Tile><Tile colour="brown" id="65" name="65"> ! <Station id="city1" position="501" 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"/> ! <Track from="city2" gauge="normal" to="side3"/> ! </Tile><Tile colour="brown" id="66" name="66"> ! <Station id="city1" position="002" 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"/> + <Track from="city2" gauge="normal" to="side5"/> + </Tile><Tile colour="brown" id="67" name="67"> + <Station id="city1" position="307" slots="1" type="City" value="50"/> + <Station id="city2" position="502" slots="1" type="City" value="50"/> <Track from="city1" gauge="normal" to="side1"/> <Track from="city1" gauge="normal" to="side3"/> ! <Track from="city2" gauge="normal" to="side5"/> ! <Track from="city2" gauge="normal" to="side2"/> ! </Tile><Tile colour="brown" id="68" name="68"> ! <Station id="city1" position="302" slots="1" type="City" value="50"/> ! <Station id="city2" position="502" slots="1" type="City" value="50"/> ! <Track from="city1" gauge="normal" to="side3"/> ! <Track from="city2" gauge="normal" to="side2"/> ! <Track from="city2" gauge="normal" to="side5"/> ! <Track from="city1" gauge="normal" to="side0"/> ! </Tile><Tile colour="brown" id="70" name="70"> ! <Track from="side3" gauge="normal" to="side5"/> ! <Track from="side3" gauge="normal" to="side4"/> ! <Track from="side5" gauge="normal" to="side0"/> ! <Track from="side4" gauge="normal" to="side0"/> </Tile></Tiles> \ No newline at end of file |
|
From: Erik V. <ev...@us...> - 2009-12-18 20:02:31
|
Update of /cvsroot/rails/18xx/data/18AL In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5514/data/18AL Modified Files: Tiles.xml Log Message: Changed orientation of tile #4 to get the village right Index: Tiles.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18AL/Tiles.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Tiles.xml 28 Feb 2008 21:35:01 -0000 1.6 --- Tiles.xml 18 Dec 2009 20:02:21 -0000 1.7 *************** *** 43,49 **** <Track from="city1" gauge="normal" to="side4"/> </Tile><Tile colour="yellow" id="4" name="4"> ! <Station id="city1" position="0" type="Town" value="10"/> ! <Track from="city1" gauge="normal" to="side2"/> ! <Track from="city1" gauge="normal" to="side5"/> </Tile><Tile colour="yellow" id="5" name="5"> <Station id="city1" position="0" slots="1" type="City" value="20"/> --- 43,49 ---- <Track from="city1" gauge="normal" to="side4"/> </Tile><Tile colour="yellow" id="4" name="4"> ! <Station id="city1" position="0" type="Town"/> ! <Track from="city1" gauge="normal" to="side3"/> ! <Track from="city1" gauge="normal" to="side0"/> </Tile><Tile colour="yellow" id="5" name="5"> <Station id="city1" position="0" slots="1" type="City" value="20"/> |
|
From: Erik V. <ev...@us...> - 2009-12-18 20:02:31
|
Update of /cvsroot/rails/18xx/data/18EU In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5514/data/18EU Modified Files: Tiles.xml Log Message: Changed orientation of tile #4 to get the village right Index: Tiles.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18EU/Tiles.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Tiles.xml 7 Dec 2009 17:46:37 -0000 1.7 --- Tiles.xml 18 Dec 2009 20:02:21 -0000 1.8 *************** *** 6,11 **** <Station id="city1" position="252" type="Town" value="10"/> <Track from="city1" gauge="normal" to="side2"/> ! <Track from="city1" gauge="normal" to="side3"/></Tile> ! <Tile colour="fixed" id="-800"> <Station id="city1" position="302" type="Town" value="10"/> <Track from="city1" gauge="normal" to="side3"/> --- 6,11 ---- <Station id="city1" position="252" type="Town" value="10"/> <Track from="city1" gauge="normal" to="side2"/> ! <Track from="city1" gauge="normal" to="side3"/> ! </Tile><Tile colour="fixed" id="-800" name="Rostock"> <Station id="city1" position="302" type="Town" value="10"/> <Track from="city1" gauge="normal" to="side3"/> *************** *** 23,30 **** <Track from="city1" gauge="normal" to="side1"/> </Tile><Tile colour="red" id="-939" name="Goderich"> ! <Station id="city1" position="201" type="OffMapCity" value="-1"/> ! <Track from="side3" gauge="normal" to="city1"/> ! <Track from="side2" gauge="normal" to="city1"/> ! <Track from="side1" gauge="normal" to="city1"/> </Tile><Tile colour="yellow" id="-3005" name="B/V"> <Station id="city1" position="102" slots="1" type="City" value="30"/> --- 23,29 ---- <Track from="city1" gauge="normal" to="side1"/> </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="yellow" id="-3005" name="B/V"> <Station id="city1" position="102" slots="1" type="City" value="30"/> *************** *** 42,48 **** <Track from="city1" gauge="normal" to="side4"/> </Tile><Tile colour="yellow" id="4" name="4"> ! <Station id="city1" position="0" type="Town" value="10"/> ! <Track from="city1" gauge="normal" to="side2"/> ! <Track from="city1" gauge="normal" to="side5"/> </Tile><Tile colour="yellow" id="7" name="7"> <Track from="side3" gauge="normal" to="side4"/> --- 41,47 ---- <Track from="city1" gauge="normal" to="side4"/> </Tile><Tile colour="yellow" id="4" name="4"> ! <Station id="city1" position="0" type="Town"/> ! <Track from="city1" gauge="normal" to="side3"/> ! <Track from="city1" gauge="normal" to="side0"/> </Tile><Tile colour="yellow" id="7" name="7"> <Track from="side3" gauge="normal" to="side4"/> |
Update of /cvsroot/rails/18xx/tiles/images In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5310/tiles/images Removed Files: tile214.gif tile2103.gif tile656.gif tile-902.gif tile604.gif tile680.gif tile-111.gif tile661.gif tile2086.gif tile672.gif tile212.gif tile630.gif tile606.gif tile129.gif tile-809.gif tile395.gif tile425.gif tile27.gif tile3.gif tile2107.gif tile127.gif tile61.gif tile652.gif tile120.gif tile608.gif tile514.gif tile651.gif tile54.gif tile-3005.gif tile1052.gif tile2110.gif tile991.gif tile57.gif tile-3007.gif tile97.gif tile93.gif tile696.gif tile1006.gif tile668.gif tile618.gif tile-9999.gif tile2101.gif tile38.gif tile997.gif tile982.gif tile95.gif tile9.gif tile2090.gif tile354.gif tile6.gif tile1443.gif tile697.gif tile-901.gif tile420.gif tile-58.gif tile47.gif tile430.gif tile2083.gif tile2074.gif tile1038.gif tile204.gif tile66.gif tile434.gif tile625.gif tile13.gif tile211.gif tile192.gif tile432.gif tile-39.gif tile445.gif tile666.gif tile-3009.gif tile45.gif tile693.gif tile627.gif tile2092.gif tile9220.gif tile700.gif tile46.gif tile571.gif tile193.gif tile406.gif tile673.gif tile141.gif tile436.gif tile611.gif tile703.gif tile581.gif tile36.gif tile86.gif tile2112.gif tile351.gif tile81.gif tile617.gif tile1092.gif tile353.gif tile-908.gif tile3082.gif tile2114.gif tile365.gif tile1112.gif tile125.gif tile629.gif tile53.gif tile-803.gif tile-6.gif tile675.gif tile37.gif tile168.gif tile-5.gif tile77.gif tile122.gif tile359.gif tile1050.gif tile73.gif tile0.gif tile435.gif tile695.gif tile205.gif tile1441.gif tile30.gif tile301.gif tile68.gif tile220.gif tile102.gif tile63.gif tile21.gif tile664.gif tile647.gif tile74.gif tile49.gif tile2093.gif tile1012.gif tile576.gif tile999.gif tile358.gif tile92.gif tile9121.gif tile657.gif tile31.gif tile11.gif tile655.gif tile3080.gif tile368.gif tile-104.gif tile50.gif tile-3008.gif tile124.gif tile411.gif tile662.gif tile26.gif tile2102.gif tile-22.gif tile-801.gif tile357.gif tile362.gif tile62.gif tile513.gif tile690.gif tile24.gif tile682.gif tile216.gif tile416.gif tile398.gif tile996.gif tile601.gif tile417.gif tile2012.gif tile98.gif tile998.gif tile56.gif tile143.gif tile667.gif tile311.gif tile364.gif tile1059.gif tile67.gif tile405.gif tile19.gif tile215.gif tile10.gif tile35.gif tile578.gif tile401.gif tile201.gif tile665.gif tile402.gif tile633.gif tile-20.gif tile80.gif tileimages.xml tile-3006.gif tile2082.gif tile-8.gif tile1.gif tile-23.gif tile-10.gif tile626.gif tile2080.gif tile312.gif tile64.gif tile705.gif tile134.gif tile419.gif tile147.gif tile65.gif tile577.gif tile131.gif tile3083.gif tile624.gif tile2106.gif tile427.gif tile59.gif tile5.gif tile421.gif tile218.gif tile-907.gif tile2115.gif tile688.gif tile707.gif tile-4.gif tile84.gif tile-810.gif tile579.gif tile614.gif tile202.gif tile123.gif tile-105.gif tile676.gif tile2073.gif tile516.gif tile78.gif tile-103.gif tile321.gif tile2063.gif tile161.gif tile121.gif tile983.gif tile82.gif tile170.gif tile15.gif tile302.gif tile1093.gif tile512.gif tile1053.gif tile663.gif tile1217.gif tile360.gif tile2079.gif tile546.gif tile622.gif tile391.gif tile3081.gif tile363.gif tile355.gif tile1206.gif tile674.gif tile2117.gif tile315.gif tile23.gif tile660.gif tile171.gif tile219.gif tile621.gif tile613.gif tile580.gif tile713.gif tile-3.gif tile369.gif tile106.gif tile203.gif tile446.gif tile-802.gif tile699.gif tile610.gif tile-21.gif tile422.gif tile142.gif tile191.gif tile1218.gif tile72.gif tile20.gif tile41.gif tile69.gif tile96.gif tile658.gif tile686.gif tile396.gif tile2077.gif tile172.gif tile28.gif tile423.gif tile994.gif tile1442.gif tile167.gif tile654.gif tile-101.gif tile2105.gif tile426.gif tile213.gif tile145.gif tile133.gif tile-912.gif tile1013.gif tile431.gif tile582.gif tile602.gif tile88.gif tile138.gif tile408.gif tile91.gif tile710.gif tile366.gif tile60.gif tile669.gif tile2119.gif tile39.gif tile-807.gif tile12.gif tile1220.gif tile429.gif tile689.gif tile2091.gif tile418.gif tile-804.gif tile2.gif tile704.gif tile584.gif tile414.gif tile89.gif tile-114.gif tile-806.gif tile424.gif tile71.gif tile-805.gif tile144.gif tile326.gif tile112.gif tile9997.gif tile22.gif tile130.gif tile-57.gif tile105.gif tile404.gif tile670.gif tile76.gif tile87.gif tile126.gif tile51.gif tile-3011.gif tile2076.gif tile103.gif tile1051.gif tile631.gif tile1069.gif tile984.gif tile79.gif tile2072.gif tile603.gif tile694.gif tile-2.gif tile370.gif tile-808.gif tile712.gif tile42.gif tile708.gif tile677.gif tile1067.gif tile108.gif tile715.gif tile1202.gif tile14.gif tile992.gif tile2116.gif tile25.gif tile2109.gif tile99.gif tile650.gif tile-9.gif tile995.gif tile210.gif tile415.gif tile2084.gif tile140.gif tile706.gif tile2071.gif tile135.gif tile410.gif tile1005.gif tile221.gif tile413.gif tile412.gif tile649.gif tile2104.gif tile111.gif tile-800.gif tile367.gif tile70.gif tile2111.gif tile683.gif tile607.gif tile217.gif tile583.gif tile-3010.gif tile392.gif tile4.gif tile692.gif tile132.gif tile113.gif tile515.gif tile2108.gif tile-913.gif tile691.gif tile609.gif tile40.gif tile632.gif tile316.gif tile511.gif tile-939.gif tile44.gif tile55.gif tile58.gif tile94.gif tile644.gif tile262.gif tile2120.gif tile709.gif tile619.gif tile32.gif tile-143.gif tile615.gif tile313.gif tile605.gif tile8.gif tile7.gif tile109.gif tile711.gif tile1444.gif tile75.gif tile52.gif tile2087.gif tile1063.gif tile981.gif tile616.gif tile623.gif tile207.gif tile393.gif tile48.gif tile2118.gif tile361.gif tile698.gif tile16.gif tile90.gif tile394.gif tile1221.gif tile43.gif tile-1.gif tile684.gif tile110.gif tile628.gif tile2081.gif tile-903.gif tile687.gif tile29.gif tile209.gif tile685.gif tile-112.gif tile678.gif tile85.gif tile101.gif tile645.gif tile653.gif tile128.gif tile-909.gif tile671.gif tile397.gif tile-113.gif tile104.gif tile2075.gif tile208.gif tile2078.gif tile190.gif tile34.gif tile544.gif tile352.gif tile-7.gif tile681.gif tile206.gif tile2113.gif tile17.gif tile356.gif tile-11.gif tile33.gif tile545.gif tile646.gif tile1091.gif tile18.gif tile659.gif tile2085.gif tile146.gif tile-102.gif tile993.gif tile107.gif tile1072.gif tile701.gif tile100.gif tile648.gif tile-41.gif tile83.gif tile714.gif tile702.gif Log Message: Removed GIF tiles --- tile62.gif DELETED --- --- tile11.gif DELETED --- --- tile2103.gif DELETED --- --- tile680.gif DELETED --- --- tile633.gif DELETED --- --- tile-3005.gif DELETED --- --- tile647.gif DELETED --- --- tile2111.gif DELETED --- --- tile695.gif DELETED --- --- tile2092.gif DELETED --- --- tile982.gif DELETED --- --- tile35.gif DELETED --- --- tile627.gif DELETED --- --- tile7.gif DELETED --- --- tile63.gif DELETED --- --- tile983.gif DELETED --- --- tile58.gif DELETED --- --- tile22.gif DELETED --- --- tile111.gif DELETED --- --- tile579.gif DELETED --- --- tile216.gif DELETED --- --- tile66.gif DELETED --- --- tile212.gif DELETED --- --- tile54.gif DELETED --- --- tile682.gif DELETED --- --- tile41.gif DELETED --- --- tile703.gif DELETED --- --- tile1093.gif DELETED --- --- tile210.gif DELETED --- --- tile126.gif DELETED --- --- tile369.gif DELETED --- --- tile167.gif DELETED --- --- tile673.gif DELETED --- --- tile618.gif DELETED --- --- tile981.gif DELETED --- --- tile2091.gif DELETED --- --- tile984.gif DELETED --- --- tile-3007.gif DELETED --- --- tile362.gif DELETED --- --- tile218.gif DELETED --- --- tile991.gif DELETED --- --- tile12.gif DELETED --- --- tile2081.gif DELETED --- --- tile68.gif DELETED --- --- tile697.gif DELETED --- --- tile311.gif DELETED --- --- tile663.gif DELETED --- --- tile27.gif DELETED --- --- tile103.gif DELETED --- --- tile34.gif DELETED --- --- tile172.gif DELETED --- --- tile393.gif DELETED --- --- tile4.gif DELETED --- --- tile138.gif DELETED --- --- tile694.gif DELETED --- --- tile417.gif DELETED --- --- tile580.gif DELETED --- --- tile88.gif DELETED --- --- tile171.gif DELETED --- --- tile168.gif DELETED --- --- tile1112.gif DELETED --- --- tile106.gif DELETED --- --- tile48.gif DELETED --- --- tile2118.gif DELETED --- --- tile671.gif DELETED --- --- tile-805.gif DELETED --- --- tile2075.gif DELETED --- --- tile61.gif DELETED --- --- tile8.gif DELETED --- --- tile1012.gif DELETED --- --- tile101.gif DELETED --- --- tile82.gif DELETED --- --- tile2093.gif DELETED --- --- tile170.gif DELETED --- --- tile688.gif DELETED --- --- tile14.gif DELETED --- --- tile619.gif DELETED --- --- tile715.gif DELETED --- --- tile10.gif DELETED --- --- tile646.gif DELETED --- --- tile60.gif DELETED --- --- tile313.gif DELETED --- --- tile18.gif DELETED --- --- tile676.gif DELETED --- --- tile-3006.gif DELETED --- --- tile3080.gif DELETED --- --- tile59.gif DELETED --- --- tile86.gif DELETED --- --- tile2116.gif DELETED --- --- tile193.gif DELETED --- --- tile302.gif DELETED --- --- tile-3.gif DELETED --- --- tile670.gif DELETED --- --- tile608.gif DELETED --- --- tile213.gif DELETED --- --- tile211.gif DELETED --- --- tile2109.gif DELETED --- --- tile28.gif DELETED --- --- tile446.gif DELETED --- --- tile689.gif DELETED --- --- tile2117.gif DELETED --- --- tile1063.gif DELETED --- --- tile644.gif DELETED --- --- tile658.gif DELETED --- --- tile434.gif DELETED --- --- tile2012.gif DELETED --- --- tile262.gif DELETED --- --- tile21.gif DELETED --- --- tile120.gif DELETED --- --- tile1069.gif DELETED --- --- tile31.gif DELETED --- --- tile512.gif DELETED --- --- tile-22.gif DELETED --- --- tile-809.gif DELETED --- --- tile9.gif DELETED --- --- tile100.gif DELETED --- --- tile1013.gif DELETED --- --- tile83.gif DELETED --- --- tile546.gif DELETED --- --- tile87.gif DELETED --- --- tile421.gif DELETED --- --- tile604.gif DELETED --- --- tile609.gif DELETED --- --- tile2077.gif DELETED --- --- tile693.gif DELETED --- --- tile147.gif DELETED --- --- tile70.gif DELETED --- --- tile-10.gif DELETED --- --- tile2108.gif DELETED --- --- tile413.gif DELETED --- --- tile2115.gif DELETED --- --- tile714.gif DELETED --- --- tile698.gif DELETED --- --- tile685.gif DELETED --- --- tile544.gif DELETED --- --- tile85.gif DELETED --- --- tile511.gif DELETED --- --- tile32.gif DELETED --- --- tile-908.gif DELETED --- --- tile999.gif DELETED --- --- tile699.gif DELETED --- --- tile684.gif DELETED --- --- tile3082.gif DELETED --- --- tile649.gif DELETED --- --- tile418.gif DELETED --- --- tile419.gif DELETED --- --- tile-807.gif DELETED --- --- tile607.gif DELETED --- --- tile-808.gif DELETED --- --- tile15.gif DELETED --- --- tile1221.gif DELETED --- --- tile681.gif DELETED --- --- tile39.gif DELETED --- --- tile394.gif DELETED --- --- tile9121.gif DELETED --- --- tile81.gif DELETED --- --- tile427.gif DELETED --- --- tile316.gif DELETED --- --- tile-913.gif DELETED --- --- tile2107.gif DELETED --- --- tile42.gif DELETED --- --- tile705.gif DELETED --- --- tile29.gif DELETED --- --- tile686.gif DELETED --- --- tile-113.gif DELETED --- --- tile1220.gif DELETED --- --- tile84.gif DELETED --- --- tile545.gif DELETED --- --- tile9220.gif DELETED --- --- tile420.gif DELETED --- --- tile2113.gif DELETED --- --- tile617.gif DELETED --- --- tile110.gif DELETED --- --- tile1072.gif DELETED --- --- tile405.gif DELETED --- --- tile17.gif DELETED --- --- tile610.gif DELETED --- --- tile-21.gif DELETED --- --- tile571.gif DELETED --- --- tile132.gif DELETED --- --- tile301.gif DELETED --- --- tile91.gif DELETED --- --- tile113.gif DELETED --- --- tile358.gif DELETED --- --- tile2072.gif DELETED --- --- tile220.gif DELETED --- --- tile707.gif DELETED --- --- tile-3009.gif DELETED --- --- tile1006.gif DELETED --- --- tile584.gif DELETED --- --- tile207.gif DELETED --- --- tile96.gif DELETED --- --- tile667.gif DELETED --- --- tile145.gif DELETED --- --- tile79.gif DELETED --- --- tile1053.gif DELETED --- --- tile75.gif DELETED --- --- tile2.gif DELETED --- --- tile-9.gif DELETED --- --- tile43.gif DELETED --- --- tile93.gif DELETED --- --- tile202.gif DELETED --- --- tile656.gif DELETED --- --- tile52.gif DELETED --- --- tile-23.gif DELETED --- --- tile125.gif DELETED --- --- tile657.gif DELETED --- --- tile616.gif DELETED --- --- tile2105.gif DELETED --- --- tile1051.gif DELETED --- --- tile602.gif DELETED --- --- tile669.gif DELETED --- --- tile712.gif DELETED --- --- tile1443.gif DELETED --- --- tileimages.xml DELETED --- --- tile51.gif DELETED --- --- tile80.gif DELETED --- --- tile691.gif DELETED --- --- tile-3008.gif DELETED --- --- tile2063.gif DELETED --- --- tile687.gif DELETED --- --- tile711.gif DELETED --- --- tile709.gif DELETED --- --- tile44.gif DELETED --- --- tile77.gif DELETED --- --- tile655.gif DELETED --- --- tile650.gif DELETED --- --- tile411.gif DELETED --- --- tile661.gif DELETED --- --- tile-8.gif DELETED --- --- tile423.gif DELETED --- --- tile-105.gif DELETED --- --- tile395.gif DELETED --- --- tile127.gif DELETED --- --- tile104.gif DELETED --- --- tile710.gif DELETED --- --- tile124.gif DELETED --- --- tile583.gif DELETED --- --- tile-104.gif DELETED --- --- tile45.gif DELETED --- --- tile76.gif DELETED --- --- tile135.gif DELETED --- --- tile666.gif DELETED --- --- tile651.gif DELETED --- --- tile89.gif DELETED --- --- tile-907.gif DELETED --- --- tile426.gif DELETED --- --- tile-802.gif DELETED --- --- tile73.gif DELETED --- --- tile40.gif DELETED --- --- tile1444.gif DELETED --- --- tile632.gif DELETED --- --- tile-902.gif DELETED --- --- tile396.gif DELETED --- --- tile416.gif DELETED --- --- tile26.gif DELETED --- --- tile622.gif DELETED --- --- tile140.gif DELETED --- --- tile615.gif DELETED --- --- tile2112.gif DELETED --- --- tile708.gif DELETED --- --- tile-804.gif DELETED --- --- tile368.gif DELETED --- --- tile516.gif DELETED --- --- tile-103.gif DELETED --- --- tile410.gif DELETED --- --- tile0.gif DELETED --- --- tile109.gif DELETED --- --- tile-7.gif DELETED --- --- tile581.gif DELETED --- --- tile74.gif DELETED --- --- tile1218.gif DELETED --- --- tile582.gif DELETED --- --- tile-102.gif DELETED --- --- tile702.gif DELETED --- --- tile57.gif DELETED --- --- tile128.gif DELETED --- --- tile2110.gif DELETED --- --- tile625.gif DELETED --- --- tile424.gif DELETED --- --- tile-112.gif DELETED --- --- tile129.gif DELETED --- --- tile2090.gif DELETED --- --- tile-3010.gif DELETED --- --- tile652.gif DELETED --- --- tile653.gif DELETED --- --- tile2074.gif DELETED --- --- tile2084.gif DELETED --- --- tile994.gif DELETED --- --- tile1050.gif DELETED --- --- tile1442.gif DELETED --- --- tile675.gif DELETED --- --- tile668.gif DELETED --- --- tile-41.gif DELETED --- --- tile55.gif DELETED --- --- tile2079.gif DELETED --- --- tile37.gif DELETED --- --- tile514.gif DELETED --- --- tile209.gif DELETED --- --- tile98.gif DELETED --- --- tile-20.gif DELETED --- --- tile161.gif DELETED --- --- tile47.gif DELETED --- --- tile665.gif DELETED --- --- tile664.gif DELETED --- --- tile-114.gif DELETED --- --- tile72.gif DELETED --- --- tile112.gif DELETED --- --- tile2101.gif DELETED --- --- tile190.gif DELETED --- --- tile-5.gif DELETED --- --- tile660.gif DELETED --- --- tile2083.gif DELETED --- --- tile1202.gif DELETED --- --- tile46.gif DELETED --- --- tile993.gif DELETED --- --- tile2102.gif DELETED --- --- tile20.gif DELETED --- --- tile513.gif DELETED --- --- tile30.gif DELETED --- --- tile429.gif DELETED --- --- tile67.gif DELETED --- --- tile-101.gif DELETED --- --- tile2104.gif DELETED --- --- tile5.gif DELETED --- --- tile-901.gif DELETED --- --- tile-143.gif DELETED --- --- tile1441.gif DELETED --- --- tile692.gif DELETED --- --- tile2076.gif DELETED --- --- tile659.gif DELETED --- --- tile364.gif DELETED --- --- tile392.gif DELETED --- --- tile370.gif DELETED --- --- tile515.gif DELETED --- --- tile2120.gif DELETED --- --- tile713.gif DELETED --- --- tile217.gif DELETED --- --- tile133.gif DELETED --- --- tile683.gif DELETED --- --- tile351.gif DELETED --- --- tile-58.gif DELETED --- --- tile-806.gif DELETED --- --- tile191.gif DELETED --- --- tile1092.gif DELETED --- --- tile706.gif DELETED --- --- tile-800.gif DELETED --- --- tile645.gif DELETED --- --- tile662.gif DELETED --- --- tile-11.gif DELETED --- --- tile672.gif DELETED --- --- tile99.gif DELETED --- --- tile208.gif DELETED --- --- tile1059.gif DELETED --- --- tile146.gif DELETED --- --- tile215.gif DELETED --- --- tile624.gif DELETED --- --- tile19.gif DELETED --- --- tile366.gif DELETED --- --- tile-3011.gif DELETED --- --- tile2119.gif DELETED --- --- tile629.gif DELETED --- --- tile436.gif DELETED --- --- tile356.gif DELETED --- --- tile628.gif DELETED --- --- tile2071.gif DELETED --- --- tile365.gif DELETED --- --- tile201.gif DELETED --- --- tile90.gif DELETED --- --- tile321.gif DELETED --- --- tile704.gif DELETED --- --- tile700.gif DELETED --- --- tile398.gif DELETED --- --- tile49.gif DELETED --- --- tile-912.gif DELETED --- --- tile2106.gif DELETED --- --- tile192.gif DELETED --- --- tile2082.gif DELETED --- --- tile992.gif DELETED --- --- tile352.gif DELETED --- --- tile144.gif DELETED --- --- tile1038.gif DELETED --- --- tile435.gif DELETED --- --- tile430.gif DELETED --- --- tile401.gif DELETED --- --- tile2073.gif DELETED --- --- tile312.gif DELETED --- --- tile1052.gif DELETED --- --- tile422.gif DELETED --- --- tile-1.gif DELETED --- --- tile690.gif DELETED --- --- tile-939.gif DELETED --- --- tile406.gif DELETED --- --- tile431.gif DELETED --- --- tile95.gif DELETED --- --- tile204.gif DELETED --- --- tile3081.gif DELETED --- --- tile1005.gif DELETED --- --- tile696.gif DELETED --- --- tile71.gif DELETED --- --- tile203.gif DELETED --- --- tile92.gif DELETED --- --- tile13.gif DELETED --- --- tile38.gif DELETED --- --- tile-2.gif DELETED --- --- tile367.gif DELETED --- --- tile36.gif DELETED --- --- tile1067.gif DELETED --- --- tile3.gif DELETED --- --- tile677.gif DELETED --- --- tile605.gif DELETED --- --- tile601.gif DELETED --- --- tile221.gif DELETED --- --- tile107.gif DELETED --- --- tile3083.gif DELETED --- --- tile25.gif DELETED --- --- tile53.gif DELETED --- --- tile121.gif DELETED --- --- tile16.gif DELETED --- --- tile143.gif DELETED --- --- tile578.gif DELETED --- --- tile359.gif DELETED --- --- tile205.gif DELETED --- --- tile94.gif DELETED --- --- tile102.gif DELETED --- --- tile603.gif DELETED --- --- tile-111.gif DELETED --- --- tile674.gif DELETED --- --- tile445.gif DELETED --- --- tile998.gif DELETED --- --- tile363.gif DELETED --- --- tile105.gif DELETED --- --- tile50.gif DELETED --- --- tile623.gif DELETED --- --- tile432.gif DELETED --- --- tile357.gif DELETED --- --- tile326.gif DELETED --- --- tile415.gif DELETED --- --- tile360.gif DELETED --- --- tile408.gif DELETED --- --- tile1.gif DELETED --- --- tile353.gif DELETED --- --- tile108.gif DELETED --- --- tile122.gif DELETED --- --- tile2078.gif DELETED --- --- tile355.gif DELETED --- --- tile23.gif DELETED --- --- tile-803.gif DELETED --- --- tile701.gif DELETED --- --- tile621.gif DELETED --- --- tile64.gif DELETED --- --- tile9997.gif DELETED --- --- tile141.gif DELETED --- --- tile626.gif DELETED --- --- tile361.gif DELETED --- --- tile142.gif DELETED --- --- tile404.gif DELETED --- --- tile219.gif DELETED --- --- tile24.gif DELETED --- --- tile-39.gif DELETED --- --- tile606.gif DELETED --- --- tile-810.gif DELETED --- --- tile654.gif DELETED --- --- tile397.gif DELETED --- --- tile2085.gif DELETED --- --- tile995.gif DELETED --- --- tile-6.gif DELETED --- --- tile613.gif DELETED --- --- tile678.gif DELETED --- --- tile56.gif DELETED --- --- tile648.gif DELETED --- --- tile97.gif DELETED --- --- tile206.gif DELETED --- --- tile-57.gif DELETED --- --- tile614.gif DELETED --- --- tile123.gif DELETED --- --- tile1206.gif DELETED --- --- tile997.gif DELETED --- --- tile2087.gif DELETED --- --- tile65.gif DELETED --- --- tile611.gif DELETED --- --- tile630.gif DELETED --- --- tile78.gif DELETED --- --- tile2080.gif DELETED --- --- tile-903.gif DELETED --- --- tile6.gif DELETED --- --- tile631.gif DELETED --- --- tile315.gif DELETED --- --- tile69.gif DELETED --- --- tile131.gif DELETED --- --- tile414.gif DELETED --- --- tile214.gif DELETED --- --- tile996.gif DELETED --- --- tile2086.gif DELETED --- --- tile-801.gif DELETED --- --- tile-909.gif DELETED --- --- tile425.gif DELETED --- --- tile402.gif DELETED --- --- tile130.gif DELETED --- --- tile412.gif DELETED --- --- tile2114.gif DELETED --- --- tile1217.gif DELETED --- --- tile354.gif DELETED --- --- tile-9999.gif DELETED --- --- tile134.gif DELETED --- --- tile577.gif DELETED --- --- tile576.gif DELETED --- --- tile1091.gif DELETED --- --- tile391.gif DELETED --- --- tile-4.gif DELETED --- --- tile33.gif DELETED --- |
Update of /cvsroot/rails/18xx/tiles/svg In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4671/tiles/svg Modified Files: tile107.svg tile134.svg tile84.svg tile674.svg tile-3008.svg tile404.svg tile1053.svg tile432.svg tile414.svg tile984.svg tile121.svg tile85.svg tile398.svg tile419.svg tile2111.svg tile680.svg tile416.svg tile1038.svg tile684.svg tile19.svg tile-801.svg tile369.svg tile2108.svg tile125.svg tile59.svg tile981.svg tile581.svg tile995.svg tile-5.svg tile-913.svg tile1013.svg tile56.svg tile514.svg tile35.svg tile91.svg tile693.svg tile617.svg tile682.svg tile2104.svg tile-3011.svg tile311.svg tile2072.svg tile683.svg tile-57.svg tile993.svg tile688.svg tile1444.svg tile3.svg tile681.svg tile313.svg tile613.svg tile83.svg tile1012.svg tile46.svg tile191.svg tile68.svg tile998.svg tile7.svg tile101.svg tile544.svg tile17.svg tile-101.svg tile301.svg tile623.svg tile127.svg tile-908.svg tile57.svg tile75.svg tile109.svg tile1092.svg tile302.svg tile686.svg tile653.svg tile44.svg tile2103.svg tile417.svg tile1072.svg tile429.svg tile648.svg tile316.svg tile2093.svg tile2082.svg tile8.svg tile353.svg tile393.svg tile40.svg tile356.svg tile89.svg tile16.svg tile-102.svg tile631.svg tile9121.svg tile699.svg tile401.svg tile621.svg tile-3010.svg tile2086.svg tile691.svg tile435.svg tile2084.svg tile25.svg tile52.svg tile-11.svg tile2115.svg tile434.svg tile424.svg tile676.svg tile396.svg tile212.svg tile54.svg tile79.svg tile1006.svg tile579.svg tile421.svg tile669.svg tile427.svg tile2076.svg tile697.svg tile673.svg tile2071.svg tile672.svg tile663.svg tile1202.svg tile614.svg tile2.svg tile124.svg tile-809.svg tile167.svg tile677.svg tile702.svg tile-41.svg tile26.svg tile12.svg tile604.svg tile-8.svg tile359.svg tile-901.svg tile546.svg tile577.svg tile420.svg tile140.svg tile2118.svg tile580.svg tile658.svg tile206.svg tile126.svg tile1206.svg tile-9.svg tile-939.svg tile-111.svg tile705.svg tile2075.svg tile144.svg tile991.svg tile-807.svg tile445.svg tile71.svg tile14.svg tile-9999.svg tile994.svg tile367.svg tile312.svg tile128.svg tile219.svg tile694.svg tile584.svg tile-105.svg tile370.svg tile654.svg tile-113.svg tile168.svg tile678.svg tile354.svg tile6.svg tile430.svg tile622.svg tile49.svg tile1218.svg tile1069.svg tile-20.svg tile609.svg tile96.svg tile20.svg tile-104.svg tile-7.svg tile73.svg tile-806.svg tile425.svg tile992.svg tile649.svg tile2063.svg tile-22.svg tile628.svg tile72.svg tile2114.svg tile51.svg tile513.svg tile1051.svg tile692.svg tile45.svg tile1067.svg tile1059.svg tile60.svg tile715.svg tile1091.svg tile76.svg tile656.svg tile216.svg tile112.svg tile-903.svg tile-3005.svg tile997.svg tile630.svg tile431.svg tile-4.svg tile138.svg tile262.svg tile647.svg tile2102.svg tile2077.svg tile618.svg tile39.svg tile2105.svg tile33.svg tile687.svg tile406.svg tile-10.svg tile213.svg tile626.svg tile713.svg tile63.svg tile31.svg tile210.svg tile-804.svg tile-3007.svg tile100.svg tile29.svg tile18.svg tile130.svg tile48.svg tile66.svg tile657.svg tile87.svg tile141.svg tile436.svg tile362.svg tile122.svg tile-909.svg tile2109.svg tile41.svg tile578.svg tile65.svg tile0.svg tile38.svg tile2079.svg tile-39.svg tile-21.svg tile576.svg tile82.svg tile2091.svg tile-143.svg tile996.svg tile99.svg tile132.svg tile357.svg tile9.svg tile2078.svg tile-902.svg tile1220.svg tile10.svg tile625.svg tile67.svg tile108.svg tile2012.svg tile34.svg tile2106.svg tile106.svg tile611.svg tile667.svg tile983.svg tile2120.svg tile30.svg tile86.svg tile666.svg tile2083.svg tile689.svg tile446.svg tile61.svg tile1441.svg tile413.svg tile2116.svg tile5.svg tile93.svg tile361.svg tile645.svg tile-802.svg tile104.svg tile94.svg tile2090.svg tile214.svg tile2107.svg tile9220.svg tile607.svg tile9997.svg tile88.svg tile15.svg tile690.svg tile2092.svg tile352.svg tile171.svg tile42.svg tile123.svg tile142.svg tile190.svg tile135.svg tile411.svg tile685.svg tile11.svg tile27.svg tile36.svg tile700.svg tile-3009.svg tile-912.svg tile28.svg tile-114.svg tile999.svg tile360.svg tile624.svg tile355.svg tile633.svg tile1063.svg tile113.svg tile-3006.svg tile608.svg tile220.svg tile37.svg tile170.svg tile1217.svg tile32.svg tile13.svg tile1050.svg tile616.svg tile218.svg tile-805.svg tile668.svg tile394.svg tile675.svg tile365.svg tile358.svg tile90.svg tile110.svg tile664.svg tile1052.svg tile661.svg tile583.svg tile662.svg tile402.svg tile391.svg tile102.svg tile315.svg tile701.svg tile627.svg tile-23.svg tile366.svg tile161.svg tile21.svg tile660.svg tile2074.svg tile204.svg tile-808.svg tile321.svg tile133.svg tile615.svg tile670.svg tile203.svg tile2101.svg tile709.svg tile215.svg tile696.svg tile646.svg tile582.svg tile111.svg tile326.svg tile412.svg tile-810.svg tile146.svg tile-907.svg tile408.svg tile606.svg tile201.svg tile512.svg tile50.svg tile711.svg tile-3.svg tile655.svg tile211.svg tile368.svg tile418.svg tile610.svg tile22.svg tile982.svg tile202.svg tile-112.svg tile24.svg tile78.svg tile671.svg tile145.svg tile415.svg tile704.svg tile1443.svg tile64.svg tile62.svg tile703.svg tile217.svg tile629.svg tile659.svg tile147.svg tile205.svg tile601.svg tile707.svg tile602.svg tile651.svg tile2113.svg tile2085.svg tile708.svg tile208.svg tile2110.svg tile364.svg tile70.svg tile-2.svg tile2112.svg tile410.svg tile-103.svg tile209.svg tile605.svg tile422.svg tile652.svg tile650.svg tile426.svg tile710.svg tile131.svg tile1112.svg tile619.svg tile706.svg tile69.svg tile221.svg tile74.svg tile2087.svg tile351.svg tile545.svg tile-6.svg tile397.svg tile2117.svg tile103.svg tile207.svg tile644.svg tile2080.svg tile695.svg tile43.svg tile120.svg tile1.svg tile95.svg tile-1.svg tile192.svg tile129.svg tile515.svg tile58.svg tile603.svg tile714.svg tile392.svg tile47.svg tile98.svg tile172.svg tile632.svg tile193.svg tile516.svg tile97.svg tile2081.svg tile2119.svg tile511.svg tile105.svg tile-800.svg tile77.svg tile92.svg tile1093.svg tile698.svg tile1005.svg tile81.svg tile395.svg tile405.svg tile80.svg tile-58.svg tile53.svg tile-803.svg tile1221.svg tile2073.svg tile1442.svg tile363.svg tile665.svg tile4.svg tile55.svg tile423.svg tile571.svg tile143.svg tile712.svg tile23.svg Log Message: Reproduced SVG tiles from TileDesigner. Tiles with ID <=0 have no visible ID. Tiles -901, -902 and -903 hand-made in Inkscape. Index: tile93.svg =================================================================== RCS file: /cvsroot/rails/18xx/tiles/svg/tile93.svg,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tile93.svg 17 Jul 2007 20:26:49 -0000 1.3 --- tile93.svg 18 Dec 2009 19:59:43 -0000 1.4 *************** *** 1,232 **** ! <?xml version="1.0" encoding="UTF-8" standalone="no"?> ! <svg ! xmlns:dc="http://purl.org/dc/elements/1.1/" ! xmlns:cc="http://web.resource.org/cc/" ! xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ! xmlns:svg="http://www.w3.org/2000/svg" ! xmlns="http://www.w3.org/2000/svg" ! xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" ! xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" ! width="100" ! height="100" ! viewBox="0 0 1 1" ! preserveAspectRatio="none" ! id="svg9662" ! sodipodi:version="0.32" ! inkscape:version="0.45.1" ! sodipodi:docname="tile93.svg" ! sodipodi:docbase="C:\Documents and Settings\Brett\workspace\18xx\tiles\svg" ! version="1.0" ! inkscape:output_extension="org.inkscape.output.svg.inkscape"> ! <metadata ! id="metadata9739"> ! <rdf:RDF> ! <cc:Work ! rdf:about=""> ! <dc:format>image/svg+xml</dc:format> ! <dc:type ! rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> ! </cc:Work> ! </rdf:RDF> ! </metadata> ! <defs ! id="defs9737" /> ! <sodipodi:namedview ! inkscape:window-height="579" ! inkscape:window-width="749" ! inkscape:pageshadow="2" ! inkscape:pageopacity="0.0" ! borderopacity="1.0" ! bordercolor="#666666" ! pagecolor="#ffffff" ! id="base" ! inkscape:zoom="2.9106618" ! inkscape:cx="52.519894" ! inkscape:cy="42.015915" ! inkscape:window-x="110" ! inkscape:window-y="110" ! inkscape:current-layer="svg9662" /> ! <title ! id="title9664">SVG drawing</title> ! <desc ! id="desc9666">This was produced by version 4.1 of GNU libplot, a free library for exporting 2-D vector graphics.</desc> ! <g ! transform="matrix(5.415947e-3,0,0,-6.1561381e-3,-9.7511369e-4,0.9993442)" ! xml:space="preserve" ! style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:none;fill-opacity:1;stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ! id="g9670"> ! <polygon ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! style="fill:#38ac00;fill-rule:nonzero;stroke:#38ac00;stroke-width:0;stroke-linejoin:round" ! id="polygon9672" /> ! <text ! transform="matrix(1,0,0,-1,111.23,7.9141)" ! style="font-size:8px;fill:#000000;stroke:none;font-family:"Helvetica", sans-serif" ! id="text9674">93</text> ! ! ! <polygon ! points="68.5,56.5 116.5,56.5 116.5,104.5 68.5,104.5 68.5,56.5 " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linejoin:round" ! id="polygon9676" /> ! <polygon ! points="68.5,56.5 116.5,56.5 116.5,104.5 68.5,104.5 68.5,56.5 " ! style="stroke:#ffffff;stroke-width:6;stroke-linejoin:round" ! id="polygon9678" /> ! <path ! d="M 92.5,80.5 L 92.469,81.735 L 92.376,82.954 L 92.223,84.155 L 92.012,85.337 L 91.744,86.498 L 91.421,87.637 L 91.044,88.752 L 90.614,89.841 L 90.133,90.905 L 89.603,91.939 L 89.025,92.944 L 88.401,93.918 L 87.732,94.859 L 87.019,95.766 L 86.265,96.637 L 85.47,97.47 L 84.637,98.265 L 83.766,99.019 L 82.859,99.732 L 81.918,100.4 L 80.944,101.03 L 79.939,101.6 L 78.905,102.13 L 77.841,102.61 L 76.752,103.04 L 75.637,103.42 L 74.498,103.74 L 73.337,104.01 L 72.155,104.22 L 70.954,104.38 L 69.735,104.47 L 68.5,104.5 C 55.246,104.5 44.5,93.754 44.5,80.5 C 44.5,67.246 55.246,56.5 68.5,56.5 C 81.754,56.5 92.5,67.246 92.5,80.5 z " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path9680" /> ! <path ! d="M 92.5,80.5 L 92.469,81.735 L 92.376,82.954 L 92.223,84.155 L 92.012,85.337 L 91.744,86.498 L 91.421,87.637 L 91.044,88.752 L 90.614,89.841 L 90.133,90.905 L 89.603,91.939 L 89.025,92.944 L 88.401,93.918 L 87.732,94.859 L 87.019,95.766 L 86.265,96.637 L 85.47,97.47 L 84.637,98.265 L 83.766,99.019 L 82.859,99.732 L 81.918,100.4 L 80.944,101.03 L 79.939,101.6 L 78.905,102.13 L 77.841,102.61 L 76.752,103.04 L 75.637,103.42 L 74.498,103.74 L 73.337,104.01 L 72.155,104.22 L 70.954,104.38 L 69.735,104.47 L 68.5,104.5 C 55.246,104.5 44.5,93.754 44.5,80.5 C 44.5,67.246 55.246,56.5 68.5,56.5 C 81.754,56.5 92.5,67.246 92.5,80.5 z " ! style="stroke:#ffffff;stroke-width:6;stroke-linecap:round;stroke-linejoin:round" ! id="path9682" /> ! <path ! d="M 140.5,80.5 L 140.47,81.735 L 140.38,82.954 L 140.22,84.155 L 140.01,85.337 L 139.74,86.498 L 139.42,87.637 L 139.04,88.752 L 138.61,89.841 L 138.13,90.905 L 137.6,91.939 L 137.03,92.944 L 136.4,93.918 L 135.73,94.859 L 135.02,95.766 L 134.26,96.637 L 133.47,97.47 L 132.64,98.265 L 131.77,99.019 L 130.86,99.732 L 129.92,100.4 L 128.94,101.03 L 127.94,101.6 L 126.9,102.13 L 125.84,102.61 L 124.75,103.04 L 123.64,103.42 L 122.5,103.74 L 121.34,104.01 L 120.15,104.22 L 118.95,104.38 L 117.73,104.47 L 116.5,104.5 C 103.25,104.5 92.5,93.754 92.5,80.5 C 92.5,67.246 103.25,56.5 116.5,56.5 C 129.75,56.5 140.5,67.246 140.5,80.5 z " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path9684" /> ! <path ! d="M 140.5,80.5 L 140.47,81.735 L 140.38,82.954 L 140.22,84.155 L 140.01,85.337 L 139.74,86.498 L 139.42,87.637 L 139.04,88.752 L 138.61,89.841 L 138.13,90.905 L 137.6,91.939 L 137.03,92.944 L 136.4,93.918 L 135.73,94.859 L 135.02,95.766 L 134.26,96.637 L 133.47,97.47 L 132.64,98.265 L 131.77,99.019 L 130.86,99.732 L 129.92,100.4 L 128.94,101.03 L 127.94,101.6 L 126.9,102.13 L 125.84,102.61 L 124.75,103.04 L 123.64,103.42 L 122.5,103.74 L 121.34,104.01 L 120.15,104.22 L 118.95,104.38 L 117.73,104.47 L 116.5,104.5 C 103.25,104.5 92.5,93.754 92.5,80.5 C 92.5,67.246 103.25,56.5 116.5,56.5 C 129.75,56.5 140.5,67.246 140.5,80.5 z " ! style="stroke:#ffffff;stroke-width:6;stroke-linecap:round;stroke-linejoin:round" ! id="path9686" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="92.5" ! y2="160.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line9688" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="120.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line9690" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="40.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line9692" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="92.5" ! y2="0.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line9694" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="23.5" ! y2="40.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line9696" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="23.5" ! y2="120.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line9698" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="92.5" ! y2="160.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line9700" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="120.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line9702" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="40.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line9704" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="92.5" ! y2="0.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line9706" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="23.5" ! y2="40.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line9708" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="23.5" ! y2="120.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line9710" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="40.5" ! style="stroke:#ffffff;stroke-width:8;stroke-linecap:round;stroke-dasharray:12" ! id="line9712" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="23.5" ! y2="120.5" ! style="stroke:#ffffff;stroke-width:8;stroke-linecap:round;stroke-dasharray:12" ! id="line9714" /> ! <polygon ! points="68.5,56.5 116.5,56.5 116.5,104.5 68.5,104.5 68.5,56.5 " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linejoin:round" ! id="polygon9716" /> ! <polygon ! points="68.5,56.5 116.5,56.5 116.5,104.5 68.5,104.5 68.5,56.5 " ! style="stroke-width:2;stroke-linejoin:round" ! id="polygon9718" /> ! <path ! d="M 92.5,80.5 L 92.469,81.735 L 92.376,82.954 L 92.223,84.155 L 92.012,85.337 L 91.744,86.498 L 91.421,87.637 L 91.044,88.752 L 90.614,89.841 L 90.133,90.905 L 89.603,91.939 L 89.025,92.944 L 88.401,93.918 L 87.732,94.859 L 87.019,95.766 L 86.265,96.637 L 85.47,97.47 L 84.637,98.265 L 83.766,99.019 L 82.859,99.732 L 81.918,100.4 L 80.944,101.03 L 79.939,101.6 L 78.905,102.13 L 77.841,102.61 L 76.752,103.04 L 75.637,103.42 L 74.498,103.74 L 73.337,104.01 L 72.155,104.22 L 70.954,104.38 L 69.735,104.47 L 68.5,104.5 C 55.246,104.5 44.5,93.754 44.5,80.5 C 44.5,67.246 55.246,56.5 68.5,56.5 C 81.754,56.5 92.5,67.246 92.5,80.5 z " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path9720" /> ! <path ! d="M 92.5,80.5 L 92.469,81.735 L 92.376,82.954 L 92.223,84.155 L 92.012,85.337 L 91.744,86.498 L 91.421,87.637 L 91.044,88.752 L 90.614,89.841 L 90.133,90.905 L 89.603,91.939 L 89.025,92.944 L 88.401,93.918 L 87.732,94.859 L 87.019,95.766 L 86.265,96.637 L 85.47,97.47 L 84.637,98.265 L 83.766,99.019 L 82.859,99.732 L 81.918,100.4 L 80.944,101.03 L 79.939,101.6 L 78.905,102.13 L 77.841,102.61 L 76.752,103.04 L 75.637,103.42 L 74.498,103.74 L 73.337,104.01 L 72.155,104.22 L 70.954,104.38 L 69.735,104.47 L 68.5,104.5 C 55.246,104.5 44.5,93.754 44.5,80.5 C 44.5,67.246 55.246,56.5 68.5,56.5 C 81.754,56.5 92.5,67.246 92.5,80.5 z " ! style="stroke-width:2;stroke-linecap:round;stroke-linejoin:round" ! id="path9722" /> ! <path ! d="M 140.5,80.5 L 140.47,81.735 L 140.38,82.954 L 140.22,84.155 L 140.01,85.337 L 139.74,86.498 L 139.42,87.637 L 139.04,88.752 L 138.61,89.841 L 138.13,90.905 L 137.6,91.939 L 137.03,92.944 L 136.4,93.918 L 135.73,94.859 L 135.02,95.766 L 134.26,96.637 L 133.47,97.47 L 132.64,98.265 L 131.77,99.019 L 130.86,99.732 L 129.92,100.4 L 128.94,101.03 L 127.94,101.6 L 126.9,102.13 L 125.84,102.61 L 124.75,103.04 L 123.64,103.42 L 122.5,103.74 L 121.34,104.01 L 120.15,104.22 L 118.95,104.38 L 117.73,104.47 L 116.5,104.5 C 103.25,104.5 92.5,93.754 92.5,80.5 C 92.5,67.246 103.25,56.5 116.5,56.5 C 129.75,56.5 140.5,67.246 140.5,80.5 z " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path9724" /> ! <path ! d="M 140.5,80.5 L 140.47,81.735 L 140.38,82.954 L 140.22,84.155 L 140.01,85.337 L 139.74,86.498 L 139.42,87.637 L 139.04,88.752 L 138.61,89.841 L 138.13,90.905 L 137.6,91.939 L 137.03,92.944 L 136.4,93.918 L 135.73,94.859 L 135.02,95.766 L 134.26,96.637 L 133.47,97.47 L 132.64,98.265 L 131.77,99.019 L 130.86,99.732 L 129.92,100.4 L 128.94,101.03 L 127.94,101.6 L 126.9,102.13 L 125.84,102.61 L 124.75,103.04 L 123.64,103.42 L 122.5,103.74 L 121.34,104.01 L 120.15,104.22 L 118.95,104.38 L 117.73,104.47 L 116.5,104.5 C 103.25,104.5 92.5,93.754 92.5,80.5 C 92.5,67.246 103.25,56.5 116.5,56.5 C 129.75,56.5 140.5,67.246 140.5,80.5 z " ! style="stroke-width:2;stroke-linecap:round;stroke-linejoin:round" ! id="path9726" /> ! <path ! d="M 66.992,140.5 L 66.981,140.71 L 66.948,140.91 L 66.894,141.11 L 66.82,141.31 L 66.725,141.51 L 66.61,141.7 L 66.477,141.89 L 66.324,142.07 L 66.154,142.25 L 65.967,142.42 L 65.762,142.59 L 65.541,142.76 L 65.304,142.92 L 65.052,143.07 L 64.785,143.22 L 64.504,143.36 L 64.209,143.49 L 63.901,143.62 L 63.58,143.74 L 63.247,143.85 L 62.902,143.95 L 62.547,144.05 L 62.181,144.14 L 61.804,144.22 L 61.419,144.29 L 61.024,144.36 L 60.621,144.41 L 60.211,144.46 L 59.793,144.49 L 59.368,144.52 L 58.937,144.53 L 58.5,144.54 C 53.812,144.54 50.008,142.73 50.008,140.5 C 50.008,138.27 53.812,136.46 58.5,136.46 C 63.188,136.46 66.992,138.27 66.992,140.5 z " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path9728" /> ! <path ! d="M 66.992,140.5 L 66.981,140.71 L 66.948,140.91 L 66.894,141.11 L 66.82,141.31 L 66.725,141.51 L 66.61,141.7 L 66.477,141.89 L 66.324,142.07 L 66.154,142.25 L 65.967,142.42 L 65.762,142.59 L 65.541,142.76 L 65.304,142.92 L 65.052,143.07 L 64.785,143.22 L 64.504,143.36 L 64.209,143.49 L 63.901,143.62 L 63.58,143.74 L 63.247,143.85 L 62.902,143.95 L 62.547,144.05 L 62.181,144.14 L 61.804,144.22 L 61.419,144.29 L 61.024,144.36 L 60.621,144.41 L 60.211,144.46 L 59.793,144.49 L 59.368,144.52 L 58.937,144.53 L 58.5,144.54 C 53.812,144.54 50.008,142.73 50.008,140.5 C 50.008,138.27 53.812,136.46 58.5,136.46 C 63.188,136.46 66.992,138.27 66.992,140.5 z " ! style="stroke-width:0.84906;stroke-linecap:round;stroke-linejoin:round" ! id="path9730" /> ! <text ! transform="matrix(1,0,0,-1,53.191,137.98)" ! style="font-size:8px;fill:#000000;stroke:none;font-family:"Helvetica", sans-serif" ! id="text9732">20</text> ! ! ! <polygon ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! style="stroke-width:1;stroke-linejoin:round" ! id="polygon9734" /> ! </g></svg> --- 1,2 ---- ! <?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="#38AC00" stroke="#38AC00" stroke-width="1" stroke-linejoin="round"/><text x="245" y="318" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Arial" font-size="31" font-weight="bold">93</text><polygon points="145,119 247,119 247,221 145,221" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="145" cy="170" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="247" cy="170" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><path d="M 196,170 L 196,0" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,0" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,255" fill="none" stroke="#FFFFFF" stroke-width="18" stroke-linecap="butt" stroke-linejoin="round" stroke-dasharray="26"/><path d="M 196,170 L 49,85" fill="none" stroke="#FFFFFF" stroke-width="18" stroke-linecap="butt" stroke-linejoin="round" stroke-dasharray="26"/><polygon points="145,119 247,119 247,221 145,221" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="145" cy="170" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="247" cy="170" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><ellipse rx="31" ry="30" cx="123" cy="43" fill="#FFFFFF" stroke="#000000" stroke-width="2" stroke-linejoin="round"/><text x="123" y="43" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Bookman Old Style" font-size="43">20</text><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg> Index: tile202.svg =================================================================== RCS file: /cvsroot/rails/18xx/tiles/svg/tile202.svg,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tile202.svg 19 Jul 2007 20:22:07 -0000 1.3 --- tile202.svg 18 Dec 2009 19:59:43 -0000 1.4 *************** *** 1,136 **** ! <?xml version="1.0" encoding="UTF-8" standalone="no"?> ! <svg ! xmlns:dc="http://purl.org/dc/elements/1.1/" ! xmlns:cc="http://web.resource.org/cc/" ! xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ! xmlns:svg="http://www.w3.org/2000/svg" ! xmlns="http://www.w3.org/2000/svg" ! xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" ! xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" ! width="100" ! height="100" ! viewBox="0 0 1 1" ! preserveAspectRatio="none" ! id="svg5546" ! sodipodi:version="0.32" ! inkscape:version="0.45.1" ! sodipodi:docname="tile202.svg" ! sodipodi:docbase="C:\Documents and Settings\Brett\workspace\18xx\tiles\svg" ! version="1.0" ! inkscape:output_extension="org.inkscape.output.svg.inkscape"> ! <metadata ! id="metadata5589"> ! <rdf:RDF> ! <cc:Work ! rdf:about=""> ! <dc:format>image/svg+xml</dc:format> ! <dc:type ! rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> ! </cc:Work> ! </rdf:RDF> ! </metadata> ! <defs ! id="defs5587" /> ! <sodipodi:namedview ! inkscape:window-height="579" ! inkscape:window-width="749" ! inkscape:pageshadow="2" ! inkscape:pageopacity="0.0" ! borderopacity="1.0" ! bordercolor="#666666" ! pagecolor="#ffffff" ! id="base" ! inkscape:zoom="2.639" ! inkscape:cx="65.888594" ! inkscape:cy="44.880637" ! inkscape:window-x="242" ! inkscape:window-y="242" ! inkscape:current-layer="svg5546" /> ! <title ! id="title5548">SVG drawing</title> ! <desc ! id="desc5550">This was produced by version 4.1 of GNU libplot, a free library for exporting 2-D vector graphics.</desc> ! <g ! transform="matrix(5.4169473e-3,0,0,-6.1915838e-3,-1.067645e-3,1.0008655)" ! xml:space="preserve" ! style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:none;fill-opacity:1;stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ! id="g5554"> ! <polygon ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! style="fill:#ffff00;fill-rule:nonzero;stroke:#ffff00;stroke-width:0;stroke-linejoin:round" ! id="polygon5556" /> ! <text ! transform="matrix(1,0,0,-1,109.2,7.9141)" ! style="font-size:8px;fill:#000000;stroke:none;font-family:"Helvetica", sans-serif" ! id="text5558">202</text> ! ! ! <path ! d="M 116.5,80.5 L 116.47,81.735 L 116.38,82.954 L 116.22,84.155 L 116.01,85.337 L 115.74,86.498 L 115.42,87.637 L 115.04,88.752 L 114.61,89.841 L 114.13,90.905 L 113.6,91.939 L 113.03,92.944 L 112.4,93.918 L 111.73,94.859 L 111.02,95.766 L 110.26,96.637 L 109.47,97.47 L 108.64,98.265 L 107.77,99.019 L 106.86,99.732 L 105.92,100.4 L 104.94,101.03 L 103.94,101.6 L 102.9,102.13 L 101.84,102.61 L 100.75,103.04 L 99.637,103.42 L 98.498,103.74 L 97.337,104.01 L 96.155,104.22 L 94.954,104.38 L 93.735,104.47 L 92.5,104.5 C 79.246,104.5 68.5,93.754 68.5,80.5 C 68.5,67.246 79.246,56.5 92.5,56.5 C 105.75,56.5 116.5,67.246 116.5,80.5 z " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path5560" /> ! <path ! d="M 116.5,80.5 L 116.47,81.735 L 116.38,82.954 L 116.22,84.155 L 116.01,85.337 L 115.74,86.498 L 115.42,87.637 L 115.04,88.752 L 114.61,89.841 L 114.13,90.905 L 113.6,91.939 L 113.03,92.944 L 112.4,93.918 L 111.73,94.859 L 111.02,95.766 L 110.26,96.637 L 109.47,97.47 L 108.64,98.265 L 107.77,99.019 L 106.86,99.732 L 105.92,100.4 L 104.94,101.03 L 103.94,101.6 L 102.9,102.13 L 101.84,102.61 L 100.75,103.04 L 99.637,103.42 L 98.498,103.74 L 97.337,104.01 L 96.155,104.22 L 94.954,104.38 L 93.735,104.47 L 92.5,104.5 C 79.246,104.5 68.5,93.754 68.5,80.5 C 68.5,67.246 79.246,56.5 92.5,56.5 C 105.75,56.5 116.5,67.246 116.5,80.5 z " ! style="stroke:#ffffff;stroke-width:6;stroke-linecap:round;stroke-linejoin:round" ! id="path5562" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="92.5" ! y2="160.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line5564" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="40.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line5566" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="92.5" ! y2="160.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line5568" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="40.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line5570" /> ! <path ! d="M 116.5,80.5 L 116.47,81.735 L 116.38,82.954 L 116.22,84.155 L 116.01,85.337 L 115.74,86.498 L 115.42,87.637 L 115.04,88.752 L 114.61,89.841 L 114.13,90.905 L 113.6,91.939 L 113.03,92.944 L 112.4,93.918 L 111.73,94.859 L 111.02,95.766 L 110.26,96.637 L 109.47,97.47 L 108.64,98.265 L 107.77,99.019 L 106.86,99.732 L 105.92,100.4 L 104.94,101.03 L 103.94,101.6 L 102.9,102.13 L 101.84,102.61 L 100.75,103.04 L 99.637,103.42 L 98.498,103.74 L 97.337,104.01 L 96.155,104.22 L 94.954,104.38 L 93.735,104.47 L 92.5,104.5 C 79.246,104.5 68.5,93.754 68.5,80.5 C 68.5,67.246 79.246,56.5 92.5,56.5 C 105.75,56.5 116.5,67.246 116.5,80.5 z " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path5572" /> ! <path ! d="M 116.5,80.5 L 116.47,81.735 L 116.38,82.954 L 116.22,84.155 L 116.01,85.337 L 115.74,86.498 L 115.42,87.637 L 115.04,88.752 L 114.61,89.841 L 114.13,90.905 L 113.6,91.939 L 113.03,92.944 L 112.4,93.918 L 111.73,94.859 L 111.02,95.766 L 110.26,96.637 L 109.47,97.47 L 108.64,98.265 L 107.77,99.019 L 106.86,99.732 L 105.92,100.4 L 104.94,101.03 L 103.94,101.6 L 102.9,102.13 L 101.84,102.61 L 100.75,103.04 L 99.637,103.42 L 98.498,103.74 L 97.337,104.01 L 96.155,104.22 L 94.954,104.38 L 93.735,104.47 L 92.5,104.5 C 79.246,104.5 68.5,93.754 68.5,80.5 C 68.5,67.246 79.246,56.5 92.5,56.5 C 105.75,56.5 116.5,67.246 116.5,80.5 z " ! style="stroke-width:2;stroke-linecap:round;stroke-linejoin:round" ! id="path5574" /> ! <path ! d="M 66.992,140.5 L 66.981,140.71 L 66.948,140.91 L 66.894,141.11 L 66.82,141.31 L 66.725,141.51 L 66.61,141.7 L 66.477,141.89 L 66.324,142.07 L 66.154,142.25 L 65.967,142.42 L 65.762,142.59 L 65.541,142.76 L 65.304,142.92 L 65.052,143.07 L 64.785,143.22 L 64.504,143.36 L 64.209,143.49 L 63.901,143.62 L 63.58,143.74 L 63.247,143.85 L 62.902,143.95 L 62.547,144.05 L 62.181,144.14 L 61.804,144.22 L 61.419,144.29 L 61.024,144.36 L 60.621,144.41 L 60.211,144.46 L 59.793,144.49 L 59.368,144.52 L 58.937,144.53 L 58.5,144.54 C 53.812,144.54 50.008,142.73 50.008,140.5 C 50.008,138.27 53.812,136.46 58.5,136.46 C 63.188,136.46 66.992,138.27 66.992,140.5 z " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path5576" /> ! <path ! d="M 66.992,140.5 L 66.981,140.71 L 66.948,140.91 L 66.894,141.11 L 66.82,141.31 L 66.725,141.51 L 66.61,141.7 L 66.477,141.89 L 66.324,142.07 L 66.154,142.25 L 65.967,142.42 L 65.762,142.59 L 65.541,142.76 L 65.304,142.92 L 65.052,143.07 L 64.785,143.22 L 64.504,143.36 L 64.209,143.49 L 63.901,143.62 L 63.58,143.74 L 63.247,143.85 L 62.902,143.95 L 62.547,144.05 L 62.181,144.14 L 61.804,144.22 L 61.419,144.29 L 61.024,144.36 L 60.621,144.41 L 60.211,144.46 L 59.793,144.49 L 59.368,144.52 L 58.937,144.53 L 58.5,144.54 C 53.812,144.54 50.008,142.73 50.008,140.5 C 50.008,138.27 53.812,136.46 58.5,136.46 C 63.188,136.46 66.992,138.27 66.992,140.5 z " ! style="stroke-width:0.84906;stroke-linecap:round;stroke-linejoin:round" ! id="path5578" /> ! <text ! transform="matrix(1,0,0,-1,53.191,137.98)" ! style="font-size:8px;fill:#000000;stroke:none;font-family:"Helvetica", sans-serif" ! id="text5580">30</text> ! ! ! <text ! transform="matrix(1,0,0,-1,18.051,74.918)" ! style="font-size:16px;fill:#000000;stroke:none;font-family:"Helvetica", sans-serif" ! id="text5582">Y</text> ! ! ! <polygon ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! style="stroke-width:1;stroke-linejoin:round" ! id="polygon5584" /> ! </g></svg> --- 1,2 ---- ! <?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="#FFFF00" stroke="#FFFF00" stroke-width="1" stroke-linejoin="round"/><text x="245" y="318" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Arial" font-size="31" font-weight="bold">202</text><circle cx="196" cy="170" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><path d="M 196,170 L 196,0" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,0" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><circle cx="196" cy="170" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><ellipse rx="31" ry="30" cx="123" cy="43" fill="#FFFFFF" stroke="#000000" stroke-width="2" stroke-linejoin="round"/><text x="123" y="43" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Bookman Old Style" font-size="43">30</text><text x="49" y="170" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="TimpaniHeavy" font-size="54">Y</text><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg> Index: tile369.svg =================================================================== RCS file: /cvsroot/rails/18xx/tiles/svg/tile369.svg,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tile369.svg 19 Jul 2007 20:21:59 -0000 1.3 --- tile369.svg 18 Dec 2009 19:59:43 -0000 1.4 *************** *** 1,226 **** ! <?xml version="1.0" encoding="UTF-8" standalone="no"?> ! <svg ! xmlns:dc="http://purl.org/dc/elements/1.1/" ! xmlns:cc="http://web.resource.org/cc/" ! xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ! xmlns:svg="http://www.w3.org/2000/svg" ! xmlns="http://www.w3.org/2000/svg" ! xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" ! xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" ! width="100" ! height="100" ! viewBox="0 0 1 1" ! preserveAspectRatio="none" ! id="svg9271" ! sodipodi:version="0.32" ! inkscape:version="0.45.1" ! sodipodi:docname="tile369.svg" ! sodipodi:docbase="C:\Documents and Settings\Brett\workspace\18xx\tiles\svg" ! version="1.0" ! inkscape:output_extension="org.inkscape.output.svg.inkscape"> ! <metadata ! id="metadata9350"> ! <rdf:RDF> ! <cc:Work ! rdf:about=""> ! <dc:format>image/svg+xml</dc:format> ! <dc:type ! rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> ! </cc:Work> ! </rdf:RDF> ! </metadata> ! <defs ! id="defs9348" /> ! <sodipodi:namedview ! inkscape:window-height="579" ! inkscape:window-width="749" ! inkscape:pageshadow="2" ! inkscape:pageopacity="0.0" ! borderopacity="1.0" ! bordercolor="#666666" ! pagecolor="#ffffff" ! id="base" ! inkscape:zoom="2.7876761" ! inkscape:cx="48.700265" ! inkscape:cy="41.061008" ! inkscape:window-x="176" ! inkscape:window-y="176" ! inkscape:current-layer="svg9271" /> ! <title ! id="title9273">SVG drawing</title> ! <desc ! id="desc9275">This was produced by version 4.1 of GNU libplot, a free library for exporting 2-D vector graphics.</desc> ! <g ! transform="matrix(5.4159067e-3,0,0,-6.1720029e-3,-9.713866e-4,0.9985245)" ! xml:space="preserve" ! style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:none;fill-opacity:1;stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ! id="g9279"> ! <polygon ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! style="fill:#808080;fill-rule:nonzero;stroke:#808080;stroke-width:0;stroke-linejoin:round" ! id="polygon9281" /> ! <text ! transform="matrix(1,0,0,-1,109.21,7.9141)" ! style="font-size:8px;fill:#000000;stroke:none;font-family:"Helvetica", sans-serif" ! id="text9283">369</text> ! ! ! <polygon ! points="68.5,42.5 116.5,42.5 137.5,78.5 113.5,120.5 71.5,120.5 47.5,78.5 68.5,42.5 " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linejoin:round" ! id="polygon9285" /> ! <polygon ! points="68.5,42.5 116.5,42.5 137.5,78.5 113.5,120.5 71.5,120.5 47.5,78.5 68.5,42.5 " ! style="stroke:#ffffff;stroke-width:6;stroke-linejoin:round" ! id="polygon9287" /> ! <path ! d="M 92.5,66.5 L 92.469,67.735 L 92.376,68.954 L 92.223,70.155 L 92.012,71.337 L 91.744,72.498 L 91.421,73.637 L 91.044,74.752 L 90.614,75.841 L 90.133,76.905 L 89.603,77.939 L 89.025,78.944 L 88.401,79.918 L 87.732,80.859 L 87.019,81.766 L 86.265,82.637 L 85.47,83.47 L 84.637,84.265 L 83.766,85.019 L 82.859,85.732 L 81.918,86.401 L 80.944,87.025 L 79.939,87.603 L 78.905,88.133 L 77.841,88.614 L 76.752,89.044 L 75.637,89.421 L 74.498,89.744 L 73.337,90.012 L 72.155,90.223 L 70.954,90.376 L 69.735,90.469 L 68.5,90.5 C 55.246,90.5 44.5,79.754 44.5,66.5 C 44.5,53.246 55.246,42.5 68.5,42.5 C 81.754,42.5 92.5,53.246 92.5,66.5 z " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path9289" /> ! <path ! d="M 92.5,66.5 L 92.469,67.735 L 92.376,68.954 L 92.223,70.155 L 92.012,71.337 L 91.744,72.498 L 91.421,73.637 L 91.044,74.752 L 90.614,75.841 L 90.133,76.905 L 89.603,77.939 L 89.025,78.944 L 88.401,79.918 L 87.732,80.859 L 87.019,81.766 L 86.265,82.637 L 85.47,83.47 L 84.637,84.265 L 83.766,85.019 L 82.859,85.732 L 81.918,86.401 L 80.944,87.025 L 79.939,87.603 L 78.905,88.133 L 77.841,88.614 L 76.752,89.044 L 75.637,89.421 L 74.498,89.744 L 73.337,90.012 L 72.155,90.223 L 70.954,90.376 L 69.735,90.469 L 68.5,90.5 C 55.246,90.5 44.5,79.754 44.5,66.5 C 44.5,53.246 55.246,42.5 68.5,42.5 C 81.754,42.5 92.5,53.246 92.5,66.5 z " ! style="stroke:#ffffff;stroke-width:6;stroke-linecap:round;stroke-linejoin:round" ! id="path9291" /> ! <path ! d="M 140.5,66.5 L 140.47,67.735 L 140.38,68.954 L 140.22,70.155 L 140.01,71.337 L 139.74,72.498 L 139.42,73.637 L 139.04,74.752 L 138.61,75.841 L 138.13,76.905 L 137.6,77.939 L 137.03,78.944 L 136.4,79.918 L 135.73,80.859 L 135.02,81.766 L 134.26,82.637 L 133.47,83.47 L 132.64,84.265 L 131.77,85.019 L 130.86,85.732 L 129.92,86.401 L 128.94,87.025 L 127.94,87.603 L 126.9,88.133 L 125.84,88.614 L 124.75,89.044 L 123.64,89.421 L 122.5,89.744 L 121.34,90.012 L 120.15,90.223 L 118.95,90.376 L 117.73,90.469 L 116.5,90.5 C 103.25,90.5 92.5,79.754 92.5,66.5 C 92.5,53.246 103.25,42.5 116.5,42.5 C 129.75,42.5 140.5,53.246 140.5,66.5 z " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path9293" /> ! <path ! d="M 140.5,66.5 L 140.47,67.735 L 140.38,68.954 L 140.22,70.155 L 140.01,71.337 L 139.74,72.498 L 139.42,73.637 L 139.04,74.752 L 138.61,75.841 L 138.13,76.905 L 137.6,77.939 L 137.03,78.944 L 136.4,79.918 L 135.73,80.859 L 135.02,81.766 L 134.26,82.637 L 133.47,83.47 L 132.64,84.265 L 131.77,85.019 L 130.86,85.732 L 129.92,86.401 L 128.94,87.025 L 127.94,87.603 L 126.9,88.133 L 125.84,88.614 L 124.75,89.044 L 123.64,89.421 L 122.5,89.744 L 121.34,90.012 L 120.15,90.223 L 118.95,90.376 L 117.73,90.469 L 116.5,90.5 C 103.25,90.5 92.5,79.754 92.5,66.5 C 92.5,53.246 103.25,42.5 116.5,42.5 C 129.75,42.5 140.5,53.246 140.5,66.5 z " ! style="stroke:#ffffff;stroke-width:6;stroke-linecap:round;stroke-linejoin:round" ! id="path9295" /> ! <path ! d="M 116.5,108.5 L 116.47,109.73 L 116.38,110.95 L 116.22,112.15 L 116.01,113.34 L 115.74,114.5 L 115.42,115.64 L 115.04,116.75 L 114.61,117.84 L 114.13,118.9 L 113.6,119.94 L 113.03,120.94 L 112.4,121.92 L 111.73,122.86 L 111.02,123.77 L 110.26,124.64 L 109.47,125.47 L 108.64,126.26 L 107.77,127.02 L 106.86,127.73 L 105.92,128.4 L 104.94,129.03 L 103.94,129.6 L 102.9,130.13 L 101.84,130.61 L 100.75,131.04 L 99.637,131.42 L 98.498,131.74 L 97.337,132.01 L 96.155,132.22 L 94.954,132.38 L 93.735,132.47 L 92.5,132.5 C 79.246,132.5 68.5,121.75 68.5,108.5 C 68.5,95.246 79.246,84.5 92.5,84.5 C 105.75,84.5 116.5,95.246 116.5,108.5 z " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path9297" /> ! <path ! d="M 116.5,108.5 L 116.47,109.73 L 116.38,110.95 L 116.22,112.15 L 116.01,113.34 L 115.74,114.5 L 115.42,115.64 L 115.04,116.75 L 114.61,117.84 L 114.13,118.9 L 113.6,119.94 L 113.03,120.94 L 112.4,121.92 L 111.73,122.86 L 111.02,123.77 L 110.26,124.64 L 109.47,125.47 L 108.64,126.26 L 107.77,127.02 L 106.86,127.73 L 105.92,128.4 L 104.94,129.03 L 103.94,129.6 L 102.9,130.13 L 101.84,130.61 L 100.75,131.04 L 99.637,131.42 L 98.498,131.74 L 97.337,132.01 L 96.155,132.22 L 94.954,132.38 L 93.735,132.47 L 92.5,132.5 C 79.246,132.5 68.5,121.75 68.5,108.5 C 68.5,95.246 79.246,84.5 92.5,84.5 C 105.75,84.5 116.5,95.246 116.5,108.5 z " ! style="stroke:#ffffff;stroke-width:6;stroke-linecap:round;stroke-linejoin:round" ! id="path9299" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="23.5" ! y2="120.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line9301" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="92.5" ! y2="160.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line9303" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="120.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line9305" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="40.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line9307" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="92.5" ! y2="0.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line9309" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="23.5" ! y2="120.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line9311" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="92.5" ! y2="160.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line9313" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="120.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line9315" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="40.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line9317" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="92.5" ! y2="0.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line9319" /> ! <polygon ! points="68.5,42.5 116.5,42.5 137.5,78.5 113.5,120.5 71.5,120.5 47.5,78.5 68.5,42.5 " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linejoin:round" ! id="polygon9321" /> ! <polygon ! points="68.5,42.5 116.5,42.5 137.5,78.5 113.5,120.5 71.5,120.5 47.5,78.5 68.5,42.5 " ! style="stroke-width:2;stroke-linejoin:round" ! id="polygon9323" /> ! <path ! d="M 92.5,66.5 L 92.469,67.735 L 92.376,68.954 L 92.223,70.155 L 92.012,71.337 L 91.744,72.498 L 91.421,73.637 L 91.044,74.752 L 90.614,75.841 L 90.133,76.905 L 89.603,77.939 L 89.025,78.944 L 88.401,79.918 L 87.732,80.859 L 87.019,81.766 L 86.265,82.637 L 85.47,83.47 L 84.637,84.265 L 83.766,85.019 L 82.859,85.732 L 81.918,86.401 L 80.944,87.025 L 79.939,87.603 L 78.905,88.133 L 77.841,88.614 L 76.752,89.044 L 75.637,89.421 L 74.498,89.744 L 73.337,90.012 L 72.155,90.223 L 70.954,90.376 L 69.735,90.469 L 68.5,90.5 C 55.246,90.5 44.5,79.754 44.5,66.5 C 44.5,53.246 55.246,42.5 68.5,42.5 C 81.754,42.5 92.5,53.246 92.5,66.5 z " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path9325" /> ! <path ! d="M 92.5,66.5 L 92.469,67.735 L 92.376,68.954 L 92.223,70.155 L 92.012,71.337 L 91.744,72.498 L 91.421,73.637 L 91.044,74.752 L 90.614,75.841 L 90.133,76.905 L 89.603,77.939 L 89.025,78.944 L 88.401,79.918 L 87.732,80.859 L 87.019,81.766 L 86.265,82.637 L 85.47,83.47 L 84.637,84.265 L 83.766,85.019 L 82.859,85.732 L 81.918,86.401 L 80.944,87.025 L 79.939,87.603 L 78.905,88.133 L 77.841,88.614 L 76.752,89.044 L 75.637,89.421 L 74.498,89.744 L 73.337,90.012 L 72.155,90.223 L 70.954,90.376 L 69.735,90.469 L 68.5,90.5 C 55.246,90.5 44.5,79.754 44.5,66.5 C 44.5,53.246 55.246,42.5 68.5,42.5 C 81.754,42.5 92.5,53.246 92.5,66.5 z " ! style="stroke-width:2;stroke-linecap:round;stroke-linejoin:round" ! id="path9327" /> ! <path ! d="M 140.5,66.5 L 140.47,67.735 L 140.38,68.954 L 140.22,70.155 L 140.01,71.337 L 139.74,72.498 L 139.42,73.637 L 139.04,74.752 L 138.61,75.841 L 138.13,76.905 L 137.6,77.939 L 137.03,78.944 L 136.4,79.918 L 135.73,80.859 L 135.02,81.766 L 134.26,82.637 L 133.47,83.47 L 132.64,84.265 L 131.77,85.019 L 130.86,85.732 L 129.92,86.401 L 128.94,87.025 L 127.94,87.603 L 126.9,88.133 L 125.84,88.614 L 124.75,89.044 L 123.64,89.421 L 122.5,89.744 L 121.34,90.012 L 120.15,90.223 L 118.95,90.376 L 117.73,90.469 L 116.5,90.5 C 103.25,90.5 92.5,79.754 92.5,66.5 C 92.5,53.246 103.25,42.5 116.5,42.5 C 129.75,42.5 140.5,53.246 140.5,66.5 z " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path9329" /> ! <path ! d="M 140.5,66.5 L 140.47,67.735 L 140.38,68.954 L 140.22,70.155 L 140.01,71.337 L 139.74,72.498 L 139.42,73.637 L 139.04,74.752 L 138.61,75.841 L 138.13,76.905 L 137.6,77.939 L 137.03,78.944 L 136.4,79.918 L 135.73,80.859 L 135.02,81.766 L 134.26,82.637 L 133.47,83.47 L 132.64,84.265 L 131.77,85.019 L 130.86,85.732 L 129.92,86.401 L 128.94,87.025 L 127.94,87.603 L 126.9,88.133 L 125.84,88.614 L 124.75,89.044 L 123.64,89.421 L 122.5,89.744 L 121.34,90.012 L 120.15,90.223 L 118.95,90.376 L 117.73,90.469 L 116.5,90.5 C 103.25,90.5 92.5,79.754 92.5,66.5 C 92.5,53.246 103.25,42.5 116.5,42.5 C 129.75,42.5 140.5,53.246 140.5,66.5 z " ! style="stroke-width:2;stroke-linecap:round;stroke-linejoin:round" ! id="path9331" /> ! <path ! d="M 116.5,108.5 L 116.47,109.73 L 116.38,110.95 L 116.22,112.15 L 116.01,113.34 L 115.74,114.5 L 115.42,115.64 L 115.04,116.75 L 114.61,117.84 L 114.13,118.9 L 113.6,119.94 L 113.03,120.94 L 112.4,121.92 L 111.73,122.86 L 111.02,123.77 L 110.26,124.64 L 109.47,125.47 L 108.64,126.26 L 107.77,127.02 L 106.86,127.73 L 105.92,128.4 L 104.94,129.03 L 103.94,129.6 L 102.9,130.13 L 101.84,130.61 L 100.75,131.04 L 99.637,131.42 L 98.498,131.74 L 97.337,132.01 L 96.155,132.22 L 94.954,132.38 L 93.735,132.47 L 92.5,132.5 C 79.246,132.5 68.5,121.75 68.5,108.5 C 68.5,95.246 79.246,84.5 92.5,84.5 C 105.75,84.5 116.5,95.246 116.5,108.5 z " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path9333" /> ! <path ! d="M 116.5,108.5 L 116.47,109.73 L 116.38,110.95 L 116.22,112.15 L 116.01,113.34 L 115.74,114.5 L 115.42,115.64 L 115.04,116.75 L 114.61,117.84 L 114.13,118.9 L 113.6,119.94 L 113.03,120.94 L 112.4,121.92 L 111.73,122.86 L 111.02,123.77 L 110.26,124.64 L 109.47,125.47 L 108.64,126.26 L 107.77,127.02 L 106.86,127.73 L 105.92,128.4 L 104.94,129.03 L 103.94,129.6 L 102.9,130.13 L 101.84,130.61 L 100.75,131.04 L 99.637,131.42 L 98.498,131.74 L 97.337,132.01 L 96.155,132.22 L 94.954,132.38 L 93.735,132.47 L 92.5,132.5 C 79.246,132.5 68.5,121.75 68.5,108.5 C 68.5,95.246 79.246,84.5 92.5,84.5 C 105.75,84.5 116.5,95.246 116.5,108.5 z " ! style="stroke-width:2;stroke-linecap:round;stroke-linejoin:round" ! id="path9335" /> ! <path ! d="M 66.992,140.5 L 66.981,140.71 L 66.948,140.91 L 66.894,141.11 L 66.82,141.31 L 66.725,141.51 L 66.61,141.7 L 66.477,141.89 L 66.324,142.07 L 66.154,142.25 L 65.967,142.42 L 65.762,142.59 L 65.541,142.76 L 65.304,142.92 L 65.052,143.07 L 64.785,143.22 L 64.504,143.36 L 64.209,143.49 L 63.901,143.62 L 63.58,143.74 L 63.247,143.85 L 62.902,143.95 L 62.547,144.05 L 62.181,144.14 L 61.804,144.22 L 61.419,144.29 L 61.024,144.36 L 60.621,144.41 L 60.211,144.46 L 59.793,144.49 L 59.368,144.52 L 58.937,144.53 L 58.5,144.54 C 53.812,144.54 50.008,142.73 50.008,140.5 C 50.008,138.27 53.812,136.46 58.5,136.46 C 63.188,136.46 66.992,138.27 66.992,140.5 z " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path9337" /> ! <path ! d="M 66.992,140.5 L 66.981,140.71 L 66.948,140.91 L 66.894,141.11 L 66.82,141.31 L 66.725,141.51 L 66.61,141.7 L 66.477,141.89 L 66.324,142.07 L 66.154,142.25 L 65.967,142.42 L 65.762,142.59 L 65.541,142.76 L 65.304,142.92 L 65.052,143.07 L 64.785,143.22 L 64.504,143.36 L 64.209,143.49 L 63.901,143.62 L 63.58,143.74 L 63.247,143.85 L 62.902,143.95 L 62.547,144.05 L 62.181,144.14 L 61.804,144.22 L 61.419,144.29 L 61.024,144.36 L 60.621,144.41 L 60.211,144.46 L 59.793,144.49 L 59.368,144.52 L 58.937,144.53 L 58.5,144.54 C 53.812,144.54 50.008,142.73 50.008,140.5 C 50.008,138.27 53.812,136.46 58.5,136.46 C 63.188,136.46 66.992,138.27 66.992,140.5 z " ! style="stroke-width:0.84906;stroke-linecap:round;stroke-linejoin:round" ! id="path9339" /> ! <text ! transform="matrix(1,0,0,-1,53.191,137.98)" ! style="font-size:8px;fill:#000000;stroke:none;font-family:"Helvetica", sans-serif" ! id="text9341">70</text> ! ! ! <text ! transform="matrix(1,0,0,-1,13.125,74.918)" ! style="font-size:16px;fill:#000000;stroke:none;font-family:"Helvetica", sans-serif" ! id="text9343">LA</text> ! ! ! <polygon ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! style="stroke-width:1;stroke-linejoin:round" ! id="polygon9345" /> ! </g></svg> --- 1,2 ---- ! <?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="#808080" stroke="#808080" stroke-width="1" stroke-linejoin="round"/><text x="245" y="318" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Arial" font-size="31" font-weight="bold">369</text><polygon points="145,90 247,90 291,167 240,255 152,255 101,167" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="145" cy="141" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="247" cy="141" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><circle cx="196" cy="229" r="51" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="12"/><path d="M 196,170 L 49,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,0" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 49,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,0" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,340" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><polygon points="145,90 247,90 291,167 240,255 152,255 101,167" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="145" cy="141" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="247" cy="141" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><circle cx="196" cy="229" r="51" fill="#FFFFFF" stroke="#000000" stroke-width="4"/><ellipse rx="31" ry="30" cx="123" cy="43" fill="#FFFFFF" stroke="#000000" stroke-width="2" stroke-linejoin="round"/><text x="123" y="43" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Bookman Old Style" font-size="43">70</text><text x="49" y="170" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="TimpaniHeavy" font-size="54">LA</text><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg> Index: tile358.svg =================================================================== RCS file: /cvsroot/rails/18xx/tiles/svg/tile358.svg,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tile358.svg 19 Jul 2007 20:22:08 -0000 1.3 --- tile358.svg 18 Dec 2009 19:59:43 -0000 1.4 *************** *** 1,204 **** ! <?xml version="1.0" encoding="UTF-8" standalone="no"?> ! <svg ! xmlns:dc="http://purl.org/dc/elements/1.1/" ! xmlns:cc="http://web.resource.org/cc/" ! xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ! xmlns:svg="http://www.w3.org/2000/svg" ! xmlns="http://www.w3.org/2000/svg" ! xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" ! xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" ! width="100" ! height="100" ! viewBox="0 0 1 1" ! preserveAspectRatio="none" ! id="svg8256" ! sodipodi:version="0.32" ! inkscape:version="0.45.1" ! sodipodi:docname="tile358.svg" ! sodipodi:docbase="C:\Documents and Settings\Brett\workspace\18xx\tiles\svg" ! version="1.0" ! inkscape:output_extension="org.inkscape.output.svg.inkscape"> ! <metadata ! id="metadata8327"> ! <rdf:RDF> ! <cc:Work ! rdf:about=""> ! <dc:format>image/svg+xml</dc:format> ! <dc:type ! rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> ! </cc:Work> ! </rdf:RDF> ! </metadata> ! <defs ! id="defs8325" /> ! <sodipodi:namedview ! inkscape:window-height="579" ! inkscape:window-width="749" ! inkscape:pageshadow="2" ! inkscape:pageopacity="0.0" ! borderopacity="1.0" ! bordercolor="#666666" ! pagecolor="#ffffff" ! id="base" ! inkscape:zoom="2.1282258" ! inkscape:cx="57.29443" ! inkscape:cy="33.421751" ! inkscape:window-x="176" ! inkscape:window-y="176" ! inkscape:current-layer="svg8256" /> ! <title ! id="title8258">SVG drawing</title> ! <desc ! id="desc8260">This was produced by version 4.1 of GNU libplot, a free library for exporting 2-D vector graphics.</desc> ! <g ! transform="matrix(5.4169565e-3,0,0,-6.1879697e-3,-1.0684924e-3,1.0008646)" ! xml:space="preserve" ! style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:none;fill-opacity:1;stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ! id="g8264"> ! <polygon ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! style="fill:#b46301;fill-rule:nonzero;stroke:#b46301;stroke-width:0;stroke-linejoin:round" ! id="polygon8266" /> ! <text ! transform="matrix(1,0,0,-1,109.19,7.9141)" ! style="font-size:8px;fill:#000000;stroke:none;font-family:"Helvetica", sans-serif" ! id="text8268">358</text> ! ! ! <polygon ! points="68.5,56.5 116.5,56.5 116.5,104.5 68.5,104.5 68.5,56.5 " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linejoin:round" ! id="polygon8270" /> ! <polygon ! points="68.5,56.5 116.5,56.5 116.5,104.5 68.5,104.5 68.5,56.5 " ! style="stroke:#ffffff;stroke-width:6;stroke-linejoin:round" ! id="polygon8272" /> ! <path ! d="M 92.5,80.5 L 92.469,81.735 L 92.376,82.954 L 92.223,84.155 L 92.012,85.337 L 91.744,86.498 L 91.421,87.637 L 91.044,88.752 L 90.614,89.841 L 90.133,90.905 L 89.603,91.939 L 89.025,92.944 L 88.401,93.918 L 87.732,94.859 L 87.019,95.766 L 86.265,96.637 L 85.47,97.47 L 84.637,98.265 L 83.766,99.019 L 82.859,99.732 L 81.918,100.4 L 80.944,101.03 L 79.939,101.6 L 78.905,102.13 L 77.841,102.61 L 76.752,103.04 L 75.637,103.42 L 74.498,103.74 L 73.337,104.01 L 72.155,104.22 L 70.954,104.38 L 69.735,104.47 L 68.5,104.5 C 55.246,104.5 44.5,93.754 44.5,80.5 C 44.5,67.246 55.246,56.5 68.5,56.5 C 81.754,56.5 92.5,67.246 92.5,80.5 z " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path8274" /> ! <path ! d="M 92.5,80.5 L 92.469,81.735 L 92.376,82.954 L 92.223,84.155 L 92.012,85.337 L 91.744,86.498 L 91.421,87.637 L 91.044,88.752 L 90.614,89.841 L 90.133,90.905 L 89.603,91.939 L 89.025,92.944 L 88.401,93.918 L 87.732,94.859 L 87.019,95.766 L 86.265,96.637 L 85.47,97.47 L 84.637,98.265 L 83.766,99.019 L 82.859,99.732 L 81.918,100.4 L 80.944,101.03 L 79.939,101.6 L 78.905,102.13 L 77.841,102.61 L 76.752,103.04 L 75.637,103.42 L 74.498,103.74 L 73.337,104.01 L 72.155,104.22 L 70.954,104.38 L 69.735,104.47 L 68.5,104.5 C 55.246,104.5 44.5,93.754 44.5,80.5 C 44.5,67.246 55.246,56.5 68.5,56.5 C 81.754,56.5 92.5,67.246 92.5,80.5 z " ! style="stroke:#ffffff;stroke-width:6;stroke-linecap:round;stroke-linejoin:round" ! id="path8276" /> ! <path ! d="M 140.5,80.5 L 140.47,81.735 L 140.38,82.954 L 140.22,84.155 L 140.01,85.337 L 139.74,86.498 L 139.42,87.637 L 139.04,88.752 L 138.61,89.841 L 138.13,90.905 L 137.6,91.939 L 137.03,92.944 L 136.4,93.918 L 135.73,94.859 L 135.02,95.766 L 134.26,96.637 L 133.47,97.47 L 132.64,98.265 L 131.77,99.019 L 130.86,99.732 L 129.92,100.4 L 128.94,101.03 L 127.94,101.6 L 126.9,102.13 L 125.84,102.61 L 124.75,103.04 L 123.64,103.42 L 122.5,103.74 L 121.34,104.01 L 120.15,104.22 L 118.95,104.38 L 117.73,104.47 L 116.5,104.5 C 103.25,104.5 92.5,93.754 92.5,80.5 C 92.5,67.246 103.25,56.5 116.5,56.5 C 129.75,56.5 140.5,67.246 140.5,80.5 z " ! style="fill:#ffffff;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path8278" /> ! <path ! d="M 140.5,80.5 L 140.47,81.735 L 140.38,82.954 L 140.22,84.155 L 140.01,85.337 L 139.74,86.498 L 139.42,87.637 L 139.04,88.752 L 138.61,89.841 L 138.13,90.905 L 137.6,91.939 L 137.03,92.944 L 136.4,93.918 L 135.73,94.859 L 135.02,95.766 L 134.26,96.637 L 133.47,97.47 L 132.64,98.265 L 131.77,99.019 L 130.86,99.732 L 129.92,100.4 L 128.94,101.03 L 127.94,101.6 L 126.9,102.13 L 125.84,102.61 L 124.75,103.04 L 123.64,103.42 L 122.5,103.74 L 121.34,104.01 L 120.15,104.22 L 118.95,104.38 L 117.73,104.47 L 116.5,104.5 C 103.25,104.5 92.5,93.754 92.5,80.5 C 92.5,67.246 103.25,56.5 116.5,56.5 C 129.75,56.5 140.5,67.246 140.5,80.5 z " ! style="stroke:#ffffff;stroke-width:6;stroke-linecap:round;stroke-linejoin:round" ! id="path8280" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="23.5" ! y2="120.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line8282" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="92.5" ! y2="160.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line8284" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="120.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line8286" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="40.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line8288" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="23.5" ! y2="120.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line8290" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="92.5" ! y2="160.5" ! style="stro... [truncated message content] |
|
From: Erik V. <ev...@us...> - 2009-12-15 22:32:50
|
Update of /cvsroot/rails/18xx/rails/ui/swing/hexmap In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17491/rails/ui/swing/hexmap Removed Files: GUIBar.java Log Message: Removed --- GUIBar.java DELETED --- |
|
From: Erik V. <ev...@us...> - 2009-12-15 18:56:22
|
Update of /cvsroot/rails/18xx/rails/ui/swing/hexmap In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4117/rails/ui/swing/hexmap Modified Files: GUIHex.java HexMap.java NSHexMap.java GUITile.java EWHexMap.java Log Message: Map made zoomable. Index: NSHexMap.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/NSHexMap.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** NSHexMap.java 8 Dec 2009 19:31:49 -0000 1.10 --- NSHexMap.java 15 Dec 2009 18:56:11 -0000 1.11 *************** *** 18,21 **** --- 18,23 ---- cx = 0; cy = -scale / 2; + scale = defaultScale = Scale.get(); + } *************** *** 24,29 **** hexes = new ArrayList<GUIHex>(); - scale = Scale.get(); - hexArray = mapManager.getHexes(); MapHex mh; --- 26,29 ---- *************** *** 49,56 **** } } preferredSize = ! new Dimension((hexArray.length + 1) * 3 * scale, (int) Math.round((hexArray[0].length + 1) * 2 ! * GUIHex.SQRT3 * scale)); } --- 49,79 ---- } } + setSize(); + } + + protected void setSize() { preferredSize = ! new Dimension( ! (int) Math.round((hexArray.length + 1) * 3 * scale * zoomFactor), (int) Math.round((hexArray[0].length + 1) * 2 ! * GUIHex.SQRT3 * scale * zoomFactor)); ! } ! ! @Override ! protected void scaleHexesGUI() { ! ! hexArray = mapManager.getHexes(); ! GUIHex hex; ! for (int i = 0; i < hexArray.length; i++) { ! for (int j = 0; j < hexArray[0].length; j++) { ! hex = h[i][j]; ! if (hex != null) { ! hex.scaleHex(cx + 3 * i * scale, ! cy + (2 * j + (i & 1)) * GUIHex.SQRT3 * scale, ! scale, zoomFactor); ! } ! } ! } ! setSize(); } Index: EWHexMap.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/EWHexMap.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** EWHexMap.java 8 Dec 2009 19:31:49 -0000 1.11 --- EWHexMap.java 15 Dec 2009 18:56:11 -0000 1.12 *************** *** 6,9 **** --- 6,10 ---- import rails.game.MapHex; + import rails.ui.swing.Scale; /** *************** *** 15,18 **** --- 16,20 ---- public EWHexMap() { + scale = defaultScale = 2 * Scale.get(); cx = scale / 2; cy = 0; *************** *** 21,24 **** --- 23,27 ---- @Override protected void setupHexesGUI() { + hexes = new ArrayList<GUIHex>(); *************** *** 46,56 **** } } preferredSize = new Dimension( (int) Math.round((hexArray.length + 1) * GUIHex.SQRT3 ! * scale), ! (int) Math.round((hexArray[0].length + 1) * 1.5 * scale)); } @Override public void paint(Graphics g) { --- 49,84 ---- } } + setSize(); + + } + protected void setSize() { preferredSize = new Dimension( (int) Math.round((hexArray.length + 1) * GUIHex.SQRT3 ! * scale * zoomFactor), ! (int) Math.round((hexArray[0].length + 1) * 1.5 * scale * zoomFactor)); } + + @Override + protected void scaleHexesGUI () { + + hexArray = mapManager.getHexes(); + GUIHex hex; + for (int i = 0; i < hexArray.length; i++) { + for (int j = 0; j < hexArray[0].length; j++) { + hex = h[i][j]; + if (hex != null) { + hex.scaleHex(cx + scale * ((GUIHex.SQRT3 * i) + (GUIHex.SQRT3 / 2 * (j & 1))), + cy + j * 1.5 * scale, + scale, zoomFactor); + + } + } + } + + setSize(); + } + @Override public void paint(Graphics g) { Index: HexMap.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/HexMap.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** HexMap.java 6 Nov 2009 20:23:53 -0000 1.19 --- HexMap.java 15 Dec 2009 18:56:11 -0000 1.20 *************** *** 13,17 **** import rails.game.*; import rails.game.action.*; ! import rails.ui.swing.*; /** --- 13,18 ---- import rails.game.*; import rails.game.action.*; ! import rails.ui.swing.GameUIManager; ! import rails.ui.swing.ORUIManager; /** *************** *** 30,33 **** --- 31,35 ---- // Abstract Methods protected abstract void setupHexesGUI(); + protected abstract void scaleHexesGUI(); // GUI hexes need to be recreated for each object, since scale varies. *************** *** 37,42 **** protected Map<String, GUIHex> hexesByName = new HashMap<String, GUIHex>(); protected ArrayList<GUIHex> hexes; ! protected List<GUIBar> bars = new ArrayList<GUIBar>(); ! protected int scale = 2 * Scale.get(); protected int cx; protected int cy; --- 39,46 ---- protected Map<String, GUIHex> hexesByName = new HashMap<String, GUIHex>(); protected ArrayList<GUIHex> hexes; ! protected int defaultScale; ! protected int scale; ! protected int zoomStep = 10; ! protected double zoomFactor = 1.0; protected int cx; protected int cy; *************** *** 130,138 **** } catch (NullPointerException ex) { ! // If we try to paint before something is loaded, just retry ! // later. } } @Override public Dimension getMinimumSize() { --- 134,165 ---- } catch (NullPointerException ex) { ! // If we try to paint before something is loaded, just retry later. } } + public void zoomIn () { + zoomStep++; + zoom(); + } + public void zoomOut() { + zoomStep--; + zoom(); + } + + protected void zoom() { + zoomFactor = GameUIManager.getImageLoader().getZoomFactor(zoomStep); + setScale(); + scaleHexesGUI(); + revalidate(); + } + + protected void setScale() { + scale = (int)(defaultScale * zoomFactor); + } + + public int getZoomStep () { + return zoomStep; + } + @Override public Dimension getMinimumSize() { Index: GUITile.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/GUITile.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** GUITile.java 4 Nov 2009 20:33:22 -0000 1.18 --- GUITile.java 15 Dec 2009 18:56:11 -0000 1.19 *************** *** 33,36 **** --- 33,37 ---- protected MapHex hex = null; + protected GUIHex guiHex = null; protected static ImageLoader imageLoader = GameUIManager.getImageLoader(); *************** *** 43,51 **** Logger.getLogger(GUITile.class.getPackage().getName()); ! public GUITile(int tileId, MapHex hex) { this.tileId = tileId; ! this.hex = hex; tile = GameManager.getInstance().getTileManager().getTile(tileId); - tileImage = imageLoader.getTile(tileId); if (hex.getTileOrientation() == MapHex.EW) { --- 44,52 ---- Logger.getLogger(GUITile.class.getPackage().getName()); ! public GUITile(int tileId, GUIHex guiHex) { ! this.guiHex = guiHex; this.tileId = tileId; ! this.hex = (MapHex)guiHex.getModel(); tile = GameManager.getInstance().getTileManager().getTile(tileId); if (hex.getTileOrientation() == MapHex.EW) { *************** *** 233,237 **** public void paintTile(Graphics2D g2, int x, int y) { ! if (tileImage != null) { double radians = baseRotation + rotation * DEG60; --- 234,242 ---- public void paintTile(Graphics2D g2, int x, int y) { ! ! int zoomStep = guiHex.getHexMap().getZoomStep(); ! tileImage = imageLoader.getTile(tileId, zoomStep); ! ! if (tileImage != null) { double radians = baseRotation + rotation * DEG60; Index: GUIHex.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/GUIHex.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** GUIHex.java 13 Dec 2009 21:14:12 -0000 1.27 --- GUIHex.java 15 Dec 2009 18:56:11 -0000 1.28 *************** *** 26,29 **** --- 26,34 ---- public static double SELECTED_SCALE = 0.8; + public static int NORMAL_TOKEN_SIZE = 15; + + public static Color BAR_COLOUR = Color.BLUE; + public static int BAR_WIDTH = 5; + public static void setScale(double scale) { NORMAL_SCALE = scale; *************** *** 35,38 **** --- 40,47 ---- protected static final Color highlightColor = Color.red; protected Point center; + /** x and y coordinates on the map */ + protected int x, y; + protected double zoomFactor = 1.0; + protected int tokenDiameter = NORMAL_TOKEN_SIZE; protected HexMap hexMap; // Containing this hex *************** *** 49,53 **** protected List<TokenI> offStationTokens; ! protected List<GUIBar> bars; protected GUIToken provisionalGUIToken = null; --- 58,62 ---- protected List<TokenI> offStationTokens; ! protected List<Integer> barStartPoints; protected GUIToken provisionalGUIToken = null; *************** *** 84,89 **** public GUIHex(HexMap hexMap, double cx, double cy, int scale, ! double xCoord, double yCoord) { this.hexMap = hexMap; if (hexMap.getMapManager().getTileOrientation() == MapHex.EW) { --- 93,109 ---- public GUIHex(HexMap hexMap, double cx, double cy, int scale, ! int xCoord, int yCoord) { this.hexMap = hexMap; + this.x = xCoord; + this.y = yCoord; + + scaleHex (cx, cy, scale, 1.0); + + } + + public void scaleHex (double cx, double cy, int scale, double zoomFactor) { + + this.zoomFactor = zoomFactor; + tokenDiameter = (int)Math.round(NORMAL_TOKEN_SIZE * zoomFactor); if (hexMap.getMapManager().getTileOrientation() == MapHex.EW) { *************** *** 154,157 **** --- 174,181 ---- } + public HexMap getHexMap() { + return hexMap; + } + public void setHexModel(MapHex model) { this.model = model; *************** *** 160,164 **** currentTileId = model.getCurrentTile().getId(); currentTileOrientation = model.getCurrentTileRotation(); ! currentGUITile = new GUITile(currentTileId, model); currentGUITile.setRotation(currentTileOrientation); setToolTip(); --- 184,188 ---- currentTileId = model.getCurrentTile().getId(); currentTileOrientation = model.getCurrentTileRotation(); ! currentGUITile = new GUITile(currentTileId, this); currentGUITile.setRotation(currentTileOrientation); setToolTip(); *************** *** 170,182 **** public void addBar (int orientation) { orientation %= 6; ! if (bars == null) bars = new ArrayList<GUIBar>(); int offset = hexMap.getMapManager().getTileOrientation() == MapHex.EW ? 0 : 4; ! int x1 = (int)xVertex[(offset+5-orientation)%6]; ! int y1 = (int)yVertex[(offset+5-orientation)%6]; ! int x2 = (int)xVertex[(offset+6-orientation)%6]; ! int y2 = (int)yVertex[(offset+6-orientation)%6]; ! GUIBar bar = new GUIBar (model.getName()+":"+orientation, ! x1, y1, x2, y2); ! bars.add(bar); } --- 194,200 ---- public void addBar (int orientation) { orientation %= 6; ! if (barStartPoints == null) barStartPoints = new ArrayList<Integer>(2); int offset = hexMap.getMapManager().getTileOrientation() == MapHex.EW ? 0 : 4; ! barStartPoints.add((offset+5-orientation)%6); } *************** *** 331,339 **** if (company.isClosed()) continue; city = homes.get(company); ! // Only draw the company name if there isn't yet a token of that company if (city.getTokens() != null) { for (TokenI token : city.getTokens()) { ! if (token instanceof BaseToken && ((BaseToken)token).getCompany() == company) { continue homes; --- 349,357 ---- if (company.isClosed()) continue; city = homes.get(company); ! // Only draw the company name if there isn't yet a token of that company if (city.getTokens() != null) { for (TokenI token : city.getTokens()) { ! if (token instanceof BaseToken && ((BaseToken)token).getCompany() == company) { continue homes; *************** *** 341,345 **** } } ! p = getTokenOrigin (1, 0, getHexModel().getCities().size(), city.getNumber()-1); //log.debug("+++ Home of "+company.getName()+" hex"+getName()+" city"+city.getName() --- 359,363 ---- } } ! p = getTokenOrigin (1, 0, getHexModel().getCities().size(), city.getNumber()-1); //log.debug("+++ Home of "+company.getName()+" hex"+getName()+" city"+city.getName() *************** *** 383,393 **** public void paintBars(Graphics g) { ! if (bars == null) return; Graphics2D g2 = (Graphics2D) g; ! for (GUIBar bar : bars) { ! bar.drawBar(g2); } } private void paintStationTokens(Graphics2D g2) { if (getHexModel().getCities().size() > 1) { --- 401,427 ---- public void paintBars(Graphics g) { ! if (barStartPoints == null) return; Graphics2D g2 = (Graphics2D) g; ! for (int startPoint : barStartPoints) { ! drawBar(g2, ! (int)Math.round(xVertex[startPoint]), ! (int)Math.round(yVertex[startPoint]), ! (int)Math.round(xVertex[(startPoint+1)%6]), ! (int)Math.round(yVertex[(startPoint+1)%6])); } } + protected void drawBar(Graphics2D g2d, int x1, int y1, int x2, int y2) { + Color oldColor = g2d.getColor(); + Stroke oldStroke = g2d.getStroke(); + + g2d.setColor(BAR_COLOUR); + g2d.setStroke(new BasicStroke(BAR_WIDTH)); + g2d.drawLine(x1, y1, x2, y2); + + g2d.setColor(oldColor); + g2d.setStroke(oldStroke); + } + private void paintStationTokens(Graphics2D g2) { if (getHexModel().getCities().size() > 1) { *************** *** 402,406 **** PublicCompanyI co = ((BaseToken) tokens.get(i)).getCompany(); Point origin = getTokenOrigin(numTokens, i, 1, 0); ! drawBaseToken(g2, co, origin); } } --- 436,440 ---- PublicCompanyI co = ((BaseToken) tokens.get(i)).getCompany(); Point origin = getTokenOrigin(numTokens, i, 1, 0); ! drawBaseToken(g2, co, origin, tokenDiameter); } } *************** *** 420,424 **** origin = getTokenOrigin(numTokens, j, numStations, i); co = ((BaseToken) tokens.get(j)).getCompany(); ! drawBaseToken(g2, co, origin); } } --- 454,458 ---- origin = getTokenOrigin(numTokens, j, numStations, i); co = ((BaseToken) tokens.get(j)).getCompany(); ! drawBaseToken(g2, co, origin, tokenDiameter); } } *************** *** 446,450 **** PublicCompanyI co = ((BaseToken) token).getCompany(); ! drawBaseToken(g2, co, origin); } else if (token instanceof BonusToken) { --- 480,484 ---- PublicCompanyI co = ((BaseToken) token).getCompany(); ! drawBaseToken(g2, co, origin, tokenDiameter); } else if (token instanceof BonusToken) { *************** *** 456,478 **** } ! private void drawBaseToken(Graphics2D g2, PublicCompanyI co, Point origin) { ! Dimension size = new Dimension(40, 40); GUIToken token = new GUIToken(co.getFgColour(), co.getBgColour(), co.getName(), ! origin.x, origin.y, 15); ! token.setBounds(origin.x, origin.y, size.width, size.height); token.drawToken(g2); } ! private void drawHome (Graphics2D g2, PublicCompanyI co, Point origin) { Font oldFont = g2.getFont(); Color oldColor = g2.getColor(); ! double tokenScale = 15.0 / 21.0; String name = co.getName(); ! Font font = GUIToken.getTokenFont(name.length()); g2.setFont(new Font("Helvetica", Font.BOLD, --- 490,512 ---- } ! private void drawBaseToken(Graphics2D g2, PublicCompanyI co, Point center, int diameter) { GUIToken token = new GUIToken(co.getFgColour(), co.getBgColour(), co.getName(), ! center.x, center.y, diameter); ! token.setBounds(center.x-(int)(0.5*diameter), center.y-(int)(0.5*diameter), ! diameter, diameter); token.drawToken(g2); } ! private void drawHome (Graphics2D g2, PublicCompanyI co, Point origin) { Font oldFont = g2.getFont(); Color oldColor = g2.getColor(); ! double tokenScale = 15.0 / 21.0; String name = co.getName(); ! Font font = GUIToken.getTokenFont(name.length()); g2.setFont(new Font("Helvetica", Font.BOLD, *************** *** 481,485 **** g2.drawString(name, (int) (origin.x + (12 - 3*name.length()) * tokenScale), (int) (origin.y + 14 * tokenScale)); ! g2.setColor(oldColor); g2.setFont(oldFont); --- 515,519 ---- g2.drawString(name, (int) (origin.x + (12 - 3*name.length()) * tokenScale), (int) (origin.y + 14 * tokenScale)); ! g2.setColor(oldColor); g2.setFont(oldFont); *************** *** 505,509 **** private Point getTokenOrigin(int numTokens, int currentToken, int numStations, int stationNumber) { ! Point p = new Point(center.x - 8, center.y - 8); int cityNumber = stationNumber + 1; --- 539,543 ---- private Point getTokenOrigin(int numTokens, int currentToken, int numStations, int stationNumber) { ! Point p = new Point(center.x, center.y); int cityNumber = stationNumber + 1; *************** *** 516,520 **** int positionCode = station.getPosition(); if (positionCode != 0) { ! y = 14; double r = Math.toRadians(30 * (positionCode / 50)); xx = x * Math.cos(r) + y * Math.sin(r); --- 550,554 ---- int positionCode = station.getPosition(); if (positionCode != 0) { ! y = 16 * zoomFactor; double r = Math.toRadians(30 * (positionCode / 50)); xx = x * Math.cos(r) + y * Math.sin(r); *************** *** 527,543 **** switch (station.getBaseSlots()) { case 2: ! x += -8 + 16 * currentToken; break; case 3: if (currentToken < 2) { ! x += -8 + 16 * currentToken; ! y += 8; } else { ! y -= 8; } break; case 4: ! x += -8 + 16 * currentToken % 2; ! y += 8 - 16 * currentToken / 2; } --- 561,577 ---- switch (station.getBaseSlots()) { case 2: ! x += (-8 + 16 * currentToken) * zoomFactor; break; case 3: if (currentToken < 2) { ! x += (-8 + 16 * currentToken) * zoomFactor; ! y += 8 * zoomFactor; } else { ! y -= 8 * zoomFactor; } break; case 4: ! x += (-8 + 16 * currentToken % 2) * zoomFactor; ! y += (8 - 16 * currentToken / 2) * zoomFactor; } *************** *** 666,670 **** this.upgradeMustConnect = upgradeMustConnect; ! provisionalGUITile = new GUITile(tileId, model); /* Check if we can find a valid orientation of this tile */ if (provisionalGUITile.rotate(0, currentGUITile, upgradeMustConnect)) { --- 700,704 ---- this.upgradeMustConnect = upgradeMustConnect; ! provisionalGUITile = new GUITile(tileId, this); /* Check if we can find a valid orientation of this tile */ if (provisionalGUITile.rotate(0, currentGUITile, upgradeMustConnect)) { *************** *** 736,740 **** currentTileId = Integer.parseInt(elements[0]); currentTileOrientation = Integer.parseInt(elements[1]); ! currentGUITile = new GUITile(currentTileId, model); currentGUITile.setRotation(currentTileOrientation); currentTile = currentGUITile.getTile(); --- 770,774 ---- currentTileId = Integer.parseInt(elements[0]); currentTileOrientation = Integer.parseInt(elements[1]); ! currentGUITile = new GUITile(currentTileId, this); currentGUITile.setRotation(currentTileOrientation); currentTile = currentGUITile.getTile(); |
|
From: Erik V. <ev...@us...> - 2009-12-15 18:56:19
|
Update of /cvsroot/rails/18xx/tiles In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4117/tiles Modified Files: Rails18xx.ini TileDictionary.18t Added Files: UserTileStyle.ini UserGridStyle.ini Log Message: Map made zoomable. Index: Rails18xx.ini =================================================================== RCS file: /cvsroot/rails/18xx/tiles/Rails18xx.ini,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Rails18xx.ini 5 Mar 2008 19:55:14 -0000 1.1 --- Rails18xx.ini 15 Dec 2009 18:56:11 -0000 1.2 *************** *** 16,19 **** --- 16,21 ---- kbDrawFrame_Checked=True kbDrawGrid_Checked=True + MinMaxPos(1440x900)=-1,-1,-4,-4 + NormPos(1440x900)=0,0,872,512 [TFormMDITileDictionarydgJun] Item0=64 *************** *** 57,58 **** --- 59,150 ---- tbMainMenu_Top=2 tbMainMenu_Left=11 + MinMaxPos(1440x900)=-1,-1,-1,-1 + NormPos(1440x900)=66,69,905,698 + [Common] + Language=0 + AutoSaveForm=1 + AutoSaveGrid=1 + [HTML] + Folder=html + ImageFormat=2 + ImageScale=1 + TileSize=80 + DrawTileID=0 + DrawGrid=0 + DrawFrame=1 + SquareImages=0 + TransparentImages=0 + TileShapeOrientationTriangleTop=1 + TileShapeOrientationTriangleBottom=0 + TileShapeOrientationTriangleLeft=0 + TileShapeOrientationTriangleRight=0 + TileShapeOrientationSquareTop=1 + TileShapeOrientationSquareTopLeft=0 + TileShapeOrientationHexagonTop=1 + TileShapeOrientationHexagonLeft=0 + TileShapeOrientationOctagonTop=1 + ImageRotation=0 + FileNameTemplate=tile<c0000>.<r> + [XML] + Folder=xml + ImageFormat=2 + ImageScale=1 + TileSize=80 + DrawTileID=0 + DrawGrid=0 + DrawFrame=1 + SquareImages=0 + TransparentImages=0 + TileShapeOrientationTriangleTop=1 + TileShapeOrientationTriangleBottom=0 + TileShapeOrientationTriangleLeft=0 + TileShapeOrientationTriangleRight=0 + TileShapeOrientationSquareTop=1 + TileShapeOrientationSquareTopLeft=0 + TileShapeOrientationHexagonTop=1 + TileShapeOrientationHexagonLeft=0 + TileShapeOrientationOctagonTop=1 + ImageRotation=0 + FileNameTemplate=tile<c0000>.<r> + [Images] + Folder=images + ImageFormat=2 + ImageScale=1 + TileSize=80 + DrawTileID=0 + DrawGrid=0 + DrawFrame=1 + SquareImages=0 + TransparentImages=0 + TileShapeOrientationTriangleTop=1 + TileShapeOrientationTriangleBottom=0 + TileShapeOrientationTriangleLeft=0 + TileShapeOrientationTriangleRight=0 + TileShapeOrientationSquareTop=1 + TileShapeOrientationSquareTopLeft=0 + TileShapeOrientationHexagonTop=1 + TileShapeOrientationHexagonLeft=0 + TileShapeOrientationOctagonTop=1 + ImageRotation=0 + FileNameTemplate=tile<c0000>.<r> + [TFormDiaSetupTileStyle] + FormVersion=0 + Flags=0 + ShowCmd=1 + PixelsPerInch=96 + MinMaxPos(1440x900)=-1,-1,-1,-1 + MinMaxPos=-1,-1,-1,-1 + NormPos(1440x900)=353,176,731,442 + NormPos=353,176,731,442 + Visible=0 + pcStyle_ActivePage=tsScale + [TFormDiaTileStylePreview] + FormVersion=0 + Flags=0 + ShowCmd=1 + PixelsPerInch=96 + MinMaxPos(1440x900)=-1,-1,-1,-1 + MinMaxPos=-1,-1,-1,-1 + NormPos(1440x900)=809,207,1208,434 + NormPos=809,207,1208,434 + Visible=1 Index: TileDictionary.18t =================================================================== RCS file: /cvsroot/rails/18xx/tiles/TileDictionary.18t,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TileDictionary.18t 11 Mar 2008 19:58:03 -0000 1.4 --- TileDictionary.18t 15 Dec 2009 18:56:11 -0000 1.5 *************** *** 157,160 **** --- 157,161 ---- Position = tp2SideC Revenue = 40 + RevenuePosition = tp3SideE end item *************** *** 162,165 **** --- 163,167 ---- Position = tp2SideF Revenue = 40 + RevenuePosition = tp3SideB end> end *************** *** 340,353 **** item Position1 = tpCenter ! Position2 = tp4SideC end item Position1 = tpCenter ! Position2 = tp4SideF end> Junctions = < item JunType = jtWhistlestop - Revenue = 10 end> end --- 342,354 ---- item Position1 = tpCenter ! Position2 = tp4SideD end item Position1 = tpCenter ! Position2 = tp4SideA end> Junctions = < item JunType = jtWhistlestop end> end *************** *** 1114,1117 **** --- 1115,1119 ---- Position = tpCurve2LeftA Revenue = 40 + RevenuePosition = tp3SideF end item *************** *** 1720,1724 **** Position = tp2CornerC Revenue = 40 ! RevenuePosition = tp3CornerD end item --- 1722,1726 ---- Position = tp2CornerC Revenue = 40 ! RevenuePosition = tp3CornerB end item *************** *** 1807,1811 **** Position = tp2CornerE Revenue = 60 ! RevenuePosition = tp3CornerD end item --- 1809,1813 ---- Position = tp2CornerE Revenue = 60 ! RevenuePosition = tp3SideC end item *************** *** 1813,1817 **** Position = tp2CornerA Revenue = 60 ! RevenuePosition = tp3CornerB end> end --- 1815,1819 ---- Position = tp2CornerA Revenue = 60 ! RevenuePosition = tp3SideB end> end *************** *** 6411,6415 **** Position = tpCurve2RightC Revenue = 30 ! RevenuePosition = tp3CornerD end> end --- 6413,6417 ---- Position = tpCurve2RightC Revenue = 30 ! RevenuePosition = tp3SideB end> end *************** *** 9942,9946 **** Position = tp1SideB Revenue = 10 ! RevenuePosition = tp3CornerD end item --- 9944,9948 ---- Position = tp1SideB Revenue = 10 ! RevenuePosition = tp3CornerC end item *************** *** 9976,9980 **** Position = tp1SideD Revenue = 10 ! RevenuePosition = tp3CornerD end item --- 9978,9982 ---- Position = tp1SideD Revenue = 10 ! RevenuePosition = tp3CornerC end item *************** *** 10051,10055 **** Position = tp2CornerE Revenue = 10 ! RevenuePosition = tp3CornerD end> end --- 10053,10057 ---- Position = tp2CornerE Revenue = 10 ! RevenuePosition = tp3CornerF end> end --- NEW FILE: UserTileStyle.ini --- object TTileStyleWrapper TileStyle.WhiteBase = True TileStyle.LevelColors = < item TileLevel = tlYellow Background = clYellow ID = clBlack Category = clBlack Refuel = clBlack Revenue = clBlack end item TileLevel = tlGreen Background = 44088 ID = clBlack Category = clBlack Refuel = clBlack Revenue = clBlack end item TileLevel = tlBrown Background = 91060 ID = clBlack Category = clBlack Refuel = clBlack Revenue = clBlack end item TileLevel = tlGray Background = clGray ID = clBlack Category = clBlack Refuel = clBlack Revenue = clBlack end item TileLevel = tlMapFixed Background = clSilver ID = clBlack Category = clBlack Refuel = clBlack Revenue = clBlack end item TileLevel = tlMapUpgradableToYellow Background = clMoneyGreen ID = clBlack Category = clBlack Refuel = clBlack Revenue = clBlack end item TileLevel = tlMapUpgradableToGreen Background = clYellow ID = clBlack Category = clBlack Refuel = clBlack Revenue = clBlack end item TileLevel = tlMapUpgradableToBrown Background = 44088 ID = clBlack Category = clBlack Refuel = clBlack Revenue = clBlack end item TileLevel = tlMapUpgradableToGray Background = 91060 ID = clBlack Category = clBlack Refuel = clBlack Revenue = clBlack end item TileLevel = tlOffMap Background = clRed ID = clBlack Category = clBlack Refuel = clBlack Revenue = clBlack end> TileStyle.Connections = < item ConnectionType = ctNone Style = [] PrimaryColor = clBlack SecondaryColor = clBlack end item ConnectionType = ctNormal Style = [csVisible] PrimaryColor = clBlack SecondaryColor = clBlack end item ConnectionType = ctSmall Style = [csVisible, csDashed, csBordered] PrimaryColor = clBlack SecondaryColor = clWhite end item ConnectionType = ctUniversal Style = [csVisible, csBordered] PrimaryColor = clBlack SecondaryColor = clWhite end item ConnectionType = ctMountain Style = [csVisible, csBordered] PrimaryColor = clGray SecondaryColor = clSilver end item ConnectionType = ctTunnel Style = [csVisible, csBordered] PrimaryColor = clBlack SecondaryColor = clGray end> TileStyle.Texts = < item TextType = tttID TextColor = clBlack FontName = 'Arial' FontStyle = [] FontScale = 2000 Shape = ttsNone ShapeColor = clWhite ShapeBorder = True end item TextType = tttCategory TextColor = clBlack FontName = 'TimpaniHeavy' FontStyle = [] FontScale = 3000 Shape = ttsNone ShapeColor = clWhite ShapeBorder = True end item TextType = tttRefuel TextColor = clBlack FontName = 'Bookman Old Style' FontStyle = [] FontScale = 2000 Shape = ttsDiamond ShapeColor = clWhite ShapeBorder = True end item TextType = tttRevenue TextColor = clBlack FontName = 'Bookman Old Style' FontStyle = [] FontScale = 3000 Shape = ttsEllipse ShapeColor = clWhite ShapeBorder = True end> TileStyle.Whistlestop = wsBarOrRound TileStyle.WhistlestopColor = clBlack TileStyle.City = csCircle TileStyle.CityBorderColor = clBlack TileStyle.CityShapeColor = clWhite TileStyle.CityForceInside = False TileStyle.LineWidthScale = 250 TileStyle.ConnectionWidthScale = 1500 TileStyle.BarDitRadiusScale = 1500 TileStyle.RoundDitRadiusScale = 1000 TileStyle.CityRadiusScale = 3000 end --- NEW FILE: UserGridStyle.ini --- object TGridStyleWrapper GridStyle.WaterColor = clBlue GridStyle.LabelCell = True GridStyle.LabelRowLeft = True GridStyle.LabelRowRight = True GridStyle.LabelColTop = True GridStyle.LabelColBottom = True GridStyle.Texts = < item TextType = gttID FontName = 'Arial' FontStyle = [] FontSizeDivider = 9 FontColor = clBlack Shape = ttsNone end item TextType = gttGameSet FontName = 'TimpaniHeavy' FontStyle = [] FontSizeDivider = 1 FontColor = clBlack Shape = ttsRoundedRectangle end item TextType = gttGame FontName = 'Bookman Old Style' FontStyle = [] FontSizeDivider = 2 FontColor = clBlack Shape = ttsRoundedRectangle end item TextType = gttLocation FontName = 'Bookman Old Style' FontStyle = [] FontSizeDivider = 9 FontColor = clBlack Shape = ttsNone end> end |
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4117/rails/ui/swing Modified Files: UpgradesPanel.java RemainingTilesWindow.java ORPanel.java GUIToken.java ImageLoader.java MapPanel.java Log Message: Map made zoomable. Index: UpgradesPanel.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/UpgradesPanel.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** UpgradesPanel.java 5 Nov 2009 22:50:38 -0000 1.19 --- UpgradesPanel.java 15 Dec 2009 18:56:10 -0000 1.20 *************** *** 201,205 **** private BufferedImage getHexImage(int tileId) { ! return GameUIManager.getImageLoader().getTile(tileId); } --- 201,205 ---- private BufferedImage getHexImage(int tileId) { ! return GameUIManager.getImageLoader().getTile(tileId, 10); } Index: ImageLoader.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/ImageLoader.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ImageLoader.java 15 Jan 2009 20:53:28 -0000 1.12 --- ImageLoader.java 15 Dec 2009 18:56:11 -0000 1.13 *************** *** 7,14 **** --- 7,17 ---- import javax.imageio.ImageIO; + import javax.xml.parsers.DocumentBuilder; + import javax.xml.parsers.DocumentBuilderFactory; import org.apache.batik.transcoder.*; import org.apache.batik.transcoder.image.ImageTranscoder; import org.apache.log4j.Logger; + import org.w3c.dom.Document; import rails.ui.swing.hexmap.GUIHex; *************** *** 21,25 **** public class ImageLoader { ! private static HashMap<String, BufferedImage> tileMap; private static int svgWidth = 60; --- 24,31 ---- public class ImageLoader { ! private static Map<Integer, Map<Integer, BufferedImage>> tileMap; ! ! private static Map<Integer, Document> svgMap; ! private static double[] zoomFactors = new double[21]; private static int svgWidth = 60; *************** *** 65,69 **** } ! private void loadTile(int tileID) { BufferedImage image = null; --- 71,75 ---- } ! private BufferedImage loadTile(int tileID, double zoomFactor) { BufferedImage image = null; *************** *** 74,83 **** // If loading the GIF fails, try loading the SVG. log.warn("Attempting to load SVG version of tile " + tileID); ! image = getSVGTile(tileID); } } else { ! image = getSVGTile(tileID); if (image == null) { // If loading the SVG fails, try loading the GIF. --- 80,89 ---- // If loading the GIF fails, try loading the SVG. log.warn("Attempting to load SVG version of tile " + tileID); ! image = getSVGTile(tileID, zoomFactor); } } else { ! image = getSVGTile(tileID, zoomFactor); if (image == null) { // If loading the SVG fails, try loading the GIF. *************** *** 86,101 **** } } ! ! /* Image will be stored, even if null, to prevent further searches. */ ! tileMap.put(Integer.toString(tileID), image); } ! private BufferedImage getSVGTile(int tileID) { String fn = "tile" + Integer.toString(tileID) + ".svg"; ! log.debug("Loading tile " + fn); BufferedImage image = null; try { InputStream stream = ResourceLoader.getInputStream(fn, directories); if (stream != null) { --- 92,106 ---- } } ! return image; } ! private BufferedImage getSVGTile(int tileID, double zoomFactor) { String fn = "tile" + Integer.toString(tileID) + ".svg"; ! //log.debug("Loading SVG tile " + fn); BufferedImage image = null; try { + /* InputStream stream = ResourceLoader.getInputStream(fn, directories); if (stream != null) { *************** *** 109,112 **** --- 114,144 ---- image = t.getImage(); } + */ + // Experimental new version, that stacks the XML to allow zooming + if (svgMap == null) { + svgMap = new HashMap<Integer, Document>(64); + } + if (!svgMap.containsKey(tileID)) { + Document doc = null; + // Step 1: create a DocumentBuilderFactory and setNamespaceAware + DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); + dbf.setNamespaceAware(true); + // Step 2: create a DocumentBuilder + DocumentBuilder db = dbf.newDocumentBuilder(); + + // Step 3: parse the input file to get a Document object + doc = + db.parse(ResourceLoader.getInputStream(fn, + directories)); + // Cache the doc + svgMap.put(tileID, doc); + } + BufferedImageTranscoder t = new BufferedImageTranscoder(); + t.addTranscodingHint(ImageTranscoder.KEY_WIDTH, new Float(svgWidth * zoomFactor)); + t.addTranscodingHint(ImageTranscoder.KEY_HEIGHT, new Float(svgHeight * zoomFactor)); + TranscoderInput input = new TranscoderInput(svgMap.get(tileID)); + t.transcode(input, null); + image = t.getImage(); + } catch (Exception e) { log.error("SVG transcoding for tile id " + tileID + " failed with " *************** *** 120,124 **** private BufferedImage getGIFTile(int tileID) { String fn = "tile" + Integer.toString(tileID) + ".gif"; ! log.debug("Loading tile " + fn); BufferedImage image = null; --- 152,156 ---- private BufferedImage getGIFTile(int tileID) { String fn = "tile" + Integer.toString(tileID) + ".gif"; ! //log.debug("Loading tile " + fn); BufferedImage image = null; *************** *** 137,149 **** } ! public BufferedImage getTile(int tileID) { ! // Check for cached copy before loading from disk. ! if (!tileMap.containsKey(Integer.toString(tileID))) loadTile(tileID); - return tileMap.get(Integer.toString(tileID)); } public ImageLoader() { - tileMap = new HashMap<String, BufferedImage>(); directories.add(tileRootDir + svgTileDir); directories.add(tileRootDir + gifTileDir); --- 169,199 ---- } ! public BufferedImage getTile(int tileID, int zoomStep) { ! ! if (tileMap == null) { ! tileMap = new HashMap<Integer, Map<Integer, BufferedImage>>(64); ! } ! if (!tileMap.containsKey(tileID)) { ! tileMap.put(tileID, new HashMap<Integer, BufferedImage>(4)); ! } ! if (!tileMap.get(tileID).containsKey(zoomStep)) { ! BufferedImage image = loadTile(tileID, getZoomFactor(zoomStep)); ! tileMap.get(tileID).put(zoomStep, image); ! } ! ! return tileMap.get(tileID).get(zoomStep); ! } ! ! public double getZoomFactor (int zoomStep) { ! if (zoomStep < 0) zoomStep = 0; ! else if (zoomStep > 20) zoomStep = 20; ! if (zoomFactors[zoomStep] == 0.0) { ! zoomFactors[zoomStep] = 1.0 * Math.pow(2.0, 0.25*(zoomStep-10)); ! } ! return zoomFactors[zoomStep]; } public ImageLoader() { directories.add(tileRootDir + svgTileDir); directories.add(tileRootDir + gifTileDir); Index: RemainingTilesWindow.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/RemainingTilesWindow.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RemainingTilesWindow.java 17 Nov 2009 19:31:27 -0000 1.7 --- RemainingTilesWindow.java 15 Dec 2009 18:56:11 -0000 1.8 *************** *** 74,78 **** tile = tmgr.getTile(tileId); ! hexImage = GameUIManager.getImageLoader().getTile(tileId); hexIcon = new ImageIcon(hexImage); hexIcon.setImage(hexIcon.getImage().getScaledInstance( --- 74,78 ---- tile = tmgr.getTile(tileId); ! hexImage = GameUIManager.getImageLoader().getTile(tileId, 10); hexIcon = new ImageIcon(hexImage); hexIcon.setImage(hexIcon.getImage().getScaledInstance( Index: ORPanel.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** ORPanel.java 13 Dec 2009 16:39:47 -0000 1.34 --- ORPanel.java 15 Dec 2009 18:56:11 -0000 1.35 *************** *** 52,55 **** --- 52,57 ---- private JMenu specialMenu; private JMenu loansMenu; + private JMenu zoomMenu; + private JMenuItem zoomIn, zoomOut; private ActionMenuItem takeLoans; private ActionMenuItem repayLoans; *************** *** 177,181 **** if (hasCompanyLoans) { loansMenu = new JMenu (LocalText.getText("LOANS")); ! specialMenu.setEnabled(true); takeLoans = new ActionMenuItem (LocalText.getText("TakeLoans")); --- 179,183 ---- if (hasCompanyLoans) { loansMenu = new JMenu (LocalText.getText("LOANS")); ! loansMenu.setEnabled(true); takeLoans = new ActionMenuItem (LocalText.getText("TakeLoans")); *************** *** 194,197 **** --- 196,211 ---- } + zoomMenu = new JMenu("Zoom"); + zoomMenu.setEnabled(true); + zoomIn = new JMenuItem("In"); + zoomIn.addActionListener(this); + zoomIn.setEnabled(true); + zoomMenu.add(zoomIn); + zoomOut = new JMenuItem("Out"); + zoomOut.addActionListener(this); + zoomOut.setEnabled(true); + zoomMenu.add(zoomOut); + menuBar.add(zoomMenu); + add(menuBar, BorderLayout.NORTH); *************** *** 529,532 **** --- 543,550 ---- orUIManager.processAction(command, executedActions); + } else if (source == zoomIn) { + orWindow.getMapPanel().zoomIn(); + } else if (source == zoomOut) { + orWindow.getMapPanel().zoomOut(); } else { orUIManager.processAction(command, null); Index: GUIToken.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/GUIToken.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** GUIToken.java 13 Dec 2009 21:13:39 -0000 1.8 --- GUIToken.java 15 Dec 2009 18:56:11 -0000 1.9 *************** *** 3,8 **** import java.awt.*; ! import java.awt.geom.*; ! import javax.swing.*; /** --- 3,9 ---- import java.awt.*; ! import java.awt.geom.Ellipse2D; ! ! import javax.swing.JPanel; /** *************** *** 25,29 **** private static final Font largeTokenFont = new Font("Helvetica", Font.BOLD, 12); ! public void paintComponent(Graphics g) { clear(g); Graphics2D g2d = (Graphics2D) g; --- 26,31 ---- private static final Font largeTokenFont = new Font("Helvetica", Font.BOLD, 12); ! @Override ! public void paintComponent(Graphics g) { clear(g); Graphics2D g2d = (Graphics2D) g; *************** *** 76,80 **** } ! public GUIToken(Color fc, Color bc, String name, int x, int y, double diameter) { super(); --- 78,82 ---- } ! public GUIToken(Color fc, Color bc, String name, int xCenter, int yCenter, double diameter) { super(); *************** *** 84,88 **** this.diameter = diameter; ! circle = new Ellipse2D.Double(x, y, diameter, diameter); this.setForeground(fgColor); --- 86,91 ---- this.diameter = diameter; ! circle = new Ellipse2D.Double(xCenter - 0.5*diameter, ! yCenter-0.5*diameter, diameter, diameter); this.setForeground(fgColor); *************** *** 104,108 **** } ! public String getName() { return name; } --- 107,112 ---- } ! @Override ! public String getName() { return name; } Index: MapPanel.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/MapPanel.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** MapPanel.java 2 Nov 2009 23:30:34 -0000 1.11 --- MapPanel.java 15 Dec 2009 18:56:11 -0000 1.12 *************** *** 2,17 **** package rails.ui.swing; import javax.swing.*; import org.apache.log4j.Logger; ! import rails.game.*; import rails.game.action.LayTile; import rails.game.action.LayToken; ! import rails.ui.swing.hexmap.*; ! ! import java.awt.*; ! import java.awt.event.*; ! import java.util.List; /** --- 2,17 ---- package rails.ui.swing; + import java.awt.BorderLayout; + import java.awt.event.KeyEvent; + import java.util.List; + import javax.swing.*; import org.apache.log4j.Logger; ! import rails.game.MapManager; import rails.game.action.LayTile; import rails.game.action.LayToken; ! import rails.ui.swing.hexmap.HexMap; /** *************** *** 48,56 **** scrollPane = new JScrollPane(map); - scrollPane.setSize(map.getPreferredSize()); add(scrollPane, BorderLayout.CENTER); ! setSize(map.getPreferredSize().width, map.getPreferredSize().height); setLocation(25, 25); } --- 48,57 ---- scrollPane = new JScrollPane(map); add(scrollPane, BorderLayout.CENTER); ! scrollPane.setSize(map.getPreferredSize()); ! ! setSize(map.getPreferredSize().width, map.getPreferredSize().height); setLocation(25, 25); } *************** *** 65,68 **** --- 66,77 ---- } + public void zoomIn() { + map.zoomIn(); + } + + public void zoomOut() { + map.zoomOut(); + } + public void keyPressed(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_F1) { |
|
From: Erik V. <ev...@us...> - 2009-12-15 18:55:38
|
Update of /cvsroot/rails/18xx/tiles/svg In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4037/tiles/svg Modified Files: tile-902.svg tile-903.svg tile-901.svg Log Message: Replaced track by pointy triangles in off-board tiles Index: tile-902.svg =================================================================== RCS file: /cvsroot/rails/18xx/tiles/svg/tile-902.svg,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tile-902.svg 29 May 2006 21:02:13 -0000 1.2 --- tile-902.svg 15 Dec 2009 18:55:24 -0000 1.3 *************** *** 2,10 **** <svg xmlns:dc="http://purl.org/dc/elements/1.1/" ! xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" ! xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="100" --- 2,10 ---- <svg xmlns:dc="http://purl.org/dc/elements/1.1/" ! xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" ! xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="100" *************** *** 14,21 **** id="svg5284" sodipodi:version="0.32" ! inkscape:version="0.43" ! sodipodi:docname="tile-902.svg" sodipodi:docbase="C:\Documents and Settings\lentz\workspace\18xx\tiles\svg" ! version="1.0"> <metadata id="metadata5315"> --- 14,22 ---- id="svg5284" sodipodi:version="0.32" ! inkscape:version="0.46" ! sodipodi:docname="tile-902a.svg" sodipodi:docbase="C:\Documents and Settings\lentz\workspace\18xx\tiles\svg" ! version="1.0" ! inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata id="metadata5315"> *************** *** 30,36 **** </metadata> <defs ! id="defs5313" /> <sodipodi:namedview ! inkscape:window-height="540" inkscape:window-width="749" inkscape:pageshadow="2" --- 31,56 ---- </metadata> <defs ! id="defs5313"><inkscape:perspective ! sodipodi:type="inkscape:persp3d" ! inkscape:vp_x="0 : 50 : 1" ! inkscape:vp_y="0 : 1000 : 0" ! inkscape:vp_z="100 : 50 : 1" ! inkscape:persp3d-origin="50 : 33.333333 : 1" ! id="perspective2544" /> ! ! ! ! ! ! ! ! ! ! ! ! ! </defs> <sodipodi:namedview ! inkscape:window-height="675" inkscape:window-width="749" inkscape:pageshadow="2" *************** *** 40,113 **** pagecolor="#ffffff" id="base" ! inkscape:zoom="0.52361111" ! inkscape:cx="360" ! inkscape:cy="360" ! inkscape:window-x="198" ! inkscape:window-y="198" ! inkscape:current-layer="svg5284" /> <title id="title5286">SVG drawing</title> <desc id="desc5288">This was produced by version 4.1 of GNU libplot, a free library for exporting 2-D vector graphics.</desc> ! <g ! transform="matrix(5.418114e-3,0,0,-6.213736e-3,-1.175565e-3,1.000871)" ! xml:space="preserve" ! style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:none;fill-opacity:1;stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ! id="g5292"> ! <polygon ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! style="fill:#ff0000;fill-rule:nonzero;stroke:#ff0000;stroke-width:0;stroke-linejoin:round" ! id="polygon5294" /> ! <text ! transform="matrix(1,0,0,-1,107.7,7.9141)" ! style="font-size:8px;fill:#000000;stroke:none;font-family:"Helvetica", sans-serif" ! id="text5296">-902</text> ! ! ! <line ! x1="78.5" ! y1="80.5" ! x2="106.5" ! y2="80.5" ! style="stroke:#ffffff;stroke-width:16" ! id="line5298" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="40.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line5300" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="120.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line5302" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="40.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line5304" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="120.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line5306" /> ! <line ! x1="80.5" ! y1="80.5" ! x2="104.5" ! y2="80.5" ! style="stroke-width:12" ! id="line5308" /> ! <polygon ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! style="stroke-width:1;stroke-linejoin:round" ! id="polygon5310" /> ! </g></svg> --- 60,99 ---- pagecolor="#ffffff" id="base" ! inkscape:zoom="4.1888889" ! inkscape:cx="70.912208" ! inkscape:cy="48.540976" ! inkscape:window-x="1804" ! inkscape:window-y="20" ! inkscape:current-layer="svg5284" ! showgrid="false" /> <title id="title5286">SVG drawing</title> <desc id="desc5288">This was produced by version 4.1 of GNU libplot, a free library for exporting 2-D vector graphics.</desc> ! <polygon ! id="polygon5310" ! style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! transform="matrix(5.418114e-3,0,0,-6.213736e-3,-1.175565e-3,1.000871)" /> ! <polygon ! id="polygon5294" ! style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! transform="matrix(5.418114e-3,0,0,-6.213736e-3,-1.175565e-3,1.000871)" /> ! <text ! id="text5296" ! style="font-size:0.04641843px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ! transform="scale(0.9337867,1.0709084)" ! x="0.62364918" ! y="0.88868004">-902</text> ! <path ! style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.01;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" ! d="M 0.84748011,0.80185676 L 0.68626123,0.63773751 L 0.90238727,0.69681698" ! id="path3345" ! sodipodi:nodetypes="ccc" /> ! <path ! style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.01;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" ! d="M 0.90302324,0.30858482 L 0.68689719,0.37364329 L 0.85050337,0.20593231" ! id="path3347" ! sodipodi:nodetypes="ccc" /> ! </svg> Index: tile-903.svg =================================================================== RCS file: /cvsroot/rails/18xx/tiles/svg/tile-903.svg,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tile-903.svg 19 Jul 2007 20:22:00 -0000 1.3 --- tile-903.svg 15 Dec 2009 18:55:24 -0000 1.4 *************** *** 2,6 **** <svg xmlns:dc="http://purl.org/dc/elements/1.1/" ! xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" --- 2,6 ---- <svg xmlns:dc="http://purl.org/dc/elements/1.1/" ! xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" *************** *** 14,19 **** id="svg5317" sodipodi:version="0.32" ! inkscape:version="0.45.1" ! sodipodi:docname="tile-903.svg" sodipodi:docbase="C:\Documents and Settings\Brett\workspace\18xx\tiles\svg" version="1.0" --- 14,19 ---- id="svg5317" sodipodi:version="0.32" ! inkscape:version="0.46" ! sodipodi:docname="tile-903a.svg" sodipodi:docbase="C:\Documents and Settings\Brett\workspace\18xx\tiles\svg" version="1.0" *************** *** 31,37 **** </metadata> <defs ! id="defs5350" /> <sodipodi:namedview ! inkscape:window-height="579" inkscape:window-width="749" inkscape:pageshadow="2" --- 31,59 ---- </metadata> <defs ! id="defs5350"><inkscape:perspective ! sodipodi:type="inkscape:persp3d" ! inkscape:vp_x="0 : 50 : 1" ! inkscape:vp_y="0 : 1000 : 0" ! inkscape:vp_z="100 : 50 : 1" ! inkscape:persp3d-origin="50 : 33.333333 : 1" ! id="perspective3450" /> ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! </defs> <sodipodi:namedview ! inkscape:window-height="675" inkscape:window-width="749" inkscape:pageshadow="2" *************** *** 41,123 **** pagecolor="#ffffff" id="base" ! inkscape:zoom="2.5704545" ! inkscape:cx="73.527852" ! inkscape:cy="41.061008" ! inkscape:window-x="242" ! inkscape:window-y="242" ! inkscape:current-layer="svg5317" /> <title id="title5319">SVG drawing</title> <desc id="desc5321">This was produced by version 4.1 of GNU libplot, a free library for exporting 2-D vector graphics.</desc> ! <g ! transform="matrix(5.4170934e-3,0,0,-6.1340585e-3,-1.0811622e-3,0.9980458)" ! xml:space="preserve" ! style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:none;fill-opacity:1;stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ! id="g5325"> ! <polygon ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! style="fill:#ff0000;fill-rule:nonzero;stroke:#ff0000;stroke-width:0;stroke-linejoin:round" ! id="polygon5327" /> ! <text ! transform="matrix(1,0,0,-1,107.73,7.9141)" ! style="font-size:8px;fill:#000000;stroke:none;font-family:"Helvetica", sans-serif" ! id="text5329">-903</text> ! ! ! ! <line ! x1="92.5" ! y1="80.5" ! x2="92.5" ! y2="0.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line5331" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="40.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line5333" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="120.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line5335" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="92.5" ! y2="0.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line5337" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="40.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line5339" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="120.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line5341" /> ! <path ! d="M 102.5,80.5 L 102.49,81.014 L 102.45,81.522 L 102.38,82.022 L 102.3,82.514 L 102.18,82.998 L 102.05,83.472 L 101.89,83.937 L 101.71,84.391 L 101.51,84.834 L 101.29,85.265 L 101.05,85.684 L 100.79,86.09 L 100.51,86.482 L 100.22,86.86 L 99.901,87.222 L 99.57,87.57 L 99.222,87.901 L 98.86,88.215 L 98.482,88.512 L 98.09,88.791 L 97.684,89.051 L 97.265,89.292 L 96.834,89.513 L 96.391,89.714 L 95.937,89.893 L 95.472,90.05 L 94.998,90.185 L 94.514,90.297 L 94.022,90.385 L 93.522,90.448 L 93.014,90.487 L 92.5,90.5 C 86.98,90.5 82.5,86.02 82.5,80.5 C 82.5,74.98 86.98,70.5 92.5,70.5 C 98.02,70.5 102.5,74.98 102.5,80.5 z " ! style="fill:#000000;fill-rule:nonzero;stroke-width:0;stroke-linecap:round;stroke-linejoin:round" ! id="path5343" /> ! <path ! d="M 102.5,80.5 L 102.49,81.014 L 102.45,81.522 L 102.38,82.022 L 102.3,82.514 L 102.18,82.998 L 102.05,83.472 L 101.89,83.937 L 101.71,84.391 L 101.51,84.834 L 101.29,85.265 L 101.05,85.684 L 100.79,86.09 L 100.51,86.482 L 100.22,86.86 L 99.901,87.222 L 99.57,87.57 L 99.222,87.901 L 98.86,88.215 L 98.482,88.512 L 98.09,88.791 L 97.684,89.051 L 97.265,89.292 L 96.834,89.513 L 96.391,89.714 L 95.937,89.893 L 95.472,90.05 L 94.998,90.185 L 94.514,90.297 L 94.022,90.385 L 93.522,90.448 L 93.014,90.487 L 92.5,90.5 C 86.98,90.5 82.5,86.02 82.5,80.5 C 82.5,74.98 86.98,70.5 92.5,70.5 C 98.02,70.5 102.5,74.98 102.5,80.5 z " ! style="stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round" ! id="path5345" /> ! <polygon ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! style="stroke-width:1;stroke-linejoin:round" ! id="polygon5347" /> ! </g></svg> --- 63,107 ---- pagecolor="#ffffff" id="base" ! inkscape:zoom="3.6351716" ! inkscape:cx="68.276031" ! inkscape:cy="36.937623" ! inkscape:window-x="1336" ! inkscape:window-y="66" ! inkscape:current-layer="svg5317" ! showgrid="false" /> <title id="title5319">SVG drawing</title> <desc id="desc5321">This was produced by version 4.1 of GNU libplot, a free library for exporting 2-D vector graphics.</desc> ! <polygon ! id="polygon5347" ! style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! transform="matrix(5.4170934e-3,0,0,-6.1340585e-3,-1.0811622e-3,0.9980458)" /> ! <polygon ! id="polygon5327" ! style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! transform="matrix(5.4170934e-3,0,0,-6.1340585e-3,-1.0811622e-3,0.9980458)" /> ! <text ! id="text5329" ! style="font-size:0.04611552px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ! transform="scale(0.9397432,1.0641205)" ! x="0.6198526" ! y="0.89228636">-903</text> ! <path ! style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.01;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" ! d="M 0.90307361,0.31456617 L 0.68694758,0.37962464 L 0.85055376,0.21191366" ! id="path3347" ! sodipodi:nodetypes="ccc" /> ! <path ! style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.01;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" ! d="M 0.84541556,0.80696945 L 0.68419668,0.6428502 L 0.90032272,0.70192967" ! id="path3345" ! sodipodi:nodetypes="ccc" /> ! <path ! style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.01;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" ! d="M 0.4437839,0.99403077 L 0.49988627,0.79690071 L 0.55646,0.99352526" ! id="path3465" ! sodipodi:nodetypes="ccc" /> ! </svg> Index: tile-901.svg =================================================================== RCS file: /cvsroot/rails/18xx/tiles/svg/tile-901.svg,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tile-901.svg 29 May 2006 21:02:13 -0000 1.2 --- tile-901.svg 15 Dec 2009 18:55:24 -0000 1.3 *************** *** 2,10 **** <svg xmlns:dc="http://purl.org/dc/elements/1.1/" ! xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" ! xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="100" --- 2,10 ---- <svg xmlns:dc="http://purl.org/dc/elements/1.1/" ! xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" ! xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="100" *************** *** 14,21 **** id="svg5255" sodipodi:version="0.32" ! inkscape:version="0.43" ! sodipodi:docname="tile-901.svg" sodipodi:docbase="C:\Documents and Settings\lentz\workspace\18xx\tiles\svg" ! version="1.0"> <metadata id="metadata5282"> --- 14,22 ---- id="svg5255" sodipodi:version="0.32" ! inkscape:version="0.46" ! sodipodi:docname="tile-901a.svg" sodipodi:docbase="C:\Documents and Settings\lentz\workspace\18xx\tiles\svg" ! version="1.0" ! inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata id="metadata5282"> *************** *** 30,36 **** </metadata> <defs ! id="defs5280" /> <sodipodi:namedview ! inkscape:window-height="540" inkscape:window-width="749" inkscape:pageshadow="2" --- 31,54 ---- </metadata> <defs ! id="defs5280"><inkscape:perspective ! sodipodi:type="inkscape:persp3d" ! inkscape:vp_x="0 : 50 : 1" ! inkscape:vp_y="0 : 1000 : 0" ! inkscape:vp_z="100 : 50 : 1" ! inkscape:persp3d-origin="50 : 33.333333 : 1" ! id="perspective2397" /> ! ! ! ! ! ! ! ! ! ! ! </defs> <sodipodi:namedview ! inkscape:window-height="675" inkscape:window-width="749" inkscape:pageshadow="2" *************** *** 40,49 **** pagecolor="#ffffff" id="base" ! inkscape:zoom="0.52361111" ! inkscape:cx="360" ! inkscape:cy="-98.355438" ! inkscape:window-x="154" ! inkscape:window-y="154" ! inkscape:current-layer="svg5255" /> <title id="title5257">SVG drawing</title> --- 58,68 ---- pagecolor="#ffffff" id="base" ! inkscape:zoom="3.6574893" ! inkscape:cx="73.988957" ! inkscape:cy="-7.0871464" ! inkscape:window-x="1347" ! inkscape:window-y="33" ! inkscape:current-layer="svg5255" ! showgrid="false" /> <title id="title5257">SVG drawing</title> *************** *** 51,99 **** id="desc5259">This was produced by version 4.1 of GNU libplot, a free library for exporting 2-D vector graphics.</desc> <g ! transform="matrix(5.418114e-3,0,0,-6.213736e-3,-1.175565e-3,1.000871)" ! xml:space="preserve" ! style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:none;fill-opacity:1;stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ! id="g5263"> ! <polygon ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! style="fill:#ff0000;fill-rule:nonzero;stroke:#ff0000;stroke-width:0;stroke-linejoin:round" ! id="polygon5265" /> ! <text ! transform="matrix(1,0,0,-1,108.36,7.9141)" ! style="font-size:8px;fill:#000000;stroke:none;font-family:"Helvetica", sans-serif" ! id="text5267">-901</text> ! ! ! <line ! x1="78.5" ! y1="80.5" ! x2="106.5" ! y2="80.5" ! style="stroke:#ffffff;stroke-width:16" ! id="line5269" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="40.5" ! style="stroke:#ffffff;stroke-width:16;stroke-linecap:round" ! id="line5271" /> ! <line ! x1="92.5" ! y1="80.5" ! x2="161.5" ! y2="40.5" ! style="stroke-width:12;stroke-linecap:round" ! id="line5273" /> ! <line ! x1="80.5" ! y1="80.5" ! x2="104.5" ! y2="80.5" ! style="stroke-width:12" ! id="line5275" /> ! <polygon ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! style="stroke-width:1;stroke-linejoin:round" ! id="polygon5277" /> ! </g></svg> --- 70,95 ---- id="desc5259">This was produced by version 4.1 of GNU libplot, a free library for exporting 2-D vector graphics.</desc> <g ! id="g3213"> ! <polygon ! transform="matrix(5.418114e-3,0,0,-6.213736e-3,-1.175565e-3,1.000871)" ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ! id="polygon5277" /> ! <polygon ! transform="matrix(5.418114e-3,0,0,-6.213736e-3,-1.175565e-3,1.000871)" ! points="46.5,160.5 138.5,160.5 184.5,80.5 138.5,0.5 46.5,0.5 0.5,80.5 46.5,160.5 " ! style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ! id="polygon5265" /> ! <path ! sodipodi:nodetypes="ccc" ! id="path2406" ! d="M 0.89103875,0.71994375 L 0.66193912,0.64215025 L 0.84027686,0.81465825" ! style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.01;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> ! <text ! y="0.88868004" ! x="0.62747878" ! transform="scale(0.9337867,1.0709084)" ! style="font-size:0.04641843px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" ! id="text5267">-901</text> ! </g> ! </svg> |
|
From: Erik V. <ev...@us...> - 2009-12-13 21:14:20
|
Update of /cvsroot/rails/18xx/rails/ui/swing/hexmap In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28388/rails/ui/swing/hexmap Modified Files: GUIHex.java Log Message: Draw company names in their home cities rather than on the hex. Index: GUIHex.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/GUIHex.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** GUIHex.java 13 Dec 2009 16:39:48 -0000 1.26 --- GUIHex.java 13 Dec 2009 21:14:12 -0000 1.27 *************** *** 293,300 **** FontMetrics fontMetrics = g2.getFontMetrics(); ! if (getHexModel().getTileCost() > 0 /* ! * && originalTileId == ! * currentTileId ! */) { g2.drawString( Bank.format(getHexModel().getTileCost()), --- 293,297 ---- FontMetrics fontMetrics = g2.getFontMetrics(); ! if (getHexModel().getTileCost() > 0 ) { g2.drawString( Bank.format(getHexModel().getTileCost()), *************** *** 306,311 **** } ! Map<PublicCompanyI, City> homes; ! if ((homes = getHexModel().getHomes()) != null) { StringBuffer b = new StringBuffer(); for (Iterator<PublicCompanyI> it = homes.keySet().iterator(); it.hasNext();) { --- 303,310 ---- } ! Map<PublicCompanyI, City> homes = getHexModel().getHomes(); ! if (homes != null) { ! //log.debug("+++ Home hex "+getName()); ! /* StringBuffer b = new StringBuffer(); for (Iterator<PublicCompanyI> it = homes.keySet().iterator(); it.hasNext();) { *************** *** 326,329 **** --- 325,350 ---- rectBound.y + ((fontMetrics.getHeight() + rectBound.height) * 3 / 10)); + */ + City city; + Point p; + homes: for (PublicCompanyI company : homes.keySet()) { + if (company.isClosed()) continue; + city = homes.get(company); + + // Only draw the company name if there isn't yet a token of that company + if (city.getTokens() != null) { + for (TokenI token : city.getTokens()) { + if (token instanceof BaseToken + && ((BaseToken)token).getCompany() == company) { + continue homes; + } + } + } + p = getTokenOrigin (1, 0, getHexModel().getCities().size(), + city.getNumber()-1); + //log.debug("+++ Home of "+company.getName()+" hex"+getName()+" city"+city.getName() + // + " x="+(p.x)+" y="+(p.y)); + drawHome (g2, company, p); + } } *************** *** 344,348 **** * 1 / 2, rectBound.y ! + ((fontMetrics.getHeight() + rectBound.height) * 7 / 15)); } } --- 365,369 ---- * 1 / 2, rectBound.y ! + ((fontMetrics.getHeight() + rectBound.height) * 5 / 15)); } } *************** *** 445,448 **** --- 466,488 ---- token.drawToken(g2); } + + private void drawHome (Graphics2D g2, PublicCompanyI co, Point origin) { + + Font oldFont = g2.getFont(); + Color oldColor = g2.getColor(); + + double tokenScale = 15.0 / 21.0; + String name = co.getName(); + + Font font = GUIToken.getTokenFont(name.length()); + g2.setFont(new Font("Helvetica", Font.BOLD, + (int) (font.getSize() * tokenScale))); + g2.setColor(Color.BLACK); + g2.drawString(name, (int) (origin.x + (12 - 3*name.length()) * tokenScale), + (int) (origin.y + 14 * tokenScale)); + + g2.setColor(oldColor); + g2.setFont(oldFont); + } private void drawBonusToken(Graphics2D g2, BonusToken bt, Point origin) { *************** *** 704,709 **** provisionalGUITile = null; ! log.debug("GUIHex " + model.getName() + " updated: new tile " ! + currentTileId + "/" + currentTileOrientation); if (GameUIManager.instance != null && GameUIManager.instance.orWindow != null) { --- 744,749 ---- provisionalGUITile = null; ! //log.debug("GUIHex " + model.getName() + " updated: new tile " ! // + currentTileId + "/" + currentTileOrientation); if (GameUIManager.instance != null && GameUIManager.instance.orWindow != null) { |
|
From: Erik V. <ev...@us...> - 2009-12-13 21:13:53
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28308/rails/ui/swing Modified Files: GUIToken.java Log Message: Addes larger token font for short names (1 or 2 chars) Index: GUIToken.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/GUIToken.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GUIToken.java 4 Jun 2008 19:00:32 -0000 1.7 --- GUIToken.java 13 Dec 2009 21:13:39 -0000 1.8 *************** *** 21,26 **** public static final int DEFAULT_Y_COORD = 1; ! private static Font smallTokenFont = new Font("Helvetica", Font.BOLD, 8); ! private static Font tokenFont = new Font("Helvetica", Font.BOLD, 10); public void paintComponent(Graphics g) { --- 21,27 ---- public static final int DEFAULT_Y_COORD = 1; ! private static final Font smallTokenFont = new Font("Helvetica", Font.BOLD, 8); ! private static final Font tokenFont = new Font("Helvetica", Font.BOLD, 10); ! private static final Font largeTokenFont = new Font("Helvetica", Font.BOLD, 12); public void paintComponent(Graphics g) { *************** *** 42,51 **** g2d.fill(circle); ! Font font = name.length() > 3 ? smallTokenFont : tokenFont; g2d.setFont(new Font("Helvetica", Font.BOLD, (int) (font.getSize() * tokenScale))); g2d.setColor(fgColor); // g2d.drawString(name, 3, 14); ! g2d.drawString(name, (int) (circle.x + 2 * tokenScale), (int) (circle.y + 14 * tokenScale)); --- 43,52 ---- g2d.fill(circle); ! Font font = getTokenFont(name.length()); g2d.setFont(new Font("Helvetica", Font.BOLD, (int) (font.getSize() * tokenScale))); g2d.setColor(fgColor); // g2d.drawString(name, 3, 14); ! g2d.drawString(name, (int) (circle.x + (12 - 3*name.length()) * tokenScale), (int) (circle.y + 14 * tokenScale)); *************** *** 107,109 **** --- 108,119 ---- } + public static Font getTokenFont (int size) { + if (size <= 2) { + return largeTokenFont; + } else if (size <= 4) { + return tokenFont; + } else { + return smallTokenFont; + } + } } |
|
From: Erik V. <ev...@us...> - 2009-12-13 21:12:22
|
Update of /cvsroot/rails/18xx/data/18EU In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28195/data/18EU Modified Files: CompanyManager.xml Log Message: Changed minor token BG colour to light gray (to better distinguish from empty circles) Index: CompanyManager.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18EU/CompanyManager.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CompanyManager.xml 5 Mar 2008 19:55:14 -0000 1.11 --- CompanyManager.xml 13 Dec 2009 21:12:12 -0000 1.12 *************** *** 1,5 **** <?xml version="1.0"?> <CompanyManager> ! <CompanyType name="Minor" class="rails.game.PublicCompany" fgColour="000000" bgColour="FFFFFF"> <ShareUnit percentage="100"/> <Certificate type="President" shares="1"/> --- 1,5 ---- <?xml version="1.0"?> <CompanyManager> ! <CompanyType name="Minor" class="rails.game.PublicCompany" fgColour="000000" bgColour="CCCCCC"> <ShareUnit percentage="100"/> <Certificate type="President" shares="1"/> |
|
From: Erik V. <ev...@us...> - 2009-12-13 16:40:05
|
Update of /cvsroot/rails/18xx/rails/game/model In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28822/rails/game/model Modified Files: PriceModel.java ModelObject.java Added Files: ViewUpdate.java Log Message: Implemented request to show low-price colours in SR and OR panels. Added a generic Model-to-View update mechanism (used by above) All configurable colours can now be specified as RGB decimally or hexadecimally. --- NEW FILE: ViewUpdate.java --- package rails.game.model; import java.io.Serializable; import java.util.*; /** * ViewUpdate is a composite object that can be sent from a ModelObject (Observable) * to a View object (Observer). * <p> The current version has text, background colour and foreground colour. * Receiving view objects must be prepared to handle extensions. * @author VosE * */ public class ViewUpdate implements Serializable { protected Map<String, Object> updates = new HashMap<String, Object>(4); public static final String TEXT = "TEXT"; public static final String BGCOLOUR = "BGCOLOUR"; public static final long serialVersionUID = 1L; public ViewUpdate (String key, Object value) { addObject (key, value); } public ViewUpdate (String text) { addObject (TEXT, text); } /** Add an object. * Return this ViewUpdate to enable chaining. */ public ViewUpdate addObject (String key, Object value) { updates.put(key, value); return this; } public Set<String> getKeys () { return updates.keySet(); } public boolean hasKey (String key) { return updates.containsKey(key); } public Object getValue(String key) { return updates.get(key); } public String getText () { return (String) updates.get(TEXT); } } Index: PriceModel.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/model/PriceModel.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PriceModel.java 4 Jun 2008 19:00:37 -0000 1.7 --- PriceModel.java 13 Dec 2009 16:39:48 -0000 1.8 *************** *** 2,8 **** package rails.game.model; ! import rails.game.Bank; ! import rails.game.PublicCompanyI; ! import rails.game.StockSpaceI; import rails.game.move.PriceMove; import rails.game.state.StateI; --- 2,6 ---- package rails.game.model; ! import rails.game.*; import rails.game.move.PriceMove; import rails.game.state.StateI; *************** *** 31,35 **** } ! public String getText() { if (stockPrice != null) { return Bank.format(stockPrice.getPrice()) + " (" --- 29,44 ---- } ! @Override ! public Object getUpdate() { ! if (stockPrice != null) { ! return new ViewUpdate(getText()) ! .addObject(ViewUpdate.BGCOLOUR, stockPrice.getColour()); ! } else { ! return getText(); ! } ! } ! ! @Override ! public String getText() { if (stockPrice != null) { return Bank.format(stockPrice.getPrice()) + " (" Index: ModelObject.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/model/ModelObject.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ModelObject.java 4 Jun 2008 19:00:37 -0000 1.7 --- ModelObject.java 13 Dec 2009 16:39:48 -0000 1.8 *************** *** 2,8 **** package rails.game.model; ! import java.util.HashSet; ! import java.util.Observable; ! import java.util.Set; import org.apache.log4j.Logger; --- 2,6 ---- package rails.game.model; ! import java.util.*; import org.apache.log4j.Logger; *************** *** 24,27 **** --- 22,31 ---- Logger.getLogger(ModelObject.class.getPackage().getName()); + @Override + public void addObserver (Observer o) { + super.addObserver(o); + notifyViewObjects(); + } + /** Add a dependent model object */ public void addDependent(ModelObject object) { *************** *** 39,50 **** private void notifyViewObjects() { setChanged(); ! notifyObservers(getText()); clearChanged(); } /** * Optional method, to make a subclass-dependent selection of the way the * "value" will be composed. The default value is 0. ! * * @param option The selected */ --- 43,59 ---- private void notifyViewObjects() { setChanged(); ! notifyObservers(getUpdate()); clearChanged(); } + /** Default update is just text */ + public Object getUpdate () { + return getText(); + } + /** * Optional method, to make a subclass-dependent selection of the way the * "value" will be composed. The default value is 0. ! * * @param option The selected */ *************** *** 79,83 **** * default result is the Observable's toString(), but it can be overridden * where needed. ! * * @return */ --- 88,92 ---- * default result is the Observable's toString(), but it can be overridden * where needed. ! * * @return */ |
|
From: Erik V. <ev...@us...> - 2009-12-13 16:40:02
|
Update of /cvsroot/rails/18xx/data/1856 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28822/data/1856 Modified Files: StockMarket.xml Log Message: Implemented request to show low-price colours in SR and OR panels. Added a generic Model-to-View update mechanism (used by above) All configurable colours can now be specified as RGB decimally or hexadecimally. Index: StockMarket.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1856/StockMarket.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StockMarket.xml 24 May 2005 21:38:03 -0000 1.3 --- StockMarket.xml 13 Dec 2009 16:39:49 -0000 1.4 *************** *** 1,7 **** <StockMarket type="rectangular"> ! <StockSpaceType name="yellow" colour="yellow"> <NoCertLimit/> </StockSpaceType> ! <StockSpaceType name="orange" colour="brown"> <NoCertLimit/> <NoHoldLimit/> --- 1,7 ---- <StockMarket type="rectangular"> ! <StockSpaceType name="yellow" colour="FFFF00"> <NoCertLimit/> </StockSpaceType> ! <StockSpaceType name="orange" colour="884000"> <NoCertLimit/> <NoHoldLimit/> |
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28822/rails/game Modified Files: StockSpaceTypeI.java PublicCompany.java StockSpaceI.java StockSpace.java StockSpaceType.java StockMarket.java Log Message: Implemented request to show low-price colours in SR and OR panels. Added a generic Model-to-View update mechanism (used by above) All configurable colours can now be specified as RGB decimally or hexadecimally. Index: PublicCompany.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/PublicCompany.java,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** PublicCompany.java 26 Nov 2009 20:13:19 -0000 1.73 --- PublicCompany.java 13 Dec 2009 16:39:48 -0000 1.74 *************** *** 268,275 **** /* Configure public company features */ fgHexColour = tag.getAttributeAsString("fgColour", fgHexColour); ! fgColour = new Color(Integer.parseInt(fgHexColour, 16)); bgHexColour = tag.getAttributeAsString("bgColour", bgHexColour); ! bgColour = new Color(Integer.parseInt(bgHexColour, 16)); floatPerc = tag.getAttributeAsInteger("floatPerc", floatPerc); --- 268,277 ---- /* Configure public company features */ fgHexColour = tag.getAttributeAsString("fgColour", fgHexColour); ! //fgColour = new Color(Integer.parseInt(fgHexColour, 16)); ! fgColour = Util.parseColour(fgHexColour); bgHexColour = tag.getAttributeAsString("bgColour", bgHexColour); ! //bgColour = new Color(Integer.parseInt(bgHexColour, 16)); ! bgColour = Util.parseColour(bgHexColour); floatPerc = tag.getAttributeAsInteger("floatPerc", floatPerc); Index: StockSpace.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/StockSpace.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** StockSpace.java 31 Oct 2009 17:08:27 -0000 1.8 --- StockSpace.java 13 Dec 2009 16:39:49 -0000 1.9 *************** *** 1,5 **** package rails.game; ! import java.util.*; import org.apache.log4j.Logger; --- 1,7 ---- package rails.game; ! import java.awt.Color; ! import java.util.ArrayList; ! import java.util.List; import org.apache.log4j.Logger; *************** *** 52,58 **** /** * Add a token at the end of the array (i.e. at the bottom of the pile) ! * * Always returns true; ! * * @param company The company object to add. */ --- 54,60 ---- /** * Add a token at the end of the array (i.e. at the bottom of the pile) ! * * Always returns true; ! * * @param company The company object to add. */ *************** *** 66,70 **** /** * Remove a token from the pile. ! * * @param company The company object to remove. * @return False if the token was not found. --- 68,72 ---- /** * Remove a token from the pile. ! * * @param company The company object to remove. * @return False if the token was not found. *************** *** 91,95 **** /** * Find the stack position of a company token ! * * @return Stock position: 0 = top, increasing towards the bottom. -1 if not * found. --- 93,97 ---- /** * Find the stack position of a company token ! * * @return Stock position: 0 = top, increasing towards the bottom. -1 if not * found. *************** *** 126,134 **** * @return The square's colour. */ ! public String getColour() { if (type != null) { return type.getColour(); } else { ! return ""; } } --- 128,136 ---- * @return The square's colour. */ ! public Color getColour() { if (type != null) { return type.getColour(); } else { ! return Color.WHITE; } } *************** *** 254,262 **** } ! public String getText() { return Bank.format(price); } ! public String toString() { return getText(); } --- 256,266 ---- } ! @Override ! public String getText() { return Bank.format(price); } ! @Override ! public String toString() { return getText(); } Index: StockSpaceType.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/StockSpaceType.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StockSpaceType.java 4 Jun 2008 19:00:30 -0000 1.3 --- StockSpaceType.java 13 Dec 2009 16:39:49 -0000 1.4 *************** *** 2,5 **** --- 2,9 ---- package rails.game; + import java.awt.Color; + + import rails.util.Util; + /** * Objects of this class represent a type of square on the StockMarket with *************** *** 13,29 **** /*--- Instance attributes ---*/ protected String name; ! protected String colour; protected boolean noCertLimit = false; // In yellow zone protected boolean noHoldLimit = false; // In orange zone (1830) protected boolean noBuyLimit = false; // In brown zone (1830) /*--- Contructors ---*/ ! public StockSpaceType(String name) { this(name, ""); } ! public StockSpaceType(String name, String colour) { this.name = name; ! this.colour = colour; } --- 17,38 ---- /*--- Instance attributes ---*/ protected String name; ! protected String colourString; ! protected Color colour; protected boolean noCertLimit = false; // In yellow zone protected boolean noHoldLimit = false; // In orange zone (1830) protected boolean noBuyLimit = false; // In brown zone (1830) + public static final String WHITE = "FFFFFF"; + /*--- Contructors ---*/ ! public StockSpaceType(String name) throws ConfigurationException { this(name, ""); } ! public StockSpaceType(String name, String colour) throws ConfigurationException { this.name = name; ! this.colourString = colour; ! //this.colour = new Color(Integer.parseInt(colourString, 16)); ! this.colour = Util.parseColour(colourString); } *************** *** 39,43 **** * @return The square type's colour. */ ! public String getColour() { return colour; } --- 48,52 ---- * @return The square type's colour. */ ! public Color getColour() { return colour; } Index: StockMarket.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/StockMarket.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** StockMarket.java 11 Nov 2009 22:26:47 -0000 1.23 --- StockMarket.java 13 Dec 2009 16:39:49 -0000 1.24 *************** *** 20,23 **** --- 20,24 ---- protected ArrayList<StockSpaceI> startSpaces = new ArrayList<StockSpaceI>(); protected int[] startPrices; + protected StockSpaceTypeI defaultType; /* Game-specific flags */ *************** *** 35,39 **** --- 36,43 ---- ArrayList<PublicCertificate> ipoPile; + public static final String DEFAULT = "default"; + public StockMarket() { + } *************** *** 42,46 **** */ public void configureFromXML(Tag tag) throws ConfigurationException { ! /* Read and configure the stock market space types */ List<Tag> typeTags = tag.getChildren(StockSpaceTypeI.ELEMENT_ID); --- 46,55 ---- */ public void configureFromXML(Tag tag) throws ConfigurationException { ! ! // Define a default stockspace type with colour white ! defaultType = new StockSpaceType(DEFAULT, StockSpaceType.WHITE); ! stockSpaceTypes.put (DEFAULT, defaultType); ! ! /* Read and configure the stock market space types */ List<Tag> typeTags = tag.getChildren(StockSpaceTypeI.ELEMENT_ID); *************** *** 99,102 **** --- 108,112 ---- "StockSpaceTypeUndefined", type)); } + if (type == null) type = defaultType; if (stockChartSpaces.get(name) != null) { *************** *** 270,274 **** else if (row < numRows - 1 && (newsquare = getStockSpace(row + 1, col)) != null) {} ! else { newsquare = oldsquare; } --- 280,284 ---- else if (row < numRows - 1 && (newsquare = getStockSpace(row + 1, col)) != null) {} ! else { newsquare = oldsquare; } Index: StockSpaceTypeI.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/StockSpaceTypeI.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StockSpaceTypeI.java 4 Jun 2008 19:00:32 -0000 1.3 --- StockSpaceTypeI.java 13 Dec 2009 16:39:48 -0000 1.4 *************** *** 2,5 **** --- 2,7 ---- package rails.game; + import java.awt.Color; + /** * The interface for StockSpaceType. *************** *** 44,48 **** * @return Color */ ! public abstract String getColour(); /** --- 46,50 ---- * @return Color */ ! public abstract Color getColour(); /** Index: StockSpaceI.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/StockSpaceI.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** StockSpaceI.java 4 Jun 2008 19:00:31 -0000 1.4 --- StockSpaceI.java 13 Dec 2009 16:39:49 -0000 1.5 *************** *** 2,5 **** --- 2,6 ---- package rails.game; + import java.awt.Color; import java.util.*; *************** *** 53,57 **** * @return The square's colour. */ ! public abstract String getColour(); /** --- 54,58 ---- * @return The square's colour. */ ! public abstract Color getColour(); /** |
|
From: Erik V. <ev...@us...> - 2009-12-13 16:40:00
|
Update of /cvsroot/rails/18xx/rails/ui/swing/elements In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28822/rails/ui/swing/elements Modified Files: Field.java GUIStockSpace.java Log Message: Implemented request to show low-price colours in SR and OR panels. Added a generic Model-to-View update mechanism (used by above) All configurable colours can now be specified as RGB decimally or hexadecimally. Index: Field.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/elements/Field.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Field.java 7 Jan 2009 21:03:24 -0000 1.8 --- Field.java 13 Dec 2009 16:39:49 -0000 1.9 *************** *** 10,14 **** import rails.game.model.ModelObject; ! import rails.ui.swing.StatusWindow; public class Field extends JLabel implements ViewObject { --- 10,15 ---- import rails.game.model.ModelObject; ! import rails.game.model.ViewUpdate; ! import rails.util.Util; public class Field extends JLabel implements ViewObject { *************** *** 23,26 **** --- 24,28 ---- private ModelObject modelObject; + private Color normalBgColour = NORMAL_BG_COLOUR; private boolean pull = false; *************** *** 43,49 **** public Field(ModelObject modelObject) { ! this(modelObject.getText()); this.modelObject = modelObject; ! if (StatusWindow.useObserver) modelObject.addObserver(this); } --- 45,56 ---- public Field(ModelObject modelObject) { ! this(""); ! //this(modelObject.getText()); this.modelObject = modelObject; ! //Object mu = modelObject.getUpdate(); ! //if (mu instanceof ViewUpdate) { ! // updateDetails ((ViewUpdate) mu); ! //} ! modelObject.addObserver(this); } *************** *** 64,77 **** public void setModel(ModelObject m) { ! if (StatusWindow.useObserver) modelObject.deleteObserver(this); modelObject = m; ! if (StatusWindow.useObserver) { ! modelObject.addObserver(this); ! update(null, null); ! } } public void setHighlight(boolean highlight) { ! setBackground(highlight ? HIGHLIGHT_BG_COLOUR : NORMAL_BG_COLOUR); } --- 71,82 ---- public void setModel(ModelObject m) { ! modelObject.deleteObserver(this); modelObject = m; ! modelObject.addObserver(this); ! update(null, null); } public void setHighlight(boolean highlight) { ! setBackground(highlight ? HIGHLIGHT_BG_COLOUR : normalBgColour); } *************** *** 80,84 **** @Override public void paintComponent(Graphics g) { ! if (modelObject != null && (pull || !StatusWindow.useObserver)) { setText(modelObject.getText()); } --- 85,89 ---- @Override public void paintComponent(Graphics g) { ! if (modelObject != null && pull) { setText(modelObject.getText()); } *************** *** 88,103 **** /** Needed to satisfy the Observer interface. */ public void update(Observable o1, Object o2) { ! if (StatusWindow.useObserver) { ! if (o2 instanceof String) { ! setText((String) o2); ! } else { ! setText(modelObject.toString()); ! } } } /** Needed to satisfy the ViewObject interface. Currently not used. */ public void deRegister() { ! if (modelObject != null && StatusWindow.useObserver) modelObject.deleteObserver(this); } --- 93,120 ---- /** Needed to satisfy the Observer interface. */ public void update(Observable o1, Object o2) { ! if (o2 instanceof String) { ! setText((String) o2); ! } else if (o2 instanceof ViewUpdate) { ! updateDetails ((ViewUpdate)o2); ! } else { ! setText(modelObject.toString()); } } + protected void updateDetails (ViewUpdate vu) { + for (String key : vu.getKeys()) { + if (ViewUpdate.TEXT.equalsIgnoreCase(key)) { + setText (vu.getText()); + } else if (ViewUpdate.BGCOLOUR.equalsIgnoreCase(key)) { + setBackground((Color)vu.getValue(key)); + normalBgColour = getBackground(); + setForeground (Util.isDark(normalBgColour) ? Color.WHITE : Color.BLACK); + } + } + } + /** Needed to satisfy the ViewObject interface. Currently not used. */ public void deRegister() { ! if (modelObject != null) modelObject.deleteObserver(this); } Index: GUIStockSpace.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/elements/GUIStockSpace.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GUIStockSpace.java 31 Oct 2009 17:08:27 -0000 1.7 --- GUIStockSpace.java 13 Dec 2009 16:39:49 -0000 1.8 *************** *** 2,15 **** package rails.ui.swing.elements; ! import java.awt.Color; ! import java.awt.Dimension; ! import java.awt.Point; import java.util.List; import java.util.Observable; ! import javax.swing.BorderFactory; ! import javax.swing.JLabel; ! import javax.swing.JLayeredPane; ! import javax.swing.SwingConstants; import org.apache.log4j.Logger; --- 2,10 ---- package rails.ui.swing.elements; ! import java.awt.*; import java.util.List; import java.util.Observable; ! import javax.swing.*; import org.apache.log4j.Logger; *************** *** 19,23 **** import rails.game.model.ModelObject; import rails.ui.swing.GUIToken; ! import rails.ui.swing.StatusWindow; public class GUIStockSpace extends JLayeredPane implements ViewObject { --- 14,18 ---- import rails.game.model.ModelObject; import rails.ui.swing.GUIToken; ! import rails.util.Util; public class GUIStockSpace extends JLayeredPane implements ViewObject { *************** *** 31,37 **** List<PublicCompanyI> tokenList; - private static final Color BROWN = new Color(144, 72, 0); private static final Color LIGHT_GRAY = new Color(200, 200, 200); - private static final Color ORANGE = new Color(255, 180, 0); protected static Logger log = --- 26,30 ---- *************** *** 53,57 **** priceLabel.setText(Integer.toString(model.getPrice())); ! priceLabel.setBackground(stringToColor(model.getColour())); priceLabel.setVerticalTextPosition(SwingConstants.TOP); --- 46,53 ---- priceLabel.setText(Integer.toString(model.getPrice())); ! //priceLabel.setBackground(stringToColor(model.getColour())); ! priceLabel.setBackground(model.getColour()); ! priceLabel.setForeground(Util.isDark(priceLabel.getBackground()) ! ? Color.WHITE : Color.BLACK); priceLabel.setVerticalTextPosition(SwingConstants.TOP); *************** *** 113,117 **** /* * (non-Javadoc) ! * * @see rails.ui.swing.elements.ViewObject#getModel() */ --- 109,113 ---- /* * (non-Javadoc) ! * * @see rails.ui.swing.elements.ViewObject#getModel() */ *************** *** 122,130 **** /* * (non-Javadoc) ! * * @see rails.ui.swing.elements.ViewObject#deRegister() */ public void deRegister() { ! if (model != null && StatusWindow.useObserver) ((ModelObject) model).deleteObserver(this); --- 118,126 ---- /* * (non-Javadoc) ! * * @see rails.ui.swing.elements.ViewObject#deRegister() */ public void deRegister() { ! if (model != null) ((ModelObject) model).deleteObserver(this); *************** *** 133,137 **** /* * (non-Javadoc) ! * * @see java.rails.util.Observer#update(java.rails.util.Observable, * java.lang.Object) --- 129,133 ---- /* * (non-Javadoc) ! * * @see java.rails.util.Observer#update(java.rails.util.Observable, * java.lang.Object) *************** *** 139,177 **** public void update(Observable o1, Object o2) { ! if (StatusWindow.useObserver) { ! recreate(); ! } ! ! } ! ! /** ! * Quick n' dirty method of converting strings to color objects. This has ! * been replaced by using hex colors in the XML definitions. ! * ! * @deprecated ! */ ! private static Color stringToColor(String color) { ! if (color.equalsIgnoreCase("yellow")) { ! return Color.YELLOW; ! } else if (color.equalsIgnoreCase("orange")) { ! return ORANGE; ! } else if (color.equalsIgnoreCase("brown")) { ! return BROWN; ! } else if (color.equalsIgnoreCase("red")) { ! return Color.RED; ! } else if (color.equalsIgnoreCase("green")) { ! return Color.GREEN; ! } else if (color.equalsIgnoreCase("blue")) { ! return Color.BLUE; ! } else if (color.equalsIgnoreCase("black")) { ! return Color.BLACK; ! } else if (color.equalsIgnoreCase("white")) { ! return Color.WHITE; ! } else if (color.equals("")) { ! return Color.WHITE; ! } else { ! log.warn("Unknown color: " + color + "."); ! return Color.MAGENTA; ! } } --- 135,139 ---- public void update(Observable o1, Object o2) { ! recreate(); } |
|
From: Erik V. <ev...@us...> - 2009-12-13 16:40:00
|
Update of /cvsroot/rails/18xx/data/1830 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28822/data/1830 Modified Files: CompanyManager.xml StockMarket.xml Log Message: Implemented request to show low-price colours in SR and OR panels. Added a generic Model-to-View update mechanism (used by above) All configurable colours can now be specified as RGB decimally or hexadecimally. Index: CompanyManager.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1830/CompanyManager.xml,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** CompanyManager.xml 26 Oct 2008 20:36:21 -0000 1.25 --- CompanyManager.xml 13 Dec 2009 16:39:49 -0000 1.26 *************** *** 55,59 **** </Company> ! <Company name="B&O" type="Public" tokens="3" fgColour="FFFFFF" bgColour="0000FF"> <FirstTrainCloses type="Private" name="B&O"/> <Home hex="I15"/> --- 55,61 ---- </Company> ! <!-- Note two supported colour specification formats: ! RGB decimal with commas and RGB hexadecimal without commas --> ! <Company name="B&O" type="Public" tokens="3" fgColour="255,255,255" bgColour="0,0,255"> <FirstTrainCloses type="Private" name="B&O"/> <Home hex="I15"/> Index: StockMarket.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1830/StockMarket.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StockMarket.xml 20 Mar 2005 23:46:56 -0000 1.2 --- StockMarket.xml 13 Dec 2009 16:39:49 -0000 1.3 *************** *** 1,147 **** ! <StockMarket type="rectangular"> ! <StockSpaceType name="yellow" colour="yellow"> ! <NoCertLimit/> ! </StockSpaceType> ! <StockSpaceType name="orange" colour="orange"> ! <NoCertLimit/> ! <NoHoldLimit/> ! </StockSpaceType> ! <StockSpaceType name="brown" colour="brown"> ! <NoCertLimit/> ! <NoHoldLimit/> ! <NoBuyLimit/> ! </StockSpaceType> ! ! <StockSpace name="A1" price="60" type="yellow"/> ! <StockSpace name="A2" price="53" type="yellow"/> ! <StockSpace name="A3" price="46" type="yellow"/> ! <StockSpace name="A4" price="39" type="orange"/> ! <StockSpace name="A5" price="32" type="orange"/> ! <StockSpace name="A6" price="25" type="brown"/> ! <StockSpace name="A7" price="18" type="brown"/> ! <StockSpace name="A8" price="10" type="brown"/> ! <StockSpace name="B1" price="67" /> ! <StockSpace name="B2" price="60" type="yellow"/> ! <StockSpace name="B3" price="55" type="yellow"/> ! <StockSpace name="B4" price="48" type="yellow"/> ! <StockSpace name="B5" price="41" type="orange"/> ! <StockSpace name="B6" price="34" type="orange"/> ! <StockSpace name="B7" price="27" type="brown"/> ! <StockSpace name="B8" price="20" type="brown"/> ! <StockSpace name="B9" price="10" type="brown"/> ! <StockSpace name="C1" price="71" /> ! <StockSpace name="C2" price="66" /> ! <StockSpace name="C3" price="60" type="yellow"/> ! <StockSpace name="C4" price="54" type="yellow"/> ! <StockSpace name="C5" price="48" type="yellow"/> ! <StockSpace name="C6" price="42" type="orange"/> ! <StockSpace name="C7" price="36" type="orange"/> ! <StockSpace name="C8" price="30" type="brown"/> ! <StockSpace name="C9" price="20" type="brown"/> ! <StockSpace name="C10" price="10" type="brown"/> ! <StockSpace name="D1" price="76" /> ! <StockSpace name="D2" price="70" /> ! <StockSpace name="D3" price="65" /> ! <StockSpace name="D4" price="60" type="yellow"/> ! <StockSpace name="D5" price="55" type="yellow"/> ! <StockSpace name="D6" price="50" type="yellow"/> ! <StockSpace name="D7" price="45" type="orange"/> ! <StockSpace name="D8" price="40" type="orange"/> ! <StockSpace name="D9" price="30" type="brown"/> ! <StockSpace name="D10" price="20" type="brown"/> ! <StockSpace name="D11" price="10" type="brown"/> ! <StockSpace name="E1" price="82" /> ! <StockSpace name="E2" price="76" /> ! <StockSpace name="E3" price="70" /> ! <StockSpace name="E4" price="66" /> ! <StockSpace name="E5" price="62" /> ! <StockSpace name="E6" price="58" type="yellow"/> ! <StockSpace name="E7" price="54" type="yellow"/> ! <StockSpace name="E8" price="50" type="yellow"/> ! <StockSpace name="E9" price="40" type="orange"/> ! <StockSpace name="E10" price="30" type="brown"/> ! <StockSpace name="E11" price="20" type="brown"/> ! <StockSpace name="F1" price="90" /> ! <StockSpace name="F2" price="82" /> ! <StockSpace name="F3" price="76" /> ! <StockSpace name="F4" price="71" /> ! <StockSpace name="F5" price="67" /> ! <StockSpace name="F6" price="65" /> ! <StockSpace name="F7" price="63" /> ! <StockSpace name="F8" price="60" type="yellow"/> ! <StockSpace name="F9" price="50" type="yellow"/> ! <StockSpace name="F10" price="40" type="orange"/> ! <StockSpace name="F11" price="30" type="brown"/> ! <StockSpace name="G1" price="100" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G2" price="90" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G3" price="82" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G4" price="76" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G5" price="71" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G6" price="67" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G7" price="67" /> ! <StockSpace name="G8" price="67" /> ! <StockSpace name="G9" price="60" type="yellow"/> ! <StockSpace name="G10" price="50" type="yellow"/> ! <StockSpace name="G11" price="40" type="orange"/> ! <StockSpace name="H1" price="112" /> ! <StockSpace name="H2" price="100" /> ! <StockSpace name="H3" price="90" /> ! <StockSpace name="H4" price="82" /> ! <StockSpace name="H5" price="76" /> ! <StockSpace name="H6" price="71" /> ! <StockSpace name="H7" price="69" /> ! <StockSpace name="H8" price="68" /> ! <StockSpace name="I1" price="126" /> ! <StockSpace name="I2" price="112" /> ! <StockSpace name="I3" price="100" /> ! <StockSpace name="I4" price="90" /> ! <StockSpace name="I5" price="82" /> ! <StockSpace name="I6" price="75" /> ! <StockSpace name="I7" price="70" /> ! <StockSpace name="J1" price="142" /> ! <StockSpace name="J2" price="126" /> ! <StockSpace name="J3" price="111" /> ! <StockSpace name="J4" price="100" /> ! <StockSpace name="J5" price="90" /> ! <StockSpace name="J6" price="80" /> ! <StockSpace name="K1" price="160" /> ! <StockSpace name="K2" price="142" /> ! <StockSpace name="K3" price="125" /> ! <StockSpace name="K4" price="110" /> ! <StockSpace name="K5" price="100" /> ! <StockSpace name="L1" price="180" /> ! <StockSpace name="L2" price="160" /> ! <StockSpace name="L3" price="140" /> ! <StockSpace name="L4" price="120" /> ! <StockSpace name="M1" price="200" /> ! <StockSpace name="M2" price="180" /> ! <StockSpace name="M3" price="155" /> ! <StockSpace name="M4" price="130" /> ! <StockSpace name="N1" price="225" /> ! <StockSpace name="N2" price="200" /> ! <StockSpace name="N3" price="170" /> ! <StockSpace name="O1" price="250" /> ! <StockSpace name="O2" price="220" /> ! <StockSpace name="O3" price="185" /> ! <StockSpace name="P1" price="275" /> ! <StockSpace name="P2" price="240" /> ! <StockSpace name="P3" price="200" /> ! <StockSpace name="Q1" price="300" /> ! <StockSpace name="Q2" price="260" /> ! <StockSpace name="R1" price="325" /> ! <StockSpace name="R2" price="280" /> ! <StockSpace name="S1" price="350" /> ! <StockSpace name="S2" price="300" /> ! </StockMarket> --- 1,149 ---- ! <StockMarket type="rectangular"> ! <!-- Note two supported colour specification formats: ! RGB decimal with commas and RGB hexadecimal without commas --> ! <StockSpaceType name="yellow" colour="255,255,0"> ! <NoCertLimit/> ! </StockSpaceType> ! <StockSpaceType name="orange" colour="FF8000"> ! <NoCertLimit/> ! <NoHoldLimit/> ! </StockSpaceType> ! <StockSpaceType name="brown" colour="884000"> ! <NoCertLimit/> ! <NoHoldLimit/> ! <NoBuyLimit/> ! </StockSpaceType> ! ! <StockSpace name="A1" price="60" type="yellow"/> ! <StockSpace name="A2" price="53" type="yellow"/> ! <StockSpace name="A3" price="46" type="yellow"/> ! <StockSpace name="A4" price="39" type="orange"/> ! <StockSpace name="A5" price="32" type="orange"/> ! <StockSpace name="A6" price="25" type="brown"/> ! <StockSpace name="A7" price="18" type="brown"/> ! <StockSpace name="A8" price="10" type="brown"/> ! <StockSpace name="B1" price="67" /> ! <StockSpace name="B2" price="60" type="yellow"/> ! <StockSpace name="B3" price="55" type="yellow"/> ! <StockSpace name="B4" price="48" type="yellow"/> ! <StockSpace name="B5" price="41" type="orange"/> ! <StockSpace name="B6" price="34" type="orange"/> ! <StockSpace name="B7" price="27" type="brown"/> ! <StockSpace name="B8" price="20" type="brown"/> ! <StockSpace name="B9" price="10" type="brown"/> ! <StockSpace name="C1" price="71" /> ! <StockSpace name="C2" price="66" /> ! <StockSpace name="C3" price="60" type="yellow"/> ! <StockSpace name="C4" price="54" type="yellow"/> ! <StockSpace name="C5" price="48" type="yellow"/> ! <StockSpace name="C6" price="42" type="orange"/> ! <StockSpace name="C7" price="36" type="orange"/> ! <StockSpace name="C8" price="30" type="brown"/> ! <StockSpace name="C9" price="20" type="brown"/> ! <StockSpace name="C10" price="10" type="brown"/> ! <StockSpace name="D1" price="76" /> ! <StockSpace name="D2" price="70" /> ! <StockSpace name="D3" price="65" /> ! <StockSpace name="D4" price="60" type="yellow"/> ! <StockSpace name="D5" price="55" type="yellow"/> ! <StockSpace name="D6" price="50" type="yellow"/> ! <StockSpace name="D7" price="45" type="orange"/> ! <StockSpace name="D8" price="40" type="orange"/> ! <StockSpace name="D9" price="30" type="brown"/> ! <StockSpace name="D10" price="20" type="brown"/> ! <StockSpace name="D11" price="10" type="brown"/> ! <StockSpace name="E1" price="82" /> ! <StockSpace name="E2" price="76" /> ! <StockSpace name="E3" price="70" /> ! <StockSpace name="E4" price="66" /> ! <StockSpace name="E5" price="62" /> ! <StockSpace name="E6" price="58" type="yellow"/> ! <StockSpace name="E7" price="54" type="yellow"/> ! <StockSpace name="E8" price="50" type="yellow"/> ! <StockSpace name="E9" price="40" type="orange"/> ! <StockSpace name="E10" price="30" type="brown"/> ! <StockSpace name="E11" price="20" type="brown"/> ! <StockSpace name="F1" price="90" /> ! <StockSpace name="F2" price="82" /> ! <StockSpace name="F3" price="76" /> ! <StockSpace name="F4" price="71" /> ! <StockSpace name="F5" price="67" /> ! <StockSpace name="F6" price="65" /> ! <StockSpace name="F7" price="63" /> ! <StockSpace name="F8" price="60" type="yellow"/> ! <StockSpace name="F9" price="50" type="yellow"/> ! <StockSpace name="F10" price="40" type="orange"/> ! <StockSpace name="F11" price="30" type="brown"/> ! <StockSpace name="G1" price="100" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G2" price="90" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G3" price="82" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G4" price="76" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G5" price="71" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G6" price="67" > ! <StartSpace/> ! </StockSpace> ! <StockSpace name="G7" price="67" /> ! <StockSpace name="G8" price="67" /> ! <StockSpace name="G9" price="60" type="yellow"/> ! <StockSpace name="G10" price="50" type="yellow"/> ! <StockSpace name="G11" price="40" type="orange"/> ! <StockSpace name="H1" price="112" /> ! <StockSpace name="H2" price="100" /> ! <StockSpace name="H3" price="90" /> ! <StockSpace name="H4" price="82" /> ! <StockSpace name="H5" price="76" /> ! <StockSpace name="H6" price="71" /> ! <StockSpace name="H7" price="69" /> ! <StockSpace name="H8" price="68" /> ! <StockSpace name="I1" price="126" /> ! <StockSpace name="I2" price="112" /> ! <StockSpace name="I3" price="100" /> ! <StockSpace name="I4" price="90" /> ! <StockSpace name="I5" price="82" /> ! <StockSpace name="I6" price="75" /> ! <StockSpace name="I7" price="70" /> ! <StockSpace name="J1" price="142" /> ! <StockSpace name="J2" price="126" /> ! <StockSpace name="J3" price="111" /> ! <StockSpace name="J4" price="100" /> ! <StockSpace name="J5" price="90" /> ! <StockSpace name="J6" price="80" /> ! <StockSpace name="K1" price="160" /> ! <StockSpace name="K2" price="142" /> ! <StockSpace name="K3" price="125" /> ! <StockSpace name="K4" price="110" /> ! <StockSpace name="K5" price="100" /> ! <StockSpace name="L1" price="180" /> ! <StockSpace name="L2" price="160" /> ! <StockSpace name="L3" price="140" /> ! <StockSpace name="L4" price="120" /> ! <StockSpace name="M1" price="200" /> ! <StockSpace name="M2" price="180" /> ! <StockSpace name="M3" price="155" /> ! <StockSpace name="M4" price="130" /> ! <StockSpace name="N1" price="225" /> ! <StockSpace name="N2" price="200" /> ! <StockSpace name="N3" price="170" /> ! <StockSpace name="O1" price="250" /> ! <StockSpace name="O2" price="220" /> ! <StockSpace name="O3" price="185" /> ! <StockSpace name="P1" price="275" /> ! <StockSpace name="P2" price="240" /> ! <StockSpace name="P3" price="200" /> ! <StockSpace name="Q1" price="300" /> ! <StockSpace name="Q2" price="260" /> ! <StockSpace name="R1" price="325" /> ! <StockSpace name="R2" price="280" /> ! <StockSpace name="S1" price="350" /> ! <StockSpace name="S2" price="300" /> ! </StockMarket> |
|
From: Erik V. <ev...@us...> - 2009-12-13 16:40:00
|
Update of /cvsroot/rails/18xx/data/18Kaas In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28822/data/18Kaas Modified Files: StockMarket.xml Log Message: Implemented request to show low-price colours in SR and OR panels. Added a generic Model-to-View update mechanism (used by above) All configurable colours can now be specified as RGB decimally or hexadecimally. Index: StockMarket.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18Kaas/StockMarket.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StockMarket.xml 3 Jul 2006 21:05:47 -0000 1.1 --- StockMarket.xml 13 Dec 2009 16:39:49 -0000 1.2 *************** *** 1,11 **** <StockMarket type="rectangular"> ! <StockSpaceType name="yellow" colour="yellow"> <NoCertLimit/> </StockSpaceType> ! <StockSpaceType name="orange" colour="orange"> <NoCertLimit/> <NoHoldLimit/> </StockSpaceType> ! <StockSpaceType name="brown" colour="brown"> <NoCertLimit/> <NoHoldLimit/> --- 1,11 ---- <StockMarket type="rectangular"> ! <StockSpaceType name="yellow" colour="FFFF00"> <NoCertLimit/> </StockSpaceType> ! <StockSpaceType name="orange" colour="FF8000"> <NoCertLimit/> <NoHoldLimit/> </StockSpaceType> ! <StockSpaceType name="brown" colour="884000"> <NoCertLimit/> <NoHoldLimit/> |
|
From: Erik V. <ev...@us...> - 2009-12-13 16:40:00
|
Update of /cvsroot/rails/18xx/data/18AL In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28822/data/18AL Modified Files: StockMarket.xml Log Message: Implemented request to show low-price colours in SR and OR panels. Added a generic Model-to-View update mechanism (used by above) All configurable colours can now be specified as RGB decimally or hexadecimally. Index: StockMarket.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18AL/StockMarket.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StockMarket.xml 24 May 2005 21:38:04 -0000 1.3 --- StockMarket.xml 13 Dec 2009 16:39:49 -0000 1.4 *************** *** 1,4 **** <StockMarket type="rectangular"> ! <StockSpaceType name="yellow" colour="yellow"> <NoCertLimit/> </StockSpaceType> --- 1,4 ---- <StockMarket type="rectangular"> ! <StockSpaceType name="yellow" colour="FFFF00"> <NoCertLimit/> </StockSpaceType> |
|
From: Erik V. <ev...@us...> - 2009-12-13 16:40:00
|
Update of /cvsroot/rails/18xx/rails/util In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28822/rails/util Modified Files: Util.java Log Message: Implemented request to show low-price colours in SR and OR panels. Added a generic Model-to-View update mechanism (used by above) All configurable colours can now be specified as RGB decimally or hexadecimally. Index: Util.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/util/Util.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Util.java 25 Sep 2009 19:13:01 -0000 1.15 --- Util.java 13 Dec 2009 16:39:49 -0000 1.16 *************** *** 2,8 **** --- 2,11 ---- package rails.util; + import java.awt.Color; import java.util.ArrayList; import java.util.List; + import org.apache.log4j.Logger; + import rails.game.ConfigurationException; import rails.game.move.Moveable; *************** *** 10,14 **** public final class Util { ! // protected static Logger log = Game.getLogger(); /** --- 13,18 ---- public final class Util { ! ! protected static Logger log; /** *************** *** 80,82 **** --- 84,138 ---- } + + /** + * Parse a colour definition string. + * Currently supported formats: + * "RRGGBB" - each character being a hexadecimal digit + * "r,g,b" - each letter representing an integer 0..255 + * @param s + * @return + */ + public static Color parseColour (String s) throws ConfigurationException{ + Color c = null; + if (s.indexOf(',') == -1) { + // Assume hexadecimal RRGGBB + try { + c = new Color (Integer.parseInt(s, 16)); + } catch (NumberFormatException e) { + getLogger().error ("Invalid hex RGB colour: "+s, e); + throw new ConfigurationException (e); + } + } else { + // Assume decimal r,g,b + try { + String[] parts = s.split(","); + c = new Color (Integer.parseInt(parts[0]), + Integer.parseInt(parts[1]), + Integer.parseInt(parts[2])); + } catch (NumberFormatException e) { + getLogger().error ("Invalid nummeric RGB colour: "+s, e); + throw new ConfigurationException (e); + } + } + //getLogger().debug("+++ String:"+s+" Color:"+c); + return c; + } + + /** + * Is a colour dark? (to check if FG colour needs be reversed) + */ + public static boolean isDark(Color c) { + if (c == null) return false; + return Math.sqrt(0.241*c.getRed()*c.getRed() + + 0.691*c.getBlue()*c.getBlue() + + 0.068*c.getGreen()*c.getGreen()) < 128; + // Copied this formula from + // http://www.nbdtech.com/blog/archive/2008/04/27/Calculating-the-Perceived-Brightness-of-a-Color.aspx + } + + public static Logger getLogger () { + if (log == null) log = Logger.getLogger(Util.class.getPackage().getName()); + return log; + + } } |
|
From: Erik V. <ev...@us...> - 2009-12-13 16:39:57
|
Update of /cvsroot/rails/18xx/data/1870 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28822/data/1870 Modified Files: StockMarket.xml Log Message: Implemented request to show low-price colours in SR and OR panels. Added a generic Model-to-View update mechanism (used by above) All configurable colours can now be specified as RGB decimally or hexadecimally. Index: StockMarket.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1870/StockMarket.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StockMarket.xml 24 May 2005 21:38:04 -0000 1.3 --- StockMarket.xml 13 Dec 2009 16:39:48 -0000 1.4 *************** *** 1,12 **** <StockMarket type="rectangular"> <UpOrDownRight/> ! <StockSpaceType name="yellow" colour="yellow"> <NoCertLimit/> </StockSpaceType> ! <StockSpaceType name="orange" colour="green"> <NoCertLimit/> <NoHoldLimit/> </StockSpaceType> ! <StockSpaceType name="brown" colour="brown"> <NoCertLimit/> <NoHoldLimit/> --- 1,12 ---- <StockMarket type="rectangular"> <UpOrDownRight/> ! <StockSpaceType name="yellow" colour="FFFF00"> <NoCertLimit/> </StockSpaceType> ! <StockSpaceType name="orange" colour="00AA00"> <NoCertLimit/> <NoHoldLimit/> </StockSpaceType> ! <StockSpaceType name="brown" colour="884000"> <NoCertLimit/> <NoHoldLimit/> |
|
From: Erik V. <ev...@us...> - 2009-12-13 16:39:56
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28822/rails/ui/swing Modified Files: StatusWindow.java ORPanel.java Log Message: Implemented request to show low-price colours in SR and OR panels. Added a generic Model-to-View update mechanism (used by above) All configurable colours can now be specified as RGB decimally or hexadecimally. Index: StatusWindow.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/StatusWindow.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** StatusWindow.java 27 Nov 2009 20:32:44 -0000 1.29 --- StatusWindow.java 13 Dec 2009 16:39:47 -0000 1.30 *************** *** 81,92 **** new ArrayList<ActionMenuItem>(); - /** - * Selector for the pattern to be used in keeping the individual UI fields - * up-to-date: <br> - true: push changes (via the Observer/Observable - * pattern), <br> - false: pull everything on repaint. NOTE: currently, - * 'false' does not work for the stock chart. - */ - public static boolean useObserver = true; - protected static Logger log = Logger.getLogger(StatusWindow.class.getPackage().getName()); --- 81,84 ---- Index: ORPanel.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** ORPanel.java 12 Sep 2009 19:48:39 -0000 1.33 --- ORPanel.java 13 Dec 2009 16:39:47 -0000 1.34 *************** *** 217,233 **** public void redisplay() { ! if (StatusWindow.useObserver) { ! revalidate(); ! } else { ! repaint(); ! } } private void deRegisterObservers() { log.debug("Deregistering observers"); ! if (StatusWindow.useObserver) { ! for (ViewObject vo : observers) { ! vo.deRegister(); ! } } } --- 217,227 ---- public void redisplay() { ! revalidate(); } private void deRegisterObservers() { log.debug("Deregistering observers"); ! for (ViewObject vo : observers) { ! vo.deRegister(); } } *************** *** 491,495 **** statusPanel.add(comp, gbc); ! if (StatusWindow.useObserver && comp instanceof ViewObject && ((ViewObject) comp).getModel() != null) { observers.add((ViewObject) comp); --- 485,489 ---- statusPanel.add(comp, gbc); ! if (comp instanceof ViewObject && ((ViewObject) comp).getModel() != null) { observers.add((ViewObject) comp); |
