some more changes from other repo

- more spellchecking - use proper portrait for Kyobaine in her death message - tried to add a new fix for #79, but it doesn't seem to work... - a few more footnotes
nemaara · Jul 25, 2024 · 5121396 · 5121396
1 parent abaef5a
commit 5121396
Show file tree

Hide file tree

Showing 11 changed files with 561 additions and 472 deletions.
diff --git a/_main.cfg b/_main.cfg
@@ -109,7 +109,9 @@ Version "+{~{LDR_PATH}/dist/VERSION}
 {./_editor.cfg}
 
 # wmllint: general spellings Wesnoth Wesnothian Wesnothians Elensefar lich Gweddry Mal-Ravanal Dacyn Weldyn orcish dwarvish exp
+# wmllint: general spellings unburied undead liches dwarves saurians Milord AMLA
 # wmllint: directory spellings Gawen Ruvio Vattin Yahyazad Akladian Akladians Darknite Darknites Grekulak Huon Ryedric Deorien Gallorae Hoyre
 # wmllint: directory spellings Raedwood Caerwyn Orannon Guilcorta Okladia Okladian Carrenemoe Carrenemoes Cryne Buffin mixling Gaeltin Hyer
 # wmllint: directory spellings Saoren Graeme Borraine Gwidle Easkladia Mithrandil Saorduc Oyre Mathauri Bontom Skagrrak Gauri Mavourneen
-# wmllint: directory spellings Lorin Vakladia
+# wmllint: directory spellings Lorin Vakladia readme.txt Reme Karen Majid Bor Freetown Barnon Raul Uri Ruen Turlin Luc Ostans
+# wmllint: directory spellings Holymen Wisemen Wondermen backroads
diff --git a/macros/elvish_macros.cfg b/macros/elvish_macros.cfg
@@ -5,12 +5,33 @@
         [filter]
             id=Kyobaine
         [/filter]
-        [message]
-            speaker=unit
-            #po: Kyobaine, female Elf
-            message=_"I will never again see our beautiful forests..."
-            image=portraits/kyobaine.png
-        [/message]
+        [if]
+            [found_item]
+                id=Kyobaine_winter_cloak
+            [/found_item]
+            [or]
+                [variable]
+                    name=ano_kyobaine_has_cloak
+                    equals=yes
+                [/variable]
+            [/or]
+            [then]
+                [message]
+                    speaker=unit
+                    #po: Kyobaine, female Elf
+                    message=_"I will never again see our beautiful forests..."
+                    image=portraits/kyobaine_winter.png
+                [/message]
+            [/then]
+            [else]
+                [message]
+                    speaker=unit
+                    # (same as before)
+                    message=_"I will never again see our beautiful forests..."
+                    image=portraits/kyobaine.png
+                [/message]
+            [/else]
+        [/if]
     [/event]
     [event]
         name=last breath

diff --git a/scenarios/05_The_Swamp_Things.cfg b/scenarios/05_The_Swamp_Things.cfg
@@ -14,6 +14,7 @@
     [story]
         {AFTERBARNONSTORY} # from macros/conversations.cfg
         [part]
+            #wmllint: local spelling Duc
             story=_"The party entered the swamps and woods of Saoren Duc with heavy hearts."
             background=story_images/swamp_scena.png
         [/part]

diff --git a/scenarios/14a_Scouting_Near_Barnon.cfg b/scenarios/14a_Scouting_Near_Barnon.cfg
@@ -3,7 +3,8 @@
 [scenario]
 #define WINCONDITION
     [objective]
-        description=_"HEROIC: Kill all enemy leaders OR"
+        #po: trailing space is intentional, to pad the footnote a bit:
+        description=_"HEROIC: Kill all enemy leaders " + {EARLY_FINISH_BONUS_FOOTNOTE} + _" OR"
         condition=win
     [/objective]
     [objective]

diff --git a/scenarios/14b_Bontom.cfg b/scenarios/14b_Bontom.cfg
@@ -395,14 +395,15 @@
         [objectives]
             side=1
             [objective]
-                description=_"HEROIC: Kill all enemy leaders OR"
+                # (this string already gets a translation note from a previous scenario)
+                description=_"HEROIC: Kill all enemy leaders " + {EARLY_FINISH_BONUS_FOOTNOTE} + _" OR"
                 condition=win
             [/objective]
             [objective]
                 description=_"NORMAL: Rescue Reme Carrenemoe and move him to the north-eastern signpost"
                 condition=win
             [/objective]
-            {OBJECTIVE_NOTES _"You may interrogate the Orcish leader with either Gawen, Ruvio, or Lorin. Other leaders may be interrogated by Gawen only."}
+            {OBJECTIVE_NOTES _"You may interrogate the Orcish leader with either Gawen, Ruvio, or Lorin. Other leaders may be interrogated by Gawen only. The Outlaw leader interrogations are largely identical."}
             {OBJECTIVES14}
             {LORINOBJECTIVES}
             {TURNS_RUN_OUT}
