63 Commits

Author SHA1 Message Date
Tommy
36d43da21a Add new PLACE_IMAGE_SUBMERGED macro and use for HttT:04_BoP
It does the same thing as PLACE_IMAGE except the created item may
use the same submerge code as units. If not placed on water there
will be no submersion effect. If placed on water it will be submerged
to the same level a unit would be submerged to. In general physical
items placed into water should use this, whereas items placed on top
of water should use PLACE_IMAGE.

The new macro has been applied to the merfolk cages in the Bay of Pearls
scenario in HttT.
2022-07-30 14:56:38 +12:00
Elvish_Hunter
1be1ba4282 Fixed {IS_HERO} to prevent loss of hero ellipse when leveling up 2022-07-27 16:18:06 +02:00
Charles Dang
99fe4293c0 IS_HERO/IS_LOYAL: use [object] instead of overlays= 2021-01-09 21:48:00 +11:00
Celtic Minstrel
059dabcb6a Do a pass of macro documentation
- Adds a bunch of documentation
- Fixes some incorrect or inaccurate documentation
- Moves some documentation so that wmlscope actually picks it up
- Excludes some internal macros from being documented
2020-11-22 12:24:43 -05:00
gfgtdf
ef06634485 use overlay effect over [unit] overlays= 2019-08-25 22:29:49 +02:00
gfgtdf
aa07ec7915 add new macors to replace loyal trait. 2019-08-25 20:35:28 +02:00
gfgtdf
5cb93694c6 move loyal overlays to the loyal trait
since the recent changes to overlays= in particular 1a7724e5472,
e71033374c35 and b2cd1cf6c [unit]overlays= is no longer the
recommended way to add an overlay and the use of the
apply_to=overlay effect is reccomended instead, so adding it
to the [trait] is the most natural option here.

this in particular fixes #4058 . Also people simply forgetting the
IS_LOYAL macro was a not-so-uncommon cause of bugs.

In some cases people want to give the LOYAL trait without giving the
loyal overlays for those cases i added a optional OVERLAY parameter to
the {TRAIT_LOYAL} macro, also heroes should now use {TRAIT_LOYAL_HERO}
instead which uses the hero overlay. The IS_LOYAL and IS_HERO macros are
no longer needed in combination with those traits.
2019-08-25 20:36:35 +02:00
Celtic Minstrel
b295aab4ba Deprecate {MAGENTA_IS_THE_TEAM_COLOR}
The magenta colour is now the default flag_rgb colour if one is not specified.
2016-08-05 00:49:39 -04:00
CelticMinstrel
b5b907afd3 Include all components in COLOR_* macros 2015-12-15 10:45:55 -05:00
Charles Dang
65c0df2343 Updated COLOR_* macros to use color= 2015-12-16 01:26:04 +11:00
Charles Dang
0dfe2a21d9 Deprecate ANIMATED_CAMPFIRE and ANIMATED_BRAZIER
Both of these have been replaced with embellishment overlay terrains
2015-08-17 10:41:46 +11:00
Elvish_Hunter
9289a9fa8a added FLAG_VARIANT6 macro, for use with ragged flags 2014-04-19 10:57:46 +02:00
Alexander van Gessel
6bc3de7663 Use hero ellipse alongside hero crown 2013-06-11 16:50:13 +02:00
Jérémy Rosen
dc02698fa8 change syntax of square bracket animations, ~ is not used for range 2013-01-30 21:37:44 +00:00
Jérémy Rosen
5662cbcc38 new syntax for animation lines, simplifies mainline WML quite a bit.
patch by Coffee
2013-01-26 22:33:51 +00:00
Lari Nieminen
d75ad32fb1 Slight updates to the new battle journey marker and animation. 2012-09-02 12:50:08 +00:00
Lari Nieminen
4a84f405df New rest markers and further improved battle markers and journey dots...
...from Blarumyrran.
2012-06-02 21:51:08 +00:00
Lari Nieminen
45ca07bd96 New battle markers and improved journey dots from Blarumyrran,
with the "new battle" marker having a simple blinking animation.
2012-05-27 21:45:08 +00:00
Simon Forsyth
39ac3633eb as fire images now in terrain,
...remove all terrain references to the ones in scenery
2012-03-10 19:30:20 +00:00
Ignacio R. Morelle
12acc65263 Remove useless flag_rgb attribute included in FLAG_VARIANT macro
side.flag_rgb isn't read by anything.
2012-02-07 16:47:46 +00:00
Anonymissimus
631e73b1d3 Make PLACE_HALO a local macro where it's needed. 2012-01-21 19:56:06 +00:00
Anonymissimus
2fbe1b7bb8 add PLACE_HALO 2012-01-21 19:25:29 +00:00
Steven Panek
70094c6df4 Moved leader-expendable.png to core; added IS_EXPENDABLE_LEADER. 2011-10-19 00:07:25 +00:00
Steven Panek
03cc45eb85 Updated comments in FLAG_VARIANT. 2011-10-07 00:45:33 +00:00
Steven Panek
97e1ceae97 Got rid of the [store_unit] and [clear_variable] steps...
...in MAKE_HERO and UNMAKE_HERO, for [unit_overlay] and
[remove_unit_overlay] can now take id=.
2011-10-07 00:23:47 +00:00
Steven Panek
3a6eb75ee8 Renamed [removeitem] to [remove_item]; deprecated [removeitem]. 2010-10-01 23:42:21 +00:00
Eric S. Raymond
dfe4cfd3f2 Use long and ragged flags appropriately in AOI, DW, DM. 2010-08-18 17:37:49 +00:00
Eric S. Raymond
03e2f8a559 Clean up after wmlscope/wmllint messages. 2010-07-09 15:54:01 +00:00
Lari Nieminen
0a067e7171 Added the new .png extensions to [terrain_graphics]...
...tags used in image-utils.cfg.
2010-06-27 18:20:08 +00:00
Steven Panek
ee3d7b7305 Ran wmlindent on some things in the water_animation branch. 2010-03-07 10:12:35 +00:00
Jérémy Rosen
6927368756 add new mausoleum scenery 2010-03-01 18:50:37 +00:00
Eric S. Raymond
75f2727548 More nacro argument type checking. No mismatches in mainline. 2010-02-11 22:45:04 +00:00
Eric S. Raymond
f88a4be057 By popular demand, make the loyal-unit generator macros...
...give the units they make the loyalty-crown overlay from Dead Water.
2009-12-15 17:14:35 +00:00
Eric S. Raymond
8ffa41056d Deprecate two redundant macros, and change mainline to use the simpler ones. 2009-04-23 02:26:39 +00:00
Eric S. Raymond
20c849736d Add some hero icons where needed. Add a standard macro to do this. 2009-04-11 19:32:51 +00:00
Eric S. Raymond
4861e50155 Reindent mainline in preparation for 1.6. 2008-12-08 17:45:47 +00:00
Eric S. Raymond
9bce366d28 Usage advice for the ANIMATED_* macros. 2008-11-15 00:14:37 +00:00
Ignacio R. Morelle
b3763eef44 New companion macro to ANIMATED_CAMPFIRE, ANIMATED_BRAZIER 2008-11-14 17:10:47 +00:00
Ignacio R. Morelle
73023e95b2 Fix nonstandard file naming and the FLAG_VARIANT macro. 2008-11-01 19:04:08 +00:00
Eric S. Raymond
55824ba7b0 wmlscope pacification. 2008-10-31 09:46:07 +00:00
Eric S. Raymond
521df2692b Add FLAG_VARIANT macro to do what it sounds like. 2008-10-31 05:56:56 +00:00
Eric S. Raymond
2cb1079152 Remove delays from OLD versions of journey track macros. 2008-10-13 17:59:20 +00:00
Eric S. Raymond
72200243c1 This is the policy change that builds on my previous diff.
Turn the new-journey and new-battle dots red.  Addresses bug #12423:
Gold and silver journey dots are hard to see against the
parchment-toned mainmap.

