Merge pull request #163 from cooljeanius/continued-validator-fixes

Copy over changes from other repo (mostly a continuation of validator fixes)
nemaara · Jan 3, 2024 · c7da459 · c7da459
2 parents 9201da5 + a445cf8
commit c7da459
Show file tree

Hide file tree

Showing 234 changed files with 4,315 additions and 2,178 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,3 +10,8 @@ updates:
     schedule:
       interval: "weekly"
       day: "tuesday"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "tuesday"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -0,0 +1,20 @@
+name: lint
+
+on: [push, pull_request]
+
+env:
+  WESNOTH_VERSION: 1.16.10
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+    - name: Verify images
+      uses: czyzby/wesnoth-png-optimizer@v1
+      if: always()
+      with:
+        wesnoth-version: ${{ env.WESNOTH_VERSION }}
+        threshold: 50
diff --git a/.luacheckrc b/.luacheckrc
@@ -0,0 +1,14 @@
+-- ignore line length warnings
+max_line_length=false
+max_code_line_length=false
+max_string_line_length=false
+max_comment_line_length=false
+-- show the warning/error codes as well
+codes=true
+-- don't show files with no issues
+quiet=1
+-- don't show undefined variable usage
+-- there are thousands of warnings here because luacheck is unaware of Wesnoth's lua environment and has no way to check which have been loaded
+global=false
+-- don't show unused variables
+unused=false
diff --git a/_main.cfg b/_main.cfg
@@ -28,6 +28,7 @@ add-ons/A_New_Order#enddef
 
 [textdomain]
     name="wesnoth-A_New_Order"
+    # https://github.com/wesnoth/wesnoth/issues/7817
     path="data/{LDR_PATH}/translations"
 [/textdomain]
 
@@ -81,6 +82,7 @@ Version "+{~{LDR_PATH}/dist/VERSION}
 # ...some sort of error?
 #endif
 
+{./lua}
 {./macros}
 [units]
     {./units}

diff --git a/about.cfg b/about.cfg
@@ -115,7 +115,9 @@
 
 [about]
     title= _ "Translations"
-    text= _ "(from WesCamp-i18n)" # wmllint: no spellcheck
+    # wmllint: markcheck off
+    text="(from WesCamp-i18n)" # wmllint: no spellcheck
+    # wmllint: markcheck on
     [entry]
         name=_" British (en_gb) translation:"+" "+"Harry Dewulf, David Philippi"
     [/entry]
@@ -231,6 +233,9 @@
     [entry]
         name="Eric Gallager (egallager, a.k.a. cooljeanius)"
     [/entry]
+    [entry]
+        name="...and you, hopefully?"
+    [/entry]
 [/about]
 
 [about]
@@ -252,7 +257,7 @@
 [about]
     title=_"Darth Vader" # wmllint: no spellcheck
     [entry]
-        #po: please translate Skywalker literally (as "sky-walker")
+        #po: please translate Skywalker literally (as "person who walks the sky")
         name=_"Father of Luke Skywalker"
     [/entry]
 [/about]