@@ -411,15 +412,15 @@
         [objectives]
             side=1
             [objective]
-                description=_"HEROIC: Kill all enemy leaders OR"
+                description=_"HEROIC: Kill all enemy leaders " + {EARLY_FINISH_BONUS_FOOTNOTE} + _" OR"
                 condition=win
             [/objective]
             [objective]
                 description=_"NORMAL: Rescue Reme Carrenemoe and move him to the north-eastern signpost"
                 condition=win
             [/objective]
             # No Lorin in this branch of the conditional, so leave her out of this:
-            {OBJECTIVE_NOTES _"You may interrogate the Orcish leader with either Gawen or Ruvio. Other leaders may be interrogated by Gawen only."}
+            {OBJECTIVE_NOTES _"You may interrogate the Orcish leader with either Gawen or Ruvio. Other leaders may be interrogated by Gawen only. The Outlaw leader interrogations are largely identical."}
             {OBJECTIVES14}
             {TURNS_RUN_OUT}
         [/objectives]
@@ -543,8 +544,8 @@
     #LEIF THRALL BY GAWEN
     [event]
         {KILLEDBY (Leif Thrall) (Gawen Hagarthen)}
-        {MSG_Leif_Thrall _"Such a young man... And yet, one darn good fighter.."}
-        {MSGW_Gawen _"You were worthy opponent too."}
+        {MSG_Leif_Thrall _"Such a young man... And yet, one darn good fighter..."}
+        {MSGW_Gawen _"You were a worthy opponent, too."}
         {MSG_Leif_Thrall _"Yes... it was a good fight, wasn't it?"}
         {MSGW_Gawen _"Yes... Before you pass on, please answer me few questions."}
         {VARIABLE ano_continue yes}
@@ -577,11 +578,13 @@
         {MSGW_Gawen _"Why are you allied with Akladians?"}
         {MSG_Leif_Thrall _"Allied? We are allied with none. They have simply paid for our services. That's all."}
         {ELSE_IF ano_opt equals mother}
+        #po: "whence" is a contraction for "from where"; it has nothing to do with the word "when":
         {MSGW_Gawen _"You are from the Outlaw Base, right? The place whence assassins come... maybe you know who poisoned the mother of Gawen Hagarthen?"}
         {MSG_Leif_Thrall _"I don't know that."}
         {ELSE_IF ano_opt equals assa}
         {MSGW_Gawen _"Someone hired an assassin to kill Gawen Hagarthen, immediately after his father's death. I know he came from the Outlaw Base. Who hired him?"}