By experiment, if the new dots are easy to see the older silver ones, attached, 
become much easier to notice.  The gold, though, was a real bitch to spot,
especially in mountains.
2008-10-09 21:03:02 +00:00
Eric S. Raymond
e5245aefb8 Change the DOT*/CROSS*/FLAG* macros to {NEW,OLD}_{JOURNEY_BATTLE_REST}.
Convert coordinates in DOT and CROSS to the centered version.
This commit makes no behavioral change at all -- it is pure mechanism,
no policy -- but will make it easier to restyle the tracking markers.

Also deprecates the old macros, and teaches wmllint to do the up-conversion.
2008-10-09 20:48:59 +00:00
Eric S. Raymond
0fda923bc2 Whitespace fix to pacify wmllint. 2008-09-22 11:59:00 +00:00
Lari Nieminen
26f972ca52 Added a macro for placing an animated campfire (via a [terrain_graphics] rule). 2008-09-21 10:01:40 +00:00
Eric S. Raymond
bdbf60838a Address bug #12269 by making Ratheln's appearance trigger...
...any time the dwarves get through the midpoint of the pass and
making his survival a requirement for this scenario only.

In the process, introduce a REMOVE_HERO_ICON macro to the standard library.
I have tweaked Liberty to use it.
2008-09-03 00:34:46 +00:00
Eric S. Raymond
f62d7491e0 Deprecate SET_IMAGE, move PLACE_IMAGE. 2008-03-16 19:11:26 +00:00
Eric S. Raymond
b2b55e5996 description= -> name in [unit]
This will cause unit names to be displayed incorrectly from savefiles made 
since 2008-03-14T01:38:17Z!esr@thyrsus.com.  It was either that or break compatibility with 1.3/1.4 
savefiles.
2008-03-15 20:30:45 +00:00
Eric S. Raymond
aae5a0cb7c description= -> id= in Standard Unit Fliters and SingleUnitWML.
For backward compatibility, description= is still accepted, 
but this will change when it is merged with unit_description.
2008-03-13 06:22:01 +00:00