HttT S06: Reverted d6f7de91 and 9b364d25 due to major bugs they caused

The thieves were duplicated first when they spawned and re-triggered the capture event several times, and again after Agadla was killed.
This commit is contained in:
ln-zookeeper 2017-06-01 11:03:48 +03:00
parent d5d297818c
commit 2d13860baa

View file

@ -321,173 +321,139 @@
speaker=Reglok
message= _ "We will serve you well, for we respect the help you are providing to our city. You shall find that there is honor, even among thieves."
[/message]
[if]
[have_unit]
id=Agadla
[/have_unit]
[then]
[message]
speaker=Konrad
message= _ "Yes, but where is your fighting force? How can you help us?"
[/message]
[message]
speaker=Gelgar
message= _ "We survive by stealth. We can help you sneak into the city and surround the orcs. Alternatively, we can lay in wait until you give us a signal then ambush the orcs rear."
[/message]
[message]
speaker=Konrad
message= _ "Hmm... I have to consider this..."
[option]
label= _ "Help us infiltrate the city. We can do the rest."
[command]
[message]
speaker=Reglok
message= _ "Excellent. Two hours past midnight meet us on the west bank of the river, across from Elensefars docks."
[/message]
[set_variable]
name=thieves_ford
value=yes
[/set_variable]
[/command]
[/option]
[option]
label= _ "I want you to reinforce us once we break through their line."
[command]
[message]
speaker=Reglok
message= _ "Very well. When you raise your red banner over any building in the city proper, we will see the sign and attack from the citys northern gate."
[/message]
[message]
speaker=Konrad
message= _ "Agreed. But, will you be able to see our flag if its dark?"
[/message]
[message]
speaker=Reglok
message= _ "Yes, we will see it. In fact, we prefer to fight at night. I pray you do not lead us into slaughter."
[/message]
[message]
speaker=Konrad
message= _ "Do not fear, friends. There will be a slaughter here, but it will be orcish blood staining the streets."
[/message]
#
# Special event - if you chose to have the thieves
# ambush the orcs, they appear when you capture
# one of the Elensefar villages
#
[event]
name=capture
[filter]
[filter_location]
x,y=16,26
radius=5
[/filter_location]
side=1
[/filter]
[filter_condition]
[have_unit]
id=Agadla
[/have_unit]
[/filter_condition]
[message]
speaker=Konrad
message= _ "Yes, but where is your fighting force? How can you help us?"
[/message]
[message]
speaker=Gelgar
message= _ "We survive by stealth. We can help you sneak into the city and surround the orcs. Alternatively, we can lay in wait until you give us a signal then ambush the orcs rear."
[/message]
[message]
speaker=Konrad
message= _ "Hmm... I have to consider this..."
[option]
label= _ "Help us infiltrate the city. We can do the rest."
[command]
[message]
speaker=Reglok
message= _ "Excellent. Two hours past midnight meet us on the west bank of the river, across from Elensefars docks."
[/message]
[set_variable]
name=thieves_ford
value=yes
[/set_variable]
[/command]
[/option]
[option]
label= _ "I want you to reinforce us once we break through their line."
[command]
[message]
speaker=Reglok
message= _ "Very well. When you raise your red banner over any building in the city proper, we will see the sign and attack from the citys northern gate."
[/message]
[message]
speaker=Konrad
message= _ "Agreed. But, will you be able to see our flag if its dark?"
[/message]
[message]
speaker=Reglok
message= _ "Yes, we will see it. In fact, we prefer to fight at night. I pray you do not lead us into slaughter."
[/message]
[message]
speaker=Konrad
message= _ "Do not fear, friends. There will be a slaughter here, but it will be orcish blood staining the streets."
[/message]
#
# Special event - if you chose to have the thieves
# ambush the orcs, they appear when you capture
# one of the Elensefar villages
#
[event]
name=capture
[filter]
[filter_location]
x,y=16,26
radius=5
[/filter_location]
side=1
[/filter]
[message]
speaker=narrator
image="wesnoth-icon.png"
message= _ "As the banner was raised, sounds of fighting could be heard from across the city."
[/message]
[message]
speaker=narrator
image="wesnoth-icon.png"
message= _ "As the banner was raised, sounds of fighting could be heard from across the city."
[/message]
#create units
#define THIEVES_JOIN_KONRAD
#create units
[unit]
id=Reglok
name= _ "Reglok"
type=Rogue
side=1
x=16
y=22
gender=male
[modifications]
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
id=Reglok
name= _ "Reglok"
type=Rogue
side=1
x=16
y=22
gender=male
[modifications]
{TRAIT_LOYAL}
{TRAIT_INTELLIGENT}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
id=Gelgar
name= _ "Gelgar"
type=Thief
side=1
x=14
y=22
gender=male
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
id=Gamlel
name= _ "Gamlel"
type=Thief
side=1
x=20
y=23
gender=female
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
id=Darglen
name= _ "Darglen"
type=Thief
side=1
x=18
y=23
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
#enddef
#define THIEVES_REVEL
#dialog
[message]
speaker=Reglok
message= _ "Lets expel these invaders! Today, the city is ours again!"
[/message]
#enddef
{THIEVES_JOIN_KONRAD}
{THIEVES_REVEL}
[/event]
[event]
name=die
[filter]
id=Agadla
[/filter]
[kill]
id=Agadla
[/kill]
{THIEVES_JOIN_KONRAD}
{THIEVES_REVEL}
[/event]
[/command]
[/option]
[/message]
[kill]
type=Thief
[/kill]
[kill]
type=Rogue
[/kill]
[/then]
[else]
{THIEVES_REVEL}
[/else]
[/if]
[unit]
id=Gelgar
name= _ "Gelgar"
type=Thief
side=1
x=14
y=22
gender=male
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
id=Gamlel
name= _ "Gamlel"
type=Thief
side=1
x=20
y=23
gender=female
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
[unit]
id=Darglen
name= _ "Darglen"
type=Thief
side=1
x=18
y=23
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
[/unit]
#dialog
[message]
speaker=Reglok
message= _ "Lets expel these invaders! Today, the city is ours again!"
[/message]
[/event]
[/command]
[/option]
[/message]
[kill]
type=Thief
[/kill]
[kill]
type=Rogue
[/kill]
[allow_recruit]
side=1
type=Thief