-        {MSG_Leif_Thrall _"I think it was one of Akladian lords... yes... his name was Cryne, Bor Cryne..."}
+        #po: lowercase "l" in "lords" because we're talking about the rank generically, not the name of the unit type:
+        {MSG_Leif_Thrall _"I think it was one of the Akladian lords... yes... his name was Cryne, Bor Cryne..."}
         {VARIABLE ano_assa_cryne yes}
         {ELSE}
         {MSG_Leif_Thrall
@@ -593,8 +596,8 @@
     [/event]
     [event]
         {KILLEDBY (Hans the Ripper) (Gawen Hagarthen)}
-        {MESSAGE (Hans the Ripper) () (_"Hans the Ripper") _"Such a young man... And yet, one darn good fighter.."}
-        {MSGW_Gawen _"You were worthy opponent too."}
+        {MESSAGE (Hans the Ripper) () (_"Hans the Ripper") _"Such a young man... And yet, one darn good fighter..."}
+        {MSGW_Gawen _"You were a worthy opponent, too."}
         {MESSAGE (Hans the Ripper)  () (_"Hans the Ripper") _"Yes... it was a good fight, wasn't it?"}
         {MSGW_Gawen _"Yes... Before you pass on, please answer me few questions."}
         {VARIABLE ano_continue yes}
@@ -631,7 +634,7 @@
         {MESSAGE (Hans the Ripper) () (_"Hans the Ripper") _"I don't know that. A lot of Akladians buy poison from us."}
         {ELSE_IF ano_opt equals assa}
         {MSGW_Gawen _"Someone hired an assassin to kill Gawen Hagarthen, immediately after his father's death. I know he came from the Outlaw Base. Who hired him?"}
-        {MESSAGE (Hans the Ripper) () (_"Hans the Ripper") _"I think it was one of Akladian lords... yes... his name was Cryne, Bor Cryne..."}
+        {MESSAGE (Hans the Ripper) () (_"Hans the Ripper") _"I think it was one of the Akladian lords... yes... his name was Cryne, Bor Cryne..."}
         {VARIABLE ano_assa_cryne yes}
         {ELSE}
         {MESSAGE (Hans the Ripper) () (_"Hans the Ripper")
@@ -905,12 +908,41 @@
         [/endlevel]
     [/event]
 
+    [event]
+        name=enemies defeated
+        [filter]
+            side=1
+        [/filter]
+        [if]
+            [have_unit]
+                id=Reme Carrenemoe
+                side=1
+                [not]
+                    x,y=1,1
+                [/not]
+                [not]
+                    x,y=recall,recall
+                [/not]
+            [/have_unit]
+            [then]
+                {MSG_Reme _"I am saved!"}
+                {VARIABLE ano_reme_saved yes}
+            [/then]
+            [else]
+                {MSGW_Gawen _"It's a hollow victory, defeating Reme's captors without him among our ranks..."}
+            [/else]
+        [/if]
+    [/event]
     [event]
         name=victory
         [filter_condition]
             {VARIABLE_CONDITIONAL ano_reme_saved equals yes}
         [/filter_condition]
+        {IF_HAVE_UNIT (Reme Carrenemoe)}
         {MSG_Reme _"The outlaws are defeated!"}
+        {ELSE}
+        {MSGW_Gawen _"We saved Reme, but do not have him here with us for our victory? What happened?"}
+        {END_IF}
     [/event]
     {ELVISH_DEATHS}
     {ALL_ANO_DEATHS}

diff --git a/scenarios/14e_Saorduc_Swamps.cfg b/scenarios/14e_Saorduc_Swamps.cfg
@@ -240,7 +240,8 @@
         [objectives]
             side=1
             [objective]
-                description=_"Kill all enemy leaders"
+                #po: trailing space is intentional, to pad the footnote a bit:
+                description=_"Kill all enemy leaders. " + {EARLY_FINISH_BONUS_FOOTNOTE}
                 condition=win
             [/objective]
             {OBJECTIVE_NOTES _"You may withdraw by moving Gawen to signpost."}
@@ -252,7 +253,7 @@
         [objectives]
             side=1
             [objective]
-                description=_"Kill all enemy leaders"
+                description=_"Kill all enemy leaders. " + {EARLY_FINISH_BONUS_FOOTNOTE}
                 condition=win
             [/objective]
             {OBJECTIVE_NOTES _"You may withdraw by moving Gawen to signpost."}

diff --git a/scenarios/21c_Ruins_of_the_Past.cfg b/scenarios/21c_Ruins_of_the_Past.cfg
@@ -24,7 +24,7 @@
             # It might be tempting to spoil Grekulak's appearance here by displaying his portrait, but let's not do that yet.
         [/part]
         [part]
-            story=_"After Mal-Ravanal's defeat, Grekulak was trapped in the swamps, spending his days roving in the morass and quagmire. Finally he came up with an idea. The undead had been storming the world of Wesnoth for millenia. They never succeeded, and often a very small group of brave living creatures - be they elves, humans or dwarves - were able to defeat large hordes of undead. "
+            story=_"After Mal-Ravanal's defeat, Grekulak was trapped in the swamps, spending his days roving in the morass and quagmire. Finally he came up with an idea. The undead had been storming the world of Wesnoth for millennia. They never succeeded, and often a very small group of brave living creatures - be they elves, humans or dwarves - were able to defeat large hordes of undead. "
             background=story/swamp-01.jpg
             # ART_TODO.txt entry: "An image illustrating how Grekulak escaped through the swamps (a dark silhouette on dark background)"
         [/part]

diff --git a/scenarios/25_The_Awakening.cfg b/scenarios/25_The_Awakening.cfg
@@ -140,7 +140,7 @@
     [floating_text]
         x,y=$x1,$y1
         #wmllint: markcheck off
-        text="<span color='#BCB088'>+{ON_DIFFICULTY4 3 2 1 0}g</span>"
+        text="<span color='#BCB088'>+{ON_DIFFICULTY4 3 2 1 0}g</span>" #wmllint: no spellcheck
         #wmllint: markcheck on
     [/floating_text]
 #endif
@@ -166,7 +166,7 @@
     [floating_text]
         x,y=$x1,$y1
         #wmllint: markcheck off
-        text="<span color='#BCB088'>+{ON_DIFFICULTY4 4 3 2 1}g</span>"
+        text="<span color='#BCB088'>+{ON_DIFFICULTY4 4 3 2 1}g</span>" #wmllint: no spellcheck
         #wmllint: markcheck on
     [/floating_text]
     {ELSE_IF random equals 5}
@@ -191,7 +191,7 @@
     [floating_text]
         x,y=$x1,$y1
         #wmllint: markcheck off
-        text="<span color='#BCB088'>+{ON_DIFFICULTY4 5 4 3 2}g</span>"
+        text="<span color='#BCB088'>+{ON_DIFFICULTY4 5 4 3 2}g</span>" #wmllint: no spellcheck
         #wmllint: markcheck on
     [/floating_text]
     {ELSE}
@@ -216,7 +216,7 @@
     [floating_text]
         x,y=$x1,$y1
         #wmllint: markcheck off
-        text="<span color='#BCB088'>+{ON_DIFFICULTY4 6 5 4 3}g</span>"
+        text="<span color='#BCB088'>+{ON_DIFFICULTY4 6 5 4 3}g</span>" #wmllint: no spellcheck
         #wmllint: markcheck on
     [/floating_text]
     {FOUR_END_IFs}