Merge pull request #3960 from nemaara/DiD_patch

[DiD] Patch fixes
wesnoth · Mar 9, 2019 · dd13ec2 · dd13ec2
2 parents e2faf1c + d445c82
commit dd13ec2
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 10 deletions.
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
@@ -108,6 +108,19 @@
     [/objectives]
 #enddef
 
+#define FULL_HEAL_RESTORE FILTER
+    [heal_unit]
+        [filter]
+            {FILTER}
+        [/filter]
+
+        amount=full
+        moves=full
+        restore_statuses=yes
+        restore_attacks=yes
+    [/heal_unit]
+#enddef
+
     [event]
         name=prestart
 
@@ -394,7 +407,7 @@
     [event]
         name=cutscene1
 
-        {FULL_HEAL (id=Malin Keshar)}
+        {FULL_HEAL_RESTORE (id=Malin Keshar)}
 
         [message]
             speaker=Malin Keshar
@@ -567,7 +580,7 @@
             id=Ogre3
         [/filter]
 
-        {FULL_HEAL (side=1)}
+        {FULL_HEAL_RESTORE (side=1)}
 
         {PLACE_IMAGE "items/bones.png" $x1 $y1}
 
@@ -656,7 +669,7 @@
         {GENERIC_UNIT 2 (Giant Scorpion) 25 4}
         {GENERIC_UNIT 2 (Giant Scorpion) 23 6}
 
-        {MODIFY_UNIT (type=Giant Scorpion) max_moves 4}
+        {MODIFY_UNIT (type=Giant Scorpion) max_moves 3}
 
         {OBJECTIVE_EXPLORE}
     [/event]
@@ -996,7 +1009,7 @@
         [/terrain]
         [redraw][/redraw]
 
-        {FULL_HEAL (side=1)}
+        {FULL_HEAL_RESTORE (side=1)}
 
         {GENERIC_UNIT 2 (Giant Scorpion) 5 5}
         {GENERIC_UNIT 2 (Giant Scorpion) 8 3}
@@ -1160,3 +1173,6 @@
     {HERODEATH_MALIN}
     {HERODEATH_VOLK}
 [/scenario]
+
+#undef OBJECTIVE_EXPLORE
+#undef FULL_HEAL_RESTORE
diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
@@ -821,7 +821,7 @@
 
         [message]
             speaker=OWarlord
-            message= _ "Look what we have here! A human city on the verge of collapse and a necromancer with only a few, paltry minions at his command. The wolves will feed well tonight!"
+            message= _ "Look what we have here! A human city on the verge of collapse and a necromancer with only a few paltry minions at his command. The wolves will feed well tonight!"
         [/message]
         [message]
             speaker=Malin Keshar

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
@@ -451,7 +451,7 @@
 
         [message]
             speaker=Darken Volk
-            message= _ "The stolen book lies within Lord Karres’s manor at the north end of the city. It will be difficult for us to defeat the entire city guard, so we must stay hidden as long as possible. For now, we can use this fog to our advantage. I shall use it to cast a spell to obscure town guards’ vision. It should not affect us, however."
+            message= _ "The stolen book lies within Lord Karres’s manor at the north end of the city. It will be difficult for us to defeat the entire city guard, so we must stay hidden as long as possible. For now, we can use this fog to our advantage. I shall use it to cast a spell to obscure the town guards’ vision. It should not affect us, however."
         [/message]
 
         [delay]

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
@@ -1117,7 +1117,6 @@
         {MODIFY_UNIT (side=2) attacks_left 0}
         {MODIFY_UNIT (side=2) moves 0}
         {MODIFY_UNIT (side=2) max_moves 2}
-        #{MODIFY_UNIT (type=Wraith) max_moves 2}
 
         [random_placement]
             num_items=1

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg
@@ -90,7 +90,7 @@
                     {STORYTXT_BACKGROUND end.jpg}
                 [/part]
                 [part]
-                    story= _ "If he allowed a foolish hero to take a copy of the book, would others eventually follow in his footsteps? Would the author’s plan actually work, or would people continue to view necromancy as only a corrupting power? One voice tells him that being accepted by society should not be of any concern to him. Another says that it would not harm him to try. He does not come to any conclusions, but a copy of the tome sits there in his lair, waiting to be taken."
+                    story= _ "If he allowed a foolish hero to take a copy of the book, would others eventually follow in his footsteps? Would the author’s plan actually work, or would people continue to view necromancy as only a corrupting power? One voice tells him that being accepted by society should not be of any concern to him. Another says that it would not harm him to try. He does not come to any conclusions, but a slightly embellished copy of the tome sits there in his lair, waiting to be taken."
                     {STORYTXT_BACKGROUND end.jpg}
                 [/part]
             [/then]
@@ -1314,7 +1314,7 @@
 
                         [message]
                             role=speakinghero
-                            message= _ "It matters not. He embraced death over life, and thus relinquished his right to our mercy. Let us return home; the town will need us to help defend against the orc raids."
+                            message= _ "It matters not. He embraced death over life, and thus relinquished his right to our mercy. Let us return home; the town will need us to help defend against the orcish raids."
                         [/message]
 
                         [message]
@@ -1507,7 +1507,8 @@
                                     speaker=narrator
                                     image=items/book2.png
                                     # po: hahaha is Zephrin laughing
-                                    message= _ "<i>Today, that stupid memory crept up on me again. It was that time at the Academy when Zephrin and I were arguing about orcs. I still remember that hoarse voice of his telling me, ‘Fun story, Malin, but you really should put a disclaimer. You know, to make sure everyone understands no orcs were harmed in the making of this story, hahaha.’
+									# po: this line sounds very "modern-day" but that's intentional because it's an easter egg, not meant to be taken strictly at face value
+                                    message= _ "<i>That stupid memory crept up on me again today. It was that time at the Academy when Zephrin and I were arguing about orcs. I still remember that hoarse voice of his telling me, ‘Fun story, Malin, but you really should put a disclaimer. You know, to make sure everyone understands no orcs were harmed in the making of this story, hahaha.’
 
 I can still hear his infernal cackling ringing in my head. Sure thing, Zephrin, right... like my whole life was some sort of work of fiction!</i>"
                                 [/message]