diff --git a/images/akladian/akl-clansman-idle-4.png b/images/akladian/akl-clansman-idle-4.png
diff --git a/images/akladian/akl-clansman-laugh-1.png b/images/akladian/akl-clansman-laugh-1.png
diff --git a/images/akladian/akl-clansman-laugh-2.png b/images/akladian/akl-clansman-laugh-2.png
diff --git a/images/akladian/akl-clansman-laugh-3.png b/images/akladian/akl-clansman-laugh-3.png
diff --git a/images/akladian/akl-clansman-melee-n-2.png b/images/akladian/akl-clansman-melee-n-2.png
diff --git a/images/akladian/akl-clansman-melee-s-1.png b/images/akladian/akl-clansman-melee-s-1.png
diff --git a/images/akladian/akl-clansman-melee-s-2.png b/images/akladian/akl-clansman-melee-s-2.png
diff --git a/images/akladian/akl-clansman-melee-s-3.png b/images/akladian/akl-clansman-melee-s-3.png
diff --git a/images/akladian/akl-clansman-selected-5.png b/images/akladian/akl-clansman-selected-5.png
diff --git a/images/akladian/akl-clansman-standing-1.png b/images/akladian/akl-clansman-standing-1.png
diff --git a/images/akladian/akl-clansman-standing-4.png b/images/akladian/akl-clansman-standing-4.png
diff --git a/images/akladian/akl-clansman-standing-5.png b/images/akladian/akl-clansman-standing-5.png
diff --git a/images/akladian/akl-clansman.png b/images/akladian/akl-clansman.png
diff --git a/images/akladian/akl-darknite.png b/images/akladian/akl-darknite.png
diff --git a/images/akladian/akl-fastfoot.png b/images/akladian/akl-fastfoot.png
diff --git a/images/akladian/akl-light-infantry-blink.png b/images/akladian/akl-light-infantry-blink.png
diff --git a/images/akladian/akl-light-infantry-defend-se.png b/images/akladian/akl-light-infantry-defend-se.png
diff --git a/images/akladian/akl-light-infantry-dies-1.png b/images/akladian/akl-light-infantry-dies-1.png
diff --git a/images/akladian/akl-light-infantry-dies-2.png b/images/akladian/akl-light-infantry-dies-2.png
diff --git a/images/akladian/akl-light-infantry-dies-4.png b/images/akladian/akl-light-infantry-dies-4.png
diff --git a/images/akladian/akl-light-infantry-laugh-2.png b/images/akladian/akl-light-infantry-laugh-2.png
diff --git a/images/akladian/akl-light-infantry-melee-ne-1.png b/images/akladian/akl-light-infantry-melee-ne-1.png
diff --git a/images/akladian/akl-light-infantry-melee-ne-2.png b/images/akladian/akl-light-infantry-melee-ne-2.png
diff --git a/images/akladian/akl-light-infantry-selected.png b/images/akladian/akl-light-infantry-selected.png
diff --git a/images/akladian/akl-light-infantry-standing-2.png b/images/akladian/akl-light-infantry-standing-2.png
diff --git a/images/akladian/akl-protector-old.png b/images/akladian/akl-protector-old.png
diff --git a/images/akladian/akl-protector.png b/images/akladian/akl-protector.png
diff --git a/images/akladian/akl-raider.png b/images/akladian/akl-raider.png
diff --git a/images/akladian/akl-shieldguard-old.png b/images/akladian/akl-shieldguard-old.png
diff --git a/images/akladian/akl-warrior-dies-1.png b/images/akladian/akl-warrior-dies-1.png
diff --git a/images/akladian/akl-warrior-dies-3.png b/images/akladian/akl-warrior-dies-3.png
diff --git a/images/akladian/akl-warrior-dies-4.png b/images/akladian/akl-warrior-dies-4.png
diff --git a/images/akladian/akl-warrior-hit.png b/images/akladian/akl-warrior-hit.png
diff --git a/images/akladian/akl-warrior-idle-8.png b/images/akladian/akl-warrior-idle-8.png
diff --git a/images/akladian/akl-warrior-idle-9.png b/images/akladian/akl-warrior-idle-9.png
diff --git a/images/akladian/akl-warrior-melee-se-3.png b/images/akladian/akl-warrior-melee-se-3.png
diff --git a/images/akladian/akl-warrior-melee-se-5.png b/images/akladian/akl-warrior-melee-se-5.png
diff --git a/images/akladian/akl-warrior-standing-2.png b/images/akladian/akl-warrior-standing-2.png
diff --git a/images/akladian/akl-warrior.png b/images/akladian/akl-warrior.png
diff --git a/images/city-militia.png b/images/city-militia.png
diff --git a/images/halo/dark-aura.png b/images/halo/dark-aura.png
diff --git a/images/halo/shadowmissile-ne.png b/images/halo/shadowmissile-ne.png
diff --git a/images/items/krzeslo_facing_n.png b/images/items/krzeslo_facing_n.png
diff --git a/images/items/krzeslo_facing_s.png b/images/items/krzeslo_facing_s.png
diff --git a/images/items/siano3.png b/images/items/siano3.png
diff --git a/images/items/smallwell.png b/images/items/smallwell.png
diff --git a/images/items/szubienica.png b/images/items/szubienica.png
diff --git a/images/items/tron-fs.png b/images/items/tron-fs.png
diff --git a/images/items/zboze2.png b/images/items/zboze2.png
diff --git a/images/logo_small.png b/images/logo_small.png
diff --git a/images/misc/ellipse-hero-leader-nozoc-top.png b/images/misc/ellipse-hero-leader-nozoc-top.png
diff --git a/images/misc/ellipse-hero-leader-selected-top.png b/images/misc/ellipse-hero-leader-selected-top.png
diff --git a/images/portraits/Medic.png b/images/portraits/Medic.png
diff --git a/images/portraits/akladian_chaotic.png b/images/portraits/akladian_chaotic.png
diff --git a/images/portraits/akladian_generic.png b/images/portraits/akladian_generic.png
diff --git a/images/portraits/akladian_holyman.png b/images/portraits/akladian_holyman.png
diff --git a/images/portraits/akladian_lord.png b/images/portraits/akladian_lord.png
diff --git a/images/portraits/akladian_lord2.png b/images/portraits/akladian_lord2.png
diff --git a/images/portraits/akladian_peasant.png b/images/portraits/akladian_peasant.png
diff --git a/images/portraits/akladian_wiseman.png b/images/portraits/akladian_wiseman.png
diff --git a/images/portraits/akladian_wonderman.png b/images/portraits/akladian_wonderman.png
diff --git a/images/portraits/alarice.png b/images/portraits/alarice.png
diff --git a/images/portraits/bor_cryne.png b/images/portraits/bor_cryne.png
diff --git a/images/portraits/boris.png b/images/portraits/boris.png
diff --git a/images/portraits/brigand.png b/images/portraits/brigand.png
diff --git a/images/portraits/buffin.png b/images/portraits/buffin.png
diff --git a/images/portraits/deorien.png b/images/portraits/deorien.png
diff --git a/images/portraits/elorain.png b/images/portraits/elorain.png
diff --git a/images/portraits/farmer_girl.png b/images/portraits/farmer_girl.png
diff --git a/images/portraits/gauri.png b/images/portraits/gauri.png
diff --git a/images/portraits/gawen.png b/images/portraits/gawen.png
diff --git a/images/portraits/gawen_matured.png b/images/portraits/gawen_matured.png
diff --git a/images/portraits/gawen_was.png b/images/portraits/gawen_was.png
diff --git a/images/portraits/gawen_was2.png b/images/portraits/gawen_was2.png
diff --git a/images/portraits/gawen_winter.png b/images/portraits/gawen_winter.png
diff --git a/images/portraits/grekulak.png b/images/portraits/grekulak.png
diff --git a/images/portraits/hoyre.png b/images/portraits/hoyre.png
diff --git a/images/portraits/huon.png b/images/portraits/huon.png
diff --git a/images/portraits/karen.png b/images/portraits/karen.png
diff --git a/images/portraits/kyobaine.png b/images/portraits/kyobaine.png
diff --git a/images/portraits/kyobaine_winter.png b/images/portraits/kyobaine_winter.png
diff --git a/images/portraits/lady_lorin.png b/images/portraits/lady_lorin.png
diff --git a/images/portraits/lorin_wilczyca.png b/images/portraits/lorin_wilczyca.png
diff --git a/images/portraits/lorin_winter.png b/images/portraits/lorin_winter.png
diff --git a/images/portraits/luc.png b/images/portraits/luc.png
diff --git a/images/portraits/majid.png b/images/portraits/majid.png
diff --git a/images/portraits/mal-ravanal.png b/images/portraits/mal-ravanal.png
diff --git a/images/portraits/milildur.png b/images/portraits/milildur.png
diff --git a/images/portraits/mithrandil.png b/images/portraits/mithrandil.png
diff --git a/images/portraits/old_orcish_shaman.png b/images/portraits/old_orcish_shaman.png
diff --git a/images/portraits/oracle.png b/images/portraits/oracle.png
diff --git a/images/portraits/orcish_shaman.png b/images/portraits/orcish_shaman.png
diff --git a/images/portraits/outlaw_raider.png b/images/portraits/outlaw_raider.png
diff --git a/images/portraits/peasant1.png b/images/portraits/peasant1.png
diff --git a/images/portraits/peasant3.png b/images/portraits/peasant3.png
diff --git a/images/portraits/profile_fastfoot.png b/images/portraits/profile_fastfoot.png
diff --git a/images/portraits/profile_homeguard.png b/images/portraits/profile_homeguard.png
diff --git a/images/portraits/profile_pikinier.png b/images/portraits/profile_pikinier.png
diff --git a/images/portraits/profile_protector.png b/images/portraits/profile_protector.png
diff --git a/images/portraits/profile_shieldguard.png b/images/portraits/profile_shieldguard.png
diff --git a/images/portraits/regven.png b/images/portraits/regven.png
diff --git a/images/portraits/relana.png b/images/portraits/relana.png
diff --git a/images/portraits/reme.png b/images/portraits/reme.png
diff --git a/images/portraits/ruvio.png b/images/portraits/ruvio.png
diff --git a/images/portraits/ruvio_broken.png b/images/portraits/ruvio_broken.png
diff --git a/images/portraits/ruvio_winter.png b/images/portraits/ruvio_winter.png
diff --git a/images/portraits/young-205.png b/images/portraits/young-205.png
diff --git a/images/portraits/young-saurian.png b/images/portraits/young-saurian.png
diff --git a/images/portraits/young_orcish_shaman.png b/images/portraits/young_orcish_shaman.png
diff --git a/images/ruvio.png b/images/ruvio.png
diff --git a/images/story_images/elven_trackers3a.png b/images/story_images/elven_trackers3a.png
diff --git a/images/story_images/haeltin_defense.png b/images/story_images/haeltin_defense.png
diff --git a/images/story_images/haeltin_winter.png b/images/story_images/haeltin_winter.png
diff --git a/images/story_images/leaving_raedwood.png b/images/story_images/leaving_raedwood.png
diff --git a/images/story_images/lorin_alone_sharp.png b/images/story_images/lorin_alone_sharp.png
diff --git a/images/story_images/majid_big.png b/images/story_images/majid_big.png
diff --git a/images/story_images/people_of_vakladia.png b/images/story_images/people_of_vakladia.png
diff --git a/images/story_images/smokes_in_forest.png b/images/story_images/smokes_in_forest.png
diff --git a/images/story_images/story_barnon.png b/images/story_images/story_barnon.png
diff --git a/images/story_images/story_cametome.png b/images/story_images/story_cametome.png
diff --git a/images/story_images/story_leftme.png b/images/story_images/story_leftme.png
diff --git a/images/story_images/story_ruvio.png b/images/story_images/story_ruvio.png
diff --git a/images/story_images/swamp_scena.png b/images/story_images/swamp_scena.png
diff --git a/images/terrain/akl-ruin.png b/images/terrain/akl-ruin.png
diff --git a/images/terrain/burned-village-snow.png b/images/terrain/burned-village-snow.png
diff --git a/images/terrain/burned-village.png b/images/terrain/burned-village.png
diff --git a/images/terrain/castle.png b/images/terrain/castle.png
diff --git a/images/terrain/castletne.png b/images/terrain/castletne.png
diff --git a/images/terrain/castletnw.png b/images/terrain/castletnw.png
diff --git a/images/terrain/castletse.png b/images/terrain/castletse.png
diff --git a/images/terrain/castletsw.png b/images/terrain/castletsw.png
diff --git a/images/terrain/city_ruin.png b/images/terrain/city_ruin.png
diff --git a/images/terrain/desert_crater.png b/images/terrain/desert_crater.png
diff --git a/images/terrain/krzeslo.png b/images/terrain/krzeslo.png
diff --git a/images/terrain/ruiny.png b/images/terrain/ruiny.png
diff --git a/images/terrain/ruiny2.png b/images/terrain/ruiny2.png
diff --git a/images/terrain/ruiny_studnia.png b/images/terrain/ruiny_studnia.png
diff --git a/images/terrain/stol.png b/images/terrain/stol.png
diff --git a/images/terrain/stoln.png b/images/terrain/stoln.png
diff --git a/images/terrain/stols.png b/images/terrain/stols.png
diff --git a/images/terrain/village-snow.png b/images/terrain/village-snow.png
diff --git a/images/terrain/void.png b/images/terrain/void.png
diff --git a/images/units/human-outlaws/brigand-attack-ranged2.png b/images/units/human-outlaws/brigand-attack-ranged2.png
diff --git a/images/units/human-outlaws/brigand-attack1.png b/images/units/human-outlaws/brigand-attack1.png
diff --git a/images/units/human-outlaws/brigand-attack2.png b/images/units/human-outlaws/brigand-attack2.png
diff --git a/images/units/human-outlaws/brigand.png b/images/units/human-outlaws/brigand.png
diff --git a/images/units/human-outlaws/raider-attack-ranged1.png b/images/units/human-outlaws/raider-attack-ranged1.png
diff --git a/images/units/human-outlaws/raider-attack1.png b/images/units/human-outlaws/raider-attack1.png
diff --git a/images/units/human-outlaws/raider-attack2.png b/images/units/human-outlaws/raider-attack2.png
diff --git a/images/units/human-outlaws/raider-moving.png b/images/units/human-outlaws/raider-moving.png
diff --git a/images/units/humans/rancher-attack.png b/images/units/humans/rancher-attack.png
diff --git a/images/units/humans/rancher.png b/images/units/humans/rancher.png
diff --git a/images/units/orcs/orcish-shaman-black-curse-1.png b/images/units/orcs/orcish-shaman-black-curse-1.png
diff --git a/images/units/orcs/orcish-shaman-black.png b/images/units/orcs/orcish-shaman-black.png
diff --git a/images/units/orcs/orcish-shaman-red-curse-1.png b/images/units/orcs/orcish-shaman-red-curse-1.png
diff --git a/images/units/orcs/orcish-shaman-red-staff-1.png b/images/units/orcs/orcish-shaman-red-staff-1.png
diff --git a/images/units/orcs/orcish-shaman-tan-curse-1.png b/images/units/orcs/orcish-shaman-tan-curse-1.png
diff --git a/images/units/orcs/orcish-shaman-tan-defend.png b/images/units/orcs/orcish-shaman-tan-defend.png
diff --git a/images/units/orcs/orcish-shaman-tan.png b/images/units/orcs/orcish-shaman-tan.png
diff --git a/images/units/saurians/youths/devotee-ne-run1.png b/images/units/saurians/youths/devotee-ne-run1.png
diff --git a/images/units/saurians/youths/devotee-ne-run4.png b/images/units/saurians/youths/devotee-ne-run4.png
diff --git a/images/units/saurians/youths/devotee-ne-run5.png b/images/units/saurians/youths/devotee-ne-run5.png
diff --git a/images/units/saurians/youths/devotee-se-bob1.png b/images/units/saurians/youths/devotee-se-bob1.png
diff --git a/images/units/saurians/youths/devotee-se-bob3.png b/images/units/saurians/youths/devotee-se-bob3.png
diff --git a/images/units/saurians/youths/devotee-se-bob4.png b/images/units/saurians/youths/devotee-se-bob4.png
diff --git a/images/units/saurians/youths/devotee-se-melee2.png b/images/units/saurians/youths/devotee-se-melee2.png
diff --git a/images/units/saurians/youths/devotee-se-run3.png b/images/units/saurians/youths/devotee-se-run3.png
diff --git a/images/units/saurians/youths/devotee-se-run4.png b/images/units/saurians/youths/devotee-se-run4.png
diff --git a/images/units/saurians/youths/young-ne-bob1.png b/images/units/saurians/youths/young-ne-bob1.png
diff --git a/images/units/saurians/youths/young-ne-run3.png b/images/units/saurians/youths/young-ne-run3.png
diff --git a/images/units/saurians/youths/young-ne-run4.png b/images/units/saurians/youths/young-ne-run4.png
diff --git a/images/units/saurians/youths/young-ne-run5.png b/images/units/saurians/youths/young-ne-run5.png
diff --git a/images/units/saurians/youths/young-se-run1.png b/images/units/saurians/youths/young-se-run1.png
diff --git a/images/units/saurians/youths/young-se-run2.png b/images/units/saurians/youths/young-se-run2.png
diff --git a/images/units/saurians/youths/young-se-run3.png b/images/units/saurians/youths/young-se-run3.png
diff --git a/images/units/saurians/youths/young-se-run5.png b/images/units/saurians/youths/young-se-run5.png
diff --git a/images/units/undead/soul-3.png b/images/units/undead/soul-3.png
diff --git a/images/wayfarer/akl-fastfoot.png b/images/wayfarer/akl-fastfoot.png
diff --git a/images/wayfarer/akl-lady-attack1.png b/images/wayfarer/akl-lady-attack1.png
diff --git a/images/wayfarer/akl-queen.png b/images/wayfarer/akl-queen.png
diff --git a/images/wayfarer/cruvio_1.png b/images/wayfarer/cruvio_1.png
diff --git a/images/wayfarer/cruvio_2.png b/images/wayfarer/cruvio_2.png
diff --git a/images/wayfarer/ruvio.png b/images/wayfarer/ruvio.png
diff --git a/lua/ano_wml_tags.lua b/lua/ano_wml_tags.lua
@@ -1,2 +1,11 @@
 -- (stub file that I may possibly put stuff in in the future)
 
