0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify some UtBS macro calls.

Browse source
This commit is contained in:
Eric S. Raymond 2008-11-19 19:27:57 +00:00
parent 1dddb6b024
commit e0478fbd84
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg
View file

@ -301,10 +301,10 @@
# and give them some help
#else
{NAMED_NOTRAIT_UNIT 2 (Skeleton Rider) 20 23 () ("")}
{NAMED_NOTRAIT_UNIT 2 (Skeleton Rider) 21 23 () ("")}
{NAMED_NOTRAIT_UNIT 3 (Necrophage) 22 6 () ("")}
{NAMED_NOTRAIT_UNIT 3 (Necrophage) 23 7 () ("")}
{NOTRAIT_UNIT 2 (Skeleton Rider) 20 23}
{NOTRAIT_UNIT 2 (Skeleton Rider) 21 23}
{NOTRAIT_UNIT 3 (Necrophage) 22 6}
{NOTRAIT_UNIT 3 (Necrophage) 23 7}
#endif
#ifdef NORMAL
@ -537,7 +537,7 @@
[/or]
[then]
#ifdef HARD
{NAMED_NOTRAIT_UNIT.side (Soulless) $x1 $y1 () ("") $unit}
{NOTRAIT_UNIT $unit.side (Soulless) $x1 $y1}
#endif
#ifdef NORMAL
{RANDOM 0..100}
@ -547,15 +547,15 @@
less_than=51
[/variable]
[then]
{NAMED_NOTRAIT_UNIT.side (Walking Corpse) $x1 $y1 () ("") $unit}
{NOTRAIT_UNIT $unit.side (Walking Corpse) $x1 $y1}
[/then]
[else]
{NAMED_NOTRAIT_UNIT.side (Soulless) $x1 $y1 () ("") $unit}
{NOTRAIT_UNIT $unit.side (Soulless) $x1 $y1}
[/else]
[/if]
#endif
#ifdef EASY
{NAMED_NOTRAIT_UNIT.side (Walking Corpse) $x1 $y1 () ("") $unit}
{NOTRAIT_UNIT $unit.side (Walking Corpse) $x1 $y1}
#endif
[if]
[variable]
@ -1281,15 +1281,15 @@ This unit always strikes first with this attack, even if they are defending."
less_than=51
[/variable]
[then]
{NAMED_NOTRAIT_UNIT 2 (Walking Corpse) 21 24 () ("")}
{NOTRAIT_UNIT 2 (Walking Corpse) 21 24}
[/then]
[else]
{NAMED_NOTRAIT_UNIT 2 (Soulless) 21 24 () ("")}
{NOTRAIT_UNIT 2 (Soulless) 21 24}
[/else]
[/if]
#endif
#ifdef EASY
{NAMED_NOTRAIT_UNIT 2 (Walking Corpse) 21 24 () ("")}
{NOTRAIT_UNIT 2 (Walking Corpse) 21 24}
#endif
{VARIABLE_OP i add 1}
[/do]
@ -1446,15 +1446,15 @@ This unit always strikes first with this attack, even if they are defending."
less_than=51
[/variable]
[then]
{NAMED_NOTRAIT_UNIT 3 (Walking Corpse) 23 6 () ("")}
{NOTRAIT_UNIT 3 (Walking Corpse) 23 6}
[/then]
[else]
{NAMED_NOTRAIT_UNIT 3 (Soulless) 23 6 () ("")}
{NOTRAIT_UNIT 3 (Soulless) 23 6}
[/else]
[/if]
#endif
#ifdef EASY
{NAMED_NOTRAIT_UNIT 3 (Walking Corpse) 23 6 () ("")}
{NOTRAIT_UNIT 3 (Walking Corpse) 23 6}
#endif
{VARIABLE_OP i add 1}
[/do]
@ -1723,15 +1723,15 @@ This unit always strikes first with this attack, even if they are defending."
less_than=51
[/variable]
[then]
{NAMED_NOTRAIT_UNIT 3 (Walking Corpse) 23 6 () ("")}
{NOTRAIT_UNIT 3 (Walking Corpse) 23 6}
[/then]
[else]
{NAMED_NOTRAIT_UNIT 3 (Soulless) 23 6 () ("")}
{NOTRAIT_UNIT 3 (Soulless) 23 6}
[/else]
[/if]
#endif
#ifdef EASY
{NAMED_NOTRAIT_UNIT 3 (Walking Corpse) 23 6 () ("")}
{NOTRAIT_UNIT 3 (Walking Corpse) 23 6}
#endif
{VARIABLE_OP i add 1}
[/do]
@ -2013,15 +2013,15 @@ This unit always strikes first with this attack, even if they are defending."
less_than=51
[/variable]
[then]
{NAMED_NOTRAIT_UNIT 2 (Walking Corpse) 21 24 () ("")}
{NOTRAIT_UNIT 2 (Walking Corpse) 21 24}
[/then]
[else]
{NAMED_NOTRAIT_UNIT 2 (Soulless) 21 24 () ("")}
{NOTRAIT_UNIT 2 (Soulless) 21 24}
[/else]
[/if]
#endif
#ifdef EASY
{NAMED_NOTRAIT_UNIT 2 (Walking Corpse) 21 24 () ("")}
{NOTRAIT_UNIT 2 (Walking Corpse) 21 24}
#endif
{VARIABLE_OP i add 1}
[/do]

12
data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
View file

@ -848,21 +848,21 @@
#make ants easy: 3 medium: 4 hard: 5
{NAMED_NOTRAIT_UNIT 8 (Giant Ant) 17 26 () ("")}
{NAMED_NOTRAIT_UNIT 8 (Giant Ant) 17 27 () ("")}
{NAMED_NOTRAIT_UNIT 8 (Giant Ant) 18 26 () ("")}
{NOTRAIT_UNIT 8 (Giant Ant) 17 26}
{NOTRAIT_UNIT 8 (Giant Ant) 17 27}
{NOTRAIT_UNIT 8 (Giant Ant) 18 26}
#ifdef EASY
#else
{NAMED_NOTRAIT_UNIT 8 (Giant Ant) 18 27 () ("")}
{NOTRAIT_UNIT 8 (Giant Ant) 18 27}
#endif
#ifdef HARD
{NAMED_NOTRAIT_UNIT 8 (Giant Ant) 19 27 () ("")}
{NOTRAIT_UNIT 8 (Giant Ant) 19 27}
#endif
#make spider
{NAMED_NOTRAIT_UNIT 9 (Cave Spider) 4 25 () ("")}
{NOTRAIT_UNIT 9 (Cave Spider) 4 25}
[redraw]
[/redraw]