From 8d5291e591ba8725bff3cb40350ed552535f874a Mon Sep 17 00:00:00 2001
From: "jason@long.name" <jason@long.name@d9718cc8-9f43-0410-858b-315f434eb58c>
Date: Wed, 26 Jun 2013 13:14:07 +0000
Subject: [PATCH] graphics: attempt to move wire over road to separate file

(generated tiles.png does not match previous version, so something
is wrong)

git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@709 d9718cc8-9f43-0410-858b-315f434eb58c
---
 graphics/roadwire.png | Bin 0 -> 318 bytes
 graphics/tiles.dat    |  48 +++++++++++++++++++++---------------------
 2 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100755 graphics/roadwire.png

diff --git a/graphics/roadwire.png b/graphics/roadwire.png
new file mode 100755
index 0000000000000000000000000000000000000000..627e05c05b56b1d96a37ed3aa607b4ed0f7cbcc1
GIT binary patch
literal 318
zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!3HFyJAa%3QjEnx?oJHr&dIz4a@dl*-CY>|
zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfT{cM(P8|z@DUX0cvY8<fCC>S|
zxv6<2KrRD=b5UwyNotBhd1gt5g1e`0K#E=}J5YS8r;B5V$MIyF;Q7ZIctzxQ{M>)t
zajxLpUcMO;8Z15EzI}^Om64J8CvQ>EAUM~zRGf#IIU=ElnVoNehlz>Ff)5v;%F4(D
z@HTJ?oR;rpRdT4U{ac@t)3e9m!%o3xOp}jA^6V&5GrRD5f#3272meFO`mzSMZr}cY
ze0n5DWiPAPezo3SW?^pU1KiE_vKQ_#IBj&^$j!jw>som<a8nw{<({s7F6*2UngDUh
BWq1Gp

literal 0
HcmV?d00001

diff --git a/graphics/tiles.dat b/graphics/tiles.dat
index cdc3ec0..a6ba18e 100644
--- a/graphics/tiles.dat
+++ b/graphics/tiles.dat
@@ -86,12 +86,12 @@
 85    roads@16,80,16,16
 86    roads@16,96,16,16
 87    roads@16,112,16,16
-88    roads@16,128,16,16
+88    roads@0,128,16,16|traffic@16,0,16,16
 89    roads@16,144,16,16
-90    roads@16,160,16,16
+90    roads@0,160,16,16|traffic@16,0,16,16
 91    roads@16,176,16,16
 92    roads@16,192,16,16
-93    roads@16,208,16,16
+93    roads@0,32,16,16|traffic@16,0,16,16 |roadwire@0,0,16,16
 94    roads@16,224,16,16
 95    roads@16,240,16,16
 96    roads@0,0,16,16 |traffic@32,0,16,16
@@ -102,12 +102,12 @@
 101   roads@32,80,16,16
 102   roads@32,96,16,16
 103   roads@32,112,16,16
-104   roads@32,128,16,16
+104   roads@0,128,16,16|traffic@32,0,16,16
 105   roads@32,144,16,16
-106   roads@32,160,16,16
+106   roads@0,160,16,16|traffic@32,0,16,16
 107   roads@32,176,16,16
 108   roads@32,192,16,16
-109   roads@32,208,16,16
+109   roads@0,32,16,16|traffic@32,0,16,16 |roadwire@0,0,16,16
 110   roads@32,224,16,16
 111   roads@32,240,16,16
 112   roads@0,0,16,16 |traffic@48,0,16,16
@@ -118,12 +118,12 @@
 117   roads@48,80,16,16
 118   roads@48,96,16,16
 119   roads@48,112,16,16
-120   roads@48,128,16,16
+120   roads@0,128,16,16|traffic@48,0,16,16
 121   roads@48,144,16,16
-122   roads@48,160,16,16
+122   roads@0,160,16,16|traffic@48,0,16,16
 123   roads@48,176,16,16
 124   roads@48,192,16,16
-125   roads@48,208,16,16
+125   roads@0,32,16,16|traffic@48,0,16,16 |roadwire@0,0,16,16
 126   roads@48,224,16,16
 127   roads@48,240,16,16
 128   roads@0,0,16,16 |traffic@64,0,16,16
@@ -134,12 +134,12 @@
 133   roads@64,80,16,16
 134   roads@64,96,16,16
 135   roads@64,112,16,16
-136   roads@64,128,16,16
+136   roads@0,128,16,16|traffic@64,0,16,16
 137   roads@64,144,16,16
-138   roads@64,160,16,16
+138   roads@0,160,16,16|traffic@64,0,16,16
 139   roads@64,176,16,16
 140   roads@64,192,16,16
-141   roads@64,208,16,16
+141   roads@0,32,16,16|traffic@64,0,16,16 |roadwire@0,0,16,16
 142   roads@64,224,16,16
 143   roads@64,240,16,16
 144   roads@0,0,16,16 |traffic@80,0,16,16
@@ -150,12 +150,12 @@
 149   roads@80,80,16,16
 150   roads@80,96,16,16
 151   roads@80,112,16,16
-152   roads@80,128,16,16
+152   roads@0,128,16,16|traffic@80,0,16,16
 153   roads@80,144,16,16
-154   roads@80,160,16,16
+154   roads@0,160,16,16|traffic@80,0,16,16
 155   roads@80,176,16,16
 156   roads@80,192,16,16
-157   roads@80,208,16,16
+157   roads@0,32,16,16|traffic@80,0,16,16 |roadwire@0,0,16,16
 158   roads@80,224,16,16
 159   roads@80,240,16,16
 160   roads@0,0,16,16 |traffic@96,0,16,16
@@ -166,12 +166,12 @@
 165   roads@96,80,16,16
 166   roads@96,96,16,16
 167   roads@96,112,16,16
-168   roads@96,128,16,16
+168   roads@0,128,16,16|traffic@96,0,16,16
 169   roads@96,144,16,16
-170   roads@96,160,16,16
+170   roads@0,160,16,16|traffic@96,0,16,16
 171   roads@96,176,16,16
 172   roads@96,192,16,16
-173   roads@96,208,16,16
+173   roads@0,32,16,16|traffic@96,0,16,16 |roadwire@0,0,16,16
 174   roads@96,224,16,16
 175   roads@96,240,16,16
 176   roads@0,0,16,16 |traffic@112,0,16,16
@@ -182,12 +182,12 @@
 181   roads@112,80,16,16
 182   roads@112,96,16,16
 183   roads@112,112,16,16
-184   roads@112,128,16,16
+184   roads@0,128,16,16|traffic@112,0,16,16
 185   roads@112,144,16,16
-186   roads@112,160,16,16
+186   roads@0,160,16,16|traffic@112,0,16,16
 187   roads@112,176,16,16
 188   roads@112,192,16,16
-189   roads@112,208,16,16
+189   roads@0,32,16,16|traffic@112,0,16,16 |roadwire@0,0,16,16
 190   roads@112,224,16,16
 191   roads@112,240,16,16
 192   roads@0,0,16,16 |traffic@128,0,16,16
@@ -198,12 +198,12 @@
 197   roads@128,80,16,16
 198   roads@128,96,16,16
 199   roads@128,112,16,16
-200   roads@128,128,16,16
+200   roads@0,128,16,16|traffic@128,0,16,16
 201   roads@128,144,16,16
-202   roads@128,160,16,16
+202   roads@0,160,16,16|traffic@128,0,16,16
 203   roads@128,176,16,16
 204   roads@128,192,16,16
-205   roads@128,208,16,16
+205   roads@0,32,16,16|traffic@128,0,16,16 |roadwire@0,0,16,16
 206   roads@128,224,16,16
 207   roads@128,240,16,16
 208   roads@144,0,16,16