miscellaneous changes I'd been sitting on

_main.cfg

@@ -93,3 +93,4 @@ Version "+{~{LDR_PATH}/dist/VERSION}
 # 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

lua/ano_wml_tags.lua

@@ -0,0 +1,2 @@
+-- (stub file that I may possibly put stuff in in the future)
+

macros/ano_macros.cfg

@@ -1038,5 +1038,24 @@
 "+{_NOTES_TEXT}
 #enddef
 
+# originally copied (and renamed) from "Across The Ocean":
+#define ANO_MOVING_ANIM_DIRECTIONAL_6_FRAME BASE_IMAGE_NAME
+    [movement_anim]
+        start_time=0
+        [if]
+            direction=s,se,sw
+            [frame]
+                image={BASE_IMAGE_NAME}-se-run[1~6].png:100
+            [/frame]
+        [/if]
+        [else]
+            direction=n,ne,nw
+            [frame]
+                image={BASE_IMAGE_NAME}-ne-run[1~6].png:100
+            [/frame]
+        [/else]
+    [/movement_anim]
+#enddef
+
 # For the AI controller:
 {./ai}

scenarios/04_Battle_of_Barnon.cfg

@@ -556,6 +556,7 @@
                 [endlevel]
                     result=victory
                     bonus=no
+                    carryover_percentage=100
                     next_scenario=05_Unexpected_Guests
                     linger_mode=no
                 [/endlevel]
@@ -579,6 +580,7 @@
                 [endlevel]
                     result=victory
                     bonus=no
+                    carryover_percentage=100
                     next_scenario=05_The_Swamp_Things
                     linger_mode=no
                 [/endlevel]
@@ -1302,6 +1304,7 @@
                         [endlevel]
                             result=victory
                             bonus=no
+                            carryover_percentage=100
                             next_scenario=05_Unexpected_Guests
                             linger_mode=no
                         [/endlevel]
@@ -1310,6 +1313,7 @@
                         [endlevel]
                             result=victory
                             bonus=no
+                            carryover_percentage=100
                             next_scenario=05_The_Swamp_Things
                             linger_mode=no
                         [/endlevel]
@@ -1506,6 +1510,7 @@
                 [endlevel]
                     result=victory
                     bonus=no
+                    carryover_percentage=100
                     next_scenario=05_Unexpected_Guests
                     linger_mode=no
                 [/endlevel]
@@ -1514,6 +1519,7 @@
                 [endlevel]
                     result=victory
                     bonus=no
+                    carryover_percentage=100
                     next_scenario=05_The_Swamp_Things
                     linger_mode=no
                 [/endlevel]

scenarios/05_The_Swamp_Things.cfg

@@ -62,9 +62,10 @@
         {GOLD4 100 110 120 130}
         {INCOME4 1 2 3 4}
         team_name=bad
-        recruit=Saurian Skirmisher,Saurian Augur,Saurian Oracle
+        recruit=Saurian Skirmisher,Saurian Augur,Saurian Oracle,Saurian Devotee,Young Saurian
         [ai]
             recruitment_pattern=scout,archer,healer
+            recruitment_more={ON_DIFFICULTY4 "0" "0,1" "1" "1,2"}
             grouping=defensive
             {QUANTITY4 aggression 0.1 0.2 0.3 0.4}
             {QUANTITY4 caution 0.9 0.8 0.7 0.6}
@@ -75,9 +76,7 @@
             support_villages=yes
         [/ai]
     [/side]
-#ifdef EASY
-    {LIMIT_CONTEMPORANEOUS_RECRUITS 2 "Saurian Oracle" 1}
-#endif
+    {LIMIT_CONTEMPORANEOUS_RECRUITS 2 "Saurian Oracle" {ON_DIFFICULTY4 1 2 3 4}}
     [side]
         type=Saurian Ambusher
         id=Ssumar
@@ -87,9 +86,10 @@
         {GOLD4 100 110 120 130}
         {INCOME4 1 2 3 4}
         team_name=bad
-        recruit=Saurian Skirmisher,Saurian Augur,Saurian Soothsayer
+        recruit=Saurian Skirmisher,Saurian Augur,Saurian Soothsayer,Saurian Devotee,Young Saurian
         [ai]
             recruitment_pattern=scout,scout,healer
