165 Commits

Author SHA1 Message Date
Jérémy Rosen
74df5c6803 fix an accidentally hard coded layer in bridge macros 2010-07-16 19:43:01 +00:00
Jérémy Rosen
3a38c234c6 final cleanups to bridge macros 2010-07-10 17:42:47 +00:00
Jérémy Rosen
cf01e1bf6c make single tile bridgs work,
...namining convention is base-ns.png base-nesw.png and base-senw.png
depending on the underlying terrain type
2010-07-10 16:59:31 +00:00
Jérémy Rosen
61f60fb269 allow random tiles in bridges...
...at a few place where they wern't allowed yet
2010-07-10 16:52:11 +00:00
Jérémy Rosen
1674a2272a make stone-bridge work,
...there is still only the nw/se variant, and single hex bridges are
still broken. will fix this later
2010-07-10 16:41:50 +00:00
Jérémy Rosen
fdb992835a fix various problems detected by wmlscope 2010-07-09 22:01:04 +00:00
Jérémy Rosen
6b8a8be620 WIP in bridge macros. Random variations arn't supported,
...and the stonebridge still points to test images, but this should be
enough to get lurker in a working state...
2010-07-05 21:05:47 +00:00
Jérémy Rosen
65f62fd25d file renaming+corresponding track macro changes.
Also add some more debugging terrains. The stonebridge is temporarly
broken
2010-07-05 19:16:05 +00:00
Jérémy Rosen
fd0e640835 early commit of the stonebridge to allow artists to test in place...
note that multiple tiles are not placed correctly (n-s main tile is
the most visible) and that most transitions are missing of badly
placed. However all macros are in place and artists can start
adjusting
2010-06-24 16:10:09 +00:00
Jérémy Rosen
60baf69bd3 fix stupy copy/paste mistakes in six sided transitions 2010-06-24 15:55:43 +00:00
Jérémy Rosen
1cf80aa835 allow transitions detection on hex with 4/5/6 similar neighbours 2010-06-24 06:49:23 +00:00
Jérémy Rosen
036b1c7e56 rewrite the whole bridge logic in order to get it right.
Rails now use the same macros as bridges... now to make the stone
bridge use them too
2010-06-20 15:24:24 +00:00
Jérémy Rosen
634db88f5d one more railway specific macro folded 2010-06-19 16:35:32 +00:00
Alexander van Gessel
3a7694f056 Reapply 2010-06-18T15:43:17Z!ai0867@gmail.com, as there aren't any problems this time 2010-06-19 04:13:49 +01:00
Jérémy Rosen
3da800e74b start merging rails with bridges, use common macros whenever possible 2010-06-18 19:05:48 +00:00
Jérémy Rosen
666a416a36 bridge refactoring step 2: add possibility to use random bridges...
...(note that it won't be possible to have animated bridges)
2010-06-18 17:45:21 +00:00
Eric S. Raymond
f7ba7f68c6 TERRAIN -> TERRAINLIST, Cleans up some wmlscope messages. 2010-06-18 17:22:39 +00:00
Eric S. Raymond
dfb4239d83 Elinminate the redundant TERRAIN_PATTERN formal in favor of TERRAINLIST. 2010-06-18 17:15:32 +00:00
Eric S. Raymond
0e731f1ca7 TERRAIN[123] -> TERRAINLIST[123]. Cleans up som wmlscope messages. 2010-06-18 17:03:58 +00:00
Eric S. Raymond
275f964640 Cleanup for an argument-type mismatch. 2010-06-18 16:51:10 +00:00
Jérémy Rosen
1f5a5bda56 re-add an bridge internal macro that was used out of bridges 2010-06-18 16:37:26 +00:00
Eric S. Raymond
2d687cce1e Typo fix. 2010-06-18 16:33:28 +00:00
Eric S. Raymond
391eebfbfe An attempt at canning the meta-macro rebuild into a makefile. 2010-06-18 16:28:06 +00:00
Jérémy Rosen
7244cce186 parameter renaming in macros for wllint 2010-06-18 16:16:07 +00:00
Jérémy Rosen
f59e76004f bridge reorganisation step one:
...use only [image] out of [tile] and merge three variants into a
single macro
2010-06-18 16:08:11 +00:00
Alexander van Gessel
5d451b4536 Revert 2010-06-18T15:43:17Z!ai0867@gmail.com as it doesn't work with () macro arguments 2010-06-18 16:47:07 +01:00
Alexander van Gessel
009d9419ce Move the .png appending around to make it easier to write custom animation builders 2010-06-18 16:43:17 +01:00
Jérémy Rosen
08b1db6f97 fix some macro errors detected by wmlscope 2010-06-18 15:42:09 +00:00
Alexander van Gessel
32980eda73 Move the appending of '.png' to image paths...
...from C++ to the terrain BUILDER macros
2010-06-18 16:28:14 +01:00
Alexander van Gessel
14a066096b Make all terrain graphics macros use BUILD_IMAGE 2010-06-18 15:52:39 +01:00
Jérémy Rosen
feef9925c7 make transition use [image] out of [tile]...
...this allows transition to overlap  on both hex
2010-06-13 18:00:40 +00:00
Jérémy Rosen
758718d964 fix previous commit 2010-06-13 17:10:44 +00:00
Jérémy Rosen
75019c554a fix previous commit, I had upgraded with the wrong macro 2010-06-13 16:39:27 +00:00
Jérémy Rosen
af2b0c210b reorganisation/renaming of all transition macros, mainline updated 2010-06-12 10:14:06 +00:00
Jérémy Rosen
aba3de0ccd removing compat.cfg instead of moving deprecated macros there 2010-06-11 16:26:59 +00:00
Jérémy Rosen
46f3384858 move all adjacent.cfg to compat, it's entirely unused in mainline 2010-06-11 16:12:11 +00:00
Jérémy Rosen
1dc3fa34ad move all of transition_overlay to compat...
...since it's entirely unused in mainline
2010-06-11 15:52:24 +00:00
Eric S. Raymond
98442423cd Partial terrain-macro argument type cleanup. 2010-06-02 00:05:09 +00:00
Eric S. Raymond
f4a42de37d Comment fixes. 2010-06-01 22:25:20 +00:00
Jérémy Rosen
d591e335f5 fix macros badly commited 2010-05-30 20:54:55 +00:00
Jérémy Rosen
318c0c36a1 early reorganisation for walls 2010-05-30 18:32:57 +00:00
Jérémy Rosen
d35b142910 early reorganisation for walls 2010-05-30 18:23:04 +00:00
Jérémy Rosen
adba879db0 generalize some internal macros, deprecate some more unused stuff 2010-05-30 15:01:17 +00:00
Jérémy Rosen
c7f1cb7fe9 get rid of SIMPLE_OVERLAY, moved to compat.cfg,
...we now have a more generic macro OVERLAY_COMPLETE to catch that
sort of things
2010-05-30 11:03:06 +00:00
Jérémy Rosen
320ada7edf more refactoring, get rid of forest.cfg 2010-05-30 10:56:51 +00:00
Jérémy Rosen
259ba9d52e move more macros to the deprecation file 2010-05-28 21:31:25 +00:00
Jérémy Rosen
7da5b9c08f provide all macro variations for villages 2010-05-28 20:48:38 +00:00
Jérémy Rosen
d0ddeaacf5 provide all macro variations for base terrains 2010-05-28 20:44:42 +00:00
Jérémy Rosen
8da579442f provide all variations of base macros for keeps 2010-05-28 19:56:49 +00:00
Jérémy Rosen
b824ad2013 generalize the overlay macros,
...now all combination of _ROTATION_ _RESTRICTED[23]_ exist and work
in similar ways
2010-05-28 19:46:48 +00:00