upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-08 01:28:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed duplicate id's of the elvish bodyguards.

Browse Source
This commit is contained in:
Lari Nieminen 2010-01-24 20:00:02 +00:00
parent 950cdb6b90
commit 2b6787c829
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
View File

@ -364,24 +364,25 @@
#endif #endif
[/variable] [/variable]
[do] [do]
{VARIABLE guard_x 0} # fallback coordinates, in case no nearby vacant forest is found
{VARIABLE guard_y 0} {VARIABLE guard_x $ethiliel_loc.x}
{VARIABLE guard_y $ethiliel_loc.y}
[set_variable] [set_variable]
name=guard_x name=guard_x
to_variable=bodyguard_loc[$number].x value=$bodyguard_loc[$number].x
[/set_variable] [/set_variable]
[set_variable] [set_variable]
name=guard_y name=guard_y
to_variable=bodyguard_loc[$number].y value=$bodyguard_loc[$number].y
[/set_variable] [/set_variable]
[unit] [unit]
id=Elvish Bodyguard role=Elvish Bodyguard
name= _ "Elvish Bodyguard" name= _ "Elvish Bodyguard"
type=Elvish Ranger type=Elvish Ranger
side=1 side=1
name=Elvish Bodyguard
x,y=$guard_x,$guard_y x,y=$guard_x,$guard_y
random_traits=yes random_traits=yes
[modifications] [modifications]
@ -394,18 +395,10 @@
[/do] [/do]
[/while] [/while]
[clear_variable] {CLEAR_VARIABLE bodyguard_loc,ethiliel_loc,number}
name=bodyguard_loc
[/clear_variable]
[clear_variable]
name=ethiliel_loc
[/clear_variable]
[clear_variable]
name=number
[/clear_variable]
[message] [message]
speaker=Elvish Bodyguard role=Elvish Bodyguard
message= _ "We stand ready, my lady, to protect you! We shall lead these men of Wesnoth into the fray!" message= _ "We stand ready, my lady, to protect you! We shall lead these men of Wesnoth into the fray!"
[/message] [/message]
[/event] [/event]

2
data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_And_Ill.cfg
View File

@ -135,7 +135,7 @@
[store_unit] [store_unit]
[filter] [filter]
side=1 side=1
id=Elvish Bodyguard role=Elvish Bodyguard
[/filter] [/filter]
kill=yes kill=yes