copy over recent changes from other repo

.github/workflows/lint.yml

@@ -3,7 +3,7 @@ name: lint
 on: [push, pull_request]
 
 env:
-  WESNOTH_VERSION: 1.16.10
+  WESNOTH_VERSION: 1.16.11
 
 jobs:
   lint:

macros/conversations_support.cfg

@@ -1,7 +1,7 @@
 #textdomain wesnoth-A_New_Order
 
 #define SUPPORT_CONVO CHAR1 CHAR2 CCONVO BCONVO ACONVO SCONVO
-    # Custom tag defined in lua/ano_wml_tags.lua:
+    # Custom tag defined in lua/ano_wml_tags.lua; will also check their srankability:
     [get_support_between]
         char1={CHAR1}
         char2={CHAR2}
@@ -11,6 +11,9 @@
         variable=ano_support_level
         [case] # Default:
             value="D"
+            #po: you can probably skip translating any/all strings in this file (conversations_support.cfg) for now, as this is a
+            #po: Work-In-Progress that isn't actually accessible in-game yet, and it is very likely that there will be many further
+            #po: changes throughout.
             {MSG_narrator _"Sorry, but "+{CHAR1}+_" and "+{CHAR2}+_" haven't built up enough support to have a support conversation yet."}
         [/case]
         [case]
@@ -34,6 +37,7 @@
         [case]
             value="S"
             # "S" support is for marriage proposals. Note that not all characters will be able to reach this rank.
+            # In fact, most won't, to avoid interfering with the canon relationships.
             {SCONVO}
         [/case]
         [else]
@@ -43,12 +47,62 @@
 #enddef
 
 # Full list of characters that can have support convos is in ano_macros.cfg
+# But, it would probably be helpful to copy them here anyways:
+# "Gawen,Reme,Reumario,Regven,Yahyazad,Lorin,Karen,Ruvio"
+# Keep the macro definitions in the same order as this list, starting from the left and going left to right.
+# Also, the macros only need to be done one way around.
+# That is, if there is an X_Y_SUPPORT_CONVO macro, there is no need for a separate Y_X_SUPPORT_CONVO macro.
 # I am making the executive decision now to only have support convos available in S13, "Scouting".
 # This means that we can assume that it is winter in the conversations, and thus use the corresponding macros
 # for winter portraits.
 #define GAWEN_REME_WINTER_SUPPORT_CONVO
     {SUPPORT_CONVO Gawen Reme {} {} {} {}}
 #enddef
+#define GAWEN_REUMARIO_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Gawen Reumario {} {} {} {}}
+#enddef
+#define GAWEN_REGVEN_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Gawen Regven {} {} {} {}}
+#enddef
+#define GAWEN_YAHYAZAD_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Gawen Yahyazad {} {} {} {}}
+#enddef
+#define GAWEN_LORIN_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Gawen Lorin {} {} {} {}}
+#enddef
+#define GAWEN_KAREN_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Gawen Karen {} {} {} {}}
+#enddef
+#define GAWEN_RUVIO_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Gawen Ruvio {} {} {} {}}
+#enddef
+#define REME_REUMARIO_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Reme Reumario {} {} {} {}}
+#enddef
+#define REME_REGVEN_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Reme Regven {} {} {} {}}
+#enddef
+#define REME_YAHYAZAD_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Reme Yahyazad {} {} {} {}}
+#enddef
+#define REME_LORIN_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Reme Lorin {} {} {} {}}
+#enddef
+#define REME_KAREN_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Reme Karen {} {} {} {}}
+#enddef
+#define REME_RUVIO_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Reme Ruvio {} {} {} {}}
+#enddef
+#define REUMARIO_REGVEN_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Reumario Regven {} {} {} {}}
+#enddef
+#define REUMARIO_YAHYAZAD_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Reumario Yahyazad {} {} {} {}}
+#enddef
+#define REUMARIO_LORIN_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Reumario Lorin {} {} {} {}}
+#enddef
 #define REUMARIO_KAREN_WINTER_SUPPORT_CONVO
     {SUPPORT_CONVO Reumario Karen {
     # C:
@@ -60,8 +114,64 @@
     # S:
     }}
 #enddef
