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

Use existing macro to avoid situations where Nym's otherwise-mute Dust Devil pet might speak.

Browse source 
Resolves #4892.

(cherry picked from commit 9941ee2258)
This commit is contained in:
Wedge009 2021-09-17 00:14:21 +10:00
parent 2041bca678
commit 7f002f3ce6
3 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/campaigns/Under_the_Burning_Suns/scenarios/06a_In_the_Tunnels_of_Trolls.cfg
View file

@ -1458,10 +1458,12 @@
message= _ "Argh! Curse you! May you never live to see daylight again!"
[/message]
{CHECK_SPEAKER}
[message]
speaker=second_unit
speaker=$speaking_unit.id
message= _ "And so, at last, it ends."
[/message]
{CLEAR_VARIABLE speaking_unit}
[message]
side=4

12
data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
View file

@ -759,10 +759,12 @@
message= _ "Ha, you’re trapped. I’ve got you right where I want you, and this time no one is gonna save you."
[/message]
{CHECK_SPEAKER}
[message]
speaker=second_unit
speaker=$speaking_unit.id
message= _ "How did a troll get stuck all the way back here?"
[/message]
{CLEAR_VARIABLE speaking_unit}
[/event]
# When Vengeful Dwarf dies
@ -1170,10 +1172,12 @@
side=1
[/filter_second]
{CHECK_SPEAKER}
[message]
speaker=second_unit
speaker=$speaking_unit.id
message= _ "Incoming! Ugh, it’s big, hairy, and nasty. I hate bats, I really hate bats."
[/message]
{CLEAR_VARIABLE speaking_unit}
[/event]
[event]
@ -1413,10 +1417,12 @@
message= _ "Faugh! Even in death I curse you! You will never escape these tunnels alive!"
[/message]
{CHECK_SPEAKER}
[message]
speaker=second_unit
speaker=$speaking_unit.id
message= _ "And so, at last, it ends."
[/message]
{CLEAR_VARIABLE speaking_unit}
[message]
side=6

16
data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
View file

@ -626,11 +626,13 @@
fire_event=no
[/kill]
{CHECK_SPEAKER}
[message]
speaker=second_unit
speaker=$speaking_unit.id
# wmllint: local spelling creeped
message= _ "I say good riddance. He creeped me out."
[/message]
{CLEAR_VARIABLE speaking_unit}
[/event]
# Event 4.5 Naga leaders appear, activate sides 7 + 8
@ -978,6 +980,7 @@
fire_event=no
[/kill]
{CHECK_SPEAKER}
[if]
[variable]
name=found_door
@ -986,18 +989,19 @@
[then]
[message]
speaker=second_unit
speaker=$speaking_unit.id
message= _ "Look, I found a gold key on a chain around his neck. This must be one of the keys needed to enter the black citadel."
[/message]
[/then]
[else]
[message]
speaker=second_unit
speaker=$speaking_unit.id
message= _ "Look, I found a gold key on a chain around his neck. I wonder what this key is for? I bet it will become useful eventually. I’ll keep it just in case."
[/message]
[/else]
[/if]
{CLEAR_VARIABLE speaking_unit}
[fire_event]
name=found_both_keys_and_door
@ -1024,6 +1028,7 @@
fire_event=no
[/kill]
{CHECK_SPEAKER}
[if]
[variable]
name=found_door
@ -1032,18 +1037,19 @@
[then]
[message]
speaker=second_unit
speaker=$speaking_unit.id
message= _ "Look, I found an iron key on a chain around his neck. This must be one of the keys needed to enter the black citadel."
[/message]
[/then]
[else]
[message]
speaker=second_unit
speaker=$speaking_unit.id
message= _ "Look, I found an iron key on a chain around his neck. I wonder what this key is for? I bet it will become useful eventually. I’ll keep it just in case."
[/message]
[/else]
[/if]
{CLEAR_VARIABLE speaking_unit}
[fire_event]
name=found_both_keys_and_door