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: Freek D. <mac...@us...> - 2010-01-30 20:53:46
|
Update of /cvsroot/rails/18xx In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10318 Modified Files: build.xml Log Message: Fix typo in path for jarbundler Index: build.xml =================================================================== RCS file: /cvsroot/rails/18xx/build.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** build.xml 30 Jan 2010 20:29:38 -0000 1.10 --- build.xml 30 Jan 2010 20:53:36 -0000 1.11 *************** *** 12,16 **** <property name="version" value="1.1.2"/> <taskdef name="jarbundler" ! classpath="ant/jarbundler-2.1.0/jarbundler-2.1.0.jar" classname="net.sourceforge.jarbundler.JarBundler" /> <path id="18xx.classpath"> --- 12,16 ---- <property name="version" value="1.1.2"/> <taskdef name="jarbundler" ! classpath="tools/lib/jarbundler-2.1.0.jar" classname="net.sourceforge.jarbundler.JarBundler" /> <path id="18xx.classpath"> *************** *** 38,41 **** --- 38,42 ---- <delete dir="rails-${version}"/> <delete dir="rails-mac-${version}"/> + <delete file="18xx.log"/> </target> <target depends="build-subprojects,build-project,build-release" name="build"/> |
|
From: Freek D. <mac...@us...> - 2010-01-30 20:29:46
|
Update of /cvsroot/rails/18xx/tools/lib In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7437/tools/lib Added Files: jarbundler-2.1.0.jar Log Message: Create build-mac target. While this creates a working .app for Mac OS X, this is considered alpha status. E.g. my.properties is ignored. --- NEW FILE: jarbundler-2.1.0.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Freek D. <mac...@us...> - 2010-01-30 20:29:46
|
Update of /cvsroot/rails/18xx In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7437 Modified Files: build.xml Log Message: Create build-mac target. While this creates a working .app for Mac OS X, this is considered alpha status. E.g. my.properties is ignored. Index: build.xml =================================================================== RCS file: /cvsroot/rails/18xx/build.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** build.xml 30 Jan 2010 00:59:52 -0000 1.9 --- build.xml 30 Jan 2010 20:29:38 -0000 1.10 *************** *** 11,14 **** --- 11,17 ---- <property name="source" value="1.5"/> <property name="version" value="1.1.2"/> + <taskdef name="jarbundler" + classpath="ant/jarbundler-2.1.0/jarbundler-2.1.0.jar" + classname="net.sourceforge.jarbundler.JarBundler" /> <path id="18xx.classpath"> <pathelement location="classes"/> *************** *** 24,27 **** --- 27,31 ---- <exclude name="**/*.java"/> <exclude name="tools/**"/> + <exclude name="images/**"/> </fileset> </copy> *************** *** 31,35 **** <delete dir="jar"/> </target> ! <target depends="clean" name="cleanall"/> <target depends="build-subprojects,build-project,build-release" name="build"/> <target name="build-subprojects"/> --- 35,42 ---- <delete dir="jar"/> </target> ! <target depends="clean" name="cleanall"> ! <delete dir="rails-${version}"/> ! <delete dir="rails-mac-${version}"/> ! </target> <target depends="build-subprojects,build-project,build-release" name="build"/> <target name="build-subprojects"/> *************** *** 70,73 **** --- 77,81 ---- <exclude name="lib/**"/> <exclude name="rails-${version}/**"/> + <exclude name="rails-*-${version}/**"/> <exclude name="rails.bat"/> <exclude name="rails.sh"/> *************** *** 100,103 **** --- 108,133 ---- </jar> </target> + <target name="build-mac"> + <mkdir dir="rails-mac-${version}" /> + <copy includeemptydirs="false" todir="rails-mac-${version}"> + <fileset dir="."> + <include name="LICENSE"/> + <include name="README"/> + <include name="AUTHORS"/> + <include name="my.properties"/> + </fileset> + </copy> + <jarbundler dir="rails-mac-${version}" + name="Rails" + mainclass="rails.util.RunGame" + icon="images/icon/rails.icns" + version="${version}"> + <jarfileset dir="rails-${version}"> + <include name="rails-${version}.jar"/> + <include name="lib/**"/> + </jarfileset> + <javaproperty name="apple.laf.useScreenMenuBar" value="true"/> + </jarbundler> + </target> <target name="RunGame"> <java classname="rails.util.RunGame" failonerror="true" fork="yes"> |
|
From: Freek D. <mac...@us...> - 2010-01-30 20:13:59
|
Update of /cvsroot/rails/18xx/images/icon In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6021/icon Added Files: rails.icns rails.ico rails128.png rails512.png Log Message: Add program icons --- NEW FILE: rails.icns --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rails.ico --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rails128.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rails512.png --- (This appears to be a binary file; contents omitted.) |
|
From: Freek D. <mac...@us...> - 2010-01-30 19:53:21
|
Update of /cvsroot/rails/18xx/images In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3936/images Log Message: Directory /cvsroot/rails/18xx/images added to the repository |
|
From: Freek D. <mac...@us...> - 2010-01-30 01:00:00
|
Update of /cvsroot/rails/18xx In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12601 Modified Files: build.xml Log Message: Ignore tools directories for builds Index: build.xml =================================================================== RCS file: /cvsroot/rails/18xx/build.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** build.xml 10 Jan 2010 18:21:53 -0000 1.8 --- build.xml 30 Jan 2010 00:59:52 -0000 1.9 *************** *** 23,26 **** --- 23,27 ---- <exclude name="**/*.launch"/> <exclude name="**/*.java"/> + <exclude name="tools/**"/> </fileset> </copy> |
|
From: Freek D. <mac...@us...> - 2010-01-30 00:53:26
|
Update of /cvsroot/rails/18xx/tools/lib In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11694/tools/lib Log Message: Directory /cvsroot/rails/18xx/tools/lib added to the repository |
|
From: Freek D. <mac...@us...> - 2010-01-30 00:36:24
|
Update of /cvsroot/rails/18xx/tools In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10443/tools Log Message: Directory /cvsroot/rails/18xx/tools added to the repository |
|
From: Erik V. <ev...@us...> - 2010-01-29 23:50:09
|
Update of /cvsroot/rails/18xx In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1898 Modified Files: my.properties Log Message: Enabled UTC timezone as default for save file names Index: my.properties =================================================================== RCS file: /cvsroot/rails/18xx/my.properties,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** my.properties 20 Jan 2010 20:29:39 -0000 1.13 --- my.properties 29 Jan 2010 23:49:56 -0000 1.14 *************** *** 51,55 **** # The default timezone is local time. # A specific timezone (such as UTC) can be set; the value must be a Java timezone ID ! #save.filename.date_time_zone=UTC # Optionally, a suffix (e.g. player name) can be added after the time stamp # with a preceding underscore (which is automatically added) --- 51,55 ---- # The default timezone is local time. # A specific timezone (such as UTC) can be set; the value must be a Java timezone ID ! save.filename.date_time_zone=UTC # Optionally, a suffix (e.g. player name) can be added after the time stamp # with a preceding underscore (which is automatically added) |
|
From: Erik V. <ev...@us...> - 2010-01-27 20:40:33
|
Update of /cvsroot/rails/18xx/data/18Kaas In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5827/data/18Kaas Modified Files: TileSet.xml Log Message: Fixed usage of amount/quantity Index: TileSet.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18Kaas/TileSet.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TileSet.xml 23 Jan 2010 17:04:55 -0000 1.3 --- TileSet.xml 27 Jan 2010 20:40:12 -0000 1.4 *************** *** 30,49 **** <!-- Yellow tiles --> ! <Tile id="1" amount="1" /> ! <Tile id="2" amount="1" /> ! <Tile id="3" amount="2" /> ! <Tile id="4" amount="2" /> ! <Tile id="7" amount="4"> <Upgrade id="18,26,27,28,29" /> </Tile> ! <Tile id="8" amount="8"> <Upgrade id="16,19,23,24,25,28,29" /> </Tile> ! <Tile id="9" amount="7"> <Upgrade id="18,19,20,23,24,26,27" /> </Tile> ! <Tile id="55" amount="1" /> ! <Tile id="56" amount="1" /> ! <Tile id="57" amount="4"> <Upgrade id="14,15" /> </Tile> --- 30,49 ---- <!-- 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> |
|
From: Erik V. <ev...@us...> - 2010-01-26 20:09:48
|
Update of /cvsroot/rails/18xx/rails/game/action In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11041/rails/game/action Modified Files: BuyTrain.java Log Message: Cleanup & additional comment Index: BuyTrain.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/action/BuyTrain.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** BuyTrain.java 26 Jan 2010 19:50:28 -0000 1.15 --- BuyTrain.java 26 Jan 2010 20:09:39 -0000 1.16 *************** *** 265,269 **** train = trainManager.getTrainByUniqueId(trainUniqueId); ! log.debug("--- Train with uid="+trainUniqueId+" is "+train, new Exception ("X")); from = gameManager.getPortfolioByName(fromName); if (trainsForExchangeUniqueIds != null --- 265,271 ---- train = trainManager.getTrainByUniqueId(trainUniqueId); ! // Note: the 2nd etc. copy of an unlimited quantity train will become null this way. ! // Set getTrain() for how this is fixed. ! from = gameManager.getPortfolioByName(fromName); if (trainsForExchangeUniqueIds != null |
|
From: Erik V. <ev...@us...> - 2010-01-26 19:50:53
|
Update of /cvsroot/rails/18xx/rails/game/specific/_18EU In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8842/rails/game/specific/_18EU Modified Files: OperatingRound_18EU.java Log Message: Discard Pullmanns to Pool, not ScrapHeap Index: OperatingRound_18EU.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/OperatingRound_18EU.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** OperatingRound_18EU.java 24 Jan 2010 16:21:28 -0000 1.13 --- OperatingRound_18EU.java 26 Jan 2010 19:50:45 -0000 1.14 *************** *** 174,178 **** TrainI pullmann = operatingCompany.getPortfolio().getTrainOfType(pullmannType); if (pullmann != null) { // must be non-null ! pullmann.moveTo(scrapHeap); ReportBuffer.add(LocalText.getText("CompanyDiscardsTrain", operatingCompany.getName(), --- 174,178 ---- TrainI pullmann = operatingCompany.getPortfolio().getTrainOfType(pullmannType); if (pullmann != null) { // must be non-null ! pullmann.moveTo(pool); ReportBuffer.add(LocalText.getText("CompanyDiscardsTrain", operatingCompany.getName(), |
|
From: Erik V. <ev...@us...> - 2010-01-26 19:50:38
|
Update of /cvsroot/rails/18xx/rails/game/action In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8810/rails/game/action Modified Files: BuyTrain.java Log Message: Fixed instantiation problem for 2nd etc. copy of unlimited quantity trains Index: BuyTrain.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/action/BuyTrain.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** BuyTrain.java 24 Jan 2010 16:21:29 -0000 1.14 --- BuyTrain.java 26 Jan 2010 19:50:28 -0000 1.15 *************** *** 117,121 **** --- 117,132 ---- } + /** + * To be used for all usage of train, also within this class. + * After reloading the 2nd copy etc. of a train with unlimited quantity, + * the train attribute will be null (because readObject() is called and the + * train is initiated before the actions have been executed - the second + * train is in this case only created after buying the first one). + * @return + */ public TrainI getTrain() { + if (train == null) { + train = GameManager.getInstance().getTrainManager().getTrainByUniqueId(trainUniqueId); + } return train; } *************** *** 158,166 **** public Portfolio getHolder() { ! return train.getHolder(); } public CashHolder getOwner() { ! return train.getOwner(); } --- 169,177 ---- public Portfolio getHolder() { ! return getTrain().getHolder(); } public CashHolder getOwner() { ! return getTrain().getOwner(); } *************** *** 196,200 **** StringBuffer b = new StringBuffer(); b.append(company.getName()); ! b.append(": buy ").append(train.getName()); b.append("-train from ").append(from.getName()); if (fixedCost > 0) { --- 207,211 ---- StringBuffer b = new StringBuffer(); b.append(company.getName()); ! b.append(": buy ").append(getTrain().getName()); b.append("-train from ").append(from.getName()); if (fixedCost > 0) { *************** *** 224,228 **** if (!(action instanceof BuyTrain)) return false; BuyTrain a = (BuyTrain) action; ! return a.train == train && a.from == from && a.fixedCost == fixedCost && a.trainsForExchange == trainsForExchange; } --- 235,239 ---- if (!(action instanceof BuyTrain)) return false; BuyTrain a = (BuyTrain) action; ! return a.getTrain() == getTrain() && a.from == from && a.fixedCost == fixedCost && a.trainsForExchange == trainsForExchange; } *************** *** 254,257 **** --- 265,269 ---- train = trainManager.getTrainByUniqueId(trainUniqueId); + log.debug("--- Train with uid="+trainUniqueId+" is "+train, new Exception ("X")); from = gameManager.getPortfolioByName(fromName); if (trainsForExchangeUniqueIds != null |
|
From: Erik V. <ev...@us...> - 2010-01-25 20:53:17
|
Update of /cvsroot/rails/18xx/rails/game/special In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31073/rails/game/special Modified Files: SpecialTileLay.java Log Message: Minor fix to help message Index: SpecialTileLay.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/special/SpecialTileLay.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SpecialTileLay.java 19 Jan 2010 19:54:43 -0000 1.8 --- SpecialTileLay.java 25 Jan 2010 20:51:59 -0000 1.9 *************** *** 43,47 **** description = LocalText.getText("LayNamedTileInfo", tileNumber, ! name, locationCodes, (extra ? LocalText.getText("extra"):LocalText.getText("notExtra")), --- 43,47 ---- description = LocalText.getText("LayNamedTileInfo", tileNumber, ! name != null ? name : "", locationCodes, (extra ? LocalText.getText("extra"):LocalText.getText("notExtra")), |
|
From: Erik V. <ev...@us...> - 2010-01-25 20:52:52
|
Update of /cvsroot/rails/18xx In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31073 Modified Files: LocalisedText.properties Log Message: Minor fix to help message Index: LocalisedText.properties =================================================================== RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** LocalisedText.properties 24 Jan 2010 16:21:28 -0000 1.102 --- LocalisedText.properties 25 Jan 2010 20:52:39 -0000 1.103 *************** *** 232,236 **** LayTileInfo=Lay an unconnected tile at hex {0} ({1}, {2}) # LayNamedTileInfo: {0}=tileId, {1}=name {2}=hexes, {3}=extra or notExtra, {4}=atNormalCost or atNoCost ! LayNamedTileInfo=Lay tile #{0} "{1}" at one of hexes {2} ({3}, {4}) LayToken=Lay Token LaysTileAt={0} lays tile #{1} at hex {2}/{3} --- 232,236 ---- LayTileInfo=Lay an unconnected tile at hex {0} ({1}, {2}) # LayNamedTileInfo: {0}=tileId, {1}=name {2}=hexes, {3}=extra or notExtra, {4}=atNormalCost or atNoCost ! LayNamedTileInfo=Lay tile #{0} {1} at (one of) hex(es) {2} ({3}, {4}) LayToken=Lay Token LaysTileAt={0} lays tile #{1} at hex {2}/{3} |
|
From: Erik V. <ev...@us...> - 2010-01-24 17:13:40
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18119/rails/game Modified Files: BonusToken.java Log Message: Fixed Javadoc Index: BonusToken.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/BonusToken.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** BonusToken.java 22 Jan 2010 21:22:41 -0000 1.14 --- BonusToken.java 24 Jan 2010 17:13:25 -0000 1.15 *************** *** 11,20 **** /** ! * A BaseToken object represents a token that a operating public company can ! * place on the map to act as a rail building and train running starting point. ! * <p> The "Base" qualifier is used (more or less) consistently in this ! * rails.game program as it most closely the function of such a token: to act as ! * a base from which a company can operate. Other names used in various games ! * and discussions are "railhead", "station", "garrison", or just "token". * * @author Erik Vos --- 11,18 ---- /** ! * A BonusToken object represents a token that a operating public company can ! * place on the map to gain extra revenue or other privileges. ! * <p>Such tokens are usually not placed in city slots, ! * which are intended for base tokens, but on some unoccupied part of a tile. * * @author Erik Vos |
|
From: Erik V. <ev...@us...> - 2010-01-24 16:21:39
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7185/rails/game Modified Files: OperatingRound.java Log Message: Fixes to 18EU Pullmann problems Index: OperatingRound.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** OperatingRound.java 19 Jan 2010 19:54:50 -0000 1.92 --- OperatingRound.java 24 Jan 2010 16:21:28 -0000 1.93 *************** *** 1312,1316 **** // Does the company have room for another train? int trainLimit = operatingCompany.getCurrentTrainLimit(); ! if (!isBelowTrainLimit() && !action.isForcedExchange()) { errMsg = LocalText.getText("WouldExceedTrainLimit", --- 1312,1316 ---- // Does the company have room for another train? int trainLimit = operatingCompany.getCurrentTrainLimit(); ! if (!canBuyTrainNow() && !action.isForcedExchange()) { errMsg = LocalText.getText("WouldExceedTrainLimit", *************** *** 2068,2072 **** boolean atTrainLimit = operatingCompany.getNumberOfTrains() >= operatingCompany.getCurrentTrainLimit(); ! boolean canBuyTrainNow = isBelowTrainLimit(); boolean presidentMayHelp = !hasTrains && operatingCompany.mustOwnATrain(); TrainI cheapestTrain = null; --- 2068,2072 ---- boolean atTrainLimit = operatingCompany.getNumberOfTrains() >= operatingCompany.getCurrentTrainLimit(); ! boolean canBuyTrainNow = canBuyTrainNow(); boolean presidentMayHelp = !hasTrains && operatingCompany.mustOwnATrain(); TrainI cheapestTrain = null; *************** *** 2234,2237 **** --- 2234,2248 ---- return operatingCompany.getNumberOfTrains() < operatingCompany.getCurrentTrainLimit(); } + + /** + * Can the company buy a train now? + * Normally only calls isBelowTrainLimit() to get the result. + * May be overridden if other considerations apply (such as + * having a Pullmann in 18EU). + * @return + */ + protected boolean canBuyTrainNow () { + return isBelowTrainLimit(); + } protected void setTrainsToDiscard() { |
|
From: Erik V. <ev...@us...> - 2010-01-24 16:21:39
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7185/rails/ui/swing Modified Files: ORUIManager.java Log Message: Fixes to 18EU Pullmann problems Index: ORUIManager.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** ORUIManager.java 19 Jan 2010 19:51:02 -0000 1.46 --- ORUIManager.java 24 Jan 2010 16:21:28 -0000 1.47 *************** *** 783,786 **** --- 783,790 ---- Bank.format(bTrain.getPresidentCashToAdd()))); } + + if (bTrain.getExtraMessage() != null) { + b.append(" (").append(bTrain.getExtraMessage()+")"); + } prompt = b.toString(); prompts.add(prompt); *************** *** 803,807 **** } setMessage(msgbuf.toString()); ! String selectedActionText = (String) JOptionPane.showInputDialog(orWindow, --- 807,811 ---- } setMessage(msgbuf.toString()); ! String selectedActionText = (String) JOptionPane.showInputDialog(orWindow, |
|
From: Erik V. <ev...@us...> - 2010-01-24 16:21:38
|
Update of /cvsroot/rails/18xx/rails/game/specific/_18EU In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7185/rails/game/specific/_18EU Modified Files: OperatingRound_18EU.java Log Message: Fixes to 18EU Pullmann problems Index: OperatingRound_18EU.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/OperatingRound_18EU.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** OperatingRound_18EU.java 19 Jan 2010 19:52:30 -0000 1.12 --- OperatingRound_18EU.java 24 Jan 2010 16:21:28 -0000 1.13 *************** *** 7,10 **** --- 7,11 ---- import rails.game.action.BuyTrain; import rails.game.state.BooleanState; + import rails.util.LocalText; /** *************** *** 45,73 **** int cost; List<TrainI> trains; ! // TrainI train; boolean hasTrains = operatingCompany.getPortfolio().getNumberOfTrains() > 0; ! boolean atTrainLimit = ! operatingCompany.getNumberOfTrains() >= operatingCompany.getCurrentTrainLimit(); ! boolean canBuyTrainNow = isBelowTrainLimit(); boolean presidentMayHelp = operatingCompany.mustOwnATrain(); TrainI cheapestTrain = null; int costOfCheapestTrain = 0; ! // Check if the company already has a Pullmann ! TrainI ownedPTrain = null; ! if (hasTrains) { ! ownedPTrain = operatingCompany.getPortfolio().getTrainOfType(pullmannType); } ! ! // Postpone train limit checking, because an exchange might be possible ! ! /* New trains */ trains = trainMgr.getAvailableNewTrains(); for (TrainI train : trains) { cost = train.getCost(); if (cost <= cash) { ! if (canBuyTrainNow) ! possibleActions.add(new BuyTrain(train, ipo, cost)); } else if (costOfCheapestTrain == 0 || cost < costOfCheapestTrain) { cheapestTrain = train; --- 46,79 ---- int cost; List<TrainI> trains; ! BuyTrain bt; ! boolean hasTrains = operatingCompany.getPortfolio().getNumberOfTrains() > 0; ! boolean canBuyTrainNow = canBuyTrainNow(); ! ! if (!canBuyTrainNow) return; ! boolean presidentMayHelp = operatingCompany.mustOwnATrain(); TrainI cheapestTrain = null; int costOfCheapestTrain = 0; ! String extraMessage = null; ! boolean mustExchangePullmann = !isBelowTrainLimit() ! && hasPullmannAtStart.booleanValue() ! && !possibleActions.contains(BuyTrain.class); ! if (mustExchangePullmann) { ! extraMessage = LocalText.getText("AutodiscardTrain", ! pullmannType.getName()); } ! /* New trains */ trains = trainMgr.getAvailableNewTrains(); for (TrainI train : trains) { cost = train.getCost(); if (cost <= cash) { ! if (canBuyTrainNow) { ! bt = new BuyTrain(train, ipo, cost); ! if (mustExchangePullmann) bt.setExtraMessage(extraMessage); ! possibleActions.add(bt); ! } } else if (costOfCheapestTrain == 0 || cost < costOfCheapestTrain) { cheapestTrain = train; *************** *** 75,91 **** } - // At train limit, exchange of a Pullmann is allowed - if (atTrainLimit && ownedPTrain != null) { - BuyTrain action = new BuyTrain(train, ipo, cost); - List<TrainI> pTrains = new ArrayList<TrainI>(); - pTrains.add(ownedPTrain); - action.setTrainsForExchange(pTrains); - action.setForcedExchange(true); - possibleActions.add(action); - } - if (!canBuyTrainNow) return; - } - if (!canBuyTrainNow) return; /* Used trains */ --- 81,85 ---- *************** *** 94,104 **** // May not buy Pullmann if one is already owned, // or if no train is owned at all ! if ((ownedPTrain != null || !hasTrains) ! && train.getType().getName().equals("P")) { continue; } cost = train.getCost(); if (cost <= cash) { ! possibleActions.add(new BuyTrain(train, pool, cost)); } else if (costOfCheapestTrain == 0 || cost < costOfCheapestTrain) { cheapestTrain = train; --- 88,101 ---- // May not buy Pullmann if one is already owned, // or if no train is owned at all ! if (train.getType().getName().equals("P") ! &&(operatingCompany.getPortfolio().getTrainOfType(pullmannType) != null ! || !hasTrains)) { continue; } cost = train.getCost(); if (cost <= cash) { ! bt = new BuyTrain(train, pool, cost); ! if (mustExchangePullmann) bt.setExtraMessage(extraMessage); ! possibleActions.add(bt); } else if (costOfCheapestTrain == 0 || cost < costOfCheapestTrain) { cheapestTrain = train; *************** *** 107,123 **** } if (!hasTrains && presidentMayHelp ! && possibleActions.getType(BuyTrain.class).isEmpty() ! && cheapestTrain != null) { ! possibleActions.add(new BuyTrain(cheapestTrain, ! cheapestTrain.getHolder(), costOfCheapestTrain).setPresidentMustAddCash(costOfCheapestTrain ! - cash)); } - if (!canBuyTrainNow) return; - /* Other company trains, sorted by president (current player first) */ if (getCurrentPhase().isTrainTradingAllowed()) { PublicCompanyI c; - BuyTrain bt; Player p; Portfolio pf; --- 104,118 ---- } if (!hasTrains && presidentMayHelp ! && possibleActions.getType(BuyTrain.class).isEmpty() ! && cheapestTrain != null) { ! bt = new BuyTrain(cheapestTrain, cheapestTrain.getHolder(), costOfCheapestTrain); ! bt.setPresidentMustAddCash(costOfCheapestTrain - cash); ! if (mustExchangePullmann) bt.setExtraMessage(extraMessage); ! possibleActions.add(bt); } /* Other company trains, sorted by president (current player first) */ if (getCurrentPhase().isTrainTradingAllowed()) { PublicCompanyI c; Player p; Portfolio pf; *************** *** 152,155 **** --- 147,151 ---- if (train.getType().getName().equals("P")) continue; bt = new BuyTrain(train, pf, 0); + if (mustExchangePullmann) bt.setExtraMessage(extraMessage); possibleActions.add(bt); } *************** *** 157,167 **** } } } /** In 18EU, a company can (effectively) exchange a Pullmann */ @Override ! protected boolean isBelowTrainLimit() { ! return super.isBelowTrainLimit() ! || operatingCompany.getPortfolio().getTrainOfType(pullmannType) != null && hasPullmannAtStart.booleanValue(); } --- 153,163 ---- } } + } /** In 18EU, a company can (effectively) exchange a Pullmann */ @Override ! protected boolean canBuyTrainNow() { ! return super.canBuyTrainNow() || hasPullmann () && hasPullmannAtStart.booleanValue(); } *************** *** 169,174 **** --- 165,185 ---- @Override public boolean buyTrain(BuyTrain action) { + + boolean mustDiscardPullmann = !super.isBelowTrainLimit() && hasPullmann (); + boolean result = super.buyTrain(action); + // If we are at train limit and have a Pullmann, discard it + if (mustDiscardPullmann) { + TrainI pullmann = operatingCompany.getPortfolio().getTrainOfType(pullmannType); + if (pullmann != null) { // must be non-null + pullmann.moveTo(scrapHeap); + ReportBuffer.add(LocalText.getText("CompanyDiscardsTrain", + operatingCompany.getName(), + pullmann.getName() )); + + } + } + // Check if we have just started Phase 5 and // if we still have at least one Minor operating. *************** *** 223,226 **** --- 234,241 ---- return !excessTrainCompanies.isEmpty(); } + + private boolean hasPullmann () { + return operatingCompany.getPortfolio().getTrainOfType(pullmannType) != null; + } } |
|
From: Erik V. <ev...@us...> - 2010-01-24 16:21:38
|
Update of /cvsroot/rails/18xx In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7185 Modified Files: LocalisedText.properties Log Message: Fixes to 18EU Pullmann problems Index: LocalisedText.properties =================================================================== RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** LocalisedText.properties 23 Jan 2010 23:02:06 -0000 1.101 --- LocalisedText.properties 24 Jan 2010 16:21:28 -0000 1.102 *************** *** 10,13 **** --- 10,14 ---- AlreadySoldThisTurn={0} already sold {1} this turn AmountMustBeMultipleOf10=Amount ({0}) must be a multiple of 10 + AutodiscardTrain=discard {0}-train Autopass=Autopass Autopasses={0} autopasses |
|
From: Erik V. <ev...@us...> - 2010-01-24 16:21:36
|
Update of /cvsroot/rails/18xx/rails/game/action In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7185/rails/game/action Modified Files: BuyTrain.java Log Message: Fixes to 18EU Pullmann problems Index: BuyTrain.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/action/BuyTrain.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** BuyTrain.java 25 Nov 2009 18:45:28 -0000 1.13 --- BuyTrain.java 24 Jan 2010 16:21:29 -0000 1.14 *************** *** 37,40 **** --- 37,42 ---- transient private SpecialTrainBuy specialProperty = null; private int specialPropertyId = 0; + + private String extraMessage = null; // User settings *************** *** 61,71 **** for (int i = 0; i < trains.size(); i++) { trainsForExchangeUniqueIds[i] = trains.get(i).getName(); ! // TODO: ! // Must ! // be ! // replaced ! // by ! // unique ! // Ids } } --- 63,67 ---- for (int i = 0; i < trains.size(); i++) { trainsForExchangeUniqueIds[i] = trains.get(i).getName(); ! // TODO: Must be replaced by unique Ids } } *************** *** 93,98 **** this.hasNoTrains = hasNoTrains; } ! /** * @return Returns the specialProperty. */ --- 89,102 ---- this.hasNoTrains = hasNoTrains; } + + public void setExtraMessage (String message) { + extraMessage = message; + } ! public String getExtraMessage() { ! return extraMessage; ! } ! ! /** * @return Returns the specialProperty. */ *************** *** 230,235 **** //in.defaultReadObject(); // TEMPORARY Custom reading for backwards compatibility - // TODO We need this code only until route checking is implemented, - // as then it will be possible to detect route existence. ObjectInputStream.GetField fields = in.readFields(); trainUniqueId = (String) fields.get("trainUniqueId", trainUniqueId); --- 234,237 ---- *************** *** 246,249 **** --- 248,252 ---- addedCash = fields.get("addedCash", addedCash); exchangedTrainUniqueId = (String) fields.get("exchangedTrainUniqueId", exchangedTrainUniqueId); + extraMessage = (String) fields.get("extraMessage", extraMessage); GameManagerI gameManager = GameManager.getInstance(); |
|
From: Erik V. <ev...@us...> - 2010-01-24 14:43:51
|
Update of /cvsroot/rails/18xx/data/1851 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31384/data/1851 Modified Files: Tiles.xml Map.xml TileSet.xml Log Message: New tile for Birmingham 1851 Index: TileSet.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1851/TileSet.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TileSet.xml 23 Jan 2010 17:04:54 -0000 1.3 --- TileSet.xml 24 Jan 2010 14:43:43 -0000 1.4 *************** *** 15,18 **** --- 15,19 ---- <Tile id="-902"/> <Tile id="-903"/> + <Tile id="-1143"/> <!-- Yellow tiles --> Index: Map.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1851/Map.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Map.xml 7 Nov 2009 17:22:44 -0000 1.4 --- Map.xml 24 Jan 2010 14:43:43 -0000 1.5 *************** *** 87,91 **** <Hex name="I19" tile="0" cost="60"/> <Hex name="J6" tile="-902" orientation="4" value="30,40,50" city="Gulf"/> ! <Hex name="J12" tile="-903" orientation="4" value="0,30,50" city="Birmingham"/> <Hex name="J14" tile="0"/> <Hex name="J16" tile="0" cost="60"/> --- 87,91 ---- <Hex name="I19" tile="0" cost="60"/> <Hex name="J6" tile="-902" orientation="4" value="30,40,50" city="Gulf"/> ! <Hex name="J12" tile="-1143" orientation="0" value="0,30,50" city="Birmingham"/> <Hex name="J14" tile="0"/> <Hex name="J16" tile="0" cost="60"/> Index: Tiles.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1851/Tiles.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Tiles.xml 28 Feb 2008 21:35:03 -0000 1.2 --- Tiles.xml 24 Jan 2010 14:43:43 -0000 1.3 *************** *** 22,26 **** <Track from="city1" gauge="normal" to="side2"/> <Track from="city1" gauge="normal" to="side1"/> ! </Tile><Tile colour="yellow" id="5" name="5"> <Station id="city1" position="0" slots="1" type="City" value="20"/> <Track from="city1" gauge="normal" to="side1"/> --- 22,33 ---- <Track from="city1" gauge="normal" to="side2"/> <Track from="city1" gauge="normal" to="side1"/> ! </Tile> ! <Tile colour="fixed" id="-1143" name="Bham1851"> ! <Station id="city1" position="0" type="Town"/> ! <Track from="city1" gauge="normal" to="side0"/> ! <Track from="city1" gauge="normal" to="side1"/> ! <Track from="city1" gauge="normal" to="side5"/> ! </Tile> ! <Tile colour="yellow" id="5" name="5"> <Station id="city1" position="0" slots="1" type="City" value="20"/> <Track from="city1" gauge="normal" to="side1"/> |
|
From: Erik V. <ev...@us...> - 2010-01-24 14:43:51
|
Update of /cvsroot/rails/18xx/tiles In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31384/tiles Modified Files: TileDictionary.18t Tiles.xml Log Message: New tile for Birmingham 1851 Index: TileDictionary.18t =================================================================== RCS file: /cvsroot/rails/18xx/tiles/TileDictionary.18t,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TileDictionary.18t 8 Jan 2010 20:47:04 -0000 1.6 --- TileDictionary.18t 24 Jan 2010 14:43:43 -0000 1.7 *************** *** 13778,13781 **** --- 13778,13802 ---- end> Junctions = <> + end + item + Code = -1143 + LongName = 'Bham1851' + Connections = < + item + Position1 = tp4SideF + Position2 = tpCenter + end + item + Position1 = tpCenter + Position2 = tp4SideA + end + item + Position1 = tpCenter + Position2 = tp4SideB + end> + Junctions = < + item + JunType = jtWhistlestop + end> end> end Index: Tiles.xml =================================================================== RCS file: /cvsroot/rails/18xx/tiles/Tiles.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Tiles.xml 8 Jan 2010 20:41:04 -0000 1.21 --- Tiles.xml 24 Jan 2010 14:43:43 -0000 1.22 *************** *** 3122,3125 **** --- 3122,3131 ---- <Track from="city1" gauge="normal" to="side2"/> </Tile> + <Tile colour="fixed" id="-1143" name="Bham1851"> + <Station id="city1" position="0" type="Town"/> + <Track from="city1" gauge="normal" to="side0"/> + <Track from="city1" gauge="normal" to="side1"/> + <Track from="city1" gauge="normal" to="side5"/> + </Tile> <Tile colour="fixed" id="-114" name="Braunschweig"> <Station id="city1" position="501" slots="1" type="City" value="20"/> |
|
From: Erik V. <ev...@us...> - 2010-01-24 14:43:34
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31375/rails/ui/swing Modified Files: GameUIManager.java Log Message: In save file name suffixes, replace spaces and other nonword characters to underscores Index: GameUIManager.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameUIManager.java,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** GameUIManager.java 22 Jan 2010 21:29:34 -0000 1.37 --- GameUIManager.java 24 Jan 2010 14:43:24 -0000 1.38 *************** *** 594,598 **** } else { if (NEXT_PLAYER_SUFFIX.equals(saveSuffixSpec)) { ! saveSuffix = "_" + gameManager.getCurrentPlayer().getName(); } filename = --- 594,598 ---- } else { if (NEXT_PLAYER_SUFFIX.equals(saveSuffixSpec)) { ! saveSuffix = "_" + gameManager.getCurrentPlayer().getName().replaceAll("[^-\\w\\.]", "_"); } filename = |
|
From: Erik V. <ev...@us...> - 2010-01-24 14:42:47
|
Update of /cvsroot/rails/18xx/tiles In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31206/tiles Modified Files: CombineTiles.pl Log Message: Updated comment Index: CombineTiles.pl =================================================================== RCS file: /cvsroot/rails/18xx/tiles/CombineTiles.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CombineTiles.pl 8 Jan 2010 20:47:04 -0000 1.2 --- CombineTiles.pl 24 Jan 2010 14:42:37 -0000 1.3 *************** *** 42,46 **** # (for unknown reasons), change the Height to 357.50. # - Then save the tile. ! # 4. Use this program to combine tiles from the following directories: # - From tiles/TDwithID: all tiles with an ID > 0 (not preprinted tiles). # These images have the id on the tile. --- 42,46 ---- # (for unknown reasons), change the Height to 357.50. # - Then save the tile. ! # 4. Use this program to combine tiles from the following directories into tiles/svg: # - From tiles/TDwithID: all tiles with an ID > 0 (not preprinted tiles). # These images have the id on the tile. |