+if not wml_actions then wml_actions = {} end
+
+function wml_actions.get_support_between(cfg)
+	local char1 = cfg.char1
+	local char2 = cfg.char2
+	-- TODO
+	wesnoth.set_variable(ano_support_level, 0)
+end
+
diff --git a/macros/ano-01_06macros.cfg b/macros/ano-01_06macros.cfg
@@ -12,7 +12,7 @@
             [/not]
         [/filter_second]
         #po: the Assassin is addressing a unit that is blocking him from reaching Gawen:
-        {MESSAGE Assassin () (Assassin) _"Get out of my way... I am not here because of you."}
+        {MSG_Assassin _"Get out of my way... I am not here because of you."}
         # I was tempted to have the assassin actually force units out of his way, but it's too hard to figure out,
         # and probably not a good idea anyways...
     [/event]
@@ -27,7 +27,7 @@
             id=Assassin
         [/filter_second]
         #po: the Assassin is speaking to a unit he has just killed; "the prince" = Gawen:
-        {MESSAGE Assassin () (Assassin) _"You aren't the prince, are you? Then it is not you I seek."}
+        {MSG_Assassin _"You aren't the prince, are you? Then it is not you I seek."}
     [/event]
     [event]
         name=attack
@@ -38,7 +38,7 @@
             id=Gawen Hagarthen
         [/filter_second]
         #po: the Assassin attacking Gawen (and most likely killing him, due to Gawen being poisoned in the first scenario):
