Sync with my other repo (Dec. 2023)

.github/FUNDING.yml

@@ -2,6 +2,6 @@
 
 github: cooljeanius
 patreon: EricGallager
-ko_fi: # Replace with a single Ko-fi username
+ko_fi: maraanelang
 liberapay: Wesnoth
 open_collective: cooljeanius

_main.cfg

@@ -45,6 +45,7 @@ add-ons/A_New_Order#enddef
 #endif
     icon=data/{LDR_PATH}/images/logo_small.png
     image=data/{LDR_PATH}/images/logo_large.png
+    # TODO: come up with something to use for a background= key.
     start_year="958 YW"
     end_year="960 YW"
     first_scenario=01_Breaking_the_Circle

macros/ano-20macros.cfg

@@ -521,10 +521,12 @@
 
     [event]
         {KILLEDBY (Robert the Hefty) (Rob Roe)}
+        {MESSAGE (Robert the Hefty) () (_"Robert the Hefty")
         #po: use of "me" instead of "my" here (and in Rob Roe's response) is to give him a bit of an accent:
-        {MESSAGE (Robert the Hefty) () (Robert the Hefty) _"Wait a minute... Rob Roe? What are you doing, me fellow Rob? What happened to our bandit fellowship?"}
+        _"Wait a minute... Rob Roe? What are you doing, me fellow Rob? What happened to our bandit fellowship?"}
+        {MESSAGE (Rob Roe) (portraits/humans/thug.png) (_"Rob Roe")
         #po: "'snothing" is a contraction for "it's nothing":
-        {MESSAGE (Rob Roe) (portraits/humans/thug.png) (Rob Roe) _"Oh, you know how things go, me fellow Rob... allegiances change. 'snothing personal, you see... strictly business."}
+        _"Oh, you know how things go, me fellow Rob... allegiances change. 'snothing personal, you see... strictly business."}
         {MESSAGE (Robert the Hefty) () (_"Robert the Hefty") _"Oh well, it figures..."}
     [/event]
 

macros/ano_macros.cfg

@@ -78,7 +78,7 @@
 #define CLEAR_GLOBAL_VARIABLE variable
     [clear_global_variable]
         namespace=ANewOrder
-        name={variable}
+        global={variable}
         side=1
     [/clear_global_variable]
 #enddef
@@ -146,8 +146,13 @@
     {VARIABLE ano_reme_saved no}
     {VARIABLE ano_gawen_mother no}
     {VARIABLE ano_cryne_and_orcs no}
+    {VARIABLE ano_luck_counter 0}
 #enddef
 
+#define ANO_LUCK_EVENTS
+    # (TODO)
+#enddef # ANO_LUCK_EVENTS
+
 #NOTE IMPORTANT: this is COSTLY MACRO
 # FIXME: players seem to think this macro is used, however, wmlscope reports that it isn't...
 #define COUNT_RELOADS variable unpleasant
@@ -869,7 +874,7 @@
 #define DEBUGMSG1 TEXT
     # Remember, when running wmllint/wmlindent, to check to make sure they don't mess with the spacing here:
     {MESSAGE narrator (wesnoth-icon.png) ()
-    #po: trailing space is intentional here:
+    #po: trailing space is intentional here, since further text is supposed to be spliced on at the end:
     _"This is a debug message. If you see it, then it means I forgot to delete it from the release scenario. "+"'{TEXT}'"}
 #enddef
 

macros/conversations.cfg

@@ -58,10 +58,11 @@
     [/store_unit]
     # TODO: maybe provide some other free recall to make up for Lorin being unavailable on this mission? Possibly Karl Regven?
     {MSG_Ruvio _"Gawen, I've never seen your step-mother like this before. I think she is sick. Very sick. I saw her vomiting yesterday."}
+    {MESSAGE (Gawen Hagarthen) (portraits/gawen_was.png) (_"Gawen")
     #po: Gawen is reacting to Ruvio informing him that he saw Lorin vomiting yesterday; the way he intended
     #po: to complete the "Is she..." sentence at the end is left intentionally ambiguous so that Ruvio can complete
     #po: it with his own assumption that Gawen meant "...poisoned?" to complete it.
-    {MESSAGE (Gawen Hagarthen) (portraits/gawen_was.png) (Gawen) _"But... What happened? Why? Is she..."}
+    _"But... What happened? Why? Is she..."}
     {MSG_Ruvio _"Poisoned? It's not impossible. We have Akladians in our army, don't we?"}
     {MESSAGE (Reme Carrenemoe) (portraits/reme.png) (Reme Carrenmoe)
     _"My lord, I do not wish to disturb you, but our scouts have reported about the enemy forces."}

