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-22 21:28:56
|
Update of /cvsroot/rails/18xx/rails/game/specific/_18EU In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16217/rails/game/specific/_18EU Modified Files: StockRound_18EU.java Log Message: Fixed looping bug: while() -> if () Index: StockRound_18EU.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/StockRound_18EU.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** StockRound_18EU.java 19 Jan 2010 20:13:38 -0000 1.33 --- StockRound_18EU.java 22 Jan 2010 21:28:42 -0000 1.34 *************** *** 176,180 **** // Does the player have enough cash? ! while (playerCash < price) continue; possibleActions.add(new BuyCertificate(cert, from, price, 1)); --- 176,180 ---- // Does the player have enough cash? ! if (playerCash < price) continue; possibleActions.add(new BuyCertificate(cert, from, price, 1)); |
|
From: Erik V. <ev...@us...> - 2010-01-22 21:28:20
|
Update of /cvsroot/rails/18xx/rails/game/move In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16145/rails/game/move Modified Files: MoveStack.java Log Message: Added getIndex (for debugging) Index: MoveStack.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/move/MoveStack.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MoveStack.java 26 Nov 2009 20:14:30 -0000 1.2 --- MoveStack.java 22 Jan 2010 21:28:06 -0000 1.3 *************** *** 154,157 **** --- 154,161 ---- return currentMoveSet != null; } + + public int getIndex() { + return lastIndex + 1; + } } |
|
From: Erik V. <ev...@us...> - 2010-01-22 21:27:24
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16041/rails/game Modified Files: TreasuryShareRound.java Log Message: Fixed price determination of company buying pool shares Index: TreasuryShareRound.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/TreasuryShareRound.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** TreasuryShareRound.java 18 Jan 2010 18:49:30 -0000 1.18 --- TreasuryShareRound.java 22 Jan 2010 21:27:07 -0000 1.19 *************** *** 361,365 **** for (int i = 0; i < number; i++) { cert2 = from.findCertificate(company, cert.getShares(), false); ! executeTradeCertificate(cert2, portfolio, shares * price); } --- 361,365 ---- for (int i = 0; i < number; i++) { cert2 = from.findCertificate(company, cert.getShares(), false); ! executeTradeCertificate(cert2, portfolio, cert2.getShares() * price); } |
|
From: Erik V. <ev...@us...> - 2010-01-22 21:26:29
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15939/rails/game Modified Files: Tile.java Log Message: Reversed an equals condition to prevent null breaking it Index: Tile.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/Tile.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Tile.java 20 Jan 2010 20:41:11 -0000 1.34 --- Tile.java 22 Jan 2010 21:26:22 -0000 1.35 *************** *** 202,206 **** /* Value '99' and '-1' mean 'unlimited' */ unlimited = (quantity == 99 || quantity == UNLIMITED_TILES ! || setTag.getGameOptions().get("UnlimitedTiles").equalsIgnoreCase("yes")); if (unlimited) quantity = UNLIMITED_TILES; /* Multiple base tokens of one company allowed */ --- 202,206 ---- /* Value '99' and '-1' mean 'unlimited' */ unlimited = (quantity == 99 || quantity == UNLIMITED_TILES ! || "yes".equalsIgnoreCase(setTag.getGameOptions().get("UnlimitedTiles"))); if (unlimited) quantity = UNLIMITED_TILES; /* Multiple base tokens of one company allowed */ |
|
From: Erik V. <ev...@us...> - 2010-01-22 21:25:46
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15774/rails/game Modified Files: StockRound.java Log Message: No change Index: StockRound.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/StockRound.java,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** StockRound.java 18 Jan 2010 18:49:20 -0000 1.56 --- StockRound.java 22 Jan 2010 21:25:32 -0000 1.57 *************** *** 1193,1197 **** } - return true; } --- 1193,1196 ---- *************** *** 1220,1223 **** --- 1219,1223 ---- protected void finishTurn() { + setNextPlayer(); sellPrices.clear(); |
|
From: Erik V. <ev...@us...> - 2010-01-22 21:23:54
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15424/rails/game Modified Files: PublicCompany.java Log Message: toString() simplified Index: PublicCompany.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/PublicCompany.java,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** PublicCompany.java 1 Jan 2010 13:59:30 -0000 1.77 --- PublicCompany.java 22 Jan 2010 21:23:43 -0000 1.78 *************** *** 1325,1329 **** @Override public String toString() { ! return name + ", " + publicNumber + " of " + numberOfPublicCompanies; } --- 1325,1329 ---- @Override public String toString() { ! return name; } |
|
From: Erik V. <ev...@us...> - 2010-01-22 21:23:34
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15362/rails/game Modified Files: Game.java Log Message: Print game setup error to sysout too Index: Game.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/Game.java,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** Game.java 15 Jan 2010 19:55:59 -0000 1.45 --- Game.java 22 Jan 2010 21:23:26 -0000 1.46 *************** *** 178,181 **** --- 178,183 ---- LocalText.getText("GameSetupFailed", GAME_XML_FILE); log.fatal(message, e); + System.out.println(e.getMessage()); + e.printStackTrace(); DisplayBuffer.add(message + ":\n " + e.getMessage()); return false; |
|
From: Erik V. <ev...@us...> - 2010-01-22 21:22:50
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15259/rails/game Modified Files: BonusToken.java Log Message: Added check (perhaps redundant) Index: BonusToken.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/BonusToken.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** BonusToken.java 19 Jan 2010 19:54:47 -0000 1.13 --- BonusToken.java 22 Jan 2010 21:22:41 -0000 1.14 *************** *** 68,72 **** new ObjectMove(this, holder, GameManager.getInstance().getBank().getScrapHeap()); ! user.removeBonus(name); } --- 68,74 ---- new ObjectMove(this, holder, GameManager.getInstance().getBank().getScrapHeap()); ! if (user != null) { ! user.removeBonus(name); ! } } |
|
From: Erik V. <ev...@us...> - 2010-01-22 21:21:31
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15092/rails/game Modified Files: GameManager.java Log Message: <GameOption> tags are processed again (and it's now documented why) Index: GameManager.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** GameManager.java 20 Jan 2010 19:52:44 -0000 1.80 --- GameManager.java 22 Jan 2010 21:21:15 -0000 1.81 *************** *** 206,215 **** initGameParameters(); ! // Get any available game options ! /* THIS IS NOT CURRENTLY USED, but I leave it in for another while (EV) GameOption option; String optionName, optionType, optionValues, optionDefault; String optionNameParameters; ! List<Tag> optionTags = tag.getChildren(OPTION_TAG); if (optionTags != null) { for (Tag optionTag : optionTags) { --- 206,219 ---- initGameParameters(); ! /* Check the game options provided with the game. ! * These duplicate the game options in Game.xml, but are still ! * required here to set default values when loading a game from ! * a save file, as in that case the options in GamesList.xml are ! * not included. ! * */ GameOption option; String optionName, optionType, optionValues, optionDefault; String optionNameParameters; ! List<Tag> optionTags = tag.getChildren("GameOption"); if (optionTags != null) { for (Tag optionTag : optionTags) { *************** *** 217,220 **** --- 221,227 ---- if (optionName == null) throw new ConfigurationException("GameOption without name"); + if (gameOptions.containsKey(optionName)) continue; + + // Include missing option option = new GameOption(optionName); availableGameOptions.add(option); *************** *** 228,237 **** if (optionValues != null) option.setAllowedValues(optionValues.split(",")); ! optionDefault = optionTag.getAttributeAsString("default"); if (optionDefault != null) option.setDefaultValue(optionDefault); } } ! */ Tag gameParmTag = tag.getChild("GameParameters"); --- 235,246 ---- if (optionValues != null) option.setAllowedValues(optionValues.split(",")); ! optionDefault = optionTag.getAttributeAsString("default", ""); if (optionDefault != null) option.setDefaultValue(optionDefault); + + gameOptions.put(optionName, optionDefault); } } ! Tag gameParmTag = tag.getChild("GameParameters"); |
|
From: Erik V. <ev...@us...> - 2010-01-22 21:19:40
|
Update of /cvsroot/rails/18xx/data/18EU In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14853/data/18EU Modified Files: Game.xml Log Message: Added default gameoption values Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18EU/Game.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Game.xml 20 Jan 2010 05:45:35 -0000 1.14 --- Game.xml 22 Jan 2010 21:19:29 -0000 1.15 *************** *** 3,8 **** <Component name="GameManager" class="rails.game.specific._18EU.GameManager_18EU"> <Game name="18EU"/> ! <GameOption name="Extra3Trains" values="0,1,2"/> ! <GameOption name="Extra4Trains" values="0,1"/> <GameOption name="UnlimitedTiles" type="toggle" default="no"/> <GameParameters> --- 3,8 ---- <Component name="GameManager" class="rails.game.specific._18EU.GameManager_18EU"> <Game name="18EU"/> ! <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> |
|
From: Erik V. <ev...@us...> - 2010-01-20 20:41:22
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17047/rails/game Modified Files: Tile.java Log Message: Honour new UnlimitedTiles game option Index: Tile.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/Tile.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** Tile.java 8 Jan 2010 21:30:46 -0000 1.33 --- Tile.java 20 Jan 2010 20:41:11 -0000 1.34 *************** *** 201,205 **** quantity = setTag.getAttributeAsInteger("quantity", 0); /* Value '99' and '-1' mean 'unlimited' */ ! unlimited = (quantity == 99 || quantity == UNLIMITED_TILES); if (unlimited) quantity = UNLIMITED_TILES; /* Multiple base tokens of one company allowed */ --- 201,206 ---- quantity = setTag.getAttributeAsInteger("quantity", 0); /* Value '99' and '-1' mean 'unlimited' */ ! unlimited = (quantity == 99 || quantity == UNLIMITED_TILES ! || setTag.getGameOptions().get("UnlimitedTiles").equalsIgnoreCase("yes")); if (unlimited) quantity = UNLIMITED_TILES; /* Multiple base tokens of one company allowed */ |
|
From: Erik V. <ev...@us...> - 2010-01-20 20:29:47
|
Update of /cvsroot/rails/18xx In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15328 Modified Files: my.properties Log Message: Added info about using custom property files Index: my.properties =================================================================== RCS file: /cvsroot/rails/18xx/my.properties,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** my.properties 19 Jan 2010 19:48:58 -0000 1.12 --- my.properties 20 Jan 2010 20:29:39 -0000 1.13 *************** *** 1,6 **** ####################### My preferences ################################ # Preferred tile format. ! # Values: svg or gif. Default: svg. Anything else is interpreted as svg. ! tile.format_preference=svg # Root directory for the tile images (just above directory 'tiles'). # Not required if tile images are provided included in the Rails jar file. --- 1,17 ---- ####################### My preferences ################################ + # + # IMPORTANT NOTE: + # If you want to use a customized version of my.properties + # (under the same or a different name), then please insert the option + # -Dconfigfile=<filepath> in your Rails startup command. + # + # Example: + # java -Dconfigfile=/Rails/18xx/my_my.properties -jar rails-1.1.2.jar + # + ######################################################################## + # # Preferred tile format. ! # The only currently supported format is svg. Anything else is ignored. ! #tile.format_preference=svg # Root directory for the tile images (just above directory 'tiles'). # Not required if tile images are provided included in the Rails jar file. |
|
From: Erik V. <ev...@us...> - 2010-01-20 19:54:01
|
Update of /cvsroot/rails/18xx In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11550 Modified Files: LocalisedText.properties Log Message: Added Message Index: LocalisedText.properties =================================================================== RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** LocalisedText.properties 20 Jan 2010 05:45:38 -0000 1.98 --- LocalisedText.properties 20 Jan 2010 19:53:52 -0000 1.99 *************** *** 251,254 **** --- 251,255 ---- MergeMinorConfirm=Do you want to merge minor {0} to start company {1}? MERGE_MINOR_LOG={0} merges minor {1} into {2}, with {3} cash and {4} train(s) + Message=Message MINIMUM_BID=<html>Min.<br>Bid</html> MinorCloses=Minor {0} is closed |
|
From: Erik V. <ev...@us...> - 2010-01-20 19:52:55
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11359/rails/ui/swing Modified Files: StatusWindow.java StartRoundWindow.java GridPanel.java GameUIManager.java ORWindow.java Log Message: All displayMessage() methods moved to GameUIManager, which now uses the new nonmodal MessageDialog Index: StatusWindow.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/StatusWindow.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** StatusWindow.java 18 Jan 2010 18:49:05 -0000 1.35 --- StatusWindow.java 20 Jan 2010 19:52:43 -0000 1.36 *************** *** 560,570 **** } - public void displayServerMessage() { - String[] message = DisplayBuffer.get(); - if (message != null) { - JOptionPane.showMessageDialog(this, message); - } - } - public void setPassButton(NullAction action) { if (action != null) { --- 560,563 ---- Index: StartRoundWindow.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/StartRoundWindow.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** StartRoundWindow.java 8 Jan 2010 21:27:54 -0000 1.34 --- StartRoundWindow.java 20 Jan 2010 19:52:44 -0000 1.35 *************** *** 438,442 **** spinnerModel.setValue(mb); } else { - //itemNameButton[i].setToolTipText(LocalText.getText("ClickToSelectForBidding")); itemNameButton[i].setPossibleAction(action); } --- 438,441 ---- *************** *** 637,647 **** } - public void displayServerMessage() { - String[] message = DisplayBuffer.get(); - if (message != null) { - JOptionPane.showMessageDialog(this, message); - } - } - private void setItemNameButton(int i, boolean clickable) { --- 636,639 ---- Index: GridPanel.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/GridPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GridPanel.java 14 Jan 2010 20:48:26 -0000 1.2 --- GridPanel.java 20 Jan 2010 19:52:44 -0000 1.3 *************** *** 100,107 **** } - public void displayPopup(String text) { - JOptionPane.showMessageDialog(this, text); - } - public void keyPressed(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_F1) { --- 100,103 ---- Index: ORWindow.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORWindow.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** ORWindow.java 14 Jan 2010 20:50:08 -0000 1.32 --- ORWindow.java 20 Jan 2010 19:52:44 -0000 1.33 *************** *** 15,19 **** import rails.common.GuiDef; ! import rails.game.*; import rails.game.action.*; import rails.util.LocalText; --- 15,20 ---- import rails.common.GuiDef; ! import rails.game.GameManager; ! import rails.game.OperatingRound; import rails.game.action.*; import rails.util.LocalText; *************** *** 124,128 **** boolean result = gameUIManager.processOnServer(action); // Display any error message ! displayServerMessage(); return result; --- 125,129 ---- boolean result = gameUIManager.processOnServer(action); // Display any error message ! //displayServerMessage(); return result; *************** *** 134,144 **** } - public void displayServerMessage() { - String[] message = DisplayBuffer.get(); - if (message != null) { - JOptionPane.showMessageDialog(this, message); - } - } - public void displayORUIMessage(String message) { if (message != null) { --- 135,138 ---- Index: GameUIManager.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameUIManager.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** GameUIManager.java 19 Jan 2010 19:48:58 -0000 1.35 --- GameUIManager.java 20 Jan 2010 19:52:44 -0000 1.36 *************** *** 67,70 **** --- 67,72 ---- protected boolean previousORWindowVisibilityHint; + protected boolean previousResult; + protected static Logger log = Logger.getLogger(GameUIManager.class.getPackage().getName()); *************** *** 132,136 **** public void startLoadedGame() { gameUIInit(); ! processOnServer(null); statusWindow.setGameActions(); } --- 134,138 ---- public void startLoadedGame() { gameUIInit(); ! processOnServer(new NullAction(NullAction.START_GAME)); statusWindow.setGameActions(); } *************** *** 138,163 **** public boolean processOnServer(PossibleAction action) { // In some cases an Undo requires a different follow-up lastAction = action; ! if (action != null) { action.setActed(); action.setPlayerName(getCurrentPlayer().getName()); - } ! log.debug("==Passing to server: " + action); ! ! Player player = getCurrentPlayer(); ! if (action != null && player != null) { ! action.setPlayerName(player.getName()); ! } ! // Process the action on the server ! boolean result = gameManager.process(action); ! // Follow-up the result ! log.debug("==Result from server: " + result); ! if (DisplayBuffer.getAutoDisplay()) activeWindow.displayServerMessage(); ! reportWindow.addLog(); // End of game checks --- 140,179 ---- public boolean processOnServer(PossibleAction action) { + boolean result = true; + // In some cases an Undo requires a different follow-up lastAction = action; ! ! if (action == null) { ! // If the action is null, we can skip processing ! // and continue with following up a previous action. ! // This occurs after a nonmodal Message dialog. ! result = previousResult; ! ! } else { action.setActed(); action.setPlayerName(getCurrentPlayer().getName()); ! log.debug("==Passing to server: " + action); ! Player player = getCurrentPlayer(); ! if (player != null) { ! action.setPlayerName(player.getName()); ! } ! // Process the action on the server ! result = previousResult = gameManager.process(action); ! // Follow-up the result ! log.debug("==Result from server: " + result); ! reportWindow.addLog(); ! if (DisplayBuffer.getAutoDisplay()) { ! if (displayServerMessage()) { ! // Interrupt processing. ! // Will be continued via dialogActionPerformed(). ! return true; ! } ! } ! } // End of game checks *************** *** 185,188 **** --- 201,217 ---- } + public boolean displayServerMessage() { + String[] message = DisplayBuffer.get(); + if (message != null) { + setCurrentDialog(new MessageDialog(this, + LocalText.getText("Message"), + "<html>" + Util.joinWithDelimiter(message, "<br>")), + null); + return true; + } + return false; + } + + public void updateUI() { *************** *** 521,525 **** action.setNumberTaken(action.getMinNumber() + selected); } else if (currentDialog instanceof MessageDialog) { ! // Nothing } else { return; --- 550,555 ---- action.setNumberTaken(action.getMinNumber() + selected); } else if (currentDialog instanceof MessageDialog) { ! // Nothing to do ! currentDialogAction = null; // Should already be null } else { return; *************** *** 527,531 **** } ! if (currentDialogAction != null) processOnServer(currentDialogAction); } --- 557,561 ---- } ! processOnServer(currentDialogAction); } |
|
From: Erik V. <ev...@us...> - 2010-01-20 19:52:52
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11359/rails/game Modified Files: GameManager.java Log Message: All displayMessage() methods moved to GameUIManager, which now uses the new nonmodal MessageDialog Index: GameManager.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/GameManager.java,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** GameManager.java 19 Jan 2010 19:53:53 -0000 1.79 --- GameManager.java 20 Jan 2010 19:52:44 -0000 1.80 *************** *** 690,695 **** guiHints.clearVisibilityHints(); ! // The action is null only immediately after Load. ! if (action != null) { action.setActed(); --- 690,700 ---- guiHints.clearVisibilityHints(); ! if (action instanceof NullAction && ((NullAction)action).getMode() == NullAction.START_GAME) { ! // Skip processing at game start after Load. ! // We're only here to create PossibleActions. ! result = true; ! ! } else if (action != null) { ! // Should never be null. action.setActed(); |
|
From: Erik V. <ev...@us...> - 2010-01-20 19:51:16
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11163/rails/ui/swing Modified Files: ActionPerformer.java Log Message: Removed displayServerMessage() Index: ActionPerformer.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/ActionPerformer.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ActionPerformer.java 4 Jun 2008 19:00:33 -0000 1.5 --- ActionPerformer.java 20 Jan 2010 19:51:08 -0000 1.6 *************** *** 11,15 **** public boolean processImmediateAction(); - - public void displayServerMessage(); } --- 11,13 ---- |
|
From: Erik V. <ev...@us...> - 2010-01-20 19:50:59
|
Update of /cvsroot/rails/18xx/rails/game/action In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11087/rails/game/action Modified Files: NullAction.java Log Message: Added START_GAME (to replace null action after loading) Index: NullAction.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/action/NullAction.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** NullAction.java 18 Jan 2010 18:49:12 -0000 1.8 --- NullAction.java 20 Jan 2010 19:50:47 -0000 1.9 *************** *** 8,14 **** public static final int SKIP = 2; public static final int AUTOPASS = 3; ! public static final int MAX_MODE = 3; - private static String[] name = new String[] { "Done", "Pass", "Skip", "Autopass" }; protected int mode = -1; --- 8,16 ---- public static final int SKIP = 2; public static final int AUTOPASS = 3; ! public static final int START_GAME = 4; // For use after loading ! public static final int MAX_MODE = 4; ! ! private static String[] name = new String[] { "Done", "Pass", "Skip", "Autopass", "StartGame" }; protected int mode = -1; |
|
From: Brett L. <wak...@us...> - 2010-01-20 05:45:48
|
Update of /cvsroot/rails/18xx/data/1830 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14308/data/1830 Modified Files: Game.xml TileSet.xml Log Message: Apply Unlimited Trains patch from Freek Dijkstra <sf_...@ma...> Index: TileSet.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1830/TileSet.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TileSet.xml 14 Jan 2010 22:28:07 -0000 1.8 --- TileSet.xml 20 Jan 2010 05:45:39 -0000 1.9 *************** *** 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> --- 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> Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1830/Game.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** Game.xml 17 Jan 2010 14:05:48 -0000 1.27 --- Game.xml 20 Jan 2010 05:45:39 -0000 1.28 *************** *** 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-20 05:45:48
|
Update of /cvsroot/rails/18xx/data/18AL In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14308/data/18AL Modified Files: Game.xml TileSet.xml Log Message: Apply Unlimited Trains patch from Freek Dijkstra <sf_...@ma...> Index: TileSet.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18AL/TileSet.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TileSet.xml 2 Nov 2008 00:07:13 -0000 1.10 --- TileSet.xml 20 Jan 2010 05:45:39 -0000 1.11 *************** *** 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" /> --- 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" /> *************** *** 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" /> --- 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" /> *************** *** 124,127 **** <!-- Grey tiles --> ! <Tile id="446" quantity="1" /><!--Missing!--> </TileManager> --- 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> Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18AL/Game.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Game.xml 17 Jan 2010 14:05:47 -0000 1.23 --- Game.xml 20 Jan 2010 05:45:39 -0000 1.24 *************** *** 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-20 05:45:47
|
Update of /cvsroot/rails/18xx/data/18EU In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14308/data/18EU Modified Files: Game.xml TileSet.xml Log Message: Apply Unlimited Trains patch from Freek Dijkstra <sf_...@ma...> Index: TileSet.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18EU/TileSet.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TileSet.xml 7 Dec 2009 17:46:37 -0000 1.5 --- TileSet.xml 20 Jan 2010 05:45:37 -0000 1.6 *************** *** 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> --- 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> Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18EU/Game.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Game.xml 18 Jan 2010 18:43:36 -0000 1.13 --- Game.xml 20 Jan 2010 05:45:35 -0000 1.14 *************** *** 5,8 **** --- 5,9 ---- <GameOption name="Extra3Trains" values="0,1,2"/> <GameOption name="Extra4Trains" values="0,1"/> + <GameOption name="UnlimitedTiles" type="toggle" default="no"/> <GameParameters> <StockRound class="rails.game.specific._18EU.StockRound_18EU" |
|
From: Brett L. <wak...@us...> - 2010-01-20 05:45:47
|
Update of /cvsroot/rails/18xx/data/1856 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14308/data/1856 Modified Files: Game.xml TileSet.xml Log Message: Apply Unlimited Trains patch from Freek Dijkstra <sf_...@ma...> Index: TileSet.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1856/TileSet.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TileSet.xml 30 Nov 2008 21:51:33 -0000 1.6 --- TileSet.xml 20 Jan 2010 05:45:39 -0000 1.7 *************** *** 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> --- 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> Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1856/Game.xml,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** Game.xml 17 Jan 2010 14:05:48 -0000 1.30 --- Game.xml 20 Jan 2010 05:45:39 -0000 1.31 *************** *** 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="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" |
|
From: Brett L. <wak...@us...> - 2010-01-20 05:45:47
|
Update of /cvsroot/rails/18xx/data/1851 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14308/data/1851 Modified Files: TileSet.xml Game.xml Log Message: Apply Unlimited Trains patch from Freek Dijkstra <sf_...@ma...> Index: TileSet.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1851/TileSet.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TileSet.xml 8 Jan 2008 20:23:55 -0000 1.1 --- TileSet.xml 20 Jan 2010 05:45:38 -0000 1.2 *************** *** 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> --- 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> Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1851/Game.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Game.xml 17 Jan 2010 14:05:48 -0000 1.7 --- Game.xml 20 Jan 2010 05:45:38 -0000 1.8 *************** *** 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-20 05:45:47
|
Update of /cvsroot/rails/18xx/data/18Kaas In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14308/data/18Kaas Modified Files: TileSet.xml Game.xml Log Message: Apply Unlimited Trains patch from Freek Dijkstra <sf_...@ma...> Index: TileSet.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18Kaas/TileSet.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TileSet.xml 3 Jul 2006 21:05:47 -0000 1.1 --- TileSet.xml 20 Jan 2010 05:45:39 -0000 1.2 *************** *** 48,53 **** <Upgrade id="14,15" /> </Tile> ! <Tile id="58" quantity="2" /> ! <Tile id="69" quantity="1" /> <!-- Green tiles --> --- 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 --> *************** *** 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> --- 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> Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18Kaas/Game.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Game.xml 17 Jan 2010 14:05:48 -0000 1.8 --- Game.xml 20 Jan 2010 05:45:39 -0000 1.9 *************** *** 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-20 05:45:47
|
Update of /cvsroot/rails/18xx/data In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14308/data Modified Files: GamesList.xml Log Message: Apply Unlimited Trains patch from Freek Dijkstra <sf_...@ma...> Index: GamesList.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/GamesList.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** GamesList.xml 15 Jan 2010 19:53:05 -0000 1.18 --- GamesList.xml 20 Jan 2010 05:45:40 -0000 1.19 *************** *** 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="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> *************** *** 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"/> *************** *** 87,90 **** --- 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 *************** *** 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-20 05:45:47
|
Update of /cvsroot/rails/18xx In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14308 Modified Files: LocalisedText.properties Log Message: Apply Unlimited Trains patch from Freek Dijkstra <sf_...@ma...> Index: LocalisedText.properties =================================================================== RCS file: /cvsroot/rails/18xx/LocalisedText.properties,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** LocalisedText.properties 19 Jan 2010 19:52:44 -0000 1.97 --- LocalisedText.properties 20 Jan 2010 05:45:38 -0000 1.98 *************** *** 454,457 **** --- 454,458 ---- UNDO=Undo UnlimitedBonusTokens=Unlimited bonus tokens + UnlimitedTiles=Unlimited tiles UnlimitedTopTrains=Unlimited {0}-trains UnnamedCompany=Unnamed company found. |