-        {MESSAGE Assassin () (Assassin) _"Finally! Now, accept the inevitable. I'm a professional, this won't hurt a bit!"}
+        {MSG_Assassin _"Finally! Now, accept the inevitable. I'm a professional, this won't hurt a bit!"}
     [/event]
     [event]
         name=attack
@@ -65,7 +65,7 @@
         #po: Gawen is asking the Assassin why he is attacking him:
         {MSG_Gawen _"Why? Who sent you?"}
         #po: "Two hundred gold pieces" = payment Assassin has received for the task of killing Gawen:
-        {MESSAGE Assassin () (Assassin) _"Why? Two hundred gold pieces, that's why."}
+        {MSG_Assassin _"Why? Two hundred gold pieces, that's why."}
     [/event]
 
     [event]
@@ -93,9 +93,9 @@
     [event]
         {KILLEDBY (Assassin) (Reme Carrenemoe)}
         {MSG_Reme _"Only one thing stays my hand from killing you now. Who sent you?"}
-        {MESSAGE Assassin () (Assassin) _"The fates."}
+        {MSG_Assassin _"The fates."}
         {MSG_Reme _"Don't test my patience. Speak, or I will kill you."}
-        {MESSAGE Assassin () (Assassin) _"Do whatever you want to."}
+        {MSG_Assassin _"Do whatever you want to."}
         {MSG_Reme _"Then die, since you want to."}
         {MSG_Lorin _"You are way too soft, Reme. Why didn't you give him to me?"}
         [set_variable]
