Author: shadowmaster
Date: Sun Apr 27 03:19:33 2008
New Revision: 26152

URL: http://svn.gna.org/viewcvs/wesnoth?rev=26152&view=rev
Log:
* Use translatable ally unit's name field instead of nontranslatable $ally_name 
variable value in dialogues

Modified:
    
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg

Modified: 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg?rev=26152&r1=26151&r2=26152&view=diff
==============================================================================
--- 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
 (original)
+++ 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
 Sun Apr 27 03:19:33 2008
@@ -2199,7 +2199,7 @@
             [then]
                 [message]
                     speaker=unit
-                    message= _ "This cave seems pretty empty, except for those 
two glowing runes in the center. This fort must have once been heavily occupied 
because countless feet have left well worn paths leading in several directions. 
$ally_name which way should we go?"
+                    message= _ "This cave seems pretty empty, except for those 
two glowing runes in the center. This fort must have once been heavily occupied 
because countless feet have left well worn paths leading in several directions. 
$unittest.name which way should we go?"
                 [/message]
 
                 [message]
@@ -3232,6 +3232,14 @@
             [/not]
         [/filter]
 
+        [store_unit]
+            [filter]
+                id=$ally_name
+            [/filter]
+            kill=no
+            variable=temp_ally_store
+        [/store_unit]
+
         [remove_shroud]
             x=3-11
             y=31-37
@@ -3255,7 +3263,7 @@
 
         [message]
             speaker=Nym
-            message= _ "I though you said $ally_name, that you'd been here 
before? Where are we supposed to go from here?"
+            message= _ "I though you said $temp_ally_store.name, that you'd 
been here before? Where are we supposed to go from here?"
         [/message]
 
         [message]
@@ -3272,6 +3280,8 @@
             name=entered_temple
             value=1
         [/set_variable]
+
+        {CLEAR_VARIABLE temp_ally_store}
     [/event]
 
     [event]
@@ -3690,6 +3700,14 @@
                     value=0
                 [/set_variable]
 
+                [store_unit]
+                    [filter]
+                        id=$ally_name
+                    [/filter]
+                    kill=no
+                    variable=temp_ally_store
+                [/store_unit]
+
                 [if]
                     [variable]
                         name=ally_race
@@ -3699,7 +3717,7 @@
                     [then]
                         [message]
                             speaker=Kaleh
-                            message= _ " $ally_name, I want to thank you so 
much for guiding us out of the caves. We never would have found our way without 
your help. But with the tunnels flooded, how are you going to find your way 
back to your people?"
+                            message= _ "$temp_ally_store.name, I want to thank 
you so much for guiding us out of the caves. We never would have found our way 
without your help. But with the tunnels flooded, how are you going to find your 
way back to your people?"
                         [/message]
 
                         [message]
@@ -3726,22 +3744,22 @@
                     [else]
                         [message]
                             speaker=Kaleh
-                            message= _ " $ally_name, thank you so much for 
leading us out of the caves. We never would have found our way without your 
help. But with the tunnels flooded, how are you going to find your way back to 
your people?"
+                            message= _ "$temp_ally_store.name, thank you so 
much for leading us out of the caves. We never would have found our way without 
your help. But with the tunnels flooded, how are you going to find your way 
back to your people?"
                         [/message]
 
                         [message]
                             speaker=$ally_name
-                            message= _ " $ally_name proud of little elves too. 
He would not have made it this far without all your help. $ally_name is 
surprised by your bravery and strength."
+                            message= _ "$temp_ally_store.name proud of little 
elves too. He would not have made it this far without all your help. 
$temp_ally_store.name is surprised by your bravery and strength."
                         [/message]
 
                         [message]
                             speaker=$ally_name
-                            message= _ "Truth is that $ally_name not know much 
of sunlight lands. Sun and stars are scary, everything is open, exposed, no 
safe places to hide. But $ally_name cannot go back through all that water. And 
$ally_name doesn't know where to find other tunnels back to his home. He is as 
lost as elves are."
+                            message= _ "Truth is that $temp_ally_store.name 
not know much of sunlight lands. Sun and stars are scary, everything is open, 
exposed, no safe places to hide. But $temp_ally_store.name cannot go back 
through all that water. And $temp_ally_store.name doesn't know where to find 
other tunnels back to his home. He is as lost as elves are."
                         [/message]
 
                         [message]
                             speaker=$ally_name
-                            message= _ "But $ally_name not afraid. Great 
leader told $ally_name to guide and protect elves, and $ally_name will keep his 
oath. $ally_name will follow elves wherever they may go and protect them from 
danger as best he can. Maybe later, $ally_name will find another way back down 
to the caves of his people. But for now, $ally_name will continue to serve and 
protect you."
+                            message= _ "But $temp_ally_store.name not afraid. 
Great leader told $temp_ally_store.name to guide and protect elves, and 
$temp_ally_store.name will keep his oath. $temp_ally_store.name will follow 
elves wherever they may go and protect them from danger as best he can. Maybe 
later, $temp_ally_store.name will find another way back down to the caves of 
his people. But for now, $temp_ally_store.name will continue to serve and 
protect you."
                         [/message]
 
                         [message]
@@ -3750,6 +3768,7 @@
                         [/message]
                     [/else]
                 [/if]
+                {CLEAR_VARIABLE temp_ally_store}
             [/then]
         [/if]
     [/event]
@@ -4355,11 +4374,18 @@
 
                     [else]
                         # troll ally version
-
+                        [store_unit]
+                            [filter]
+                                id=$ally_name
+                            [/filter]
+                            kill=no
+                            variable=temp_ally_store
+                        [/store_unit]
                         [message]
                             speaker=unit
-                            message= _ "We made it. Outside look strange to 
$ally_name, $ally_name not used to big open spaces."
+                            message= _ "We made it. Outside look strange to 
$temp_ally_store.name, $temp_ally_store.name not used to big open spaces."
                         [/message]
+                        {CLEAR_VARIABLE temp_ally_store}
                     [/else]
                 [/if]
             [/then]
@@ -4646,6 +4672,14 @@
             x,y=21,23
         [/teleport]
 
+        [store_unit]
+            [filter]
+                id=$ally_name
+            [/filter]
+            kill=no
+            variable=temp_ally_store
+        [/store_unit]
+
         [message]
             speaker=$ally_name
             message= _ "Kaleh, a quick question-"
@@ -4653,7 +4687,7 @@
 
         [message]
             speaker=Kaleh
-            message= _ "Not now $ally_name, I'm busy."
+            message= _ "Not now $temp_ally_store.name, I'm busy."
         [/message]
 
         [message]
@@ -4917,7 +4951,7 @@
             [then]
                 [message]
                     speaker=$ally_name
-                    message= _ " $ally_name no like humans either. They mean. 
But they sound great when they go squish."
+                    message= _ "$temp_ally_store.name no like humans either. 
They mean. But they sound great when they go squish."
                 [/message]
             [/then]
 
@@ -4980,6 +5014,8 @@
             name=loyalists.ogg
             immediate=yes
         [/music]
+
+        {CLEAR_VARIABLE temp_ally_store}
     [/event]
 
     # Event 16: Nym returns


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to