Fix dialogues using nontranslatable ally_name...

...variable value to use unit's name instead.

Also, introduced a bugcheck (hint:
http://www.wesnoth.org/forum/viewtopic.php?f=7&t=13827)
This commit is contained in:
Ignacio R. Morelle 2008-04-27 00:53:35 +00:00
parent 12007e1566
commit 54856ca47c

View File

@ -231,6 +231,13 @@
[/have_unit]
[then]
[store_unit]
[filter]
id=$ally_name
[/filter]
kill=no
variable=temp_ally_store
[/store_unit]
[if]
[variable]
name=ally_race
@ -240,7 +247,7 @@
[then]
[message]
speaker=Melusand
message= _ "No, you don't have to introduce yourselves. I already know who you are and why you have been journeying all this way. And I must say, $ally_name, that your recent actions and indeed your presence with these fine folk is a credit to your race."
message= _ "No, you don't have to introduce yourselves. I already know who you are and why you have been journeying all this way. And I must say, $temp_ally_store.name, that your recent actions and indeed your presence with these fine folk is a credit to your race."
[/message]
[message]
@ -253,16 +260,18 @@
[else]
[message]
speaker=Melusand
message= _ "No, you don't have to introduce yourselves. I already know who you are and why you have been journeying all this way. And I must say, $ally_name, that your recent actions and indeed your presence with these fine folk is a credit to your race."
message= _ "No, you don't have to introduce yourselves. I already know who you are and why you have been journeying all this way. And I must say, $temp_ally_store.name, that your recent actions and indeed your presence with these fine folk is a credit to your race."
[/message]
[message]
speaker=$ally_name
image=portraits/grog.png
message= _ " $ally_name says thank you."
message= _ "$temp_ally_store.name says thank you."
[/message]
[/else]
[/if]
{CLEAR_VARIABLE temp_ally_store}
[/then]
[else]
@ -617,7 +626,7 @@
[message]
speaker=$ally_name
image=portraits/grog.png
message= _ " $ally_name not sure if he trust fish lady. What if she just want you elves to fight her war for her?"
message= _ "$temp_ally_store.name not sure if he trust fish lady. What if she just want you elves to fight her war for her?"
[/message]
[/else]
[/if]
@ -694,7 +703,7 @@
[message]
speaker=$ally_name
image=portraits/grog.png
message= _ " Do not give up yet, little one. The battle is not yet lost while we still fight."
message= _ "Do not give up yet, little one. The battle is not yet lost while we still fight."
[/message]
[/else]
[/if]
@ -732,11 +741,19 @@
[/then]
[else]
[store_unit]
[filter]
id=$ally_name
[/filter]
kill=no
variable=temp_ally_store
[/store_unit]
[message]
speaker=$ally_name
image=portraits/grog.png
message= _ "Even in deepest tunnels my people could not escape Yechnagoth's power forever if she is not stopped. Against such evil I am sure the Great Leader would give you whole army of trolls, but I am afraid you only have $ally_name. Still, $ally_name will do what he can to see her destroyed."
message= _ "Even in deepest tunnels my people could not escape Yechnagoth's power forever if she is not stopped. Against such evil I am sure the Great Leader would give you whole army of trolls, but I am afraid you only have $temp_ally_store.name. Still, $temp_ally_store.name will do what he can to see her destroyed."
[/message]
{CLEAR_VARIABLE temp_ally_store}
[/else]
[/if]