@@ -107,12 +107,12 @@
     [event]
         {KILLEDBY (Assassin) (Lady Lorin)}
         {MSG_Lorin _"Who sent you?"}
-        {MESSAGE Assassin () (Assassin) _"Our rules are to never betray the trust of those who hired us."}
+        {MSG_Assassin _"Our rules are to never betray the trust of those who hired us."}
         {MSG_Lorin _"Don't test my patience, underling! Speak, or you will be sorry you are still alive!"}
-        {MESSAGE Assassin () (Assassin) _"Who sent me? Fate! And there will be others after me. (<i>scream of pain</i>) Aaaargh!"}
+        {MSG_Assassin _"Who sent me? Fate! And there will be others after me. (<i>scream of pain</i>) Aaaargh!"}
         {MSG_Lorin _"Speak!"}
         {MSG_Reme _"My lady, please, stop, that's just..."}
-        {MESSAGE Assassin () (Assassin) _"I can't tell you! (Aaargh) I don't know his name! I was given this task by our elders... of the Outlaw Place. All I know is one of the Akladian lords paid us in gold! The price for the Hagarthens was three hundred gold pieces for the father and two hundred for the son! Aiieeee!!!"}
+        {MSG_Assassin _"I can't tell you! (Aaargh) I don't know his name! I was given this task by our elders... of the Outlaw Place. All I know is one of the Akladian lords paid us in gold! The price for the Hagarthens was three hundred gold pieces for the father and two hundred for the son! Aiieeee!!!"}
         {MSG_Lorin _"No price for me?"}
         {MSG_Reme _"I think he would kill you gratis. He won't say anything more, my lady."}
         [set_variable]
