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

Remove redundant type names from monster declarations.

Browse source
This commit is contained in:
Eric S. Raymond 2008-11-19 16:29:18 +00:00
parent 33d2dfdbc2
commit 564465a311
5 changed files with 75 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg
View file

@ -345,50 +345,50 @@
{PLACE_IMAGE items/ankh-necklace.png 87 66}
#ifdef EASY
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
#endif
#ifdef NORMAL
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
#endif
#ifdef HARD
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
#endif
#ifdef NIGHTMARE
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38}
#endif
@ -554,19 +554,18 @@
x=82-91
y=62-69
[/filter]
{NAMED_LOYAL_UNIT 2 (Giant Spider) 95 60 (Giant Spider) ( _ "Giant Spider")}
{NAMED_LOYAL_UNIT 2 (Giant Spider) 97 62 (Giant Spider) ( _ "Giant Spider")}
{NAMED_LOYAL_UNIT 2 (Giant Spider) 97 68 (Giant Spider) ( _ "Giant Spider")}
{NAMED_LOYAL_UNIT 2 (Giant Spider) 95 70 (Giant Spider) ( _ "Giant Spider")}
{NAMED_LOYAL_UNIT 2 (Giant Spider) 89 74 (Giant Spider) ( _ "Giant Spider")}
{NAMED_LOYAL_UNIT 2 (Giant Spider) 84 72 (Giant Spider) ( _ "Giant Spider")}
{NAMED_LOYAL_UNIT 2 (Giant Spider) 78 70 (Giant Spider) ( _ "Giant Spider")}
{NAMED_LOYAL_UNIT 2 (Giant Spider) 76 68 (Giant Spider) ( _ "Giant Spider")}
# wmllint: recognize Giant Spider
0
{LOYAL_UNIT 2 (Giant Spider) 95 60}
{LOYAL_UNIT 2 (Giant Spider) 97 62}
{LOYAL_UNIT 2 (Giant Spider) 97 68}
{LOYAL_UNIT 2 (Giant Spider) 95 70}
{LOYAL_UNIT 2 (Giant Spider) 89 74}
{LOYAL_UNIT 2 (Giant Spider) 84 72}
{LOYAL_UNIT 2 (Giant Spider) 78 70}
{LOYAL_UNIT 2 (Giant Spider) 76 68}
[message]
speaker=Giant Spider
type=Giant Spider
message= _ "HISSSSSS" # wmllint: no spellcheck
[/message]
[/event]

36
data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_of_the_Deep.cfg
View file

@ -55,28 +55,28 @@
name=prestart
#ifdef EASY
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 3 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 22 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 10 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 16 16 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 3 16}
{LOYAL_UNIT 2 (Tentacle of the Deep) 22 16}
{LOYAL_UNIT 2 (Tentacle of the Deep) 10 16}
{LOYAL_UNIT 2 (Tentacle of the Deep) 16 16}
#endif
#ifdef NORMAL
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 3 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 22 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 10 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 16 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 12 17 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 14 17 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 3 16}
{LOYAL_UNIT 2 (Tentacle of the Deep) 22 16}
{LOYAL_UNIT 2 (Tentacle of the Deep) 10 16}
{LOYAL_UNIT 2 (Tentacle of the Deep) 16 16}
{LOYAL_UNIT 2 (Tentacle of the Deep) 12 17}
{LOYAL_UNIT 2 (Tentacle of the Deep) 14 17}
#endif
#ifdef HARD
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 3 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 22 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 10 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 16 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 12 17 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 14 17 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 10 15 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 16 15 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 3 16}
{LOYAL_UNIT 2 (Tentacle of the Deep) 22 16}
{LOYAL_UNIT 2 (Tentacle of the Deep) 10 16}
{LOYAL_UNIT 2 (Tentacle of the Deep) 16 16}
{LOYAL_UNIT 2 (Tentacle of the Deep) 12 17}
{LOYAL_UNIT 2 (Tentacle of the Deep) 14 17}
{LOYAL_UNIT 2 (Tentacle of the Deep) 10 15}
{LOYAL_UNIT 2 (Tentacle of the Deep) 16 15}
#endif
{PLACE_IMAGE (terrain/cave/floor.png) 6 18}
{PLACE_IMAGE (terrain/cave/floor.png) 20 18}

16
data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg
View file

@ -144,19 +144,19 @@
{PLACE_IMAGE (scenery/rubble.png) 15 3}
{PLACE_IMAGE (scenery/rubble.png) 17 27}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 15 11 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 3 (Tentacle of the Deep) 15 20 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 15 11}
{LOYAL_UNIT 3 (Tentacle of the Deep) 15 20}
#ifdef NORMAL
{NAMED_LOYAL_UNIT 4 (Tentacle of the Deep) 11 15 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 5 (Tentacle of the Deep) 19 17 () ( _ "Tentacle")}
{LOYAL_UNIT 4 (Tentacle of the Deep) 11 15}
{LOYAL_UNIT 5 (Tentacle of the Deep) 19 17}
#endif
#ifdef HARD
{NAMED_LOYAL_UNIT 4 (Tentacle of the Deep) 11 15 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 5 (Tentacle of the Deep) 19 17 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 11 17 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 3 (Tentacle of the Deep) 19 15 () ( _ "Tentacle")}
{LOYAL_UNIT 4 (Tentacle of the Deep) 11 15}
{LOYAL_UNIT 5 (Tentacle of the Deep) 19 17}
{LOYAL_UNIT 2 (Tentacle of the Deep) 11 17}
{LOYAL_UNIT 3 (Tentacle of the Deep) 19 15}
#endif
{RANDOM 1..4}

8
data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
View file

@ -455,14 +455,14 @@
[/filter]
#No campaign is complete without a cuttlefish
{NAMED_LOYAL_UNIT 3 (Cuttle Fish) 11 17 () ( _ "Cuttle Fish")}
{LOYAL_UNIT 3 (Cuttle Fish) 11 17}
#ifdef NORMAL
{NAMED_LOYAL_UNIT 3 (Cuttle Fish) 11 18 () ( _ "Cuttle Fish")}
{LOYAL_UNIT 3 (Cuttle Fish) 11 18}
#endif
#ifdef HARD
{NAMED_LOYAL_UNIT 3 (Cuttle Fish) 11 18 () ( _ "Cuttle Fish")}
{NAMED_LOYAL_UNIT 3 (Cuttle Fish) 12 16 () ( _ "Cuttle Fish")}
{LOYAL_UNIT 3 (Cuttle Fish) 11 18}
{LOYAL_UNIT 3 (Cuttle Fish) 12 16}
#endif
[message]
type=Cuttle Fish

1
data/core/macros/unit-utils.cfg
View file

@ -17,6 +17,7 @@
# Rationale for the naming scheme of these generators:
# All generators take SIDE X Y for consistency.
# Those that begin with NAMED_ additionally take ID_STRING NAME_STRING
# The LOYAL_ macros set the loyalty trait.
#define UNIT SIDE TYPE X Y WML
# Place a unit with embedded WML specified.