+            recruitment_more={ON_DIFFICULTY4 "0" "0,1" "1" "1,2"}
             grouping=offensive
             {QUANTITY4 aggression 0.4 0.5 0.6 0.7}
             {QUANTITY4 caution 0.3 0.2 0.1 0.0}
@@ -100,9 +100,7 @@
             support_villages=no
         [/ai]
     [/side]
-#ifdef EASY
-    {LIMIT_CONTEMPORANEOUS_RECRUITS 3 "Saurian Soothsayer" 1}
-#endif
+    {LIMIT_CONTEMPORANEOUS_RECRUITS 3 "Saurian Soothsayer" {ON_DIFFICULTY4 1 2 3 4}}
     [event]
         name=prestart
         # no need to RECALL Reme Carrenemoe here because we use unstore_unit to get him later

scenarios/06_Separation.cfg

@@ -123,6 +123,8 @@
         [if]
             {CONDITION ano_orcs_in_hills equals yes}
             [then]
+                #po: note that "found" and "found out" have different meanings; "found out about" means more like "learned about",
+                #po: and can cover both hearing about, and witnessing firsthand.
                 {MSG_Lorin _"And what about that Orcish army we found out about? We should stick together!"}
                 {MSG_Reme _"I have already told you. There is no WE. Neither of us can do anything about those Orcs."}
             [/then]

scenarios/07_Ally_From_the_Past.cfg

@@ -80,7 +80,7 @@
             y=18
             facing=se
             [modifications]
-                {TRAIT_LOYAL}
+                {TRAIT_LOYAL OVERLAY=""}
 #ifdef EASY
                 {TRAIT_RESILIENT}
 #endif
@@ -123,7 +123,7 @@
             {TRAIT_DIM}
 #else
             {TRAIT_STRONG}
-            {TRAIT_LOYAL}
+            {TRAIT_LOYAL OVERLAY=""}
 #endif
         [/modifications]
         [unit]

scenarios/08_Outlaw_Base.cfg

@@ -6,7 +6,7 @@
     map_data="{~add-ons/A_New_Order/maps/OutlawBase.map}"
     # This can be increased to {36 34 32 30} if this turns out to still not be enough:
     {TURNS4 35 33 31 29}
-    {INTRO_AND_SCENARIO_MUSIC loyalists.ogg gameplay06.ogg}
+    {INTRO_AND_SCENARIO_MUSIC loyalists.ogg battle/gameplay06.ogg}
     {EXTRA_SCENARIO_MUSIC old_english_march.ogg}
     {EXTRA_SCENARIO_MUSIC strings_wings_and_things.ogg}
     {EXTRA_SCENARIO_MUSIC breaking_the_chains.ogg}
@@ -262,7 +262,7 @@
         {IF ano_roe_tmp greater_than_equal_to 1}
         [gold]
             side=2
-            amount=$ano_roe_tmp
+            amount="$(min($turn_number|, $ano_roe_tmp|))"
         [/gold]
         {END_IF_WITHOUT_ELSE}
 #endif
@@ -408,6 +408,31 @@
         [/if]
     [/event]
 
+    [event]
+        name=recruit
+        first_time_only=yes
+        [filter]
+            side=1
+            type=Peasant
+        [/filter]
+        {MSG_unit _"Oh, there is a horse in this village. I can ride it!"}
+        [transform_unit]
+            id=$unit.id
+            transform_to=Rancher
+        [/transform_unit]
+        [heal_unit]
+            [filter]
+                id=$unit.id
+            [/filter]
+            moves=full
+            restore_attacks=yes
+        [/heal_unit]
+        {MSG_unit _"...see?"}
+        {MSG_Gawen _"You look different now."}
+        {MSG_unit _"It's amazing the effect that getting on horseback can have on one's appearance, isn't it?"}
+        {MSG_Gawen _"Indeed."}
+    [/event]
+
     [event]
         name=victory
         [if]

scenarios/09_Hired_Swords.cfg

@@ -711,7 +711,7 @@
             [/variable]
             [then]
                 {MSG_unit _"What a fighter! I would willingly fight for someone like her..."}
-                {MSG_Lorin _"I am no necromancer; I use only for living warriors, not the dead!"}
+                {MSG_Lorin _"I am no necromancer; I have use only for living warriors, not the dead!"}
                 {MSG_Yahyazad _"They seem to have come to respect you now. Strange."}
             [/then]
         [/if]