@@ -123,6 +123,10 @@
     [/event]
 #enddef
 
+#define MSG_Oeame _TEXT
+    {MESSAGE Oeame () (_"Oeame") ({_TEXT})}
+#enddef
+
 #define ANO_FPASS_REBEL WHO
     [if]
         {CONDITION ano_fpassrebel equals no}
@@ -142,13 +146,13 @@
             [/scroll_to_unit]
             [lock_view][/lock_view]
             [redraw][/redraw]
-            {MESSAGE Oeame () (Oeame) _"Our king is dead! We are not traitors!"}
+            {MSG_Oeame _"Our king is dead! We are not traitors!"}
             [unlock_view][/unlock_view]
             {MSG_Reme _"But here is king's son, his rightful heir. Are you going to fight him?"}
-            {MESSAGE Oeame () (Oeame) _"The king's son is dead! We heard about it!"}
+            {MSG_Oeame _"The king's son is dead! We heard about it!"}
             {MSG_Gawen _"Do I look dead to you?"}
-            {MESSAGE Oeame () (Oeame) _"We were deceived! My king, please forgive me!"}
-            {MESSAGE Roule () (Roule) _"You fool! He is mixling, he can't be our king!"}
+            {MSG_Oeame _"We were deceived! My king, please forgive me!"}
+            {MESSAGE Roule () (_"Roule") _"You fool! He is a mixling, he can't be our king!"}
             {CHANGE_SIDE Oeame 3}
             # Making Oeame a leader is necessary for the AI controller to work:
             [store_unit]

diff --git a/macros/ano-14macros.cfg b/macros/ano-14macros.cfg
@@ -34,51 +34,42 @@
         # already did the competition in a previous scenario:
         {IF ano_competition equals end}
         {IF ano_competition_k equals 0}
