Menu
▾
▴
[Rails-commits] SF.net SVN: rails:[1465] trunk/18xx
|
From: <ev...@us...> - 2010-12-24 20:24:07
|
Revision: 1465
http://rails.svn.sourceforge.net/rails/?rev=1465&view=rev
Author: evos
Date: 2010-12-24 20:24:00 +0000 (Fri, 24 Dec 2010)
Log Message:
-----------
Implemented usage of <TileSet><Tile> pictureID attribute.
In 18EU this causes the correct green and brown plain track tiles (internally numbered 3080-3083 and 3544-3546) to be displayed.
Modified Paths:
--------------
trunk/18xx/data/18EU/TileSet.xml
trunk/18xx/rails/ui/swing/RemainingTilesWindow.java
trunk/18xx/rails/ui/swing/UpgradesPanel.java
trunk/18xx/tiles/svg/tile3080.svg
Added Paths:
-----------
trunk/18xx/tiles/svg/tile3544.svg
trunk/18xx/tiles/svg/tile3545.svg
trunk/18xx/tiles/svg/tile3546.svg
Modified: trunk/18xx/data/18EU/TileSet.xml
===================================================================
--- trunk/18xx/data/18EU/TileSet.xml 2010-12-24 18:59:23 UTC (rev 1464)
+++ trunk/18xx/data/18EU/TileSet.xml 2010-12-24 20:24:00 UTC (rev 1465)
@@ -112,9 +112,9 @@
<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="544" pic="3544" quantity="3" />
+ <Tile id="545" pic="3545" quantity="3" />
+ <Tile id="546" pic="3546" quantity="3" />
<Tile id="582" quantity="9" />
<Tile id="583" quantity="1">
<AllowsMultipleBasesOfOneCompany/>
Modified: trunk/18xx/rails/ui/swing/RemainingTilesWindow.java
===================================================================
--- trunk/18xx/rails/ui/swing/RemainingTilesWindow.java 2010-12-24 18:59:23 UTC (rev 1464)
+++ trunk/18xx/rails/ui/swing/RemainingTilesWindow.java 2010-12-24 20:24:00 UTC (rev 1465)
@@ -62,6 +62,7 @@
Field label;
BufferedImage hexImage;
ImageIcon hexIcon;
+ int picId;
// Build the grid with tiles in the sequence as
// these have been defined in Tiles.xml
@@ -72,8 +73,9 @@
if (tileId <= 0) continue;
tile = tmgr.getTile(tileId);
+ picId = tile.getPictureId();
- hexImage = GameUIManager.getImageLoader().getTile(tileId, 10);
+ hexImage = GameUIManager.getImageLoader().getTile(picId, 10);
hexIcon = new ImageIcon(hexImage);
hexIcon.setImage(hexIcon.getImage().getScaledInstance(
(int) (hexIcon.getIconWidth() * GUIHex.NORMAL_SCALE * 0.8),
Modified: trunk/18xx/rails/ui/swing/UpgradesPanel.java
===================================================================
--- trunk/18xx/rails/ui/swing/UpgradesPanel.java 2010-12-24 18:59:23 UTC (rev 1464)
+++ trunk/18xx/rails/ui/swing/UpgradesPanel.java 2010-12-24 20:24:00 UTC (rev 1465)
@@ -174,7 +174,7 @@
orUIManager.setMessage(LocalText.getText("NoTiles"));
} else {
for (TileI tile : orUIManager.tileUpgrades) {
- BufferedImage hexImage = getHexImage(tile.getId());
+ BufferedImage hexImage = getHexImage(tile.getPictureId());
ImageIcon hexIcon = new ImageIcon(hexImage);
// Cheap n' Easy rescaling.
Modified: trunk/18xx/tiles/svg/tile3080.svg
===================================================================
(Binary files differ)
Added: trunk/18xx/tiles/svg/tile3544.svg
===================================================================
--- trunk/18xx/tiles/svg/tile3544.svg (rev 0)
+++ trunk/18xx/tiles/svg/tile3544.svg 2010-12-24 20:24:00 UTC (rev 1465)
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg"><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="#B46301" stroke="#B46301" stroke-width="1" stroke-linejoin="round"/><text x="245" y="318" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Arial" font-size="34" font-weight="bold">544</text><path d="M 196,0 L 196,340" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 343,85 L 49,255" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,0 L 196,340" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 343,85 L 49,255" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg>
Added: trunk/18xx/tiles/svg/tile3545.svg
===================================================================
--- trunk/18xx/tiles/svg/tile3545.svg (rev 0)
+++ trunk/18xx/tiles/svg/tile3545.svg 2010-12-24 20:24:00 UTC (rev 1465)
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg"><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="#B46301" stroke="#B46301" stroke-width="1" stroke-linejoin="round"/><text x="245" y="318" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Arial" font-size="34" font-weight="bold">545</text><path d="M 196,0 L 196,340" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 49,85 L 196,170" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 49,255 L 196,170" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,0 L 196,340" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 49,85 L 196,170" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 49,255 L 196,170" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg>
Added: trunk/18xx/tiles/svg/tile3546.svg
===================================================================
--- trunk/18xx/tiles/svg/tile3546.svg (rev 0)
+++ trunk/18xx/tiles/svg/tile3546.svg 2010-12-24 20:24:00 UTC (rev 1465)
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg"><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="#B46301" stroke="#B46301" stroke-width="1" stroke-linejoin="round"/><text x="245" y="318" dy="0.3em" fill="#000000" stroke="#000000" text-anchor="middle" font-family="Arial" font-size="34" font-weight="bold">546</text><path d="M 196,0 L 196,340" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 343,85 L 196,170" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 49,85 L 196,170" fill="none" stroke="#FFFFFF" stroke-width="34" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 196,0 L 196,340" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 343,85 L 196,170" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d="M 49,85 L 196,170" fill="none" stroke="#000000" stroke-width="26" stroke-linecap="butt" stroke-linejoin="round"/><path d=" M 98,0 L 294,0 L 392,170 L 294,340 L 98,340 L 0,170 Z" fill="none" stroke="black" stroke-width="1" stroke-linejoin="round"/></svg>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
