AToTB Remove variable artifacts

wesnoth · Aug 19, 2016 · 8199098 · 8199098
1 parent da56151
commit 8199098
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 40 deletions.
diff --git a/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg b/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg
@@ -397,14 +397,14 @@ Besides... I want my brother back."
         {VARIABLE first_password_3 _"Jarlom"}
         {VARIABLE first_password_4 _"Hamik"}
 
-        {VARIABLE_OP first_password_number rand "1..4"}
+        {VARIABLE_OP first_password rand "1..4"}
 
         {VARIABLE second_password_1 _"Akranbral"}
         {VARIABLE second_password_2 _"Drakanal"}
         {VARIABLE second_password_3 _"Xaskanat"}
         {VARIABLE second_password_4 _"Katklagad"}
 
-        {VARIABLE_OP second_password_number rand "1..4"}
+        {VARIABLE_OP second_password rand "1..4"}
 
         [if]
             [not]
@@ -426,9 +426,12 @@ Besides... I want my brother back."
 
         [message]
             speaker=unit
-            message= _ "Three days ride to the northeast, in a deserted castle. The passwords to the guards are $first_password_$first_password_number and $second_password_$second_password_number|."
+            message= _ "Three days ride to the northeast, in a deserted castle. The passwords to the guards are $first_password_$first_password and $second_password_$second_password|."
         [/message]
 
+        {CLEAR_VARIABLE first_password_1,first_password_2,first_password_3,first_password_4}
+        {CLEAR_VARIABLE second_password_1,second_password_2,second_password_3,second_password_4}
+
         [message]
             speaker=Arvith
             message= _ "Bind him and take him with us. If he has played us false, he will die."

diff --git a/data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg b/data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg
@@ -284,36 +284,25 @@ Yet for some reason I fear these brothers more. If Mordak were here it would be
         [message]
             speaker=Arvith
             message= _ "The password is"
+            variable=password_picked
             [option]
-                label= _ "$first_password_1|!"
-                [command]
-                    {VARIABLE first_password_picked "$first_password_1"}
-                [/command]
+                label= _ "Sithrak!"
             [/option]
             [option]
-                label= _ "$first_password_2|!"
-                [command]
-                    {VARIABLE first_password_picked "$first_password_2"}
-                [/command]
+                label= _ "Eleben!"
             [/option]
             [option]
-                label= _ "$first_password_3|!"
-                [command]
-                    {VARIABLE first_password_picked "$first_password_3"}
-                [/command]
+                label= _ "Jarlom!"
             [/option]
             [option]
-                label= _ "$first_password_4|!"
-                [command]
-                    {VARIABLE first_password_picked "$first_password_4"}
-                [/command]
+                label= _ "Hamik!"
             [/option]
         [/message]
 
         [if]
             [variable]
-                name=first_password_picked
-                equals=$first_password_$first_password_number
+                name=password_picked
+                equals=$first_password
             [/variable]
 
             [then]
@@ -355,6 +344,7 @@ Yet for some reason I fear these brothers more. If Mordak were here it would be
                 {VARIABLE delay_guards true}
             [/else]
         [/if]
+        {CLEAR_VARIABLE password_picked}
     [/event]
 
     [event]
@@ -481,36 +471,25 @@ Yet for some reason I fear these brothers more. If Mordak were here it would be
         [message]
             speaker=Arvith
             message= _ "Oh, of course. I had nearly forgotten."
+            variable=password_picked
             [option]
-                label= _ "$second_password_1|!"
-                [command]
-                    {VARIABLE second_password_picked "$second_password_1"}
-                [/command]
+                label= _ "Akranbral!"
             [/option]
             [option]
-                label= _ "$second_password_2|!"
-                [command]
-                    {VARIABLE second_password_picked "$second_password_2"}
-                [/command]
+                label= _ "Drakanal!"
             [/option]
             [option]
-                label= _ "$second_password_3|!"
-                [command]
-                    {VARIABLE second_password_picked "$second_password_3"}
-                [/command]
+                label= _ "Xaskanat!"
             [/option]
             [option]
-                label= _ "$second_password_4|!"
-                [command]
-                    {VARIABLE second_password_picked "$second_password_4"}
-                [/command]
+                label= _ "Katklagad!"
             [/option]
         [/message]
 
         [if]
             [variable]
-                name=second_password_picked
-                equals=$second_password_$second_password_number
+                name=password_picked
+                equals=$second_password
             [/variable]
 
             [then]
@@ -533,6 +512,7 @@ Yet for some reason I fear these brothers more. If Mordak were here it would be
                 [/message]
             [/else]
         [/if]
+        {CLEAR_VARIABLE password_picked}
 
         [message]
             speaker=Arvith
@@ -798,7 +778,7 @@ Yet for some reason I fear these brothers more. If Mordak were here it would be
     [event]
         name=victory
 
-        {CLEAR_VARIABLE Got_Key}
+        {CLEAR_VARIABLE Got_Key,delay_guards}
     [/event]
 
     [event]