macros/deaths.cfg

@@ -30,7 +30,8 @@
         [filter]
             id=Karl Regven
         [/filter]
-        {MESSAGE (Karl Regven) (portraits/regven.png) (Karl Regven)
+        {MESSAGE (Karl Regven) (portraits/regven.png) (_"Karl Regven")
+        #po: Karl Regven's "last breath" message:
         _"I'm not afraid... I would just want to smoke a little longer..."}
     [/event]
 #enddef

macros/elvish_macros.cfg

@@ -75,8 +75,9 @@
         {VARIABLE ano_loyal_elves true}
         {VARIABLE ano_loyal_elf Milildur}
 
+        {MESSAGE (Milildur) (portraits/milildur.png) (_"Milildur")
         #po: The message 'I fought with you for so many battles...' etc. will be spoken by both male, Milildur, and Elorain, female. Make it gender neutral.
-        {MESSAGE (Milildur) (portraits/milildur.png) (Milildur) _"My lord, I fought with you for so many battles... I can accept money from you no more. Please, treat me like a friend, not like a hired soldier."}
+        _"My lord, I fought with you for so many battles... I can accept money from you no more. Please, treat me like a friend, not like a hired soldier."}
         {MAKE_LOYAL (id) (Milildur)}
         {ELSE}
         # (???)
@@ -93,7 +94,7 @@
         {VARIABLE ano_loyal_elf Elorain}
 
         # (same string as previously, so no need to duplicate the previous translation note above it)
-        {MESSAGE (Elorain) (portraits/elorain.png) (Elorain) _"My lord, I fought with you for so many battles... I can accept money from you no more. Please, treat me like a friend, not like a hired soldier."}
+        {MESSAGE (Elorain) (portraits/elorain.png) (_"Elorain") _"My lord, I fought with you for so many battles... I can accept money from you no more. Please, treat me like a friend, not like a hired soldier."}
         {MAKE_LOYAL (id) (Elorain)}
         {ELSE}
         # (???)
@@ -138,8 +139,9 @@
         {MESSAGE (Kyobaine) ($ano_kyobaine_portrait|) (_"Kyobaine") _"...Aaand?"}
         #po: again, see previously:
         {MSGm_Gawen _"Well, you know, I thought that I should no longer treat you like a hired soldier..."}
+        {MESSAGE (Kyobaine) ($ano_kyobaine_portrait|) (_"Kyobaine")
         #po: "ask me out" as in, on a date:
-        {MESSAGE (Kyobaine) ($ano_kyobaine_portrait|) (Kyobaine) _"What?!? Are you trying to ask me out or something?"}
+        _"What?!? Are you trying to ask me out or something?"}
         {MSGm_Gawen _"...Eee?"}
         {MESSAGE (Kyobaine) ($ano_kyobaine_portrait|) (_"Kyobaine") _"No offense, but... it's not like I have something against males in general. It's more like I like them less hairy. And less... human. Anything more? No? Good. Let's get back to the business. And don't forget about my 20 gold pieces."}
         {CLEAR_VARIABLE ano_kyobaine_portrait}
@@ -160,8 +162,9 @@
 
         # She has to advance before she can be recalled, so her portrait always ought to be her standard one in this event
         # (i.e., she can't have her winter portrait yet)
+        {MESSAGE (Kyobaine) (portraits/kyobaine.png) (_"Kyobaine")
         #po: Kyobaine advances to Elvish Druid
-        {MESSAGE (Kyobaine) (portraits/kyobaine.png) (Kyobaine) _"How on earth I am supposed to walk in these clothes during winter? It's frigging cold!"}
+        _"How on earth I am supposed to walk in these clothes during winter? It's frigging cold!"}
         [if]
             [have_unit]
                 id=Kyobaine
@@ -170,8 +173,9 @@
             [then]
                 #po: Gawen speaking to Kyobaine:
                 {MSGW_Gawen _"But you're wearing snowshoes though."}
+                {MESSAGE (Kyobaine) (portraits/kyobaine.png) (_"Kyobaine")
                 #po: Kyobaine speaking to Gawen:
-                {MESSAGE (Kyobaine) (portraits/kyobaine.png) (Kyobaine) _"Do you seriously think that helps with the fact that it's my <b><i>BARE FEET</i></b> I have strapped into them? The holes in their webbing are enormous! The snow gets right through!"}
+                _"Do you seriously think that helps with the fact that it's my <b><i>BARE FEET</i></b> I have strapped into them? The holes in their webbing are enormous! The snow gets right through!"}
             [/then]
         [/if]
     [/event]
@@ -188,27 +192,32 @@
         [/gold]
         {IF ano_kyobaine_complained equals 0}
         {VARIABLE ano_kyobaine_complained 1}
+        {MESSAGE (Kyobaine) (portraits/kyobaine.png) (_"Kyobaine")
         #po: The talk between Kyobaine as Elvish Druid and Gawen, during winter
-        {MESSAGE (Kyobaine) (portraits/kyobaine.png) (Kyobaine) _"Oooh, no. I refuse to fight in these conditions, as long as I'm clad as such."}
+        _"Oooh, no. I refuse to fight in these conditions, as long as I'm clad as such."}
         {MSGW_Gawen _"What do you mean? Your clothes are just fine."}
         [if]
             [have_unit]
                 id=Kyobaine
                 trait=snow_shoes
             [/have_unit]
             [then]
+                {MESSAGE (Kyobaine) (portraits/kyobaine.png) (_"Kyobaine")
                 #po: Kyobaine asks Gawen for different clothes when she's wearing snowshoes:
-                {MESSAGE (Kyobaine) (portraits/kyobaine.png) (Kyobaine) _"Except for the snowshoes, these are clothes <i>for the spring</i>. The least you can do is to give me a proper cloak. You expect me to fight when I'm shivering and have goosebumps??"}
+                _"Except for the snowshoes, these are clothes <i>for the spring</i>. The least you can do is to give me a proper cloak. You expect me to fight when I'm shivering and have goosebumps??"}
                 {MSGW_Gawen _"That's ridiculous."}
+                {MESSAGE (Kyobaine) (portraits/kyobaine.png) (_"Kyobaine")
                 #po: Kyobaine asks Gawen for different clothes when she's wearing snowshoes:
-                {MESSAGE (Kyobaine) (portraits/kyobaine.png) (Kyobaine) _"I couldn't agree more. Call me when you have a new cloak."}
+                _"I couldn't agree more. Call me when you have a new cloak."}
             [/then]
             [else]
+                {MESSAGE (Kyobaine) (portraits/kyobaine.png) (_"Kyobaine")
                 #po: the old version of Kyobaine's request to Gawen:
-                {MESSAGE (Kyobaine) (portraits/kyobaine.png) (Kyobaine) _"<i>For the spring</i>. The least you can do is to give me proper shoes. You expect me to walk in this snow <i>barefoot</i>??"}
+                _"<i>For the spring</i>. The least you can do is to give me proper shoes. You expect me to walk in this snow <i>barefoot</i>??"}
                 {MSGW_Gawen _"That's ridiculous."}
+                {MESSAGE (Kyobaine) (portraits/kyobaine.png) (_"Kyobaine")
                 #po: the old version of Kyobaine's request to Gawen:
-                {MESSAGE (Kyobaine) (portraits/kyobaine.png) (Kyobaine) _"I couldn't agree more. Call me when you have new shoes."}
+                _"I couldn't agree more. Call me when you have new shoes."}
             [/else]
         [/if]
 

macros/messages.cfg

@@ -1,4 +1,10 @@
 #textdomain wesnoth-A_New_Order
+
+# This file is intended for characters that are used across multiple scenarios.
+# If you have a character who speaks a lot, but only exists in a single scenario,
+# just define a similar macro in that scenario's cfg file specifically instead.
+# (Note that any characters currently violating this guideline are being grandfathered in, i.e., they can stay here)
+
 #define MSG_narrator _TEXT
     {MESSAGE (narrator) () () ({_TEXT})}
 #enddef
@@ -44,6 +50,10 @@
     {MESSAGE (Uri van Roe) (portraits/akladian_lord2.png) (_"Uri van Roe") ({_TEXT})}
 #enddef
 
+#define MSG_Hoyre _TEXT
+    {MESSAGE (Hoyre O Barnone) (portraits/hoyre.png) (_"Hoyre O Barnone") ({_TEXT})}
+#enddef
+
 #define MSG_Quivre _TEXT
     {MESSAGE (Quivre O Raednon) (portraits/akladian_chaotic.png) (_"Quivre") ({_TEXT})}
 #enddef
@@ -52,6 +62,10 @@
     {MESSAGE (Gwidle Turlin) (portraits/maddock.png) (_"Gwidle") ({_TEXT})}
 #enddef
 
+#define MSG_Huon _TEXT
+    {MESSAGE (Huon Ryedric) (portraits/huon.png) (_"Huon Ryedric") ({_TEXT})}
+#enddef
+
 #define MSG_Karen _TEXT
     {MESSAGE (Karen) (portraits/karen.png) (_"Karen") ({_TEXT})}
 #enddef

scenarios/01_Breaking_the_Circle.cfg

@@ -24,6 +24,9 @@
     {EXTRA_SCENARIO_MUSIC casualties_of_war.ogg}
     {TURNS4 22 18 16 14}
     [story]
+        [part]
+            story = _ "Content Note: This campaign contains mature themes, some of which may be unsuitable for children. Player discretion advised."
+        [/part]
         [part]
             story = _ "Moments slowly lengthen into hours. Hope is slipping through my fingers..."
             show_title=yes

scenarios/04_Battle_of_Barnon.cfg

@@ -608,7 +608,7 @@
                 equals=no
             [/variable]
             [then]
-                {MESSAGE (Hoyre O Barnone) (portraits/hoyre.png) (Hoyre O Barnone) _"It is a dark day indeed, to see Akladian lords siding with an underling bastard child. What will your ancestors say about this, Uri?"}
+                {MSG_Hoyre _"It is a dark day indeed, to see Akladian lords siding with an underling bastard child. What will your ancestors say about this, Uri?"}
                 {MSG_Uri _"Hoyre, you have always been my friend. I would never fight against you. Rather, I join with you to kill that mixling!"}
                 [modify_side]
                     side=4
@@ -645,7 +645,7 @@
                 equals=no
             [/variable]
             [then]
-                {MESSAGE (Hoyre O Barnone) (portraits/hoyre.png) (Hoyre O Barnone) _"We spent so many days drinking and fighting together. Now you come with an army against me? What about our plans, Bor?"}
+                {MSG_Hoyre _"We spent so many days drinking and fighting together. Now you come with an army against me? What about our plans, Bor?"}
                 {MSG_Cryne _"Our plans haven't changed, Hoyre. You were and are my friend. I only came here with the underling so we could trap him. I am with you!"}
                 [modify_side]
                     side=3
@@ -751,7 +751,7 @@
                 {ELSE}
                 {IF_HAVE_UNIT (Hoyre O Barnone)}
                 # This probably shouldn't ever be reached, but just in case:
-                {MESSAGE (Hoyre O Barnone) (portraits/hoyre.png) (Hoyre O Barnone) _"Wait a second, something odd seems to be happening here..."}
+                {MSG_Hoyre _"Wait a second, something odd seems to be happening here..."}
                 {ELSE}
                 # REALLY shouldn't ever be reached:
                 {MSG_narrator _"At this moment, Gawen remembered what he was trying to do."}
@@ -1549,11 +1549,11 @@
         [filter_second]
             id="Hoyre O Barnone"
         [/filter_second]
-        {MESSAGE (Hoyre O Barnone) (portraits/hoyre.png) (Hoyre O Barnone) _"Argh! I am wounded!"}
+        {MSG_Hoyre _"Argh! I am wounded!"}
         {MSG_Cryne _"They got Hoyre! My friend! You will be avenged!"}
-        {MESSAGE (Hoyre O Barnone) (portraits/hoyre.png) (Hoyre O Barnone) _"I am alive, but I must run away! They try to kill me!"}
+        {MSG_Hoyre _"I am alive, but I must run away! They try to kill me!"}
         {MSG_Cryne _"Run away? You are an Akladian Lord, stay and fight!"}
-        {MESSAGE (Hoyre O Barnone) (portraits/hoyre.png) (Hoyre O Barnone) _"Fortunately I have a hideout here..."}
+        {MSG_Hoyre _"Fortunately I have a hideout here..."}
         [kill]
             id="Hoyre O Barnone"
         [/kill]
@@ -1570,7 +1570,7 @@
         [filter_second]
             side=1
         [/filter_second]
-        {MESSAGE (Hoyre O Barnone) (portraits/hoyre.png) (Hoyre O Barnone) _"Argh! I am wounded!"}
+        {MSG_Hoyre _"Argh! I am wounded!"}
         {MSG_Cryne _"They got Hoyre! My friend! You will be avenged!"}
         {MSG_Uri _"No, he is not dead, he is just heavily wounded and has lost consciousness!"}
         {MSG_narrator _"How did you manage to kill Hoyre? This shouldn't happen... Hoyre was supposed to run away when approached. Contact the maintainers with your savegame and replay for review!"}
@@ -2073,7 +2073,7 @@
             x=17-24
             y=1-6
         [/filter]
-        {MESSAGE (Hoyre O Barnone) (portraits/hoyre.png) (Hoyre O Barnone) _"My faithful warriors, it's time to show your loyalty to the clan!"}
+        {MSG_Hoyre _"My faithful warriors, it's time to show your loyalty to the clan!"}
         # These are the faithful warriors:
         {IF_NOT_HAVE_CREATE_LOYAL 2 (Akladian Warrior) 19 4}
         {IF_NOT_HAVE_CREATE_LOYAL 2 (Akladian Warrior) 18 4}
@@ -2110,7 +2110,7 @@
             id="Hoyre O Barnone"
         [/unhide_unit]
 
-        {MESSAGE (Hoyre O Barnone) (portraits/hoyre.png) (Hoyre O Barnone) _"Do not worry, I will soon be back, with reinforcements!"}
+        {MSG_Hoyre _"Do not worry, I will soon be back, with reinforcements!"}
 #ifdef NIGHTMARE
         [store_unit]
             [filter]
@@ -2202,7 +2202,7 @@
                 [/status]
             [/modify_unit]
             [redraw][/redraw]
-            {MESSAGE (Hoyre O Barnone) (portraits/hoyre.png) (Hoyre O Barnone) _"I'm back with the reinforcements, just as promised!"}
+            {MSG_Hoyre _"I'm back with the reinforcements, just as promised!"}
             # Fire this as a separate event due to this one using delayed_variable_substitution=no above:
             [fire_event]
                 # Tee hee hee I'm evil:
@@ -2235,7 +2235,7 @@
             amount=$gold_amt
         [/gold]
         {MSG_Uri _"Now wait just a minute here! Men, look around and see if they dropped any of their own gold!"}
-        # Bor Cryne's response here assumes that Uri is still alive (which he ought to be) and said his line:
+        #po: Bor Cryne's response here assumes that Uri is still alive (which he ought to be) and said his line:
         {MSG_Cryne _"Yes, gold for all true Akladians!"}
         {MSG_narrator _"Bor Cryne and Uri van Roe have each received $gold_amt gold pieces."}
         [gold]

scenarios/11_Council_in_Freetown.cfg

@@ -206,18 +206,18 @@
     [event]
         name=start
         {MSG_Gwidle _"Welcome back to Freetown, Ruvio. You are just in time for our meeting."}
-        {MESSAGE (Huon Ryedric) (portraits/huon.png) (Huon) _"We also welcome your daughter. Karen, I would order you to leave this meeting and go to your mother..."}
+        {MSG_Huon _"We also welcome your daughter. Karen, I would order you to leave this meeting and go to your mother..."}
         {MSG_Karen _"...but you know that you would only waste your breath."}
         {MSG_Gwidle _"We've heard that you have battled and defeated both Akladians and Outlaws. Accept our congratulations, Ruvio. But who is this young man, your companion?"}
         {MSG_Ruvio _"I participated in the battles you have mentioned, but someone else should be credited for the victory. We were commanded by this young man."}
         {MSG_Gwidle _"And his name is...?"}
         {MSG_Karen _"Gaumhaldric."}
         {MSG_Gawen _"(<i>grumbling</i>) I hate you."}
-        {MESSAGE (Huon Ryedric) (portraits/huon.png) (Huon) _"But now, he must leave. We have very important and secret things to talk upon."}
+        {MSG_Huon _"But now, he must leave. We have very important and secret things to talk upon."}
         {MSG_Ruvio _"He has my full trust. He stays."}
         {MSG_Gwidle _"So be it. Let's greet our honorable guest, Mithrandil of the northern Elves. He has made a long journey here and he bears important news."}
         {MESSAGE (Mithrandil) (portraits/mithrandil.png) (Mithrandil) _"My respect and best wishes for everyone in this free city. I hope you will forgive me for dispensing with the formalities of a long traditional speech. The news I bring here is simple, and terrifying. The Orcish army has marched unnoticed and unopposed into the very heart of Wesnoth."}
-        {MESSAGE (Huon Ryedric) (portraits/huon.png) (Huon) _"No! That impossible! How that could possibly happened? They would have had to cross through the free realms of the north, and..."}
+        {MSG_Huon _"No! That impossible! How that could possibly happened? They would have had to cross through the free realms of the north, and..."}
         {MSG_Gwidle _"Mithrandil speaks the truth, Huon. You have not seen the reports I've gotten."}
         #po: presumably the "queen whose name I will not utter" is Asheviere:
         {MESSAGE (Mithrandil) (portraits/mithrandil.png) (Mithrandil) _"They indeed crossed the free realms of the north. The relations among humans are none of my business. Also, I will pretend that I have not noticed that you have called me a liar. The Orcish army has appeared in Wesnoth, bringing back dark memories of the queen whose name I will not utter."}