EI S07a various fixes (#6639)

* Side 2 hidden without spoilers * Fixed Grug upkeep, added dialogue about Ogres joining * typographic quote (cherry picked from commit 742bb75)
wesnoth · May 30, 2022 · 142c6db · 142c6db
1 parent c6eb655
commit 142c6db
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/changelog.md b/changelog.md
@@ -2,6 +2,10 @@
  ### Add-ons client
  ### Add-ons server
  ### Campaigns
+   * Eastern Invasion
+     * S07a:
+       * Better handling for side 2 (issue #4145)
+       * Fixed Grug upkeep, added dialogue about ogres joining (issue #4145)
    * Under the Burning Suns
      * S5: Enforce encounter with the Cloaked Figure (issue #6364)
  ### Editor

diff --git a/data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg b/data/campaigns/Eastern_Invasion/scenarios/07a_The_Crossing.cfg
@@ -33,6 +33,7 @@
         side=2
         canrecruit=yes
         controller=ai
+        hidden=yes
         recruit=Skeleton Rider,Vampire Bat,Skeleton,Skeleton Archer
         [ai]
             recruitment_pattern=fighter,fighter,scout,scout,archer
@@ -124,6 +125,14 @@
                 carryover_percentage=70
             [/gold_carryover]
         [/objectives]
+
+        [store_unit]
+            [filter]
+                id=Garnad
+            [/filter]
+            kill=yes
+            variable=saved_Garnad
+        [/store_unit]
     [/event]
 
     [event]
@@ -136,14 +145,6 @@
             id=Owaec
         [/recall]
 
-        [store_unit]
-            [filter]
-                id=Garnad
-            [/filter]
-            kill=yes
-            variable=saved_Garnad
-        [/store_unit]
-
         [message]
             speaker=Gweddry
             message= _ "We have come to the Great River. Should we cross here, or try to find a ford?"
@@ -189,6 +190,10 @@
             x,y=36,29
         [/unstore_unit]
         {CLEAR_VARIABLE saved_Garnad}
+        [modify_side]
+            side=2
+            hidden=no
+        [/modify_side]
 
         [terrain]
             x,y=36,29
@@ -368,7 +373,8 @@
                     [then]
                         [message]
                             speaker=Grug
-                            message= _ "Grug say join you will he."
+                            #po: "Grug say join you will he" means "I will join you" in a weird speech pattern. "Gork and Drog too" means that two other ogres will be joining Gweddry.
+                            message= _ "Grug say join you will he. Gork and Drog too."
                         [/message]
 
                         [modify_unit]
@@ -379,24 +385,22 @@
                             side=1
                             canrecruit=no
 
-                            [modifications]
-                                {TRAIT_LOYAL}
-                                {TEAM_COLOR_OVERRIDE () purple}
-                            [/modifications]
+                            {TRAIT_LOYAL}
+                            {TEAM_COLOR_OVERRIDE () purple}
                         [/modify_unit]
 
                         [unit]
                             name= _ "Gork"
                             side=1
                             type=Ogre
-                            x,y=recall,recall
+                            x,y=39,4
                             random_traits=yes
                         [/unit]
                         [unit]
                             name= _ "Drog"
                             side=1
                             type=Ogre
-                            x,y=recall,recall
+                            x,y=40,5
                             random_traits=yes
                         [/unit]
 

diff --git a/data/campaigns/Eastern_Invasion/scenarios/07b_Undead_Crossing.cfg b/data/campaigns/Eastern_Invasion/scenarios/07b_Undead_Crossing.cfg
@@ -328,7 +328,7 @@
 
         [message]
             speaker=Dacyn
-            message= _ "We have no time to lose! Let's get moving quickly before the rest of their army catches up with us."
+            message= _ "We have no time to lose! Let’s get moving quickly before the rest of their army catches up with us."
         [/message]
 
         [endlevel]