another sync of changes from my other repo

- create CODEOWNERS file
- enable optional advancements as per issue nemaara#118
- confirmation of @alxrem's translation credits entry
- start on ChangeLog
- updated Medic frankenportrait from @DuncanusDillius
- even more validator fixes that I thought were too difficult to do previously
- start writing support conversations
- improve S01 cutscene/dialogue
- attempt at debugging odd bug where Lorin randomly disappears when visiting the gallows in S02
- minor updates to the Akladian name generator

.github/CODEOWNERS

@@ -0,0 +1,11 @@
+.luacheckrc @cooljeanius
+CODE_OF_CONDUCT.md @cooljeanius
+CONTRIBUTING.md @cooljeanius
+lua/ano_wml_tags.lua @cooljeanius
+macros/conversations_support.cfg @cooljeanius
+macros/debug.cfg @cooljeanius
+macros/items.cfg @cooljeanius
+macros/units.cfg @cooljeanius
+maps/Trapped_sandy.map @cooljeanius
+README_egallager_mods.txt @cooljeanius
+scenarios/15c_Raedwood_East.cfg @cooljeanius

ART_TODO.txt

@@ -54,7 +54,8 @@ PORTRAITS
 * Heinric the Redbeard (enemy leader from the first scenario; can be either a City
   Militia or a Lieutenant, depending on difficulty) (low priority)
 * better older-looking mage for the medic who heals Gawen in S01 (low priority)
