Preparing for another PR

- Another attempt at fixing #23 again; cc @Toranks and @knyghtmare
- Refer to Gawen as "Haldric" in S08 for nemaara#182
- Dune is probably ok to reference explicitly by name in the translators' comments
- try Lorin stat changes suggested in nemaara#179

lua/ano_wml_tags.lua

@@ -10,7 +10,8 @@ function wml_actions.get_support_between(cfg)
 end
 
 function check_srankability(cfg)
-	-- check for existing sranks
-	-- chech for compatibility
+	-- TODO:
+	-- - check for existing sranks
+	-- - check for compatibility
 end
 

scenarios/02_Fighting_for_Passage.cfg

@@ -681,6 +681,17 @@
                 [/micro_ai]
                 {MSG_Assassin _"Where is he? He is starting to get on my nerves..."}
             [/then]
+#ifdef DEBUG_MODE
+            [else]
+                {IF_DEBUG_MODE_IS_ACTUALLY_ON}
+                [inspect][/inspect]
+                {ELSE}
+#ifdef DEBUGMSG1
+                {DEBUGMSG1 "ano_assa_killed value: $ano_assa_killed|."}
+#endif
+                {END_IF}
+            [/else]
+#endif
         [/if]
     [/event]
     {ANO_ASSASSIN} # defined in macros/ano-01_06macros.cfg
@@ -858,6 +869,7 @@
         [scroll_to_unit]
             id=Lady Lorin
         [/scroll_to_unit]
+        #po: the "traitors" to which she refers are Akladian Warriors on side 2:
         {MSG_Lorin _"No! More traitors are coming from every side! We cannot hope to deal with all them!"}
         # "From every side":
         [for]
@@ -973,11 +985,28 @@
 #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...
+            # FIXME: this condition might still be wrong; some of the stuff that Toranks and Knyghtmare suggested
+            # from the UnitMarker addon might not be applicable here:
             [have_unit]
                 id=$unit.id
-                # FIXME: validator complaint: "error validation: Invalid key 'upkeep=' in tag [have_unit]":
-                upkeep="loyal"
+                x,y=$x1,$y1
+                side=1
+                [filter_wml]
+                    upkeep="loyal"
+                    [or]
+                        [modifications]
+                            [trait]
+                                id=loyal
+                                [or]
+                                    [effect]
+                                        apply_to=overlay
+                                        add="misc/loyal-icon.png"
+                                    [/effect]
+                                [/or]
+                            [/trait]
+                        [/modifications]
+                    [/or]
+                [/filter_wml]
             [/have_unit]
             [then]
                 {MSG_Gawen _"But he was loyal to our cause though!"}

scenarios/08_Outlaw_Base.cfg

@@ -12,7 +12,7 @@
     {EXTRA_SCENARIO_MUSIC breaking_the_chains.ogg}
     [story]
         [part]
-            story=_"Gawen, Ruvio and Karen didn't celebrate their victory. The bodies of the last Akladians were still warm as they hurried from the battlefield. They entered the forest of Raedwood, hoping that no one would follow them."
+            story=_"Gawen, Ruvio, and Karen didn't celebrate their victory. The bodies of the last Akladians were still warm as they hurried from the battlefield. They entered the forest of Raedwood, hoping that no one would follow them."
         [/part]
     [/story]
     {DAWN}
@@ -181,7 +181,9 @@
         [/modify_unit]
         {MSG_Gawen _"What kind of place is this?"}
         {MSG_Karen _"It's a bad place. Not the worst place imaginable, but it's still bad enough."}
-        {MSG_Ruvio _"You see, Gawen, when the royal family of Wesnoth started a war over succession, a golden era for bandits and thieves began. The succession wars were devastating and divided Wesnoth into many small kingdoms."}
+        {MSG_Ruvio _"You see, Haldric... uh, Haldric? HALDRIC!"}
+        {MSG_Gawen _"...oh right, you mean me. Sorry, I just haven't gotten used to that name yet..."}
+        {MSG_Ruvio _"Right, well, as I was saying, about this place, when the royal family of Wesnoth started a war over succession, a golden era for bandits and thieves began. The succession wars were devastating and divided Wesnoth into many small kingdoms."}
         {MSG_Ruvio _"During the wars, kings became weaker and lost much of their power, so when peace came they no longer had the forces needed to drive bandits out of their hideouts. The bandits continued to flourish even in periods of peace. When the Akladians came, they didn't care about rooting the bandits out either."}
         {MSG_Ruvio _"Fortunately, the place seems to be abandoned now."}
         [modify_unit]

scenarios/14b_Bontom.cfg

@@ -673,7 +673,7 @@
     [event]
         {KILLEDBY (Uruk Lug) (Lady Lorin)}
 
-        #po: this is a well-known quote from a well-known book -- translators, please find how this quote was translated into your language before trying translating it by yourself.
+        #po: this is the "Litany Against Fear" from the "Dune" franchise -- translators, please find how this quote was translated into your language before trying translating it by yourself.
         {MSG_Uruk_Lug _"I must not fear. Fear is the mind-killer. Fear is the little-death that brings total obliteration. I will face my fear. I will permit it to pass over me and through me. And when it has gone past I will turn the inner eye to see its path. Where the fear has gone there will be nothing. Only I will remain."}
         #po: this is a play on what the orc just said; try to use similar wording when translating:
         {MSGW_Lorin _"Oh that was cute. Now, if you are quite finished, I have here this little knife-thing. This knife is what brings total obliteration, not to mention suffering."}