From: Brett L. <wak...@us...> - 2010-01-23 17:05:03
|
Update of /cvsroot/rails/18xx/data/18EU In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6354/data/18EU Modified Files: Game.xml TileSet.xml Log Message: Revert Freek Dijkstra's unlimited trains patch. We found a simpler way to implement this. Index: TileSet.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18EU/TileSet.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TileSet.xml 20 Jan 2010 05:45:37 -0000 1.6 --- TileSet.xml 23 Jan 2010 17:04:54 -0000 1.7 *************** *** 27,352 **** <!-- Yellow tiles --> ! <Tile id="3"> <Upgrade id="141,142,143" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="8"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="4"> <Upgrade id="141,142" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="10"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="7"> <Upgrade id="80,82,83" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="8"> <Upgrade id="80,81,82,83" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="15"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="9"> <Upgrade id="82,83" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="15"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="57"> <Upgrade id="14,15" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="8"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="58"> <Upgrade id="141,142,143,144" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="14"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="201"> <Upgrade id="576,577,578" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="7"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="202"> <Upgrade id="576,577,578,579" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="9"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> <!-- Green tiles --> ! <Tile id="14"> <Upgrade id="611" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="15"> <Upgrade id="611" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="80" pic="3080"> <Upgrade id="545,546" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="81" pic="3081"> <Upgrade id="546" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="82" pic="3082"> <Upgrade id="544,545,546" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="83" pic="3083"> <Upgrade id="544,545,546" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="141"> <Upgrade id="145,146,147" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="5"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="142"> <Upgrade id="145,146,147" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="143"> <Upgrade id="146,147" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="144"> <Upgrade id="147" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="576"> <Upgrade id="582" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="577"> <Upgrade id="582" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="578"> <Upgrade id="582" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="3"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="579"> <Upgrade id="582" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="3"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="580"> <Upgrade id="583" /> <AllowsMultipleBasesOfOneCompany/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="581"> <Upgrade id="584" /> <AllowsMultipleBasesOfOneCompany/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> <!-- Brown tiles --> ! <Tile id="145"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="4"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="146"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="5"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="147"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="4"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="544"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="3"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="545"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="3"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="546"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="3"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="582"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="9"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="583"> <AllowsMultipleBasesOfOneCompany/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="584"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="611"> <Upgrade id="513" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="8"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> <!-- Grey tiles --> ! <Tile id="513"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="5"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> </TileManager> --- 27,127 ---- <!-- Yellow tiles --> ! <Tile id="3" quantity="8"> <Upgrade id="141,142,143" /> </Tile> ! <Tile id="4" quantity="10"> <Upgrade id="141,142" /> </Tile> ! <Tile id="7" quantity="4"> <Upgrade id="80,82,83" /> </Tile> ! <Tile id="8" quantity="15"> <Upgrade id="80,81,82,83" /> </Tile> ! <Tile id="9" quantity="15"> <Upgrade id="82,83" /> </Tile> ! <Tile id="57" quantity="8"> <Upgrade id="14,15" /> </Tile> ! <Tile id="58" quantity="14"> <Upgrade id="141,142,143,144" /> </Tile> ! <Tile id="201" quantity="7"> <Upgrade id="576,577,578" /> </Tile> ! <Tile id="202" quantity="9"> <Upgrade id="576,577,578,579" /> </Tile> <!-- Green tiles --> ! <Tile id="14" quantity="4"> <Upgrade id="611" /> </Tile> ! <Tile id="15" quantity="4"> <Upgrade id="611" /> </Tile> ! <Tile id="80" pic="3080" quantity="4"> <Upgrade id="545,546" /> </Tile> ! <Tile id="81" pic="3081" quantity="4"> <Upgrade id="546" /> </Tile> ! <Tile id="82" pic="3082" quantity="4"> <Upgrade id="544,545,546" /> </Tile> ! <Tile id="83" pic="3083" quantity="4"> <Upgrade id="544,545,546" /> </Tile> ! <Tile id="141" quantity="5"> <Upgrade id="145,146,147" /> </Tile> ! <Tile id="142" quantity="4"> <Upgrade id="145,146,147" /> </Tile> ! <Tile id="143" quantity="2"> <Upgrade id="146,147" /> </Tile> ! <Tile id="144" quantity="2"> <Upgrade id="147" /> </Tile> ! <Tile id="576" quantity="4"> <Upgrade id="582" /> </Tile> ! <Tile id="577" quantity="4"> <Upgrade id="582" /> </Tile> ! <Tile id="578" quantity="3"> <Upgrade id="582" /> </Tile> ! <Tile id="579" quantity="3"> <Upgrade id="582" /> </Tile> ! <Tile id="580" quantity="1"> <Upgrade id="583" /> <AllowsMultipleBasesOfOneCompany/> </Tile> ! <Tile id="581" quantity="2"> <Upgrade id="584" /> <AllowsMultipleBasesOfOneCompany/> </Tile> <!-- Brown tiles --> ! <Tile id="145" quantity="4" /> ! <Tile id="146" quantity="5" /> ! <Tile id="147" quantity="4" /> ! <Tile id="544" quantity="3" /> ! <Tile id="545" quantity="3" /> ! <Tile id="546" quantity="3" /> ! <Tile id="582" quantity="9" /> ! <Tile id="583" quantity="1"> <AllowsMultipleBasesOfOneCompany/> </Tile> ! <Tile id="584" quantity="2" /> ! <Tile id="611" quantity="8"> <Upgrade id="513" /> </Tile> <!-- Grey tiles --> ! <Tile id="513" quantity="5" /> </TileManager> Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18EU/Game.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Game.xml 22 Jan 2010 21:19:29 -0000 1.15 --- Game.xml 23 Jan 2010 17:04:53 -0000 1.16 *************** *** 5,9 **** <GameOption name="Extra3Trains" values="0,1,2" default="0"/> <GameOption name="Extra4Trains" values="0,1" default="0"/> - <GameOption name="UnlimitedTiles" type="toggle" default="no"/> <GameParameters> <StockRound class="rails.game.specific._18EU.StockRound_18EU" --- 5,8 ---- |