-        {MESSAGE (Karen) (portraits/karen.png) (Karen) _"Scored!"}
-        {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin)
-        # FIXME: the word "again" doesn't make sense if this is the first kill of the competition, or if the competition ended in the previous scenario without anyone killing anyone (resulting in there being no dialogue about it):
-        _"Don't start again, kid. I won't play that game this time."}
+        {MSGW_Karen _"Scored!"}
+        #po: FIXME: the word "again" doesn't make sense if this is the first kill of the competition, or if the competition ended in the previous scenario without anyone killing anyone (resulting in there being no dialogue about it):
+        {MSGW_Lorin _"Don't start again, kid. I won't play that game this time."}
         {VARIABLE ano_competition_k 1}
         {END_IF_WITHOUT_ELSE}
         {ELSE}
         {IF ano_competition_k equals 0}
-        {MESSAGE (Karen) (portraits/karen.png) (Karen)
-        _"Hey, Lorin, or whatever your name is, did you see that? Now you know why underlings give weapons to 'children'!"}
+        {MSGW_Karen _"Hey, Lorin, or whatever your name is, did you see that? Now you know why underlings give weapons to 'children'!"}
         {ELSE_IF ano_competition_k equals 1}
         {IF ano_competition_l equals 0}
-        {MESSAGE (Karen) (portraits/karen.png) (Karen)
-        _"Ha! Gawen, did you see that? I've already killed two enemies, and your step-grand-mother hasn't killed a single one!"}
+        {MSGW_Karen _"Ha! Gawen, did you see that? I've already killed two enemies, and your step-grand-mother hasn't killed a single one!"}
         {ELSE}
-        {MESSAGE (Karen) (portraits/karen.png) (Karen) _"Ha! Scored two!"}
-        {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin)
-        _"You think it is some kind of competition?"}
+        {MSGW_Karen _"Ha! Scored two!"}
+        {MSGW_Lorin _"You think it is some kind of competition?"}
         {END_IF}
         {ELSE_IF ano_competition_k equals 2}
         {IF ano_competition_l equals 0}
-        {MESSAGE (Karen) (portraits/karen.png) (Karen)
-        _"Hey, Gawen. That she-wolf of yours is pathetic. I've scored three and she hasn't killed a single enemy!"}
+        {MSGW_Karen _"Hey, Gawen. That she-wolf of yours is pathetic. I've scored three and she hasn't killed a single enemy!"}
         {ELSE}
         {IF ano_competition_l greater_than 2}
-        {MESSAGE (Karen) (portraits/karen.png) (Karen) _"Ha! Scored three!"}
-        {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin)
-        _"So what? I am winning!"}
+        {MSGW_Karen _"Ha! Scored three!"}
+        {MSGW_Lorin _"So what? I am winning!"}
         {ELSE}
-        {MESSAGE (Karen) (portraits/karen.png) (Karen) _"Ha! Scored three!"}
-        {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin) _"So what?"}
+        {MSGW_Karen _"Ha! Scored three!"}
+        {MSGW_Lorin _"So what?"}
         {END_IF}
         {END_IF}
         {ELSE}
         {IF ano_competition_l greater_than $ano_competition_k}
-        {MESSAGE (Karen) (portraits/karen.png) (Karen) _"Ha! Another one!"}
-        {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin)
-        _"So what? I am winning!"}
+        {MSGW_Karen _"Ha! Another one!"}
+        {MSGW_Lorin _"So what? I am winning!"}
         {ELSE_IF ano_competition_l equals 0}
-        {MESSAGE (Karen) (portraits/karen.png) (Karen)
-        _"I'm a killing machine! Lorin should just go back and hide in Haeltin!"}
+        {MSGW_Karen _"I'm a killing machine! Lorin should just go back and hide in Haeltin!"}
         {ELSE}
-        {MESSAGE (Karen) (portraits/karen.png) (Karen) _"Ha! I'm winning!"}
-        {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin)
-        _"Impertinent heathen underling child, the day has not yet ended!"}
+        {MSGW_Karen _"Ha! I'm winning!"}
+        {MSGW_Lorin _"Impertinent heathen underling child, the day has not yet ended!"}
         {TWO_END_IFs}
         {TWO_END_IFs}
         {END_IF}
@@ -96,45 +87,34 @@
         # (already did the competition in a previous scenario)
         {ELSE}
         {IF ano_competition_l equals 0}
-        {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin) _"First kill today!"}
-        {MESSAGE (Karen) (portraits/karen.png) (Karen)
-        _"Oh no, the mighty Lorin is coming! Children and little furry animals, run for your life!"}
+        {MSGW_Lorin _"First kill today!"}
+        {MSGW_Karen _"Oh no, the mighty Lorin is coming! Children and little furry animals, run for your life!"}
         {ELSE_IF ano_competition_l equals 1}
         {IF ano_competition_k equals 0}
-        {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Karen)
-        _"My son, send little Karen back home. She is useless. I've killed two enemies already, and what has she done?"}
+        {MSGW_Lorin _"My son, send little Karen back home. She is useless. I've killed two enemies already, and what has she done?"}
         {ELSE}
         {IF ano_competition_l greater_than $ano_competition_k}