-#define KAREN_YAHYAZAD_WINTER_SUPPORT_CONVO
-    {SUPPORT_CONVO Karen Yahyazad {
+#define REUMARIO_RUVIO_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Reumario Ruvio {} {} {} {}}
+#enddef
+#define REGVEN_YAHYAZAD_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Regven Yahyazad {} {} {} {}}
+#enddef
+#define REGVEN_LORIN_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Reumario Lorin {
+    # C:
+    {MSG_Regven _"Excuse me, Madam Lorin, but you wouldn't have happened to see Karen anywhere around here lately, would you?"}
+    # (TODO)
+    } {
+    # B:
+    } {
+    # A:
+    } {
+    # S:
+    }}
+#enddef
+#define REGVEN_KAREN_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Regven Karen {
+    # C:
+    {MSGW_Karen _"Hey Karl, can you please stop following me so closely?"}
+    {MSG_Regven _"It is my duty to guard you, Miss Karen."}
+    {MSGW_Karen _"Sure, but, like, can't you at least guard me from over <i>THERE</i> instead?"}
+    {MSG_Regven _"Your father ordered me to keep a close eye on you, so keep a close eye on you I shall."}
+    {MSGW_Karen _"I still don't think that keeping “a close eye” on me means it has to be <i>THAT</i> close, though..."}
+    {MSG_Regven _"Your father pays me a fair sum of gold to keep you safe; it is not my place to go interpreting his orders in a way that could jeopardize my employment. He is no doubt already angry at me for letting you escape my watch so many times..."}
+    {MSGW_Karen _"Is he really, or are you just assuming that? I mean, he hasn't fired you yet, and it's been <i>HOW</i> many times now?"}
+    {MSG_Regven _"I've lost count, to be honest..."}
+    {MSGW_Karen _"See? Exactly. I think Father actually kind of <i>likes</i> it when I come tagging along with him, personally..."}
+    {MSG_Regven _"Perhaps, although he also would hate for any harm to come to you."}
+    {MSGW_Karen _"I know, I know, but, I mean, no harm has come to me <i>YET</i>, has it? You really don't need to worry so much..."}
+    {MSG_Regven _"People generally don't come to harm, until they do. It only takes once for disaster to occur..."}
+    {MSGW_Karen _"Yeah, but, I mean, have you seen me in battle, though? I can handle myself perfectly fine!"}
+    {MSG_Regven _"Nevertheless, I must fulfill my duty."}
+    {MSGW_Karen _"OK, compromise: how about half the distance from the point I suggested you guard me from originally?"}
+    {MSG_Regven _"One quarter the distance."}
+    {MSGW_Karen _"One third."}
+    {MSG_Regven _"You drive a hard bargain, Miss Karen! But all right, I guess that will be acceptable..."}
+    {MSGW_Karen _"Thanks, Karl! You won't regret this!"}
+    {MSG_Regven _"(<i>to himself</i>) The things I put up with for this job..."}
+    } {
+    # B:
+    } {
+    # A:
+    } {
+    # S:
+    }}
+#enddef
+#define REGVEN_RUVIO_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Regven Ruvio {} {} {} {}}
+#enddef
+#define YAHYAZAD_LORIN_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Yahyazad Lorin {} {} {} {}}
+#enddef
+#define YAHYAZAD_KAREN_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Yahyazad Karen {
     # C:
     {MSGW_Karen _"Hey Mr. Yahyazad, so you like Lorin, right? Just what do you see in her, anyways?"}
     {MSGW_Yahyazad _"You don't have to call me “mister”; just “Majid” is fine."}
@@ -99,11 +209,13 @@
     {MSGW_Karen _"I don't know! I didn't invent our language!"}
     {MSGW_Yahyazad _"Well, anyways. I believe you were telling me about Gawen?"}
     {MSGW_Karen _"It's like he never even notices me! Sometimes I don't even know why I bother trying to get his attention..."}
-    {MSGW_Yahyazad _"Hm. Well, I told you about what I found interesting Lorin previously. What do you see in Gawen, anyways?"}
+    #po: I want to add some italics for emphasis in here, but don't want to go emphasizing every other word, so I dunno:
+    {MSGW_Yahyazad _"Hm. Well, I told you about what I found interesting about Lorin previously. What do you see in Gawen, anyways?"}
     {MSGW_Karen _"Well, he's going to be king some day!"}
     {MSGW_Yahyazad _"Ah, so it's power that attracts you, then, is it?"}
     {MSGW_Karen _"No no no, that's not it at all! It's just... well, kings always get to go on these grand adventures, and... well, I just keep thinking about how romantic it would be to be by his side on such an adventure..."}
     {MSGW_Yahyazad _"Aren't you already on adventure with him?"}
