78 Commits

Author SHA1 Message Date
Eric S. Raymond
318486ce4b Reindent most of the data tree in preparation for making wmlindent smarter. 2008-08-28 17:57:00 +00:00
Eric S. Raymond
1f1fc2164f Re-enable macro argument type checking, and fix some glitches it turns up.
Most changes in this diff just rename macro formal args so they match
what the type checker expects.
2008-06-09 16:25:13 +00:00
Moritz Göbelbecker
9631f90b96 Move terrain-graphics/_final.cfg to terrain-graphics.cfg...
...and include it after the campaigns.

This makes campaign specific terrains work without ugly workarounds.
2008-05-18 21:40:55 +00:00
Moritz Göbelbecker
0a09602dea Fix collision of macro names. 2008-05-17 15:49:59 +00:00
Tommy
1765feaacd update indoor walls to use new image centering 2008-05-04 05:48:06 +00:00
Moritz Göbelbecker
9778e8f9a9 Added cave path terrain from musketaquid. string=Ur, currently aliased to flat. 2008-05-03 18:24:07 +00:00
Moritz Göbelbecker
7819881877 Fix z-layering of overlays 2008-04-30 15:34:49 +00:00
Moritz Göbelbecker
ff1761aabf New ford graphics from Syntax_Error 2008-04-30 15:32:55 +00:00
Moritz Göbelbecker
547d5d2615 Use the new center feature in the terrain macros to center all overlays.
Crop and/or expand existing images to fit the new behaviour
2008-04-29 10:52:05 +00:00
Moritz Göbelbecker
5da3f92634 Reorganisation of the terrain macros including more consistent image naming. 2008-04-26 19:44:45 +00:00
Tommy
caf3ee4a96 automatically use random variations for certain wall segments,
...if they are available
2008-04-22 02:04:57 +00:00
Tommy
03cb730ec2 tabs to spaces 2008-04-06 22:39:56 +00:00
Tommy
ec4bf1a96d change most Qxu to Qx* to allow custom terrains derived from chasm...
...(e.g. abyss)
2008-04-06 02:09:28 +00:00
Tommy
c197ddb89a fix glitch when desert road is next to grass and bridge 2008-04-02 13:41:45 +00:00
Eric S. Raymond
2cabbcf3d7 Fix two glitches revealed by wmlscope and wmllint. 2008-03-31 15:56:08 +00:00
Lari Nieminen
f8b28d5193 Added mesilliac's new walls. 2008-03-29 23:16:57 +00:00
Eric S. Raymond
83ae0b3bc8 Apply wmlindent. 2008-03-26 14:04:37 +00:00
Lari Nieminen
beffa41dc2 Tuned the flower transitions. 2008-03-23 18:03:37 +00:00
Lari Nieminen
a3f2ce7f6c Reordered a few transition rules...
...to fix a glitch between mountains and desert hills.
2008-03-22 22:59:32 +00:00
Lari Nieminen
fa7008d6a6 Applied mesilliac's fix for keep<->cavewall glitches. 2008-03-22 11:12:10 +00:00
Ignacio R. Morelle
e79357de8f Added a third city terrain variation by Syn_Err 2008-03-19 15:52:09 +00:00
Lari Nieminen
9cb9d35f5e Wired in the new human city village. 2008-03-18 12:25:54 +00:00
Lari Nieminen
20368e4cd7 A fix by mesilliac to a mountain<->castle glitch. 2008-03-16 14:17:12 +00:00
Lari Nieminen
069838e0a6 Revert patch #992 (it introduced a glitch). 2008-03-15 08:10:47 +00:00
Lari Nieminen
c12964d7fc Fixed some small glitches between swamp transitions and other transitions. 2008-03-08 19:18:15 +00:00
Eric S. Raymond
364a4decbd wmlindent strikes again. 2008-03-07 21:26:44 +00:00
Lari Nieminen
2e4795c2bb Implement the minimal patch #992. 2008-03-06 10:51:40 +00:00
Eric S. Raymond
c9d86da3f7 Get rid of the FAKE_REFERENCE kluge. 2008-02-16 10:48:20 +00:00
Eric S. Raymond
f97409480c Macro prprocessor chokes on {} under unknown other circumstances.
Avoid this.
2008-02-16 10:25:44 +00:00
Eric S. Raymond
5e83a9cf7d Fix a couple of glitches picked up by my improved regexp. 2008-02-16 09:46:23 +00:00
Eric S. Raymond
51dd6e3dab Move move things unused in mainline or 1.3 UMC to attic. 2008-02-14 16:31:51 +00:00
Eric S. Raymond
34d528064a Macro and documentation-comment cleanup; remove some unused cruft. 2008-02-14 13:21:03 +00:00
Eric S. Raymond
1981d43bad Teach wmllint to convert letter= to terrain= when appropriate.
Fix a comment.
2008-02-12 13:16:22 +00:00
Eric S. Raymond
4c6f5f1e3e More macro typechecking. Clean up the terrain-types mess. 2008-02-12 11:55:52 +00:00
Eric S. Raymond
ef4a692367 More macro typechecking. A terrain code is now a recognized actual type. 2008-02-12 11:16:54 +00:00
Eric S. Raymond
1e90674462 Extend type-checking to more macros. 2008-02-12 05:11:18 +00:00
Eric S. Raymond
9225c7b79c More minor fixes found by sifting through the list of unused images. 2008-02-11 16:59:49 +00:00
Eric S. Raymond
a600ade30e Regularize use of macro formal arguments so we can do better typechecking. 2008-02-10 04:30:18 +00:00
Moritz Göbelbecker
934b071747 Added stone bridge terrain over lava and chasm 2008-02-07 20:26:13 +00:00
Eric S. Raymond
8a2db11ceb Implement the IMAGE argument type for macros.
This involved changing a bunch of formal args in the terrain graphics
macros from IMAGE to IMAGESTEM or IMAGELINE to avoid false positives.
2008-02-06 19:28:56 +00:00
Eric S. Raymond
2f30f121cc Implement zookeeper's FR #5 from bug #10990
check macro calls for mismatches in argument number.  Fix a few
glitches found in mainline using this test.
2008-02-06 08:17:57 +00:00
Eric S. Raymond
4d073f8def Comment out a spurious macro call. It may need to actually be fixed. 2008-01-28 19:36:22 +00:00
Eric S. Raymond
3dc5ab79c9 Indentation cleanup.
If terrain transition graphics start breaking, suspect this commit.
2008-01-24 03:58:32 +00:00
Moritz Göbelbecker
a650d9a90e Fix some transition glitches 2008-01-13 13:32:03 +00:00
Lari Nieminen
214d17bda1 Removed the windmill village terrain,
replaced it with a purely decorative grassland windmill terrain, and
made 2p Hamlets use that instead of the old hack.
2008-01-11 16:25:59 +00:00
Lari Nieminen
d6995d1646 Fix bug. 2008-01-11 00:11:19 +00:00
Lari Nieminen
5d1875a4e7 Use smaller swamp reeds also when next to...
...chasm, cavewall, lava or snowy terrains.
2008-01-10 23:55:27 +00:00
Lari Nieminen
ccead10615 Put back hills as the base terrain of mountains (fixes some glitches). 2008-01-10 18:00:09 +00:00
Mark de Wever
bcf51e964e Overlays are properly drawn at the top row (eg forrest) (bug #10238).
Mountains no longer have a hill as base.
2008-01-01 15:07:47 +00:00
Lari Nieminen
9bf1489557 Wire in simple WML for a water-chasm transition. 2007-12-28 16:39:10 +00:00