-        {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin)
-        _"Scored! Now I'm in the lead!"}
-        {MESSAGE (Karen) (portraits/karen.png) (Karen)
-        _"And I thought you weren't competing with me."}
-        {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin)
-        _"I am not competing with you, silly child."}
+        {MSGW_Lorin _"Scored! Now I'm in the lead!"}
+        {MSGW_Karen _"And I thought you weren't competing with me."}
+        {MSGW_Lorin _"I am not competing with you, silly child."}
         {ELSE}
-        {MESSAGE (Karen) (portraits/karen.png) (Karen)
-        _"Try a little harder, grand-mother. But not bad for your age."}
+        {MSGW_Karen _"Try a little harder, grand-mother. But not bad for your age."}
         {END_IF}
         {END_IF}
         {ELSE_IF ano_competition_l equals 2}
         {IF ano_competition_l greater_than $ano_competition_k}
-        {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin)
-        _"Ha! She-wolf of Haeltin is coming! No underling child could be better than me!"}
-        {MESSAGE (Karen) (portraits/karen.png) (Karen)
-        _"The She-wolf of Haeltin, don't get too excited; it will cause more wrinkles."}
+        {MSGW_Lorin _"Ha! She-wolf of Haeltin is coming! No underling child could be better than me!"}
+        {MSGW_Karen _"The She-wolf of Haeltin, don't get too excited; it will cause more wrinkles."}
         {ELSE}
-        {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin) _"Three!"}
-        {MESSAGE (Karen) (portraits/karen.png) (Karen) _"Pfff! Only three?"}
+        {MSGW_Lorin _"Three!"}
+        {MSGW_Karen _"Pfff! Only three?"}
         {END_IF}
         {ELSE}
         {IF ano_competition_l greater_than $ano_competition_k}
-        {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin)
-        _"Who's the killing machine now?"}
+        {MSGW_Lorin _"Who's the killing machine now?"}
         {ELSE}
-        {MESSAGE (Karen) (portraits/karen.png) (Karen)
-        _"Not bad, but still you have to a lot to learn!"}
-        {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin)
-        _"Do you think, little child, that I will honour you with an answer?"}
+        {MSGW_Karen _"Not bad, but still you have to a lot to learn!"}
+        {MSGW_Lorin _"Do you think, little child, that I will honour you with an answer?"}
         {END_IF}
         {TWO_END_IFs}
         {END_IF}
@@ -153,23 +133,16 @@
     {ELSE}
     {IF_HAVE_UNIT (Lady Lorin)}
     {IF ano_competition_l greater_than $ano_competition_k}
-    {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin)
-    _"By the way, I won: I scored $ano_competition_l|."}
-    {MESSAGE (Majid Yahyazad) (portraits/majid.png) (Majid Yahyazad)
-    _"Girls, what do you exactly mean by 'scored'? Is it because you are slicing up your fallen foes?"}
+    {MSGW_Lorin _"By the way, I won: I scored $ano_competition_l|."}
+    {MSGW_Yahyazad _"Girls, what do you exactly mean by 'scored'? Is it because you are slicing up your fallen foes?"}
     {ELSE_IF ano_competition_k greater_than $ano_competition_l}
-    {MESSAGE (Karen) (portraits/karen.png) (Karen)
-    _"By the way, I won: I scored $ano_competition_k|."}
-    {MESSAGE (Majid Yahyazad) (portraits/majid.png) (Majid Yahyazad)
-    _"Girls, what do you exactly mean by 'scored'? Is it because you are slicing up your fallen foes?"}
+    {MSGW_Karen _"By the way, I won: I scored $ano_competition_k|."}
+    {MSGW_Yahyazad _"Girls, what do you exactly mean by 'scored'? Is it because you are slicing up your fallen foes?"}
     {ELSE_IF ano_competition_k greater_than 0}
-    {MESSAGE (Gawen Hagarthen) (portraits/gawen_winter.png) (Gawen)
-    _"Why such an angry look, Lorin?"}
-    {MESSAGE (Karen) (portraits/karen.png) (Karen) _"She lost."}
-    {MESSAGE (Lady Lorin) (portraits/lorin_winter.png) (Lorin)
-    _"I have not lost. I have not won."}
-    {MESSAGE (Karen) (portraits/karen.png) (Karen)
-    _"That's what I meant. You have not won, great super killing machine, so you have lost."}
+    {MSGW_Gawen _"Why such an angry look, Lorin?"}
+    {MSGW_Karen _"She lost."}
+    {MSGW_Lorin _"I have not lost. I have not won."}
+    {MSGW_Karen _"That's what I meant. You have not won, great super killing machine, so you have lost."}
     {ELSE}
 #ifdef DEBUG_MODE
     {IF_DEBUG_MODE_IS_ACTUALLY_ON}