+    #po: the beard part is a reference to the part in S13 when ano_strateg_pos equals 2 and she says, "He HAS to have a beard. All of our great Wesnothian kings had beards!"
     {MSGW_Karen _"Well, yeah, but that's different! You see, when a <i>KING</i> goes on an adventure, it's an event to remember! The bards write songs about it! And plus by the time he's a king, he'll have a beard!"}
     {MSGW_Yahyazad _"I have a beard."}
     {MSGW_Karen _"Yeah, but it's not a <i>KING</i>-type beard, though."}
@@ -132,6 +244,8 @@
     # (end of A-rank support convo)
     } {
     # S:
+#ifdef __UNUSED__
+    #po: the implication behind this sigh is that Yahyazad is just getting back from having been rejected by Lorin again:
     {MSGW_Yahyazad _"(<i>sighs</i>)"}
     {MSGW_Karen _"You know, Majid, we're actually pretty similar, both being rejected by members of the royal family like this..."}
     {MSGW_Yahyazad _"Hey, don't take that defeatist attitude! This is merely a temporary setback!"}
@@ -169,37 +283,40 @@
     {MSGW_Karen _"Well... ok, so just how many other wives do you have already?"}
     {MSGW_Yahyazad _"Just the two so far, Raya and Ni'wa. You'd be the third. It really isn't that many if you compare that against the chieftains of some of the other Ostans, why just take that Arsham Mahouri for instance, he--"}
     {MSGW_Karen _"OK, I don't care about this Arsham Mahouri guy; I just care about you, and your... family that I'll be joining. Tell me more about this Raya and Ni'wa?"}
+    #po: the implication with the word "fiery" is that Raya is a unit of the Dune Burner -> Dune Scorcher -> Dune Firetrooper line:
     {MSGW_Yahyazad _"Oh, you'll absolutely love Raya! She's a warrior like you are, although she specializes more in fiery weaponry... you could have a killing competition with her like you did with Lorin!"}
+    #po: implication is that Ni'wa is a unit of the Dune Falconer -> Dune Sky Hunter line:
     {MSGW_Yahyazad _"As for Ni'wa... well, she's a bit more shy, and takes a bit longer to open up to people she's newly met, but I'm sure you'll grow to get along just fine with her as well! She spends most of her time training falcons to hunt for us..."}
     {MSGW_Karen _"Well, they sound interesting, at least... all right, Majid, I'm reassured! Take me as your third wife, and then let's go on an adventure together!"}
     {MSGW_Yahyazad _"With pleasure, my dear Karen."}
     {MSG_narrator _"(<i>They kiss</i>)"}
     # (end of S-rank support convo)
+#endif
     }}
 #enddef
