Menu
▾
▴
[Rails-commits] 18xx/data/18AL Game.xml, 1.24, 1.25 TileSet.xml, 1.11, 1.12
|
From: Brett L. <wak...@us...> - 2010-01-23 17:05:03
|
Update of /cvsroot/rails/18xx/data/18AL In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6354/data/18AL 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/18AL/TileSet.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TileSet.xml 20 Jan 2010 05:45:39 -0000 1.11 --- TileSet.xml 23 Jan 2010 17:04:55 -0000 1.12 *************** *** 25,257 **** <Upgrade id="142,143" /> </Tile> ! <Tile id="4"> <Upgrade id="142"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="3"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="5"> <Upgrade id="14,15" hex="-L5"/> <Upgrade id="1443" hex="L5"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="3"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="6"> <Upgrade id="14,15" hex="-L5"/> <Upgrade id="1443" hex="L5"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="3"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="7"> <Upgrade id="26,27,28,29" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="5"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="8"> <Upgrade id="16,19,23,24,25,28,29" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="11"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="9"> <Upgrade id="19,20,23,24,26,27" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="10"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="57"> <Upgrade id="14,15" hex="-L5"/> <Upgrade id="1443" hex="L5"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="58"> <Upgrade id="142,143,144" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="3"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> <Tile id="1441" extId="441" quantity="1"><!--Missing!--> <Upgrade id="1442" /> </Tile> ! <Tile id="445"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile><!--Missing!--> <!-- Green tiles --> ! <Tile id="14"> <Upgrade id="63" /> - <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" /> - <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="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="17"> <Upgrade id="43" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </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="1"/> - </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="1"/> - </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="1"/> - </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="1"/> - </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="1"/> - </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="1"/> - </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="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="142"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="143"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="144"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> <Tile id="1442" extId="442" quantity="1"><!--Missing!--> <Upgrade id="1444" /> --- 25,103 ---- <Upgrade id="142,143" /> </Tile> ! <Tile id="4" quantity="3"> <Upgrade id="142"/> </Tile> ! <Tile id="5" quantity="3"> <Upgrade id="14,15" hex="-L5"/> <Upgrade id="1443" hex="L5"/> </Tile> ! <Tile id="6" quantity="3"> <Upgrade id="14,15" hex="-L5"/> <Upgrade id="1443" hex="L5"/> </Tile> ! <Tile id="7" quantity="5"> <Upgrade id="26,27,28,29" /> </Tile> ! <Tile id="8" quantity="11"> <Upgrade id="16,19,23,24,25,28,29" /> </Tile> ! <Tile id="9" quantity="10"> <Upgrade id="19,20,23,24,26,27" /> </Tile> ! <Tile id="57" quantity="4"> <Upgrade id="14,15" hex="-L5"/> <Upgrade id="1443" hex="L5"/> </Tile> ! <Tile id="58" quantity="3"> <Upgrade id="142,143,144" /> </Tile> <Tile id="1441" extId="441" quantity="1"><!--Missing!--> <Upgrade id="1442" /> </Tile> ! <Tile id="445" quantity="1" /><!--Missing!--> <!-- Green tiles --> ! <Tile id="14" quantity="4"> <Upgrade id="63" /> </Tile> ! <Tile id="15" quantity="4"> <Upgrade id="63" /> </Tile> ! <Tile id="16" quantity="1"> <Upgrade id="43,70" /> </Tile> ! <Tile id="17" quantity="1"> <Upgrade id="43" /> </Tile> ! <Tile id="19" quantity="1"> <Upgrade id="45,46" /> </Tile> ! <Tile id="20" quantity="1"> <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="1"> <Upgrade id="40" /> </Tile> ! <Tile id="26" quantity="1"> <Upgrade id="42,44,45" /> </Tile> ! <Tile id="27" quantity="1"> <Upgrade id="41,44,46" /> </Tile> ! <Tile id="28" quantity="1"> <Upgrade id="39,43,46,70" /> </Tile> ! <Tile id="29" quantity="1"> <Upgrade id="39,43,45,70" /> </Tile> + <Tile id="142" quantity="2" /> + <Tile id="143" quantity="2" /> + <Tile id="144" quantity="2" /> <Tile id="1442" extId="442" quantity="1"><!--Missing!--> <Upgrade id="1444" /> *************** *** 262,353 **** <!-- Brown tiles --> ! <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="1"/> ! </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="7"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="70"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> <Tile id="1444" extId="444" quantity="2"><!--Missing!--> <Upgrade id="446" /> --- 108,122 ---- <!-- Brown tiles --> ! <Tile id="39" quantity="1" /> ! <Tile id="40" quantity="1" /> ! <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="7" /> ! <Tile id="70" quantity="1" /> <Tile id="1444" extId="444" quantity="2"><!--Missing!--> <Upgrade id="446" /> *************** *** 355,365 **** <!-- Grey tiles --> ! <Tile id="446"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile><!--Missing!--> </TileManager> --- 124,127 ---- <!-- Grey tiles --> ! <Tile id="446" quantity="1" /><!--Missing!--> </TileManager> Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18AL/Game.xml,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Game.xml 20 Jan 2010 05:45:39 -0000 1.24 --- Game.xml 23 Jan 2010 17:04:55 -0000 1.25 *************** *** 5,9 **** <GameOption name="UnlimitedTopTrains" parm="4D" type="toggle" default="no"/> <GameOption name="Obsolete4Trains" type="toggle" default="yes"/> - <GameOption name="UnlimitedTiles" type="toggle" default="no"/> <GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/> <GameParameters> --- 5,8 ---- |
