From: Brett L. <wak...@us...> - 2010-01-23 17:05:03
|
Update of /cvsroot/rails/18xx/data/1856 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6354/data/1856 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/1856/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:39 -0000 1.7 --- TileSet.xml 23 Jan 2010 17:04:55 -0000 1.8 *************** *** 28,499 **** <!-- Yellow tiles --> ! <Tile id="1"> <Upgrade id="14" phase="5,6"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="2"> <Upgrade id="15" phase="5,6"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="3"> <Upgrade id="5,7" phase="5,6"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="3"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="4"> <Upgrade id="57,9" phase="5,6"/> - <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" /> - <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="7"/> - </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="13"/> - </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="13"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="55"> <Upgrade id="14" phase="5,6"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="56"> <Upgrade id="15" phase="5,6"/> - <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="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="58"> <Upgrade id="6,8" phase="5,6"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="3"/> - </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 tiles --> ! <Tile id="14"> <Upgrade id="63" hex="D17,G12,H15,I8,J11,J13,J15,K8"/> <Upgrade id="125" hex="B19,C14,F17,L13,N3,O18,P9"/> - <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" hex="D17,G12,H15,I8,J11,J13,J15,K8"/> <Upgrade id="125" hex="B19,C14,F17,L13,N3,O18,P9"/> - <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="47" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </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="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="59"> <Upgrade id="64,65,66,67,68" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="120"> <Upgrade id="122" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="121"> <Upgrade id="126" hex="F15"/> <Upgrade id="127" hex="M4"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </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="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="4"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="64"> <Upgrade id="123" hex="L15"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="65"> <Upgrade id="123" hex="L15"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="66"> <Upgrade id="123" hex="L15"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="67"> <Upgrade id="123" hex="L15"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="68"> <Upgrade id="123" hex="L15"/> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </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="122"> <Upgrade id="124" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="125"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="126"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="127"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> <!-- Grey tiles --> ! <Tile id="123"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="124"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> </TileManager> --- 28,164 ---- <!-- Yellow tiles --> ! <Tile id="1" quantity="1"> <Upgrade id="14" phase="5,6"/> </Tile> ! <Tile id="2" quantity="1"> <Upgrade id="15" phase="5,6"/> </Tile> ! <Tile id="3" quantity="3"> <Upgrade id="5,7" phase="5,6"/> </Tile> ! <Tile id="4" quantity="3"> <Upgrade id="57,9" phase="5,6"/> </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="7"> <Upgrade id="18,26,27,28,29" /> </Tile> ! <Tile id="8" quantity="13"> <Upgrade id="16,17,19,23,24,25,28,29" /> </Tile> ! <Tile id="9" quantity="13"> <Upgrade id="18,19,20,23,24,26,27" /> </Tile> ! <Tile id="55" quantity="1"> <Upgrade id="14" phase="5,6"/> </Tile> ! <Tile id="56" quantity="1"> <Upgrade id="15" phase="5,6"/> </Tile> ! <Tile id="57" quantity="4"> <Upgrade id="14,15" /> </Tile> ! <Tile id="58" quantity="3"> <Upgrade id="6,8" phase="5,6"/> </Tile> + <Tile id="69" quantity="1" /> <!-- Green tiles --> ! <Tile id="14" quantity="4"> <Upgrade id="63" hex="D17,G12,H15,I8,J11,J13,J15,K8"/> <Upgrade id="125" hex="B19,C14,F17,L13,N3,O18,P9"/> </Tile> ! <Tile id="15" quantity="4"> <Upgrade id="63" hex="D17,G12,H15,I8,J11,J13,J15,K8"/> <Upgrade id="125" hex="B19,C14,F17,L13,N3,O18,P9"/> </Tile> ! <Tile id="16" quantity="1"> <Upgrade id="43,70" /> </Tile> ! <Tile id="17" quantity="1"> <Upgrade id="47" /> </Tile> ! <Tile id="18" 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="59" quantity="2"> <Upgrade id="64,65,66,67,68" /> </Tile> ! <Tile id="120" quantity="1"> <Upgrade id="122" /> </Tile> ! <Tile id="121" quantity="2"> <Upgrade id="126" hex="F15"/> <Upgrade id="127" hex="M4"/> </Tile> <!-- 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="4" /> ! <Tile id="64" quantity="1"> <Upgrade id="123" hex="L15"/> </Tile> ! <Tile id="65" quantity="1"> <Upgrade id="123" hex="L15"/> </Tile> ! <Tile id="66" quantity="1"> <Upgrade id="123" hex="L15"/> </Tile> ! <Tile id="67" quantity="1"> <Upgrade id="123" hex="L15"/> </Tile> ! <Tile id="68" quantity="1"> <Upgrade id="123" hex="L15"/> </Tile> ! <Tile id="70" quantity="1" /> ! <Tile id="122" quantity="1"> <Upgrade id="124" /> </Tile> + <Tile id="125" quantity="4" /> + <Tile id="126" quantity="1" /> + <Tile id="127" quantity="1" /> <!-- Grey tiles --> ! <Tile id="123" quantity="1" /> ! <Tile id="124" quantity="1" /> </TileManager> Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1856/Game.xml,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** Game.xml 20 Jan 2010 05:45:39 -0000 1.31 --- Game.xml 23 Jan 2010 17:04:55 -0000 1.32 *************** *** 3,9 **** <Component name="GameManager" class="rails.game.specific._1856.GameManager_1856"> <Game name="1856"/> - <GameOption name="UnlimitedTiles" type="toggle" default="no"/> - <GameOption name="UnlimitedBonusTokens" type="toggle" default="no"/> <GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/> <GameParameters> <StockRound class="rails.game.specific._1856.StockRound_1856" --- 3,8 ---- <Component name="GameManager" class="rails.game.specific._1856.GameManager_1856"> <Game name="1856"/> <GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/> + <GameOption name="UnlimitedBonusTokens" type="toggle" default="no"/> <GameParameters> <StockRound class="rails.game.specific._1856.StockRound_1856" |