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

Removed some more duplicate single unit id's.

Browse source
This commit is contained in:
Lari Nieminen 2008-08-29 10:07:13 +00:00
parent 215082a73f
commit 545a8ef1ab
4 changed files with 35 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg
View file

@ -117,21 +117,21 @@
{PLACE_IMAGE (scenery/temple1.png) 1 26}
{PLACE_IMAGE (scenery/temple1.png) 5 12}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 26 4}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 32 27}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 4 17 35}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 26 4}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 32 27}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 4 17 35}
#ifdef NORMAL
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 13 8}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 32 31}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 4 9 34}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 13 8}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 32 31}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 4 9 34}
#endif
#ifdef HARD
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 13 8}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 15 3}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 32 31}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 33 36}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 4 9 34}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 4 20 32}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 13 8}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 15 3}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 32 31}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 33 36}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 4 9 34}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 4 20 32}
#endif
[recall]
id=Lady Outlaw

30
data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer.cfg
View file

@ -96,25 +96,25 @@
id=Minister Edmond
[/recall]
{GUARD_UNIT (Giant Spider) (Spider) ( _ "Spider") 2 2 6}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 3 5}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 24 18}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 20 15}
{GUARD_UNIT (Giant Spider) () ( _ "Spider") 2 2 6}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 3 5}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 24 18}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 20 15}
#ifdef NORMAL
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 12 7}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 16 8}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 29 20}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 14 8}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 2 5}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 12 7}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 16 8}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 29 20}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 14 8}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 2 5}
#endif
#ifdef HARD
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 12 7}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 16 8}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 29 20}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 14 8}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 2 2 5}
{GUARD_UNIT (Giant Scorpion) (Scorpion) ( _ "Scorpion") 3 3 7}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 12 7}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 16 8}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 29 20}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 14 8}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 2 2 5}
{GUARD_UNIT (Giant Scorpion) () ( _ "Scorpion") 3 3 7}
#endif
[objectives]

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

@ -181,11 +181,11 @@
[kill]
id=Erart
[/kill]
{GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 3 5 5}
{GUARD_UNIT (Giant Spider) () ( _ "Fang") 3 5 5}
[kill]
id=Raol
[/kill]
{GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 2 25 5}
{GUARD_UNIT (Giant Spider) () ( _ "Fang") 2 25 5}
[/then]
[/if]
[if]
@ -197,11 +197,11 @@
[kill]
id=Raol
[/kill]
{GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 2 25 5}
{GUARD_UNIT (Giant Spider) () ( _ "Fang") 2 25 5}
[kill]
id=Rilg
[/kill]
{GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 5 5 25}
{GUARD_UNIT (Giant Spider) () ( _ "Fang") 5 5 25}
[/then]
[/if]
[if]
@ -213,11 +213,11 @@
[kill]
id=Rilg
[/kill]
{GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 5 5 25}
{GUARD_UNIT (Giant Spider) () ( _ "Fang") 5 5 25}
[kill]
id=Gulg
[/kill]
{GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 4 25 25}
{GUARD_UNIT (Giant Spider) () ( _ "Fang") 4 25 25}
[/then]
[/if]
[if]
@ -229,11 +229,11 @@
[kill]
id=Gulg
[/kill]
{GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 4 25 25}
{GUARD_UNIT (Giant Spider) () ( _ "Fang") 4 25 25}
[kill]
id=Erart
[/kill]
{GUARD_UNIT (Giant Spider) (Fang) ( _ "Fang") 3 5 5}
{GUARD_UNIT (Giant Spider) () ( _ "Fang") 3 5 5}
[/then]
[/if]

3
data/campaigns/The_Rise_Of_Wesnoth/utils/trow-macros.cfg
View file

@ -103,7 +103,6 @@
#ifdef EASY
[unit]
id=A Former Friend
name= _ "A Former Friend"
type=Walking Corpse
side=2
@ -118,7 +117,6 @@
#endif
#ifdef NORMAL
[unit]
id=A Former Friend
name= _ "A Former Friend"
type=Soulless
side=2
@ -133,7 +131,6 @@
#endif
#ifdef HARD
[unit]
id=A Former Friend
name= _ "A Former Friend"
type=Ghoul
side=2