Menu
▾
▴
[Rails-commits] 18xx/data/1870 TileSet.xml, 1.7, 1.8 Game.xml, 1.23, 1.24
|
From: Brett L. <wak...@us...> - 2010-01-23 17:05:03
|
Update of /cvsroot/rails/18xx/data/1870 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6354/data/1870 Modified Files: TileSet.xml Game.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/1870/TileSet.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TileSet.xml 20 Jan 2010 05:45:38 -0000 1.7 --- TileSet.xml 23 Jan 2010 17:04:54 -0000 1.8 *************** *** 17,447 **** <!-- Yellow --> ! <Tile id="1"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="2"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="3"> <Upgrade id="141,142,143"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="3"/> - </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="6"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="5"> <Upgrade id="14,15" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="6"> <Upgrade id="14,15" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="7"> <Upgrade id="18,26,27,28,29" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="9"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="8"> <Upgrade id="16,17,19,23,24,25,28,29" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="22"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="9"> <Upgrade id="18,19,20,23,24,26,27" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="23"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="55"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="56"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </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="5"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="58"> <Upgrade id="141,142,143"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="69"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> <!-- Green --> ! <Tile id="14"> <Upgrade id="63" /> <Upgrade id="170" label="P"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="15"> <Upgrade id="63" /> <Upgrade id="170" label="P"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="16"> <Upgrade id="43,70" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="17"> <Upgrade id="47" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="18"> <Upgrade id="43" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="19"> <Upgrade id="45,46" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="20"> <Upgrade id="44,47" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="23"> <Upgrade id="41,43,45,47" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="24"> <Upgrade id="42,43,46,47" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="25"> <Upgrade id="40" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="3"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="26"> <Upgrade id="42,44,45" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="27"> <Upgrade id="41,44,46" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="28"> <Upgrade id="39,43,46,70" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="29"> <Upgrade id="39,43,45,70" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="141"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </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="2"/> - </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="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="144"> <Upgrade id="147" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> <!-- Brown--> ! <Tile id="39"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="40"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="41"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="3"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="42"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="3"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="43"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="44"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="45"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="46"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="47"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="63"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="5"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="70"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="145"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="146"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="147"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="170"> <Upgrade id="171" hex="B11"/> <Upgrade id="172" hex="C18"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> <!-- Grey --> ! <Tile id="171"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="172"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> </TileManager> --- 17,132 ---- <!-- Yellow --> ! <Tile id="1" quantity="1" /> ! <Tile id="2" quantity="1" /> ! <Tile id="3" quantity="3"> <Upgrade id="141,142,143"/> </Tile> ! <Tile id="4" quantity="6"> <Upgrade id="141,142"/> </Tile> ! <Tile id="5" quantity="2"> <Upgrade id="14,15" /> </Tile> ! <Tile id="6" quantity="2"> <Upgrade id="14,15" /> </Tile> ! <Tile id="7" quantity="9"> <Upgrade id="18,26,27,28,29" /> </Tile> ! <Tile id="8" quantity="22"> <Upgrade id="16,17,19,23,24,25,28,29" /> </Tile> ! <Tile id="9" quantity="23"> <Upgrade id="18,19,20,23,24,26,27" /> </Tile> ! <Tile id="55" quantity="1" /> ! <Tile id="56" quantity="1" /> ! <Tile id="57" quantity="5"> <Upgrade id="14,15" /> </Tile> ! <Tile id="58" quantity="4"> <Upgrade id="141,142,143"/> </Tile> + <Tile id="69" quantity="1" /> <!-- Green --> ! <Tile id="14" quantity="4"> <Upgrade id="63" /> <Upgrade id="170" label="P"/> </Tile> ! <Tile id="15" quantity="4"> <Upgrade id="63" /> <Upgrade id="170" label="P"/> </Tile> ! <Tile id="16" quantity="2"> <Upgrade id="43,70" /> </Tile> ! <Tile id="17" quantity="2"> <Upgrade id="47" /> </Tile> ! <Tile id="18" quantity="2"> <Upgrade id="43" /> </Tile> ! <Tile id="19" quantity="2"> <Upgrade id="45,46" /> </Tile> ! <Tile id="20" quantity="2"> <Upgrade id="44,47" /> </Tile> ! <Tile id="23" quantity="4"> <Upgrade id="41,43,45,47" /> </Tile> ! <Tile id="24" quantity="4"> <Upgrade id="42,43,46,47" /> </Tile> ! <Tile id="25" quantity="3"> <Upgrade id="40" /> </Tile> ! <Tile id="26" quantity="2"> <Upgrade id="42,44,45" /> </Tile> ! <Tile id="27" quantity="2"> <Upgrade id="41,44,46" /> </Tile> ! <Tile id="28" quantity="2"> <Upgrade id="39,43,46,70" /> </Tile> ! <Tile id="29" quantity="2"> <Upgrade id="39,43,45,70" /> </Tile> ! <Tile id="141" quantity="2"> </Tile> ! <Tile id="142" quantity="2"> <Upgrade id="145,146,147" /> </Tile> ! <Tile id="143" quantity="1"> <Upgrade id="146,147" /> </Tile> ! <Tile id="144" quantity="1"> <Upgrade id="147" /> </Tile> <!-- Brown--> ! <Tile id="39" quantity="1" /> ! <Tile id="40" quantity="2" /> ! <Tile id="41" quantity="3" /> ! <Tile id="42" quantity="3" /> ! <Tile id="43" quantity="2" /> ! <Tile id="44" quantity="1" /> ! <Tile id="45" quantity="2" /> ! <Tile id="46" quantity="2" /> ! <Tile id="47" quantity="2" /> ! <Tile id="63" quantity="5" /> ! <Tile id="70" quantity="2" /> ! <Tile id="145" quantity="2" /> ! <Tile id="146" quantity="2" /> ! <Tile id="147" quantity="2" /> ! <Tile id="170" quantity="4"> <Upgrade id="171" hex="B11"/> <Upgrade id="172" hex="C18"/> </Tile> <!-- Grey --> ! <Tile id="171" quantity="1" /> ! <Tile id="172" quantity="1" /> </TileManager> Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1870/Game.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Game.xml 20 Jan 2010 05:45:39 -0000 1.23 --- Game.xml 23 Jan 2010 17:04:55 -0000 1.24 *************** *** 3,7 **** <Component name="GameManager" class="rails.game.GameManager"> <Game name="1870"/> - <GameOption name="UnlimitedTiles" type="toggle" default="no"/> <GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/> <GameParameters> --- 3,6 ---- |
