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...> - 2009-12-26 12:47:02
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6688/rails/game Modified Files: Bonus.java Log Message: Added 2 chars of name to View string if no locations exist Index: Bonus.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/Bonus.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Bonus.java 31 Oct 2009 17:08:27 -0000 1.2 --- Bonus.java 26 Dec 2009 12:46:52 -0000 1.3 *************** *** 45,51 **** } ! public String getLocationNameString() { ! if (locations == null || locations.isEmpty()) return ""; StringBuffer b = new StringBuffer(); --- 45,53 ---- } ! public String getIdForView() { ! if (locations == null || locations.isEmpty()) { ! return name.substring(0, 2); ! } StringBuffer b = new StringBuffer(); *************** *** 100,104 **** public String toString() { return "Bonus "+name+" hex=" ! + getLocationNameString() + " value=" + value; } --- 102,106 ---- public String toString() { return "Bonus "+name+" hex=" ! + getIdForView() + " value=" + value; } |
|
From: Erik V. <ev...@us...> - 2009-12-26 12:47:02
|
Update of /cvsroot/rails/18xx/rails/game/model In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6688/rails/game/model Modified Files: BonusModel.java Log Message: Added 2 chars of name to View string if no locations exist Index: BonusModel.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/model/BonusModel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BonusModel.java 23 Sep 2009 21:38:57 -0000 1.1 --- BonusModel.java 26 Dec 2009 12:46:52 -0000 1.2 *************** *** 33,37 **** b.append("<br>"); } ! b.append(bonus.getLocationNameString()).append("+").append(Bank.format(bonus.getValue())); } --- 33,37 ---- b.append("<br>"); } ! b.append(bonus.getIdForView()).append("+").append(Bank.format(bonus.getValue())); } |
|
From: Erik V. <ev...@us...> - 2009-12-26 10:08:49
|
Update of /cvsroot/rails/18xx/data In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1035/data Modified Files: GamesList.xml Log Message: Described 1856 limitation Index: GamesList.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/GamesList.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** GamesList.xml 23 Nov 2009 18:32:47 -0000 1.15 --- GamesList.xml 26 Dec 2009 10:08:31 -0000 1.16 *************** *** 54,57 **** --- 54,60 ---- (c) 1992, 1995 Mayfair Games, Inc. Designed by Bill Dixon + + Limitation: + - 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"/> |
|
From: Erik V. <ev...@us...> - 2009-12-22 11:23:45
|
Update of /cvsroot/rails/18xx/data/1851 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23345/data/1851 Modified Files: Game.xml Log Message: Fixed cert.limits for 3 and 5 players (which were swapped) Index: Game.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1851/Game.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Game.xml 3 Sep 2009 21:36:54 -0000 1.4 --- Game.xml 22 Dec 2009 11:23:36 -0000 1.5 *************** *** 14,20 **** </Component> <Component name="PlayerManager" class="rails.game.PlayerManager"> ! <Players number="3" cash="500" certLimit="10"/> <Players number="4" cash="430" certLimit="12"/> ! <Players number="5" cash="400" certLimit="15"/> </Component> <Component name="Bank" class="rails.game.Bank"> --- 14,20 ---- </Component> <Component name="PlayerManager" class="rails.game.PlayerManager"> ! <Players number="3" cash="500" certLimit="15"/> <Players number="4" cash="430" certLimit="12"/> ! <Players number="5" cash="400" certLimit="10"/> </Component> <Component name="Bank" class="rails.game.Bank"> |
|
From: Erik V. <ev...@us...> - 2009-12-22 11:18:23
|
Update of /cvsroot/rails/18xx/rails/game/specific/_18EU In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21473/rails/game/specific/_18EU Modified Files: StockRound_18EU.java Log Message: Fixed wrong $1 token cost display when merging 2nd etc. minot into major. Index: StockRound_18EU.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/specific/_18EU/StockRound_18EU.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** StockRound_18EU.java 7 Dec 2009 17:49:23 -0000 1.29 --- StockRound_18EU.java 22 Dec 2009 11:18:13 -0000 1.30 *************** *** 524,528 **** if (major != null && action.getReplaceToken()) { if (homeHex.layBaseToken(major, homeCityNumber)) { ! major.layBaseToken(homeHex, homeCityNumber); } } --- 524,528 ---- if (major != null && action.getReplaceToken()) { if (homeHex.layBaseToken(major, homeCityNumber)) { ! major.layBaseToken(homeHex, 0); } } |
|
From: Brett L. <wak...@us...> - 2009-12-20 22:13:35
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16580/rails/game Modified Files: Game.java Log Message: bump version to 1.1.1 Index: Game.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/Game.java,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** Game.java 12 Dec 2009 22:05:20 -0000 1.41 --- Game.java 20 Dec 2009 22:13:25 -0000 1.42 *************** *** 12,16 **** public class Game { ! public static final String version = "1.1.0"; /** The component Manager */ --- 12,16 ---- public class Game { ! public static final String version = "1.1.1"; /** The component Manager */ |
|
From: Brett L. <wak...@us...> - 2009-12-20 22:13:33
|
Update of /cvsroot/rails/18xx In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16580 Modified Files: rails.sh rails.bat build.xml Log Message: bump version to 1.1.1 Index: rails.bat =================================================================== RCS file: /cvsroot/rails/18xx/rails.bat,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** rails.bat 12 Dec 2009 22:05:20 -0000 1.4 --- rails.bat 20 Dec 2009 22:13:24 -0000 1.5 *************** *** 1,2 **** ! java -jar rails-1.1.0.jar %1 \ No newline at end of file --- 1,2 ---- ! java -jar rails-1.1.1.jar %1 \ No newline at end of file Index: rails.sh =================================================================== RCS file: /cvsroot/rails/18xx/rails.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** rails.sh 12 Dec 2009 22:05:20 -0000 1.4 --- rails.sh 20 Dec 2009 22:13:22 -0000 1.5 *************** *** 1,3 **** #!/bin/bash ! java -jar ./rails-1.1.0.jar $1 --- 1,3 ---- #!/bin/bash ! java -jar ./rails-1.1.1.jar $1 Index: build.xml =================================================================== RCS file: /cvsroot/rails/18xx/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** build.xml 12 Dec 2009 22:05:20 -0000 1.6 --- build.xml 20 Dec 2009 22:13:24 -0000 1.7 *************** *** 10,14 **** <property name="target" value="1.5"/> <property name="source" value="1.5"/> ! <property name="version" value="1.1.0"/> <path id="18xx.classpath"> <pathelement location="classes"/> --- 10,14 ---- <property name="target" value="1.5"/> <property name="source" value="1.5"/> ! <property name="version" value="1.1.1"/> <path id="18xx.classpath"> <pathelement location="classes"/> |
|
From: Erik V. <ev...@us...> - 2009-12-20 21:16:31
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10346/rails/ui/swing Modified Files: UpgradesPanel.java Log Message: Fixed disappearance of tiles if a selected and dropped tile is changed. Index: UpgradesPanel.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/UpgradesPanel.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** UpgradesPanel.java 20 Dec 2009 15:35:56 -0000 1.21 --- UpgradesPanel.java 20 Dec 2009 21:16:07 -0000 1.22 *************** *** 177,181 **** upgradePanel.add(cancelButton); ! repaint(); } --- 177,182 ---- upgradePanel.add(cancelButton); ! //repaint(); ! revalidate(); } |
|
From: Erik V. <ev...@us...> - 2009-12-20 15:38:15
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9800/rails/ui/swing Modified Files: ORUIManager.java Log Message: Explicitly remove tiles at start of token mode (although that should have happened earlier). Unclear why that doesn't work. The disappearance of the tiles when another one is selected remains a mystery. Index: ORUIManager.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** ORUIManager.java 20 Dec 2009 14:58:23 -0000 1.35 --- ORUIManager.java 20 Dec 2009 15:38:05 -0000 1.36 *************** *** 1346,1349 **** --- 1346,1350 ---- break; case SELECT_HEX_FOR_TOKEN: + upgradePanel.setTileUpgrades(null); upgradePanel.setDoneEnabled(false); upgradePanel.setCancelEnabled(true); |
|
From: Erik V. <ev...@us...> - 2009-12-20 15:36:05
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9568/rails/ui/swing Modified Files: UpgradesPanel.java Log Message: Formatting only Index: UpgradesPanel.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/UpgradesPanel.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** UpgradesPanel.java 15 Dec 2009 18:56:10 -0000 1.20 --- UpgradesPanel.java 20 Dec 2009 15:35:56 -0000 1.21 *************** *** 147,151 **** setSelectedToken(); ! } else if (orUIManager.tileUpgrades == null) {} else if (orUIManager.tileUpgrades.size() == 0) { orUIManager.setMessage(LocalText.getText("NoTiles")); } else { --- 147,153 ---- setSelectedToken(); ! } else if (orUIManager.tileUpgrades == null) { ! ; ! } else if (orUIManager.tileUpgrades.size() == 0) { orUIManager.setMessage(LocalText.getText("NoTiles")); } else { |
|
From: Erik V. <ev...@us...> - 2009-12-20 15:03:24
|
Update of /cvsroot/rails/18xx/rails/ui/swing/hexmap In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6653/rails/ui/swing/hexmap Modified Files: GUIHex.java Log Message: Fixed bonus token position on hex Index: GUIHex.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/GUIHex.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** GUIHex.java 20 Dec 2009 14:57:57 -0000 1.30 --- GUIHex.java 20 Dec 2009 15:03:11 -0000 1.31 *************** *** 441,451 **** } ! private static int[] offStationTokenX = new int[] { -20, 0 }; // Unclear ! // why ! // x=-10,y=-10 ! // puts it ! // at the ! // center. ! private static int[] offStationTokenY = new int[] { -20, 0 }; private void paintOffStationTokens(Graphics2D g2) { --- 441,446 ---- } ! private static int[] offStationTokenX = new int[] { -11, 0 }; ! private static int[] offStationTokenY = new int[] { -19, 0 }; private void paintOffStationTokens(Graphics2D g2) { |
|
From: Erik V. <ev...@us...> - 2009-12-20 14:58:32
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6115/rails/game Modified Files: Tile.java Log Message: Fixed a misnamed constant. Index: Tile.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/Tile.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** Tile.java 17 Nov 2009 19:31:26 -0000 1.31 --- Tile.java 20 Dec 2009 14:58:24 -0000 1.32 *************** *** 60,64 **** public static final String WHITE_COLOUR_NAME = "white"; public static final int WHITE_COLOUR_NUMBER = 0; ! public static final String YELLOW_COLOPUR_NAME = "yellow"; public static final int YELLOW_COLOUR_NUMBER = 1; public static final String GREEN_COLOUR_NAME = "green"; --- 60,64 ---- public static final String WHITE_COLOUR_NAME = "white"; public static final int WHITE_COLOUR_NUMBER = 0; ! public static final String YELLOW_COLOUR_NAME = "yellow"; public static final int YELLOW_COLOUR_NUMBER = 1; public static final String GREEN_COLOUR_NAME = "green"; *************** *** 71,75 **** protected static final List<String> VALID_COLOUR_NAMES = Arrays.asList(new String[] { RED_COLOUR_NAME, FIXED_COLOUR_NAME, ! WHITE_COLOUR_NAME, YELLOW_COLOPUR_NAME, GREEN_COLOUR_NAME, BROWN_COLOUR_NAME, GREY_COLOUR_NAME }); --- 71,75 ---- protected static final List<String> VALID_COLOUR_NAMES = Arrays.asList(new String[] { RED_COLOUR_NAME, FIXED_COLOUR_NAME, ! WHITE_COLOUR_NAME, YELLOW_COLOUR_NAME, GREEN_COLOUR_NAME, BROWN_COLOUR_NAME, GREY_COLOUR_NAME }); |
|
From: Erik V. <ev...@us...> - 2009-12-20 14:58:32
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6115/rails/ui/swing Modified Files: ORUIManager.java Log Message: Fixed a misnamed constant. Index: ORUIManager.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** ORUIManager.java 25 Nov 2009 18:48:19 -0000 1.34 --- ORUIManager.java 20 Dec 2009 14:58:23 -0000 1.35 *************** *** 520,524 **** // Check if the new tile must be connected to some other track boolean mustConnect = ! tile.getColourName().equalsIgnoreCase(Tile.YELLOW_COLOPUR_NAME) // Does not apply to the current company's home hex(es) && !hex.getHexModel().isHome(orComp) --- 520,524 ---- // Check if the new tile must be connected to some other track boolean mustConnect = ! tile.getColourName().equalsIgnoreCase(Tile.YELLOW_COLOUR_NAME) // Does not apply to the current company's home hex(es) && !hex.getHexModel().isHome(orComp) |
|
From: Erik V. <ev...@us...> - 2009-12-20 14:58:12
|
Update of /cvsroot/rails/18xx/rails/ui/swing/hexmap In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6021/rails/ui/swing/hexmap Modified Files: GUIHex.java Log Message: Removed GUI status update which seems redundant and in any case caused crashes in solitaite/hotseat play. Index: GUIHex.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/GUIHex.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** GUIHex.java 19 Dec 2009 16:48:31 -0000 1.29 --- GUIHex.java 20 Dec 2009 14:57:57 -0000 1.30 *************** *** 763,769 **** // + currentTileId + "/" + currentTileOrientation); ! if (GameUIManager.instance != null && GameUIManager.instance.orWindow != null) { ! GameUIManager.instance.orWindow.updateStatus(); ! } } else { hexMap.repaint(getBounds()); --- 763,769 ---- // + currentTileId + "/" + currentTileOrientation); ! //if (GameUIManager.instance != null && GameUIManager.instance.orWindow != null) { ! // GameUIManager.instance.orWindow.updateStatus(); ! //} } else { hexMap.repaint(getBounds()); |
|
From: Erik V. <ev...@us...> - 2009-12-20 14:57:17
|
Update of /cvsroot/rails/18xx/rails/game In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5954/rails/game Modified Files: OperatingRound.java Log Message: Moved stepObject creation backwards to OR start() Index: OperatingRound.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** OperatingRound.java 27 Nov 2009 20:35:18 -0000 1.81 --- OperatingRound.java 20 Dec 2009 14:57:02 -0000 1.82 *************** *** 164,167 **** --- 164,172 ---- log.info("Initial operating sequence is "+msg.toString()); + if (stepObject == null) { + stepObject = new IntegerState("ORStep", -1); + stepObject.addObserver(this); + } + if (operatingCompanyArray.length > 0) { *************** *** 1912,1919 **** if (step == STEP_INITIAL) initTurn(); - if (stepObject == null) { - stepObject = new IntegerState("ORStep", -1); - stepObject.addObserver(this); - } stepObject.set(step); --- 1917,1920 ---- |
|
From: Erik V. <ev...@us...> - 2009-12-19 18:32:46
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4550/rails/ui/swing Modified Files: GUIToken.java Log Message: Fixed price token display Index: GUIToken.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/GUIToken.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** GUIToken.java 15 Dec 2009 18:56:11 -0000 1.9 --- GUIToken.java 19 Dec 2009 18:32:32 -0000 1.10 *************** *** 49,53 **** (int) (font.getSize() * tokenScale))); g2d.setColor(fgColor); - // g2d.drawString(name, 3, 14); g2d.drawString(name, (int) (circle.x + (12 - 3*name.length()) * tokenScale), (int) (circle.y + 14 * tokenScale)); --- 49,52 ---- |
|
From: Erik V. <ev...@us...> - 2009-12-19 18:32:43
|
Update of /cvsroot/rails/18xx/rails/ui/swing/elements In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4550/rails/ui/swing/elements Modified Files: GUIStockSpace.java Log Message: Fixed price token display Index: GUIStockSpace.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/elements/GUIStockSpace.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** GUIStockSpace.java 13 Dec 2009 16:39:49 -0000 1.8 --- GUIStockSpace.java 19 Dec 2009 18:32:34 -0000 1.9 *************** *** 27,30 **** --- 27,35 ---- private static final Color LIGHT_GRAY = new Color(200, 200, 200); + + private static final int TOKEN_ORIGIN_X = 12; + private static final int TOKEN_ORIGIN_Y = 10; + private static final int TOKEN_INCREMENT_Y = 6; + private static final int TOKEN_DIAMETER = 20; protected static Logger log = *************** *** 87,90 **** --- 92,98 ---- private void placeToken(List<PublicCompanyI> tokenList) { + int xCenter = TOKEN_ORIGIN_X; + int yCenter = TOKEN_ORIGIN_Y; + int diameter = TOKEN_DIAMETER; Point origin = new Point(16, 0); Dimension size = new Dimension(40, 40); *************** *** 99,107 **** fgColour = co.getFgColour(); ! token = new GUIToken(fgColour, bgColour, co.getName()); token.setBounds(origin.x, origin.y, size.width, size.height); add(token, new Integer(0), 0); ! origin.y += 6; } } --- 107,115 ---- fgColour = co.getFgColour(); ! token = new GUIToken(fgColour, bgColour, co.getName(), xCenter, yCenter, diameter); token.setBounds(origin.x, origin.y, size.width, size.height); add(token, new Integer(0), 0); ! yCenter += TOKEN_INCREMENT_Y; } } |
|
From: Erik V. <ev...@us...> - 2009-12-19 16:48:46
|
Update of /cvsroot/rails/18xx/rails/ui/swing/hexmap In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1867/rails/ui/swing/hexmap Modified Files: GUIHex.java GUITile.java Log Message: Better positioning and sizing of tokens and home indicators Index: GUIHex.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/GUIHex.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** GUIHex.java 15 Dec 2009 18:56:11 -0000 1.28 --- GUIHex.java 19 Dec 2009 16:48:31 -0000 1.29 *************** *** 27,30 **** --- 27,32 ---- public static int NORMAL_TOKEN_SIZE = 15; + public static double TILE_GRID_SCALE = 14.0; + public static double CITY_SIZE = 16.0; public static Color BAR_COLOUR = Color.BLUE; *************** *** 322,348 **** Map<PublicCompanyI, City> homes = getHexModel().getHomes(); if (homes != null) { ! //log.debug("+++ Home hex "+getName()); ! /* ! StringBuffer b = new StringBuffer(); ! for (Iterator<PublicCompanyI> it = homes.keySet().iterator(); it.hasNext();) { ! ! PublicCompanyI co = it.next(); ! ! if (!co.hasStarted() && !co.hasFloated()) { ! if (b.length() > 0) b.append(","); ! b.append(co.getName()); ! } ! } ! String label = b.toString(); ! g2.drawString( ! label, ! rectBound.x ! + (rectBound.width - fontMetrics.stringWidth(label)) ! * 1 / 2, ! rectBound.y ! + ((fontMetrics.getHeight() + rectBound.height) * 3 / 10)); ! */ ! City city; Point p; homes: for (PublicCompanyI company : homes.keySet()) { --- 324,330 ---- Map<PublicCompanyI, City> homes = getHexModel().getHomes(); + if (homes != null) { ! City city; Point p; homes: for (PublicCompanyI company : homes.keySet()) { *************** *** 359,363 **** } } ! p = getTokenOrigin (1, 0, getHexModel().getCities().size(), city.getNumber()-1); //log.debug("+++ Home of "+company.getName()+" hex"+getName()+" city"+city.getName() --- 341,345 ---- } } ! p = getTokenCenter (1, 0, getHexModel().getCities().size(), city.getNumber()-1); //log.debug("+++ Home of "+company.getName()+" hex"+getName()+" city"+city.getName() *************** *** 435,440 **** for (int i = 0; i < tokens.size(); i++) { PublicCompanyI co = ((BaseToken) tokens.get(i)).getCompany(); ! Point origin = getTokenOrigin(numTokens, i, 1, 0); ! drawBaseToken(g2, co, origin, tokenDiameter); } } --- 417,422 ---- for (int i = 0; i < tokens.size(); i++) { PublicCompanyI co = ((BaseToken) tokens.get(i)).getCompany(); ! Point center = getTokenCenter(numTokens, i, 1, 0); ! drawBaseToken(g2, co, center, tokenDiameter); } } *************** *** 452,456 **** for (int j = 0; j < tokens.size(); j++) { ! origin = getTokenOrigin(numTokens, j, numStations, i); co = ((BaseToken) tokens.get(j)).getCompany(); drawBaseToken(g2, co, origin, tokenDiameter); --- 434,438 ---- for (int j = 0; j < tokens.size(); j++) { ! origin = getTokenCenter(numTokens, j, numStations, i); co = ((BaseToken) tokens.get(j)).getCompany(); drawBaseToken(g2, co, origin, tokenDiameter); *************** *** 506,518 **** Color oldColor = g2.getColor(); ! double tokenScale = 15.0 / 21.0; String name = co.getName(); Font font = GUIToken.getTokenFont(name.length()); g2.setFont(new Font("Helvetica", Font.BOLD, ! (int) (font.getSize() * tokenScale))); g2.setColor(Color.BLACK); ! g2.drawString(name, (int) (origin.x + (12 - 3*name.length()) * tokenScale), ! (int) (origin.y + 14 * tokenScale)); g2.setColor(oldColor); --- 488,500 ---- Color oldColor = g2.getColor(); ! double scale = 0.5 * zoomFactor; String name = co.getName(); Font font = GUIToken.getTokenFont(name.length()); g2.setFont(new Font("Helvetica", Font.BOLD, ! (int) (font.getSize() * zoomFactor * 0.75))); g2.setColor(Color.BLACK); ! g2.drawString(name, (int) (origin.x + (-4 - 3*name.length()) * scale), ! (int) (origin.y + 4 * scale)); g2.setColor(oldColor); *************** *** 537,541 **** } ! private Point getTokenOrigin(int numTokens, int currentToken, int numStations, int stationNumber) { Point p = new Point(center.x, center.y); --- 519,523 ---- } ! private Point getTokenCenter(int numTokens, int currentToken, int numStations, int stationNumber) { Point p = new Point(center.x, center.y); *************** *** 550,554 **** int positionCode = station.getPosition(); if (positionCode != 0) { ! y = 16 * zoomFactor; double r = Math.toRadians(30 * (positionCode / 50)); xx = x * Math.cos(r) + y * Math.sin(r); --- 532,536 ---- int positionCode = station.getPosition(); if (positionCode != 0) { ! y = TILE_GRID_SCALE * zoomFactor; double r = Math.toRadians(30 * (positionCode / 50)); xx = x * Math.cos(r) + y * Math.sin(r); *************** *** 561,577 **** switch (station.getBaseSlots()) { case 2: ! x += (-8 + 16 * currentToken) * zoomFactor; break; case 3: if (currentToken < 2) { ! x += (-8 + 16 * currentToken) * zoomFactor; ! y += 8 * zoomFactor; } else { ! y -= 8 * zoomFactor; } break; case 4: ! x += (-8 + 16 * currentToken % 2) * zoomFactor; ! y += (8 - 16 * currentToken / 2) * zoomFactor; } --- 543,559 ---- switch (station.getBaseSlots()) { case 2: ! x += (-0.5 + currentToken) * CITY_SIZE * zoomFactor; break; case 3: if (currentToken < 2) { ! x += (-0.5 + currentToken) * CITY_SIZE * zoomFactor; ! y += -3 + 0.25 * SQRT3 * CITY_SIZE * zoomFactor; } else { ! y -= 3 + 0.5 * CITY_SIZE * zoomFactor; } break; case 4: ! x += (-0.5 + currentToken % 2) * CITY_SIZE * zoomFactor; ! y += (0.5 - currentToken / 2) * CITY_SIZE * zoomFactor; } Index: GUITile.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/GUITile.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** GUITile.java 18 Dec 2009 20:04:31 -0000 1.20 --- GUITile.java 19 Dec 2009 16:48:32 -0000 1.21 *************** *** 24,29 **** protected TileI tile = null; protected String tileType = null; - //protected double xCenterRelativeLocation = SVG_X_CENTER_LOC; - //protected double yCenterRelativeLocation = SVG_Y_CENTER_LOC; protected BufferedImage tileImage = null; --- 24,27 ---- *************** *** 44,49 **** public static final double DEG60 = Math.PI / 3; - //public static final double DFLT_X_CENTER_LOC = 0.5; - //public static final double DFLT_Y_CENTER_LOC = 0.5; public static final double SVG_X_CENTER_LOC = 0.489; public static final double SVG_Y_CENTER_LOC = 0.426; --- 42,45 ---- *************** *** 245,255 **** int zoomStep = guiHex.getHexMap().getZoomStep(); tileImage = imageLoader.getTile(tileId, zoomStep); - //if (tileType == null) { - // tileType = imageLoader.getTileType(tileId); - // if (tileType.equalsIgnoreCase("svg")) { - // xCenterRelativeLocation = SVG_X_CENTER_LOC; - // yCenterRelativeLocation = SVG_Y_CENTER_LOC; - // } - //} if (tileImage != null) { --- 241,244 ---- |
|
From: Erik V. <ev...@us...> - 2009-12-19 16:48:41
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1867/rails/ui/swing Modified Files: ImageLoader.java Log Message: Better positioning and sizing of tokens and home indicators Index: ImageLoader.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/ImageLoader.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ImageLoader.java 18 Dec 2009 20:04:32 -0000 1.14 --- ImageLoader.java 19 Dec 2009 16:48:32 -0000 1.15 *************** *** 26,44 **** private static Map<Integer, Document> svgMap; private static double[] zoomFactors = new double[21]; - //private static Map<Integer, String> tileTypes = new HashMap<Integer, String>(64); - //private static int svgWidth = 60; - //private static int svgHeight = 55; private static double svgWidth = 75; private static double svgHeight = svgWidth * 0.5 * Math.sqrt(3.0); private static String svgTileDir = "tiles/svg"; - //private static String gifTileDir = "tiles/images"; private static String tileRootDir = Config.get("tile.root_directory"); - //private static String preference = Config.get("tile.format_preference"); private static List<String> directories = new ArrayList<String>(); static { - //GUIHex.setScale(preference.equalsIgnoreCase("svg") ? 1.0 : 0.33); - //GUIHex.setScale(preference.equalsIgnoreCase("svg") ? 1.0 : 0.163); GUIHex.setScale(1.0); } --- 26,37 ---- *************** *** 74,130 **** } - /* - private BufferedImage loadTile(int tileID, double zoomFactor) { - BufferedImage image = null; - - //String tileType; - if (preference.equalsIgnoreCase("gif")) { - - image = getGIFTile(tileID); - if (image == null) { - // If loading the GIF fails, try loading the SVG. - log.warn("Attempting to load SVG version of tile " + tileID); - image = getSVGTile(tileID, zoomFactor); - //tileType = "svg"; - } else { - tileType = "gif"; - } - - } else { - - image = getSVGTile(tileID, zoomFactor); - if (image == null) { - // If loading the SVG fails, try loading the GIF. - log.warn("Attempting to load GIF version of tile " + tileID); - image = getGIFTile(tileID); - tileType = "gif"; - } else { - tileType = "svg"; - } - } - //tileTypes.put(tileID, tileType); - return image; - }*/ - private BufferedImage getSVGTile(int tileID, double zoomFactor) { String fn = "tile" + Integer.toString(tileID) + ".svg"; - //log.debug("Loading SVG tile " + fn); BufferedImage image = null; try { - /* - InputStream stream = ResourceLoader.getInputStream(fn, directories); - if (stream != null) { - BufferedImageTranscoder t = new BufferedImageTranscoder(); - t.addTranscodingHint(ImageTranscoder.KEY_WIDTH, new Float( - svgWidth)); - t.addTranscodingHint(ImageTranscoder.KEY_HEIGHT, new Float( - svgHeight)); - TranscoderInput input = new TranscoderInput(stream); - t.transcode(input, null); - image = t.getImage(); - } - */ // Experimental new version, that stacks the XML to allow zooming if (svgMap == null) { --- 67,76 ---- *************** *** 162,186 **** } - /* - private BufferedImage getGIFTile(int tileID) { - String fn = "tile" + Integer.toString(tileID) + ".gif"; - //log.debug("Loading tile " + fn); - - BufferedImage image = null; - - try { - - InputStream str = ResourceLoader.getInputStream(fn, directories); - if (str != null) { - image = ImageIO.read(str); - } - } catch (Exception e) { - log.error("Error loading file: " + fn + "\nLoad failed with " + e); - return null; - } - return image; - } - */ - public BufferedImage getTile(int tileID, int zoomStep) { --- 108,111 ---- *************** *** 209,219 **** } - //public String getTileType (int tileID) { - // return tileTypes.get(tileID); - //} - public ImageLoader() { directories.add(tileRootDir + svgTileDir); - //directories.add(tileRootDir + gifTileDir); directories.add(tileRootDir); } --- 134,139 ---- |
|
From: Erik V. <ev...@us...> - 2009-12-18 20:05:09
|
Update of /cvsroot/rails/18xx/rails/ui/swing/hexmap In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5921/rails/ui/swing/hexmap Modified Files: GUITile.java Log Message: Adapted code for correct working with new set of SVG tiles. Removed support for GIF tiles. Index: GUITile.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/GUITile.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** GUITile.java 15 Dec 2009 18:56:11 -0000 1.19 --- GUITile.java 18 Dec 2009 20:04:31 -0000 1.20 *************** *** 23,26 **** --- 23,29 ---- protected TileI tile = null; + protected String tileType = null; + //protected double xCenterRelativeLocation = SVG_X_CENTER_LOC; + //protected double yCenterRelativeLocation = SVG_Y_CENTER_LOC; protected BufferedImage tileImage = null; *************** *** 41,44 **** --- 44,52 ---- public static final double DEG60 = Math.PI / 3; + //public static final double DFLT_X_CENTER_LOC = 0.5; + //public static final double DFLT_Y_CENTER_LOC = 0.5; + public static final double SVG_X_CENTER_LOC = 0.489; + public static final double SVG_Y_CENTER_LOC = 0.426; + protected static Logger log = Logger.getLogger(GUITile.class.getPackage().getName()); *************** *** 237,248 **** int zoomStep = guiHex.getHexMap().getZoomStep(); tileImage = imageLoader.getTile(tileId, zoomStep); if (tileImage != null) { double radians = baseRotation + rotation * DEG60; ! int xCenter = ! (int) Math.round(tileImage.getWidth() * 0.5 * tileScale); ! int yCenter = ! (int) Math.round(tileImage.getHeight() * 0.5 * tileScale); af = AffineTransform.getRotateInstance(radians, xCenter, yCenter); --- 245,263 ---- int zoomStep = guiHex.getHexMap().getZoomStep(); tileImage = imageLoader.getTile(tileId, zoomStep); + //if (tileType == null) { + // tileType = imageLoader.getTileType(tileId); + // if (tileType.equalsIgnoreCase("svg")) { + // xCenterRelativeLocation = SVG_X_CENTER_LOC; + // yCenterRelativeLocation = SVG_Y_CENTER_LOC; + // } + //} if (tileImage != null) { double radians = baseRotation + rotation * DEG60; ! int xCenter = (int) Math.round(tileImage.getWidth() ! * SVG_X_CENTER_LOC * tileScale); ! int yCenter = (int) Math.round(tileImage.getHeight() ! * SVG_Y_CENTER_LOC * tileScale); af = AffineTransform.getRotateInstance(radians, xCenter, yCenter); |
|
From: Erik V. <ev...@us...> - 2009-12-18 20:04:42
|
Update of /cvsroot/rails/18xx/.settings In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5921/.settings Added Files: org.eclipse.core.resources.prefs Log Message: Adapted code for correct working with new set of SVG tiles. Removed support for GIF tiles. --- NEW FILE: org.eclipse.core.resources.prefs --- #Fri Dec 18 15:48:31 CET 2009 eclipse.preferences.version=1 encoding//tiles/TDwithID/tile0.svg=UTF-8 encoding//tiles/handmade/tile-901.svg=UTF-8 encoding//tiles/handmade/tile-902-inkscape.svg=UTF-8 encoding//tiles/handmade/tile-902.svg=UTF-8 encoding//tiles/handmade/tile-903-inkscape.svg=UTF-8 encoding//tiles/handmade/tile-903.svg=UTF-8 encoding//tiles/svg/tile-902.svg=UTF-8 encoding//tiles/svg/tile-903.svg=UTF-8 |
|
From: Erik V. <ev...@us...> - 2009-12-18 20:04:41
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5921/rails/ui/swing Modified Files: MapPanel.java ImageLoader.java Log Message: Adapted code for correct working with new set of SVG tiles. Removed support for GIF tiles. Index: ImageLoader.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/ImageLoader.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ImageLoader.java 15 Dec 2009 18:56:11 -0000 1.13 --- ImageLoader.java 18 Dec 2009 20:04:32 -0000 1.14 *************** *** 3,10 **** import java.awt.image.BufferedImage; - import java.io.InputStream; import java.util.*; - import javax.imageio.ImageIO; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; --- 3,8 ---- *************** *** 28,42 **** private static Map<Integer, Document> svgMap; private static double[] zoomFactors = new double[21]; ! private static int svgWidth = 60; ! private static int svgHeight = 55; private static String svgTileDir = "tiles/svg"; ! private static String gifTileDir = "tiles/images"; private static String tileRootDir = Config.get("tile.root_directory"); ! private static String preference = Config.get("tile.format_preference"); private static List<String> directories = new ArrayList<String>(); static { ! GUIHex.setScale(preference.equalsIgnoreCase("svg") ? 1.0 : 0.33); } --- 26,45 ---- private static Map<Integer, Document> svgMap; private static double[] zoomFactors = new double[21]; + //private static Map<Integer, String> tileTypes = new HashMap<Integer, String>(64); ! //private static int svgWidth = 60; ! //private static int svgHeight = 55; ! private static double svgWidth = 75; ! private static double svgHeight = svgWidth * 0.5 * Math.sqrt(3.0); private static String svgTileDir = "tiles/svg"; ! //private static String gifTileDir = "tiles/images"; private static String tileRootDir = Config.get("tile.root_directory"); ! //private static String preference = Config.get("tile.format_preference"); private static List<String> directories = new ArrayList<String>(); static { ! //GUIHex.setScale(preference.equalsIgnoreCase("svg") ? 1.0 : 0.33); ! //GUIHex.setScale(preference.equalsIgnoreCase("svg") ? 1.0 : 0.163); ! GUIHex.setScale(1.0); } *************** *** 71,77 **** --- 74,82 ---- } + /* private BufferedImage loadTile(int tileID, double zoomFactor) { BufferedImage image = null; + //String tileType; if (preference.equalsIgnoreCase("gif")) { *************** *** 81,84 **** --- 86,92 ---- log.warn("Attempting to load SVG version of tile " + tileID); image = getSVGTile(tileID, zoomFactor); + //tileType = "svg"; + } else { + tileType = "gif"; } *************** *** 90,97 **** log.warn("Attempting to load GIF version of tile " + tileID); image = getGIFTile(tileID); } } return image; ! } private BufferedImage getSVGTile(int tileID, double zoomFactor) { --- 98,109 ---- log.warn("Attempting to load GIF version of tile " + tileID); image = getGIFTile(tileID); + tileType = "gif"; + } else { + tileType = "svg"; } } + //tileTypes.put(tileID, tileType); return image; ! }*/ private BufferedImage getSVGTile(int tileID, double zoomFactor) { *************** *** 135,140 **** } BufferedImageTranscoder t = new BufferedImageTranscoder(); ! t.addTranscodingHint(ImageTranscoder.KEY_WIDTH, new Float(svgWidth * zoomFactor)); ! t.addTranscodingHint(ImageTranscoder.KEY_HEIGHT, new Float(svgHeight * zoomFactor)); TranscoderInput input = new TranscoderInput(svgMap.get(tileID)); t.transcode(input, null); --- 147,152 ---- } BufferedImageTranscoder t = new BufferedImageTranscoder(); ! t.addTranscodingHint(ImageTranscoder.KEY_MAX_WIDTH, new Float(svgWidth * zoomFactor)); ! t.addTranscodingHint(ImageTranscoder.KEY_MAX_HEIGHT, new Float(svgHeight * zoomFactor)); TranscoderInput input = new TranscoderInput(svgMap.get(tileID)); t.transcode(input, null); *************** *** 150,153 **** --- 162,166 ---- } + /* private BufferedImage getGIFTile(int tileID) { String fn = "tile" + Integer.toString(tileID) + ".gif"; *************** *** 168,171 **** --- 181,185 ---- return image; } + */ public BufferedImage getTile(int tileID, int zoomStep) { *************** *** 178,182 **** } if (!tileMap.get(tileID).containsKey(zoomStep)) { ! BufferedImage image = loadTile(tileID, getZoomFactor(zoomStep)); tileMap.get(tileID).put(zoomStep, image); } --- 192,196 ---- } if (!tileMap.get(tileID).containsKey(zoomStep)) { ! BufferedImage image = getSVGTile(tileID, getZoomFactor(zoomStep)); tileMap.get(tileID).put(zoomStep, image); } *************** *** 195,201 **** } public ImageLoader() { directories.add(tileRootDir + svgTileDir); ! directories.add(tileRootDir + gifTileDir); directories.add(tileRootDir); } --- 209,219 ---- } + //public String getTileType (int tileID) { + // return tileTypes.get(tileID); + //} + public ImageLoader() { directories.add(tileRootDir + svgTileDir); ! //directories.add(tileRootDir + gifTileDir); directories.add(tileRootDir); } Index: MapPanel.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/MapPanel.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** MapPanel.java 15 Dec 2009 18:56:11 -0000 1.12 --- MapPanel.java 18 Dec 2009 20:04:31 -0000 1.13 *************** *** 31,35 **** public MapPanel(GameUIManager gameUIManager) { this.gameUIManager = gameUIManager; ! Scale.set(15); setLayout(new BorderLayout()); --- 31,36 ---- public MapPanel(GameUIManager gameUIManager) { this.gameUIManager = gameUIManager; ! //Scale.set(15); ! Scale.set(16); setLayout(new BorderLayout()); |
|
From: Erik V. <ev...@us...> - 2009-12-18 20:04:02
|
Update of /cvsroot/rails/18xx/rails/util In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5814/rails/util Modified Files: MakeGameTileSets.java Log Message: Some updates Index: MakeGameTileSets.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/util/MakeGameTileSets.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MakeGameTileSets.java 11 Dec 2008 20:12:30 -0000 1.7 --- MakeGameTileSets.java 18 Dec 2009 20:03:52 -0000 1.8 *************** *** 79,87 **** for (int i = 0; i < games.length; i++) { ! makeTileSet(games[i], tileMap); } ! } --- 79,87 ---- for (int i = 0; i < games.length; i++) { ! System.out.println("Preparing "+games[i]); makeTileSet(games[i], tileMap); } ! System.out.println("Done"); } *************** *** 89,92 **** --- 89,93 ---- throws ConfigurationException { + directories.clear(); directories.add("data/" + gameName); *************** *** 120,123 **** --- 121,125 ---- tileName = ((Element) tiles.item(i)).getAttribute("id"); + System.out.println("Tile "+tileName); // Save the tile in a Map so that we can check completeness // later. |
|
From: Erik V. <ev...@us...> - 2009-12-18 20:02:37
|
Update of /cvsroot/rails/18xx/data/1856 In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5514/data/1856 Modified Files: Tiles.xml Log Message: Changed orientation of tile #4 to get the village right Index: Tiles.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/1856/Tiles.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Tiles.xml 28 Feb 2008 21:35:04 -0000 1.6 --- Tiles.xml 18 Dec 2009 20:02:21 -0000 1.7 *************** *** 31,38 **** <Track from="city1" gauge="normal" to="side1"/> </Tile><Tile colour="red" id="-939" name="Goderich"> ! <Station id="city1" position="201" type="OffMapCity" value="-1"/> ! <Track from="side3" gauge="normal" to="city1"/> ! <Track from="side2" gauge="normal" to="city1"/> ! <Track from="side1" gauge="normal" to="city1"/> </Tile><Tile colour="yellow" id="1" name="1"> <Station id="city1" position="408" type="Town" value="10"/> --- 31,37 ---- <Track from="city1" gauge="normal" to="side1"/> </Tile><Tile colour="red" id="-939" name="Goderich"> ! <Track from="side3" gauge="normal" to="side1"/> ! <Track from="side3" gauge="normal" to="side2"/> ! <Track from="side2" gauge="normal" to="side1"/> </Tile><Tile colour="yellow" id="1" name="1"> <Station id="city1" position="408" type="Town" value="10"/> *************** *** 54,60 **** <Track from="city1" gauge="normal" to="side4"/> </Tile><Tile colour="yellow" id="4" name="4"> ! <Station id="city1" position="0" type="Town" value="10"/> ! <Track from="city1" gauge="normal" to="side2"/> ! <Track from="city1" gauge="normal" to="side5"/> </Tile><Tile colour="yellow" id="5" name="5"> <Station id="city1" position="0" slots="1" type="City" value="20"/> --- 53,59 ---- <Track from="city1" gauge="normal" to="side4"/> </Tile><Tile colour="yellow" id="4" name="4"> ! <Station id="city1" position="0" type="Town"/> ! <Track from="city1" gauge="normal" to="side3"/> ! <Track from="city1" gauge="normal" to="side0"/> </Tile><Tile colour="yellow" id="5" name="5"> <Station id="city1" position="0" slots="1" type="City" value="20"/> |
|
From: Erik V. <ev...@us...> - 2009-12-18 20:02:37
|
Update of /cvsroot/rails/18xx/data/18Kaas In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5514/data/18Kaas Modified Files: Tiles.xml Log Message: Changed orientation of tile #4 to get the village right Index: Tiles.xml =================================================================== RCS file: /cvsroot/rails/18xx/data/18Kaas/Tiles.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Tiles.xml 28 Feb 2008 21:35:03 -0000 1.2 --- Tiles.xml 18 Dec 2009 20:02:21 -0000 1.3 *************** *** 58,64 **** <Track from="city1" gauge="normal" to="side4"/> </Tile><Tile colour="yellow" id="4" name="4"> ! <Station id="city1" position="0" type="Town" value="10"/> ! <Track from="city1" gauge="normal" to="side2"/> ! <Track from="city1" gauge="normal" to="side5"/> </Tile><Tile colour="yellow" id="7" name="7"> <Track from="side3" gauge="normal" to="side4"/> --- 58,64 ---- <Track from="city1" gauge="normal" to="side4"/> </Tile><Tile colour="yellow" id="4" name="4"> ! <Station id="city1" position="0" type="Town"/> ! <Track from="city1" gauge="normal" to="side3"/> ! <Track from="city1" gauge="normal" to="side0"/> </Tile><Tile colour="yellow" id="7" name="7"> <Track from="side3" gauge="normal" to="side4"/> |