-#define KAREN_REGVEN_WINTER_SUPPORT_CONVO
-    {SUPPORT_CONVO Karen Regven {
+#define YAHYAZAD_RUVIO_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Yahyazad Ruvio {} {} {} {}}
+#enddef
+#define LORIN_KAREN_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Lorin Karen {
     # C:
-    {MSGW_Karen _"Hey Karl, can you please stop following me so closely?"}
-    {MSG_Regven _"It is my duty to guard you, Miss Karen."}
-    {MSGW_Karen _"Sure, but, like, can't you at least guard me from over <i>THERE</i> instead?"}
-    {MSG_Regven _"Your father ordered me to keep a close eye on you, so keep a close eye on you I shall."}
-    {MSGW_Karen _"I still don't think that keeping “a close eye” on me means it has to be <i>THAT</i> close, though..."}
-    {MSG_Regven _"Your father pays me a fair sum of gold to keep you safe; it is not my place to go interpreting his orders in a way that could jeopardize my employment. He is no doubt already angry at me for letting you escape my watch so many times..."}
-    {MSGW_Karen _"Is he really, or are you just assuming that? I mean, he hasn't fired you yet, and it's been <i>HOW</i> many times now?"}
-    {MSG_Regven _"I've lost count, to be honest..."}
-    {MSGW_Karen _"See? Exactly. I think Father actually kind of <i>likes</i> it when I come tagging along with him, personally..."}
-    {MSG_Regven _"Perhaps, although he also would hate for any harm to come to you."}
-    {MSGW_Karen _"I know, I know, but, I mean, no harm has come to me <i>YET</i>, has it? You really don't need to worry so much..."}
-    {MSG_Regven _"People generally don't come to harm, until they do. It only takes once for disaster to occur..."}
-    {MSGW_Karen _"Yeah, but, I mean, have you seen me in battle, though? I can handle myself perfectly fine!"}
-    {MSG_Regven _"Nevertheless, I must fulfill my duty."}
-    {MSGW_Karen _"OK, compromise: how about half the distance from the point I suggested you guard me from originally?"}
-    {MSG_Regven _"One quarter the distance."}
-    {MSGW_Karen _"One third."}
-    {MSG_Regven _"You drive a hard bargain, Miss Karen! But all right, I guess that will be acceptable..."}
-    {MSGW_Karen _"Thanks, Karl! You won't regret this!"}
-    {MSG_Regven _"(<i>to himself</i>) The things I put up with for this job..."}
+    #po: reference to story part in S15 where Gawen says, "Karen had even promised to show Lorin a few easy exercises to help her to regain the slenderness of her youth."
+    {MSGW_Karen _"Hey Lorin, you look like you could use some exercise."}
+    # (TODO)
+    } {
+    # B:
+    } {
+    # A:
+    } {
+    # S:
+    # (N/A)
+    }}
+#enddef
+#define LORIN_RUVIO_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Lorin Ruvio {
+    # C:
+    {MSGW_Lorin _"Ruvio, that child of yours is an absolute menace. You'd better do a better job of keeping her under control."}
+    # (TODO)
     } {
     # B:
     } {
@@ -208,6 +325,6 @@
     # S:
     }}
 #enddef
-#define KAREN_REME_WINTER_SUPPORT_CONVO
-    {SUPPORT_CONVO Karen Reme {} {} {} {}}
+#define KAREN_RUVIO_WINTER_SUPPORT_CONVO
+    {SUPPORT_CONVO Karen Ruvio {} {} {} {}}
 #enddef

scenarios/01_Breaking_the_Circle.cfg

@@ -682,15 +682,23 @@
                 [/scroll_to_unit]
                 [redraw][/redraw]
                 {MSG_Reme _"My lady, we have found a medic!"}
+                [scroll_to_unit]
+                    id=Medic
+                    highlight=yes
+                [/scroll_to_unit]
+                [redraw][/redraw]
+                [delay]
+                    time=234
+                [/delay]
                 {MSG_Lorin _"Underling! My son is dying. If you heal him, I will spare your life. If not, I will burn you and your family alive, do you understand?"}
                 # TODO: this medic should have a (better) older-looking portrait, to match this dialogue:
                 {MESSAGE (Medic) () (_"Medic") _"Don't try to intimidate me. I am too old to be afraid of death, I have no family. I will try to heal your son because of my vows as a healer, not because of your threats, Akladian lady."}
                 {MSG_Lorin _"Your motives are of no concern to me, just do it!"}
                 {MESSAGE (Medic) () (_"Medic") _"Hold on a moment."}
                 [move_unit]
                     id=Medic
-                    to_x=16
-                    to_y=4
+                    to_x=15,16
+                    to_y=5,4
                 [/move_unit]
                 [store_unit]
                     [filter]

scenarios/02_Fighting_for_Passage.cfg

@@ -973,8 +973,10 @@
 #endif
         # Getting this loyalty check to work was a pain; see issue 23: https://github.com/nemaara/A_New_Order/issues/23
         [if]
+            # FIXME: this condition might still be wrong; I had it fire for me with a non-loyal Clansman...
             [have_unit]
                 id=$unit.id
+                # FIXME: validator complaint: "error validation: Invalid key 'upkeep=' in tag [have_unit]":
                 upkeep="loyal"
             [/have_unit]
             [then]
@@ -1078,6 +1080,11 @@
             factor=2.0
             relative=yes
         [/zoom]
+        # Just in case the zoom-in decentered him:
+        [scroll_to_unit]
+            id="Raul O Gaeltin"
+            highlight=yes
+        [/scroll_to_unit]
         [delay]
             time=123
         [/delay]