Menu
▾
▴
rails-commits — CVS Commits
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
(46) |
Dec
(57) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(51) |
Feb
(10) |
Mar
|
Apr
|
May
(14) |
Jun
|
Jul
(13) |
Aug
(30) |
Sep
(83) |
Oct
(56) |
Nov
(148) |
Dec
(107) |
| 2010 |
Jan
(260) |
Feb
(164) |
Mar
(183) |
Apr
(99) |
May
(160) |
Jun
(40) |
Jul
(33) |
Aug
(48) |
Sep
(22) |
Oct
(24) |
Nov
(1) |
Dec
(12) |
| 2011 |
Jan
(6) |
Feb
(15) |
Mar
(13) |
Apr
(37) |
May
(27) |
Jun
(29) |
Jul
(33) |
Aug
(20) |
Sep
(17) |
Oct
(20) |
Nov
(33) |
Dec
(17) |
| 2012 |
Jan
(39) |
Feb
(38) |
Mar
(20) |
Apr
(21) |
May
(17) |
Jun
(22) |
Jul
(16) |
Aug
(3) |
Sep
(9) |
Oct
(10) |
Nov
|
Dec
|
|
From: Erik V. <ev...@us...> - 2010-01-24 14:41:59
|
Update of /cvsroot/rails/18xx/tiles In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31116/tiles Modified Files: FixInvisibility.pl Log Message: Allow passing working directory Index: FixInvisibility.pl =================================================================== RCS file: /cvsroot/rails/18xx/tiles/FixInvisibility.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FixInvisibility.pl 18 Dec 2009 20:03:31 -0000 1.1 --- FixInvisibility.pl 24 Jan 2010 14:41:50 -0000 1.2 *************** *** 1,3 **** ! $dir = "TileDictionary"; opendir (DIR, $dir) and print "Opened $dir\n" or die "Cannot open dir $dir: $!\n"; while (($file = readdir DIR)) { --- 1,3 ---- ! $dir = $ARGV[0] || "TileDictionary"; opendir (DIR, $dir) and print "Opened $dir\n" or die "Cannot open dir $dir: $!\n"; while (($file = readdir DIR)) { |
|
From: Erik V. <ev...@us...> - 2010-01-24 14:41:30
|
Update of /cvsroot/rails/18xx/tiles/svg In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31106/tiles/svg Added Files: tile-1143.svg Log Message: New tile for Birmingham 1851 --- NEW FILE: tile-1143.svg --- <?xml version="1.0"?> <svg version="1.1" xmlns="http://www.w3.org/2000/svg"><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="#C0C0C0" stroke="#C0C0C0" stroke-width="1" stroke-linejoin="round"/><path d="M 49,85 L 196,170" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,0" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,85" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 49,85 L 196,170" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 196,0" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,170 L 343,85" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><circle cx="196" cy="170" r="21" fill="#000000" stroke="#FFFFFF" stroke-width="4"/><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg> |
|
From: Brett L. <wak...@us...> - 2010-01-23 23:02:14
|
Update of /cvsroot/rails/18xx/data In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22668/data Modified Files: GamesList.xml Log Message: Add unlimited tiles option back in. Index: GamesList.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/GamesList.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** GamesList.xml 23 Jan 2010 17:04:55 -0000 1.20 --- GamesList.xml 23 Jan 2010 23:02:06 -0000 1.21 *************** *** 23,26 **** --- 23,27 ---- <Option name="WithOptional6Train" type="toggle" default="no"/> <Option name="UnlimitedTopTrains" parm="D" type="toggle" default="no"/> + <Option name="UnlimitedTiles" type="toggle" default="no"/> <Option name="LeaveAuctionOnPass" type="toggle" default="no"/> <Players minimum="3" maximum="6"/> *************** *** 47,50 **** --- 48,52 ---- </Description> <Option name="Variant" values="Standard,Clemens,Snake"/> + <Option name="UnlimitedTiles" type="toggle" default="no"/> <Players minimum="3" maximum="7"/> </Game> *************** *** 57,60 **** --- 59,63 ---- - No random assignment of private companies (players should do this off-line and enter the result) </Description> + <Option name="UnlimitedTiles" type="toggle" default="no"/> <Players minimum="3" maximum="5"/> </Game> *************** *** 68,73 **** - The restriction that shares cannot be sold in the same round that these are bought is not enforced. </Description> - <Option name="LeaveAuctionOnPass" type="toggle" default="no"/> <Option name="UnlimitedBonusTokens" type="toggle" default="no"/> <Players minimum="3" maximum="6"/> </Game> --- 71,77 ---- - The restriction that shares cannot be sold in the same round that these are bought is not enforced. </Description> <Option name="UnlimitedBonusTokens" type="toggle" default="no"/> + <Option name="UnlimitedTiles" type="toggle" default="no"/> + <Option name="LeaveAuctionOnPass" type="toggle" default="no"/> <Players minimum="3" maximum="6"/> </Game> *************** *** 80,83 **** --- 84,88 ---- Aspects not present in 1830 have not been implemented yet. </Description> + <Option name="UnlimitedTiles" type="toggle" default="no"/> <Option name="LeaveAuctionOnPass" type="toggle" default="no"/> <Players minimum="2" maximum="6"/> *************** *** 85,91 **** <Game name="18AL"> <Note>Fully playable</Note> - <Option name="UnlimitedTopTrains" parm="4D" type="toggle" default="no"/> - <Option name="Obsolete4Trains" type="toggle" default="yes"/> - <Option name="LeaveAuctionOnPass" type="toggle" default="no"/> <Description>18AL - The Railroads come to Alabama (c) 2000, 2004 Mark Derrick and John David Galt --- 90,93 ---- *************** *** 97,100 **** --- 99,106 ---- - Privates cannot be traded between players. </Description> + <Option name="UnlimitedTopTrains" parm="4D" type="toggle" default="no"/> + <Option name="Obsolete4Trains" type="toggle" default="yes"/> + <Option name="UnlimitedTiles" type="toggle" default="no"/> + <Option name="LeaveAuctionOnPass" type="toggle" default="no"/> <Players minimum="3" maximum="5"/> </Game> *************** *** 110,113 **** --- 116,120 ---- <Option name="Extra3Trains" values="0,1,2" default="0"/> <Option name="Extra4Trains" values="0,1" default="0"/> + <Option name="UnlimitedTiles" type="toggle" default="no"/> <Players minimum="2" maximum="6"/> </Game> *************** *** 121,124 **** --- 128,132 ---- <Option name="WithOptional6Train" type="toggle" default="no"/> <Option name="UnlimitedTopTrains" parm="D" type="toggle" default="no"/> + <Option name="UnlimitedTiles" type="toggle" default="no"/> <Option name="LeaveAuctionOnPass" type="toggle" default="no"/> <Players minimum="3" maximum="6"/> |
|
From: Brett L. <wak...@us...> - 2010-01-23 23:02:14
|
Update of /cvsroot/rails/18xx/data/1830 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22668/data/1830 Modified Files: Game.xml Log Message: Add unlimited tiles option back in. Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1830/Game.xml,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Game.xml 23 Jan 2010 17:04:55 -0000 1.29 --- Game.xml 23 Jan 2010 23:02:06 -0000 1.30 *************** *** 18,23 **** <GameOption name="WithOptional6Train" type="toggle" default="no"/> <GameOption name="UnlimitedTopTrains" parm="D" type="toggle" default="no"/> <GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/> ! <GameParameters> <PlayerShareLimit percentage="60"> <!-- Option "NumberOfPlayers" is automatically set --- 18,24 ---- <GameOption name="WithOptional6Train" type="toggle" default="no"/> <GameOption name="UnlimitedTopTrains" parm="D" type="toggle" default="no"/> + <GameOption name="UnlimitedTiles" type="toggle" default="no"/> <GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/> ! <GameParameters> <PlayerShareLimit percentage="60"> <!-- Option "NumberOfPlayers" is automatically set |
|
From: Brett L. <wak...@us...> - 2010-01-23 23:02:14
|
Update of /cvsroot/rails/18xx/data/18AL In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22668/data/18AL Modified Files: Game.xml Log Message: Add unlimited tiles option back in. Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18AL/Game.xml,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Game.xml 23 Jan 2010 17:04:55 -0000 1.25 --- Game.xml 23 Jan 2010 23:02:06 -0000 1.26 *************** *** 5,8 **** --- 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> |
|
From: Brett L. <wak...@us...> - 2010-01-23 23:02:14
|
Update of /cvsroot/rails/18xx/data/1835 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22668/data/1835 Modified Files: Game.xml Log Message: Add unlimited tiles option back in. Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1835/Game.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Game.xml 23 Jan 2010 17:04:54 -0000 1.23 --- Game.xml 23 Jan 2010 23:02:05 -0000 1.24 *************** *** 4,7 **** --- 4,8 ---- <Game name="1835"/> <GameOption name="Variant" values="Standard,Clemens,Snake"/> + <GameOption name="UnlimitedTiles" type="toggle" default="no"/> <GameParameters> <PlayerShareLimit percentage="60"/> |
|
From: Brett L. <wak...@us...> - 2010-01-23 23:02:13
|
Update of /cvsroot/rails/18xx/data/18EU In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22668/data/18EU Modified Files: Game.xml Log Message: Add unlimited tiles option back in. Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18EU/Game.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Game.xml 23 Jan 2010 17:04:53 -0000 1.16 --- Game.xml 23 Jan 2010 23:02:05 -0000 1.17 *************** *** 5,8 **** --- 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" |
|
From: Brett L. <wak...@us...> - 2010-01-23 23:02:13
|
Update of /cvsroot/rails/18xx/data/1856 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22668/data/1856 Modified Files: Game.xml Log Message: Add unlimited tiles option back in. Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1856/Game.xml,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** Game.xml 23 Jan 2010 17:04:55 -0000 1.32 --- Game.xml 23 Jan 2010 23:02:05 -0000 1.33 *************** *** 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" --- 3,9 ---- <Component name="GameManager" class="rails.game.specific._1856.GameManager_1856"> <Game name="1856"/> <GameOption name="UnlimitedBonusTokens" type="toggle" default="no"/> + <GameOption name="UnlimitedTiles" type="toggle" default="no"/> + <GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/> <GameParameters> <StockRound class="rails.game.specific._1856.StockRound_1856" |
|
From: Brett L. <wak...@us...> - 2010-01-23 23:02:13
|
Update of /cvsroot/rails/18xx In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22668 Modified Files: LocalisedText.properties Log Message: Add unlimited tiles option back in. Index: LocalisedText.properties =================================================================== RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** LocalisedText.properties 23 Jan 2010 17:04:54 -0000 1.100 --- LocalisedText.properties 23 Jan 2010 23:02:06 -0000 1.101 *************** *** 455,458 **** --- 455,459 ---- UNDO=Undo UnlimitedBonusTokens=Unlimited bonus tokens + UnlimitedTiles=Unlimited tiles UnlimitedTopTrains=Unlimited {0}-trains UnnamedCompany=Unnamed company found. |
|
From: Brett L. <wak...@us...> - 2010-01-23 23:02:13
|
Update of /cvsroot/rails/18xx/data/18Kaas In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22668/data/18Kaas Modified Files: Game.xml Log Message: Add unlimited tiles option back in. Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18Kaas/Game.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Game.xml 23 Jan 2010 17:04:55 -0000 1.10 --- Game.xml 23 Jan 2010 23:02:05 -0000 1.11 *************** *** 3,6 **** --- 3,7 ---- <Component name="GameManager" class="rails.game.GameManager"> <Game name="18Kaas"/> + <GameOption name="UnlimitedTiles" type="toggle" default="no"/> <GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/> <GameParameters> |
|
From: Brett L. <wak...@us...> - 2010-01-23 23:02:13
|
Update of /cvsroot/rails/18xx/data/1851 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22668/data/1851 Modified Files: Game.xml Log Message: Add unlimited tiles option back in. Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1851/Game.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Game.xml 23 Jan 2010 17:04:54 -0000 1.9 --- Game.xml 23 Jan 2010 23:02:06 -0000 1.10 *************** *** 3,6 **** --- 3,7 ---- <Component name="GameManager" class="rails.game.GameManager"> <Game name="1851"/> + <GameOption name="UnlimitedTiles" type="toggle" default="no"/> <GameParameters> <PlayerShareLimit percentage="60"/> |
|
From: Brett L. <wak...@us...> - 2010-01-23 23:02:13
|
Update of /cvsroot/rails/18xx/data/1870 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22668/data/1870 Modified Files: Game.xml Log Message: Add unlimited tiles option back in. Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1870/Game.xml,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Game.xml 23 Jan 2010 17:04:55 -0000 1.24 --- Game.xml 23 Jan 2010 23:02:05 -0000 1.25 *************** *** 3,6 **** --- 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> |
|
From: Brett L. <wak...@us...> - 2010-01-23 17:05:03
|
Update of /cvsroot/rails/18xx/data/18Kaas In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6354/data/18Kaas 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/18Kaas/TileSet.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TileSet.xml 20 Jan 2010 05:45:39 -0000 1.2 --- TileSet.xml 23 Jan 2010 17:04:55 -0000 1.3 *************** *** 48,67 **** <Upgrade id="14,15" /> </Tile> ! <Tile id="58"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </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 --> --- 48,53 ---- <Upgrade id="14,15" /> </Tile> ! <Tile id="58" quantity="2" /> ! <Tile id="69" quantity="1" /> <!-- Green tiles --> *************** *** 70,353 **** <Upgrade id="9220" hex="I12"/> </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="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="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="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="9121"> <Upgrade id="9997" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="54"> <Upgrade id="62" /> - <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> <!-- 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="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="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="9997"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="62"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </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="9220" quantity="1" /> ! <Tile id="64"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="65"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="66"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="67"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="68"> ! <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> </TileManager> --- 56,123 ---- <Upgrade id="9220" hex="I12"/> </Tile> ! <Tile id="15" quantity="2"> <Upgrade id="63" /> </Tile> ! <Tile id="16" quantity="1"> <Upgrade id="43,70" /> </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="3"> <Upgrade id="41,43,45,47" /> </Tile> ! <Tile id="24" quantity="3"> <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="9121" quantity="1"> <Upgrade id="9997" /> </Tile> ! <Tile id="54" quantity="1"> <Upgrade id="62" /> </Tile> ! <Tile id="59" quantity="2"> <Upgrade id="64,65,66,67,68" /> </Tile> <!-- 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="2" /> ! <Tile id="44" quantity="1" /> ! <Tile id="45" quantity="2" /> ! <Tile id="46" quantity="2" /> ! <Tile id="47" quantity="1" /> ! <Tile id="9997" quantity="1" /> ! <Tile id="62" quantity="1" /> ! <Tile id="63" quantity="3" /> <Tile id="9220" quantity="1" /> ! <Tile id="64" quantity="1" /> ! <Tile id="65" quantity="1" /> ! <Tile id="66" quantity="1" /> ! <Tile id="67" quantity="1" /> ! <Tile id="68" quantity="1" /> ! <Tile id="70" quantity="1" /> </TileManager> Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18Kaas/Game.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Game.xml 20 Jan 2010 05:45:39 -0000 1.9 --- Game.xml 23 Jan 2010 17:04:55 -0000 1.10 *************** *** 3,7 **** <Component name="GameManager" class="rails.game.GameManager"> <Game name="18Kaas"/> - <GameOption name="UnlimitedTiles" type="toggle" default="no"/> <GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/> <GameParameters> --- 3,6 ---- |
|
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 ---- |
|
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 ---- |
|
From: Brett L. <wak...@us...> - 2010-01-23 17:05:03
|
Update of /cvsroot/rails/18xx In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6354 Modified Files: LocalisedText.properties Log Message: Revert Freek Dijkstra's unlimited trains patch. We found a simpler way to implement this. Index: LocalisedText.properties =================================================================== RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** LocalisedText.properties 20 Jan 2010 19:53:52 -0000 1.99 --- LocalisedText.properties 23 Jan 2010 17:04:54 -0000 1.100 *************** *** 455,459 **** UNDO=Undo UnlimitedBonusTokens=Unlimited bonus tokens - UnlimitedTiles=Unlimited tiles UnlimitedTopTrains=Unlimited {0}-trains UnnamedCompany=Unnamed company found. --- 455,458 ---- |
|
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" |
|
From: Brett L. <wak...@us...> - 2010-01-23 17:05:03
|
Update of /cvsroot/rails/18xx/data/1830 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6354/data/1830 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/1830/TileSet.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TileSet.xml 20 Jan 2010 05:45:39 -0000 1.9 --- TileSet.xml 23 Jan 2010 17:04:55 -0000 1.10 *************** *** 36,429 **** <!-- 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="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="4"/> - </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="8"/> - </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="7"/> - </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="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="58"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </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" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="3"/> - </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="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="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,45,46" /> - <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="53"> <Upgrade id="61" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="54"> <Upgrade id="62" /> - <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> <!-- 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="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="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="61"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="2"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="62"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </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="64"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="65"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="66"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="67"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> ! <Tile id="68"> ! <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> </TileManager> --- 36,127 ---- <!-- Yellow tiles --> ! <Tile id="1" quantity="1" /> ! <Tile id="2" quantity="1" /> ! <Tile id="3" quantity="2" /> ! <Tile id="4" quantity="2" /> ! <Tile id="7" quantity="4"> <Upgrade id="18,26,27,28,29" /> </Tile> ! <Tile id="8" quantity="8"> <Upgrade id="16,19,23,24,25,28,29" /> </Tile> ! <Tile id="9" quantity="7"> <Upgrade id="18,19,20,23,24,26,27" /> </Tile> ! <Tile id="55" quantity="1" /> ! <Tile id="56" quantity="1" /> ! <Tile id="57" quantity="4"> <Upgrade id="14,15" /> </Tile> + <Tile id="58" quantity="2" /> + <Tile id="69" quantity="1" /> <!-- Green tiles --> ! <Tile id="14" quantity="3"> <Upgrade id="63" /> </Tile> ! <Tile id="15" quantity="2"> <Upgrade id="63" /> </Tile> ! <Tile id="16" quantity="1"> <Upgrade id="43,70" /> </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="3"> <Upgrade id="41,43,45,47" /> </Tile> ! <Tile id="24" quantity="3"> <Upgrade id="42,43,46,47" /> </Tile> ! <Tile id="25" quantity="1"> <Upgrade id="40,45,46" /> </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="53" quantity="2"> <Upgrade id="61" /> </Tile> ! <Tile id="54" quantity="1"> <Upgrade id="62" /> </Tile> ! <Tile id="59" quantity="2"> <Upgrade id="64,65,66,67,68" /> </Tile> <!-- 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="2" /> ! <Tile id="44" quantity="1" /> ! <Tile id="45" quantity="2" /> ! <Tile id="46" quantity="2" /> ! <Tile id="47" quantity="1" /> ! <Tile id="61" quantity="2" /> ! <Tile id="62" quantity="1" /> ! <Tile id="63" quantity="3" /> ! <Tile id="64" quantity="1" /> ! <Tile id="65" quantity="1" /> ! <Tile id="66" quantity="1" /> ! <Tile id="67" quantity="1" /> ! <Tile id="68" quantity="1" /> ! <Tile id="70" quantity="1" /> </TileManager> Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1830/Game.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** Game.xml 20 Jan 2010 05:45:39 -0000 1.28 --- Game.xml 23 Jan 2010 17:04:55 -0000 1.29 *************** *** 18,24 **** <GameOption name="WithOptional6Train" type="toggle" default="no"/> <GameOption name="UnlimitedTopTrains" parm="D" type="toggle" default="no"/> - <GameOption name="UnlimitedTiles" type="toggle" default="no"/> <GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/> ! <GameParameters> <PlayerShareLimit percentage="60"> <!-- Option "NumberOfPlayers" is automatically set --- 18,23 ---- <GameOption name="WithOptional6Train" type="toggle" default="no"/> <GameOption name="UnlimitedTopTrains" parm="D" type="toggle" default="no"/> <GameOption name="LeaveAuctionOnPass" type="toggle" default="no"/> ! <GameParameters> <PlayerShareLimit percentage="60"> <!-- Option "NumberOfPlayers" is automatically set |
|
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 ---- |
|
From: Brett L. <wak...@us...> - 2010-01-23 17:05:03
|
Update of /cvsroot/rails/18xx/data In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6354/data Modified Files: GamesList.xml Log Message: Revert Freek Dijkstra's unlimited trains patch. We found a simpler way to implement this. Index: GamesList.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/GamesList.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** GamesList.xml 20 Jan 2010 05:45:40 -0000 1.19 --- GamesList.xml 23 Jan 2010 17:04:55 -0000 1.20 *************** *** 23,27 **** <Option name="WithOptional6Train" type="toggle" default="no"/> <Option name="UnlimitedTopTrains" parm="D" type="toggle" default="no"/> - <Option name="UnlimitedTiles" type="toggle" default="no"/> <Option name="LeaveAuctionOnPass" type="toggle" default="no"/> <Players minimum="3" maximum="6"/> --- 23,26 ---- *************** *** 48,52 **** </Description> <Option name="Variant" values="Standard,Clemens,Snake"/> - <Option name="UnlimitedTiles" type="toggle" default="no"/> <Players minimum="3" maximum="7"/> </Game> --- 47,50 ---- *************** *** 59,63 **** - No random assignment of private companies (players should do this off-line and enter the result) </Description> - <Option name="UnlimitedTiles" type="toggle" default="no"/> <Players minimum="3" maximum="5"/> </Game> --- 57,60 ---- *************** *** 71,77 **** - The restriction that shares cannot be sold in the same round that these are bought is not enforced. </Description> - <Option name="UnlimitedTiles" type="toggle" default="no"/> - <Option name="UnlimitedBonusTokens" type="toggle" default="no"/> <Option name="LeaveAuctionOnPass" type="toggle" default="no"/> <Players minimum="3" maximum="6"/> </Game> --- 68,73 ---- - The restriction that shares cannot be sold in the same round that these are bought is not enforced. </Description> <Option name="LeaveAuctionOnPass" type="toggle" default="no"/> + <Option name="UnlimitedBonusTokens" type="toggle" default="no"/> <Players minimum="3" maximum="6"/> </Game> *************** *** 84,88 **** Aspects not present in 1830 have not been implemented yet. </Description> - <Option name="UnlimitedTiles" type="toggle" default="no"/> <Option name="LeaveAuctionOnPass" type="toggle" default="no"/> <Players minimum="2" maximum="6"/> --- 80,83 ---- *************** *** 92,96 **** <Option name="UnlimitedTopTrains" parm="4D" type="toggle" default="no"/> <Option name="Obsolete4Trains" type="toggle" default="yes"/> - <Option name="UnlimitedTiles" type="toggle" default="no"/> <Option name="LeaveAuctionOnPass" type="toggle" default="no"/> <Description>18AL - The Railroads come to Alabama --- 87,90 ---- *************** *** 116,120 **** <Option name="Extra3Trains" values="0,1,2" default="0"/> <Option name="Extra4Trains" values="0,1" default="0"/> - <Option name="UnlimitedTiles" type="toggle" default="no"/> <Players minimum="2" maximum="6"/> </Game> --- 110,113 ---- *************** *** 128,132 **** <Option name="WithOptional6Train" type="toggle" default="no"/> <Option name="UnlimitedTopTrains" parm="D" type="toggle" default="no"/> - <Option name="UnlimitedTiles" type="toggle" default="no"/> <Option name="LeaveAuctionOnPass" type="toggle" default="no"/> <Players minimum="3" maximum="6"/> --- 121,124 ---- |
|
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 ---- |
|
From: Brett L. <wak...@us...> - 2010-01-23 17:05:03
|
Update of /cvsroot/rails/18xx/data/1851 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6354/data/1851 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/1851/TileSet.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TileSet.xml 20 Jan 2010 05:45:38 -0000 1.2 --- TileSet.xml 23 Jan 2010 17:04:54 -0000 1.3 *************** *** 17,425 **** <!-- Yellow tiles --> ! <Tile id="5"> <Upgrade id="14,15,619" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="6"> <Upgrade id="14,15,619" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="7"> <Upgrade id="18,21,22,26,27,28,29,30,31,624,625,626" /> - <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,17,19,21,22,23,24,25,28,29,30,31" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="18"/> - </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="18"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="57"> <Upgrade id="14,15,619" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="202"> <Upgrade id="511" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="3"/> - </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="3"/> - </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="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,628" /> - <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,627" /> - <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="21"> <Upgrade id="46,629" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="22"> <Upgrade id="45,629" /> - <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,45,46,629" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="2"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="26"> <Upgrade id="42,44,45,627" /> - <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,627" /> - <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="30"> <Upgrade id="42,70,628,629" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="31"> <Upgrade id="41,70,628,629" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="511"> <Upgrade id="216" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="4"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="619"> <Upgrade id="611" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="3"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="624"> <Upgrade id="39,627,629" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="625"> <Upgrade id="70,627" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> ! <Tile id="626"> <Upgrade id="44,628" /> - <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="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="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="216"> <Upgrade id="512" /> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="3"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="611"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="5"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="627"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="628"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> - </Tile> - <Tile id="629"> - <IfOption name="UnlimitedTiles" value="no"> - <Attributes quantity="1"/> - </IfOption> - <IfOption name="UnlimitedTiles" value="yes"> - <Attributes quantity="-1"/> - </IfOption> </Tile> <!-- Grey tiles --> ! <Tile id="512"> ! <IfOption name="UnlimitedTiles" value="no"> ! <Attributes quantity="1"/> ! </IfOption> ! <IfOption name="UnlimitedTiles" value="yes"> ! <Attributes quantity="-1"/> ! </IfOption> ! </Tile> </TileManager> --- 17,134 ---- <!-- Yellow tiles --> ! <Tile id="5" quantity="4"> <Upgrade id="14,15,619" /> </Tile> ! <Tile id="6" quantity="4"> <Upgrade id="14,15,619" /> </Tile> ! <Tile id="7" quantity="5"> <Upgrade id="18,21,22,26,27,28,29,30,31,624,625,626" /> </Tile> ! <Tile id="8" quantity="18"> <Upgrade id="16,17,19,21,22,23,24,25,28,29,30,31" /> </Tile> ! <Tile id="9" quantity="18"> <Upgrade id="18,19,20,23,24,26,27" /> </Tile> ! <Tile id="57" quantity="4"> <Upgrade id="14,15,619" /> </Tile> ! <Tile id="202" quantity="3"> <Upgrade id="511" /> </Tile> <!-- Green tiles --> ! <Tile id="14" quantity="3"> <Upgrade id="611" /> </Tile> ! <Tile id="15" quantity="4"> <Upgrade id="611" /> </Tile> ! <Tile id="16" quantity="1"> <Upgrade id="43,70" /> </Tile> ! <Tile id="17" quantity="1"> <Upgrade id="47,628" /> </Tile> ! <Tile id="18" quantity="1"> <Upgrade id="43,627" /> </Tile> ! <Tile id="19" quantity="1"> <Upgrade id="45,46" /> </Tile> ! <Tile id="20" quantity="1"> <Upgrade id="44,47" /> </Tile> ! <Tile id="21" quantity="1"> <Upgrade id="46,629" /> </Tile> ! <Tile id="22" quantity="1"> <Upgrade id="45,629" /> </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="2"> <Upgrade id="40,45,46,629" /> </Tile> ! <Tile id="26" quantity="1"> <Upgrade id="42,44,45,627" /> </Tile> ! <Tile id="27" quantity="1"> <Upgrade id="41,44,46,627" /> </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="30" quantity="1"> <Upgrade id="42,70,628,629" /> </Tile> ! <Tile id="31" quantity="1"> <Upgrade id="41,70,628,629" /> </Tile> ! <Tile id="511" quantity="4"> <Upgrade id="216" /> </Tile> ! <Tile id="619" quantity="3"> <Upgrade id="611" /> </Tile> ! <Tile id="624" quantity="1"> <Upgrade id="39,627,629" /> </Tile> ! <Tile id="625" quantity="1"> <Upgrade id="70,627" /> </Tile> ! <Tile id="626" quantity="1"> <Upgrade id="44,628" /> </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="1" /> ! <Tile id="70" quantity="1" /> ! <Tile id="216" quantity="3"> <Upgrade id="512" /> </Tile> + <Tile id="611" quantity="5" /> + <Tile id="627" quantity="1" /> + <Tile id="628" quantity="1" /> + <Tile id="629" quantity="1" /> <!-- Grey tiles --> ! <Tile id="512" quantity="1" /> </TileManager> Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1851/Game.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Game.xml 20 Jan 2010 05:45:38 -0000 1.8 --- Game.xml 23 Jan 2010 17:04:54 -0000 1.9 *************** *** 3,7 **** <Component name="GameManager" class="rails.game.GameManager"> <Game name="1851"/> - <GameOption name="UnlimitedTiles" type="toggle" default="no"/> <GameParameters> <PlayerShareLimit percentage="60"/> --- 3,6 ---- |
|
From: Erik V. <ev...@us...> - 2010-01-22 21:44:46
|
Update of /cvsroot/rails/18xx/rails/util In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18138/rails/util Modified Files: Tag.java Log Message: Safety check on assigning game option value Index: Tag.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/util/Tag.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Tag.java 15 Jan 2010 19:52:01 -0000 1.13 --- Tag.java 22 Jan 2010 21:44:34 -0000 1.14 *************** *** 304,309 **** if (optionValue == null) { // Take the default value ! optionValue = ! GameOption.getByName(name).getDefaultValue(); log.warn("GameOption " + name + "=" + value + " but no assigned value found, assumed "+optionValue); --- 304,309 ---- if (optionValue == null) { // Take the default value ! GameOption go = GameOption.getByName(name); ! optionValue = go != null ? go.getDefaultValue() : ""; log.warn("GameOption " + name + "=" + value + " but no assigned value found, assumed "+optionValue); |
|
From: Erik V. <ev...@us...> - 2010-01-22 21:30:33
|
Update of /cvsroot/rails/18xx/rails/util In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16466/rails/util Modified Files: ListAndFixSavedFiles.java Log Message: Fixed: log was set too early Index: ListAndFixSavedFiles.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/util/ListAndFixSavedFiles.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ListAndFixSavedFiles.java 5 Jan 2010 20:53:16 -0000 1.3 --- ListAndFixSavedFiles.java 22 Jan 2010 21:30:10 -0000 1.4 *************** *** 35,40 **** private String filepath; ! protected static Logger log = ! Logger.getLogger(ListAndFixSavedFiles.class.getPackage().getName()); /** --- 35,40 ---- private String filepath; ! protected static Logger log; ! /** *************** *** 57,60 **** --- 57,62 ---- */ System.setProperty("log4j.configuration", myConfigFile); + log = Logger.getLogger(ListAndFixSavedFiles.class.getPackage().getName()); + /* Tell the properties loader to read this file. */ Config.setConfigFile(myConfigFile); *************** *** 213,217 **** (List<PossibleAction>) ois.readObject(); savedObjects.add(executedActions); ! i=1; for (PossibleAction action : executedActions) { add("Action "+(i++)+": "+action.toString()); --- 215,219 ---- (List<PossibleAction>) ois.readObject(); savedObjects.add(executedActions); ! i=0; for (PossibleAction action : executedActions) { add("Action "+(i++)+": "+action.toString()); |
|
From: Erik V. <ev...@us...> - 2010-01-22 21:29:45
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16347/rails/ui/swing Modified Files: GameUIManager.java Log Message: Moved nonmodal message display to end of updating UI Index: GameUIManager.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameUIManager.java,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** GameUIManager.java 20 Jan 2010 19:52:44 -0000 1.36 --- GameUIManager.java 22 Jan 2010 21:29:34 -0000 1.37 *************** *** 168,171 **** --- 168,172 ---- log.debug("==Result from server: " + result); reportWindow.addLog(); + /* if (DisplayBuffer.getAutoDisplay()) { if (displayServerMessage()) { *************** *** 174,178 **** return true; } ! } } --- 175,179 ---- return true; } ! }*/ } *************** *** 196,199 **** --- 197,209 ---- statusWindow.setGameActions(); + // Is this perhaps the right place to display messages...? + if (DisplayBuffer.getAutoDisplay()) { + if (displayServerMessage()) { + // Interrupt processing. + // Will be continued via dialogActionPerformed(). + return true; + } + } + if (!result) return false; |