-  (current one is a lazy frankenportrait that I just threw together myself)
+  (current one is a frankenportrait, that, despite having received some work,
+  could still use further improvement)
 * portraits for some of the less-important units with descriptive names, e.g.
   "John the Baldhead" (a peasant discoverable in S13), "Fat Bart" (an enemy
   Fugitive leader attacking the Oracle in S19c), and "Robert the Hefty" (an enemy

ART_authors.txt

@@ -36,8 +36,8 @@ Majid, Bor Cryne, akladian_lord, akladian_lord2, hoyre, Grekulak - Łukasz Zarę
 
 The previous version of Grekulak: "Fluffy!!!" <[email protected]>
 
-Medic.png is a frankenportrait (by egallager) of the Mage and Necromancer portraits
-from mainline Wesnoth.
+Medic.png is a frankenportrait (originally by egallager, improved by
+DuncanusDillius) of the Mage and Necromancer portraits from mainline Wesnoth.
 
 ruvio_broken.png was commissioned from a Twitter user who uses the handle
 @olivia_lucy46

CHANGELOG.cfg

@@ -1,5 +1,12 @@
 #textdomain wesnoth-A_New_Order
 
+Changelog for 1.7.0 (WIP):
+* Link to additional funding options
+* New portraits, including ones for the Brigand and Outlaw Raider
+* Validator fixes
+* Additional disclaimer about mature content added
+* New macros for wrapping dialogue messages
+
 Changelog for 1.6.0:
 * New portraits, including new winter clothes for Kyobaine
 * Image filesize reduced with ImageOptim

TRANSLATORS.txt

@@ -5,17 +5,18 @@ Then Sigil came along, and he corrected much of the English. As an effect, all
 translations became outdated. Since I (usually) knew what was changed, I 
 manually updated part of the translated strings, but I could be wrong. Then
 egallager came along and corrected many of the errors that Sigil had missed, so
-the translations became outdated again.
+the translations became outdated again. This will continue to happen so long as
+maintainers feel like continuing to edit translatable strings.
 
 If you like the campaign, please help us to make it better, so others can
 enjoy it, too. Consider translation to your own language. It's a lot of work --
 but you can translate just a bit, for example one or two scenarios, then others
 can translate another bit, etc.
 
-Read http://wiki.wesnoth.org/WesCamp 
+Read https://wiki.wesnoth.org/WesCamp
 
 If you are confused and you don't know what to do, send me an email at
-[email protected], I can sent you a .po file with strings which need
+[email protected], I can send you a .po file with strings which need
 to be translated, and answer your questions.  
 
 Finally, read the remarks below.
@@ -55,4 +56,6 @@ GUIDE FOR TRANSLATION
 USEFUL LINKS
 ------------
 Czech translation wiki page:
-https://wiki.wesnoth.org/CzechTranslationANewOrderCampaign
+https://wiki.wesnoth.org/CzechTranslationANewOrderCampaign
+Russian translation wiki page:
+https://wiki.wesnoth.org/CampaignANewOrder:RussianTranslation

_main.cfg

@@ -56,6 +56,18 @@ add-ons/A_New_Order#enddef
     {CAMPAIGN_DIFFICULTY HARD "data/{LDR_PATH}/images/akladian/akl-shieldguard.png~TC(1,magenta)" _"Akladian Shieldguard" _"Difficult" }
     {CAMPAIGN_DIFFICULTY NIGHTMARE "data/{LDR_PATH}/images/akladian/akl-protector.png~TC(1,magenta)" _"Akladian Protector" _"Impossible" }
     define=ANEWORDER
+    {ENABLE_PARAGON}
+#ifdef EASY
+    {ENABLE_WOSE_SHAMAN} # (allied in optional scenario)
+#else
+    {ENABLE_ARMAGEDDON_DRAKE} # (only appears in optional scenario)
+    {ENABLE_TROLL_SHAMAN}
+#ifdef NIGHTMARE
+    {ENABLE_NIGHTBLADE}
+    {ENABLE_ANCIENT_LICH}
+    {ENABLE_DEATH_KNIGHT}
+#endif
+#endif
     # wmllint: general spelling Dunefolk
     description= _"The old kingdom of Wesnoth has fallen before barbarian hordes. The occupying barbarians are on the brink of civil war, the seeds of Wesnothian rebellion are kept alive by old legends, while bandits and Dunefolk mercenaries roam the land. Can Gawen Hagarthen unite these disparate factions against a common foe?
 

about.cfg

@@ -146,7 +146,7 @@
         name=_"Polish translation:"+" "+"A. D. (szopen) Danilecki, Piotr Cychowski"
     [/entry]
     [entry]
-        name=_"Russian translation:"+" "+"nikita, Alexey Remizov"
+        name=_"Russian translation:"+" "+"nikita, Alexey Remizov (alxrem)"
     [/entry]
     [entry]
         name=_"Spanish translation:"+" "+"Toranks"

lua/ano_wml_tags.lua

@@ -9,3 +9,8 @@ function wml_actions.get_support_between(cfg)
 	wesnoth.set_variable(ano_support_level, 0)
 end
 
+function check_srankability(cfg)
+	-- check for existing sranks
+	-- chech for compatibility
+end
+

macros/ano-14macros.cfg

@@ -182,26 +182,26 @@
             id=Rassum
         [/have_unit]
         [then]
-            {PROPOSE_PEACE_LIZARD Rassum}
+            {PROPOSE_PEACE_LIZARD Rassum (_"Rassum")}
         [/then]
         [else]
             [if]
                 [have_unit]
                     id=Bussur
                 [/have_unit]
                 [then]
-                    {PROPOSE_PEACE_LIZARD Bussur}
+                    {PROPOSE_PEACE_LIZARD Bussur (_"Bussur")}
                 [/then]
                 [else]
                     [if]
                         [have_unit]
                             id=Burass
                         [/have_unit]
                         [then]
-                            {PROPOSE_PEACE_LIZARD Burass}
+                            {PROPOSE_PEACE_LIZARD Burass (_"Burass")}
                         [/then]
                         [else]
-                            {PROPOSE_PEACE_LIZARD Ussuh}
+                            {PROPOSE_PEACE_LIZARD Ussuh (_"Ussuh")}
                         [/else]
                     [/if]
                 [/else]

macros/ano_macros.cfg

@@ -211,6 +211,8 @@
         [/filter_second]
         {DECREMENT ano_luck_counter}
     [/event]
+    # (maybe I also want to have hits/misses by units on allied/enemy sides count, too?)
+    # (allied/enemy sides don't always have the same side number between scenarios, though...)
 #enddef # ANO_LUCK_EVENTS
 
 #define ANO_SUPPORT_EVENTS