DiD: forwardports

wesnoth · Feb 8, 2020 · d10a760 · d10a760
1 parent e679909
commit d10a760
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
@@ -17,9 +17,8 @@
     [story]
         [part]
             music=elvish-theme.ogg
-
-            # po: comments about dialogue style and characterization **THIS TEXT CONTAINS SPOILERS**:
-            # po:
+            #                          **THIS TEXT CONTAINS SPOILERS**
+            # po: Comments about dialogue style and characterization:
             # po: Drogan: although he is the captain of Parthyn's guard, he shows signs of recklessness and inflexibility; he's stiff and stubborn, which causes him to butt heads with Malin
             # po:           often, we see that Drogan says something to Malin (e.g. banishing him) without a clearly good reason why, and that's because of his ego and confidence in his own righteousness
             # po:           Drogan speaks with a country accent, using things like "ta" instead of "to", "ya" instead of "you", "thar" instead of "there", and some incorrect grammatical constructs like "them orcs" instead of "the orcs"
@@ -536,12 +535,12 @@
                     message= _ "Yes, yes it is. Nobody’ll support ya on yer crazy path to depravity."
                 [/message]
 
-                # Hint that the loyal units stay behind
+                # po: Hint, that the loyal units stay behind
                 [message]
                     side=1
                     race=human
                     [not]
-                        id=Malin Keshar
+                        id=Malin Keshar,Dela Keshar,Drogan
                     [/not]
                     message= _ "We should all be glad to see you gone, necromancer. I detest having fought by your side."
                 [/message]
@@ -607,12 +606,12 @@
                     message= _ "If ya go out on a quest to seek depravity, none o’ us will support ya."
                 [/message]
 
-                # Hint that the loyal units stay behind
+                # po: Hint, that the loyal units stay behind
                 [message]
                     side=1
                     race=human
                     [not]
-                        id=Malin Keshar
+                        id=Malin Keshar,Dela Keshar,Drogan
                     [/not]
                     message= _ "Better to die than to ally ourselves with a necromancer."
                 [/message]

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
@@ -491,6 +491,7 @@
 
         [message]
             speaker=Malin Keshar
+            # po: In the sense of "Understood, I will do that", not "very good".
             message= _ "Very well."
         [/message]
 
@@ -678,6 +679,7 @@
 
         [message]
             speaker=Malin Keshar
+            # po: That's the case for both usages of this string.
             message= _ "Very well."
         [/message]
 

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/07a_A_Small_Favor.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/07a_A_Small_Favor.cfg
@@ -149,7 +149,7 @@
 
         type=General
         id=Taylor
-        name= _ "General Taylor"
+        name= _ "Taylor"
         canrecruit=yes
 
         fog=yes
@@ -423,8 +423,9 @@
                 description= _ "Move Malin and Darken Volk into the Mage Lady’s manor"
             [/objective]
             [objective]
+                {ALTERNATIVE_OBJECTIVE_CAPTION}
                 condition=win
-                description= _ "OR: Defeat General Taylor"
+                description= _ "Defeat General Taylor"
             [/objective]
             [objective]
                 condition=lose
@@ -443,7 +444,7 @@
             [/gold_carryover]
 
             [note]
-                description= _ "Enemy units have reduced vision (radius 3)"
+                description= _ "Enemy units have reduced vision (radius 3)."
             [/note]
         [/objectives]
 

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/07b_A_Small_Favor2.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/07b_A_Small_Favor2.cfg
@@ -393,6 +393,11 @@
                         [/effect]
                     [/object]
                 [/modify_unit]
+
+                [redraw]
+                    clear_shroud=yes
+                    side=1
+                [/redraw]
             [/do]
         [/foreach]
 

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/07c_A_Small_Favor3.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/07c_A_Small_Favor3.cfg
@@ -425,6 +425,11 @@
                         [/effect]
                     [/object]
                 [/modify_unit]
+
+                [redraw]
+                    clear_shroud=yes
+                    side=1
+                [/redraw]
             [/do]
         [/foreach]
 
@@ -1013,9 +1018,9 @@ Existence churns and the soul is reborn into endless night.</i>"
                 [/message]
             [/then]
             [else]
-                # human or bat
                 [message]
                     id=Malin Keshar
+                    # po: The speaker addresses a human or a bat.
                     message=_ "Guard that book with your life while I come to fetch it."
                 [/message]
             [/else]