From: Brett L. <wak...@us...> - 2010-01-23 17:05:03
|
Update of /cvsroot/rails/18xx/data/1835 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6354/data/1835 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/1835/TileSet.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TileSet.xml 20 Jan 2010 05:45:38 -0000 1.10 --- TileSet.xml 23 Jan 2010 17:04:54 -0000 1.11 *************** *** 44,79 **** <!-- yellow tiles --> ! <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"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="4"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="3"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> <Tile id="5" quantity="3" > <Upgrade id="12,14,15,205,206" /> --- 44,51 ---- <!-- yellow tiles --> ! <Tile id="1" quantity="1" /> ! <Tile id="2" quantity="1" /> ! <Tile id="3" quantity="2" /> ! <Tile id="4" quantity="3" /> <Tile id="5" quantity="3" > <Upgrade id="12,14,15,205,206" /> *************** *** 82,570 **** <Upgrade id="12,13,14,15,205,206" /> </Tile> ! <Tile id="7"> <Upgrade id="18,26,27,28,29" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="8"/> - </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="16"/> - </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="12"/> - </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,205,206" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="58"> - <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="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="201"> <Upgrade id="207,208" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="202"> <Upgrade id="207,208" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> <!-- green tiles --> ! <Tile id="12"> <Upgrade id="63" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="13"> <Upgrade id="63" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="14"> <Upgrade id="63" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="15"> <Upgrade id="63" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </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="18"> <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="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="3"/> - </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="3"/> - </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="87"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="88"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="203"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="204"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="205"> <Upgrade id="63" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="206"> <Upgrade id="63" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="207"> <Upgrade id="216" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="208"> <Upgrade id="216" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="209"> <Upgrade id="220" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="210"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="211"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="212"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="213"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="214"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="215"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> <!-- 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="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="42"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="43"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="44"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </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="3"/> ! </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="216"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="4"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="217"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="218"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="219"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="220"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="221"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> </TileManager> --- 54,169 ---- <Upgrade id="12,13,14,15,205,206" /> </Tile> ! <Tile id="7" quantity="8"> <Upgrade id="18,26,27,28,29" /> </Tile> ! <Tile id="8" quantity="16"> <Upgrade id="16,19,23,24,25,28,29" /> </Tile> ! <Tile id="9" quantity="12"> <Upgrade id="18,19,20,23,24,26,27" /> </Tile> ! <Tile id="55" quantity="1" /> ! <Tile id="56" quantity="1" /> ! <Tile id="57" quantity="2"> <Upgrade id="14,15,205,206" /> </Tile> ! <Tile id="58" quantity="4" /> ! <Tile id="69" quantity="2" /> ! <Tile id="201" quantity="2"> <Upgrade id="207,208" /> </Tile> ! <Tile id="202" quantity="2"> <Upgrade id="207,208" /> </Tile> <!-- green tiles --> ! <Tile id="12" quantity="2"> <Upgrade id="63" /> </Tile> ! <Tile id="13" quantity="2"> <Upgrade id="63" /> </Tile> ! <Tile id="14" quantity="2"> <Upgrade id="63" /> </Tile> ! <Tile id="15" quantity="2"> <Upgrade id="63" /> </Tile> ! <Tile id="16" quantity="2"> <Upgrade id="43,70" /> </Tile> ! <Tile id="18" quantity="1"> <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="3"> <Upgrade id="41,43,45,47" /> </Tile> ! <Tile id="24" quantity="3"> <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="87" quantity="2" /> ! <Tile id="88" quantity="2" /> ! <Tile id="203" quantity="2" /> ! <Tile id="204" quantity="2" /> ! <Tile id="205" quantity="1"> <Upgrade id="63" /> </Tile> ! <Tile id="206" quantity="1"> <Upgrade id="63" /> </Tile> ! <Tile id="207" quantity="2"> <Upgrade id="216" /> </Tile> ! <Tile id="208" quantity="2"> <Upgrade id="216" /> </Tile> ! <Tile id="209" quantity="1"> <Upgrade id="220" /> </Tile> + <Tile id="210" quantity="1" /> + <Tile id="211" quantity="1" /> + <Tile id="212" quantity="1" /> + <Tile id="213" quantity="1" /> + <Tile id="214" quantity="1" /> + <Tile id="215" quantity="1" /> <!-- Brown tiles --> ! <Tile id="39" quantity="1" /> ! <Tile id="40" quantity="1" /> ! <Tile id="41" quantity="2" /> ! <Tile id="42" quantity="2" /> ! <Tile id="43" quantity="1" /> ! <Tile id="44" quantity="2" /> ! <Tile id="45" quantity="2" /> ! <Tile id="46" quantity="2" /> ! <Tile id="47" quantity="2" /> ! <Tile id="63" quantity="3" /> ! <Tile id="70" quantity="1" /> ! <Tile id="216" quantity="4" /> ! <Tile id="217" quantity="2" /> ! <Tile id="218" quantity="2" /> ! <Tile id="219" quantity="2" /> ! <Tile id="220" quantity="1" /> ! <Tile id="221" quantity="1" /> </TileManager> Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1835/Game.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Game.xml 20 Jan 2010 05:45:38 -0000 1.22 --- Game.xml 23 Jan 2010 17:04:54 -0000 1.23 *************** *** 4,8 **** <Game name="1835"/> <GameOption name="Variant" values="Standard,Clemens,Snake"/> - <GameOption name="UnlimitedTiles" type="toggle" default="no"/> <GameParameters> <PlayerShareLimit percentage="60"/> --- 4,7 ---- |