From 3d2733436e8237da4e0bb18e62389b2bdb7b588e Mon Sep 17 00:00:00 2001 From: Jason Long Date: Sun, 21 Sep 2014 20:33:05 -0400 Subject: [PATCH] animation: turn traffic into an animation --- graphics/heavy_traffic.ani | 7 + graphics/light_traffic.ani | 7 + graphics/tiles.rc | 240 +++++++++--------- graphics/{traffic.png => traffic_frames.png} | Bin ...traffic_3x3.png => traffic_frames_3x3.png} | Bin tiles/aliases.txt | 97 +++++++ 6 files changed, 231 insertions(+), 120 deletions(-) create mode 100644 graphics/heavy_traffic.ani create mode 100644 graphics/light_traffic.ani rename graphics/{traffic.png => traffic_frames.png} (100%) rename graphics/{traffic_3x3.png => traffic_frames_3x3.png} (100%) diff --git a/graphics/heavy_traffic.ani b/graphics/heavy_traffic.ani new file mode 100644 index 0000000..d931d5d --- /dev/null +++ b/graphics/heavy_traffic.ani @@ -0,0 +1,7 @@ + + + + + + + diff --git a/graphics/light_traffic.ani b/graphics/light_traffic.ani new file mode 100644 index 0000000..7f807f4 --- /dev/null +++ b/graphics/light_traffic.ani @@ -0,0 +1,7 @@ + + + + + + + diff --git a/graphics/tiles.rc b/graphics/tiles.rc index bd85d9c..799f217 100644 --- a/graphics/tiles.rc +++ b/graphics/tiles.rc @@ -98,135 +98,135 @@ # open draw bridge (east-west) - 79 roads@0,240 (bulldozable)(noburn)(overwater)(description=#7)(behavior=ROAD) # BEGIN ROADS WITH LIGHT TRAFFIC # -80 (64) |traffic@0,0 (becomes=128)(pollution=50) -81 (65) |traffic@0,16 (becomes=129)(pollution=50) -82 (66) |traffic@0,0 (becomes=130)(pollution=50) -83 (67) |traffic@0,16 (becomes=131)(pollution=50) -84 (68) |traffic@0,64 (becomes=132)(pollution=50) -85 (69) |traffic@0,80 (becomes=133)(pollution=50) -86 (70) |traffic@0,96 (becomes=134)(pollution=50) -87 (71) |traffic@0,112 (becomes=135)(pollution=50) -88 (72) |traffic@0,0 (becomes=136)(pollution=50) -89 (73) |traffic@0,16 (becomes=137)(pollution=50) -90 (74) |traffic@0,0 (becomes=138)(pollution=50) -91 (75) |traffic@0,16 (becomes=139)(pollution=50) -92 (76) |traffic@0,192 (becomes=140)(pollution=50) -93 roads@0,32 |traffic@0,0 |roadwire@0,0 (bulldozable)(conducts)(becomes=141)(description=#7)(behavior=ROAD)(pollution=50) -94 roads@0,48 |traffic@0,16 |roadwire@0,16 (bulldozable)(conducts)(becomes=142)(description=#7)(behavior=ROAD)(pollution=50) +80 (64) |light_traffic@0,0 (pollution=50) +81 (65) |light_traffic@0,16 (pollution=50) +82 (66) |light_traffic@0,0 (pollution=50) +83 (67) |light_traffic@0,16 (pollution=50) +84 (68) |light_traffic@0,64 (pollution=50) +85 (69) |light_traffic@0,80 (pollution=50) +86 (70) |light_traffic@0,96 (pollution=50) +87 (71) |light_traffic@0,112 (pollution=50) +88 (72) |light_traffic@0,0 (pollution=50) +89 (73) |light_traffic@0,16 (pollution=50) +90 (74) |light_traffic@0,0 (pollution=50) +91 (75) |light_traffic@0,16 (pollution=50) +92 (76) |light_traffic@0,192 (pollution=50) +93 (66) |light_traffic@0,0 |roadwire@0,0 (conducts)(pollution=50) +94 (67) |light_traffic@0,16 |roadwire@0,16 (conducts)(pollution=50) # open draw bridge (north-south) - 95 roads@0,240 (bulldozable)(noburn)(overwater)(becomes=143)(description=#7)(behavior=ROAD)(pollution=50) -96 (64) |traffic@16,0 (becomes=80)(pollution=50) -97 (65) |traffic@16,16 (becomes=81)(pollution=50) -98 (66) |traffic@16,0 (becomes=82)(pollution=50) -99 (67) |traffic@16,16 (becomes=83)(pollution=50) -100 (68) |traffic@16,64 (becomes=84)(pollution=50) -101 (69) |traffic@16,80 (becomes=85)(pollution=50) -102 (70) |traffic@16,96 (becomes=86)(pollution=50) -103 (71) |traffic@16,112 (becomes=87)(pollution=50) -104 (72) |traffic@16,0 (becomes=88)(pollution=50) -105 (73) |traffic@16,16 (becomes=89)(pollution=50) -106 (74) |traffic@16,0 (becomes=90)(pollution=50) -107 (75) |traffic@16,16 (becomes=91)(pollution=50) -108 (76) |traffic@16,192 (becomes=92)(pollution=50) -109 roads@0,32 |traffic@16,0 |roadwire@0,0 (bulldozable)(conducts)(becomes=93)(description=#7)(behavior=ROAD)(pollution=50) -110 roads@0,48 |traffic@16,16 |roadwire@0,16 (bulldozable)(conducts)(becomes=94)(description=#7)(behavior=ROAD)(pollution=50) +96 +97 +98 +99 +100 +101 +102 +103 +104 +105 +106 +107 +108 +109 +110 111 -112 (64) |traffic@32,0 (becomes=96)(pollution=50) -113 (65) |traffic@32,16 (becomes=97)(pollution=50) -114 (66) |traffic@32,0 (becomes=98)(pollution=50) -115 (67) |traffic@32,16 (becomes=99)(pollution=50) -116 (68) |traffic@32,64 (becomes=100)(pollution=50) -117 (69) |traffic@32,80 (becomes=101)(pollution=50) -118 (70) |traffic@32,96 (becomes=102)(pollution=50) -119 (71) |traffic@32,112 (becomes=103)(pollution=50) -120 (72) |traffic@32,0 (becomes=104)(pollution=50) -121 (73) |traffic@32,16 (becomes=105)(pollution=50) -122 (74) |traffic@32,0 (becomes=106)(pollution=50) -123 (75) |traffic@32,16 (becomes=107)(pollution=50) -124 (76) |traffic@32,192 (becomes=108)(pollution=50) -125 roads@0,32 |traffic@32,0 |roadwire@0,0 (bulldozable)(conducts)(becomes=109)(description=#7)(behavior=ROAD)(pollution=50) -126 roads@0,48 |traffic@32,16 |roadwire@0,16 (bulldozable)(conducts)(becomes=110)(description=#7)(behavior=ROAD)(pollution=50) +112 +113 +114 +115 +116 +117 +118 +119 +120 +121 +122 +123 +124 +125 +126 127 -128 (64) |traffic@48,0 (becomes=112)(pollution=50) -129 (65) |traffic@48,16 (becomes=113)(pollution=50) -130 (66) |traffic@48,0 (becomes=114)(pollution=50) -131 (67) |traffic@48,16 (becomes=115)(pollution=50) -132 (68) |traffic@48,64 (becomes=116)(pollution=50) -133 (69) |traffic@48,80 (becomes=117)(pollution=50) -134 (70) |traffic@48,96 (becomes=118)(pollution=50) -135 (71) |traffic@48,112 (becomes=119)(pollution=50) -136 (72) |traffic@48,0 (becomes=120)(pollution=50) -137 (73) |traffic@48,16 (becomes=121)(pollution=50) -138 (74) |traffic@48,0 (becomes=122)(pollution=50) -139 (75) |traffic@48,16 (becomes=123)(pollution=50) -140 (76) |traffic@48,192 (becomes=124)(pollution=50) -141 roads@0,32 |traffic@48,0 |roadwire@0,0 (bulldozable)(conducts)(becomes=125)(description=#7)(behavior=ROAD)(pollution=50) -142 roads@0,48 |traffic@48,16 |roadwire@0,16 (bulldozable)(conducts)(becomes=126)(description=#7)(behavior=ROAD)(pollution=50) +128 +129 +130 +131 +132 +133 +134 +135 +136 +137 +138 +139 +140 +141 +142 143 # BEGIN ROADS WITH HEAVY TRAFFIC # -144 (64) |traffic@64,0 (becomes=192)(pollution=75) -145 (65) |traffic@64,16 (becomes=193)(pollution=75) -146 (66) |traffic@64,0 (becomes=194)(pollution=75) -147 (67) |traffic@64,16 (becomes=195)(pollution=75) -148 (68) |traffic@64,64 (becomes=196)(pollution=75) -149 (69) |traffic@64,80 (becomes=197)(pollution=75) -150 (70) |traffic@64,96 (becomes=198)(pollution=75) -151 (71) |traffic@64,112 (becomes=199)(pollution=75) -152 (72) |traffic@64,0 (becomes=200)(pollution=75) -153 (73) |traffic@64,16 (becomes=201)(pollution=75) -154 (74) |traffic@64,0 (becomes=202)(pollution=75) -155 (75) |traffic@64,16 (becomes=203)(pollution=75) -156 (76) |traffic@64,192 (becomes=204)(pollution=75) -157 roads@0,32 |traffic@64,0 |roadwire@0,0 (bulldozable)(conducts)(becomes=205)(description=#7)(behavior=ROAD)(pollution=75) -158 roads@0,48 |traffic@64,16 |roadwire@0,16 (bulldozable)(conducts)(becomes=206)(description=#7)(behavior=ROAD)(pollution=75) +144 (64) |heavy_traffic@0,0 (pollution=75) +145 (65) |heavy_traffic@0,16 (pollution=75) +146 (66) |heavy_traffic@0,0 (pollution=75) +147 (67) |heavy_traffic@0,16 (pollution=75) +148 (68) |heavy_traffic@0,64 (pollution=75) +149 (69) |heavy_traffic@0,80 (pollution=75) +150 (70) |heavy_traffic@0,96 (pollution=75) +151 (71) |heavy_traffic@0,112 (pollution=75) +152 (72) |heavy_traffic@0,0 (pollution=75) +153 (73) |heavy_traffic@0,16 (pollution=75) +154 (74) |heavy_traffic@0,0 (pollution=75) +155 (75) |heavy_traffic@0,16 (pollution=75) +156 (76) |heavy_traffic@0,192 (pollution=75) +157 (66) |heavy_traffic@0,0 |roadwire@0,0 (conducts)(pollution=75) +158 (67) |heavy_traffic@0,16 |roadwire@0,16 (conducts)(pollution=75) 159 -160 (64) |traffic@80,0 (becomes=144)(pollution=75) -161 (65) |traffic@80,16 (becomes=145)(pollution=75) -162 (66) |traffic@80,0 (becomes=146)(pollution=75) -163 (67) |traffic@80,16 (becomes=147)(pollution=75) -164 (68) |traffic@80,64 (becomes=148)(pollution=75) -165 (69) |traffic@80,80 (becomes=149)(pollution=75) -166 (70) |traffic@80,96 (becomes=150)(pollution=75) -167 (71) |traffic@80,112 (becomes=151)(pollution=75) -168 (72) |traffic@80,0 (becomes=152)(pollution=75) -169 (73) |traffic@80,16 (becomes=153)(pollution=75) -170 (74) |traffic@80,0 (becomes=154)(pollution=75) -171 (75) |traffic@80,16 (becomes=155)(pollution=75) -172 (76) |traffic@80,192 (becomes=156)(pollution=75) -173 roads@0,32 |traffic@80,0 |roadwire@0,0 (bulldozable)(conducts)(becomes=157)(description=#7)(behavior=ROAD)(pollution=75) -174 roads@0,48 |traffic@80,16 |roadwire@0,16 (bulldozable)(conducts)(becomes=158)(description=#7)(behavior=ROAD)(pollution=75) +160 +161 +162 +163 +164 +165 +166 +167 +168 +169 +170 +171 +172 +173 +174 175 -176 (64) |traffic@96,0 (becomes=160)(pollution=75) -177 (65) |traffic@96,16 (becomes=161)(pollution=75) -178 (66) |traffic@96,0 (becomes=162)(pollution=75) -179 (67) |traffic@96,16 (becomes=163)(pollution=75) -180 (68) |traffic@96,64 (becomes=164)(pollution=75) -181 (69) |traffic@96,80 (becomes=165)(pollution=75) -182 (70) |traffic@96,96 (becomes=166)(pollution=75) -183 (71) |traffic@96,112 (becomes=167)(pollution=75) -184 (72) |traffic@96,0 (becomes=168)(pollution=75) -185 (73) |traffic@96,16 (becomes=169)(pollution=75) -186 (74) |traffic@96,0 (becomes=170)(pollution=75) -187 (75) |traffic@96,16 (becomes=171)(pollution=75) -188 (76) |traffic@96,192 (becomes=172)(pollution=75) -189 roads@0,32 |traffic@96,0 |roadwire@0,0 (bulldozable)(conducts)(becomes=173)(description=#7)(behavior=ROAD)(pollution=75) -190 roads@0,48 |traffic@96,16 |roadwire@0,16 (bulldozable)(conducts)(becomes=174)(description=#7)(behavior=ROAD)(pollution=75) +176 +177 +178 +179 +180 +181 +182 +183 +184 +185 +186 +187 +188 +189 +190 191 -192 (64) |traffic@112,0 (becomes=176)(pollution=75) -193 (65) |traffic@112,16 (becomes=177)(pollution=75) -194 (66) |traffic@112,0 (becomes=178)(pollution=75) -195 (67) |traffic@112,16 (becomes=179)(pollution=75) -196 (68) |traffic@112,64 (becomes=180)(pollution=75) -197 (69) |traffic@112,80 (becomes=181)(pollution=75) -198 (70) |traffic@112,96 (becomes=182)(pollution=75) -199 (71) |traffic@112,112 (becomes=183)(pollution=75) -200 (72) |traffic@112,0 (becomes=184)(pollution=75) -201 (73) |traffic@112,16 (becomes=185)(pollution=75) -202 (74) |traffic@112,0 (becomes=186)(pollution=75) -203 (75) |traffic@112,16 (becomes=187)(pollution=75) -204 (76) |traffic@112,192 (becomes=188)(pollution=75) -205 roads@0,32 |traffic@112,0 |roadwire@0,0 (bulldozable)(conducts)(becomes=189)(description=#7)(behavior=ROAD)(pollution=75) -206 roads@0,48 |traffic@112,16 |roadwire@0,16 (bulldozable)(conducts)(becomes=190)(description=#7)(behavior=ROAD)(pollution=75) +192 +193 +194 +195 +196 +197 +198 +199 +200 +201 +202 +203 +204 +205 +206 207 # BEGIN WIRES # 208 wires@0,0 (bulldozable)(noburn)(overwater)(conducts)(description=#8) diff --git a/graphics/traffic.png b/graphics/traffic_frames.png similarity index 100% rename from graphics/traffic.png rename to graphics/traffic_frames.png diff --git a/graphics/traffic_3x3.png b/graphics/traffic_frames_3x3.png similarity index 100% rename from graphics/traffic_3x3.png rename to graphics/traffic_frames_3x3.png diff --git a/tiles/aliases.txt b/tiles/aliases.txt index b0f06ab..3b43c9d 100644 --- a/tiles/aliases.txt +++ b/tiles/aliases.txt @@ -12,6 +12,103 @@ 61 56 62 56 63 56 +# light traffic +96 80 +97 81 +98 82 +99 83 +100 84 +101 85 +102 86 +103 87 +104 88 +105 89 +106 90 +107 91 +108 92 +109 93 +110 94 + +112 80 +113 81 +114 82 +115 83 +116 84 +117 85 +118 86 +119 87 +120 88 +121 89 +122 90 +123 91 +124 92 +125 93 +126 94 + +128 80 +129 81 +130 82 +131 83 +132 84 +133 85 +134 86 +135 87 +136 88 +137 89 +138 90 +139 91 +140 92 +141 93 +142 94 +143 95 +# heavy traffic +160 144 +161 145 +162 146 +163 147 +164 148 +165 149 +166 150 +167 151 +168 152 +169 153 +170 154 +171 155 +172 156 +173 157 +174 158 + +176 144 +177 145 +178 146 +179 147 +180 148 +181 149 +182 150 +183 151 +184 152 +185 153 +186 154 +187 155 +188 156 +189 157 +190 158 + +192 144 +193 145 +194 146 +195 147 +196 148 +197 149 +198 150 +199 151 +200 152 +201 153 +202 154 +203 155 +204 156 +205 157 +206 158 # radar dish animation 833 832 834 832