Merge pull request #125 from cooljeanius/egallager_final_scenarios

Another major-ish content update:
- Updated changelog
- Additional translation comments, to help with issues #10 and #111
- Updated debug menu for conversing with characters
- Additional dialogue with Kyobaine for her event about her winter clothes
- Clarify that Lorin is from the Gallorae Clan as early as the first scenario (something @Toranks pointed out)
- Additional copyediting, as per issue #5
- Rebalancing of S19c, "The Oracle"
- Multiple changes to S21b, "Haunted Place", including a new secret to find; closes #42
- Ensure named mages have their genders specified
- Fancier treatment of discoverable peasants in S25, "The Awakening"

ART_TODO.txt

@@ -38,6 +38,8 @@ PORTRAITS
 * Generic Akladian unit with spears (Warrior and LightInfantry still remain)
   (Clansman already exists as akladian_generic.png and Pikeneer already exists as
   profile_pikinier.png)
+* Portrait for the Brigand -> Outlaw Raider unit line (might cost more due to some
+  artists charging more for horses)
 * A winter version of Yahyazad's portrait
 * Another Reme portrait (for the "m"-suffixed message macro for him)
 * Generic leading units (Chieftain+leader - this is very low priority)

CHANGELOG.cfg

@@ -2,6 +2,19 @@
 
 Changelog for 1.6.0:
 * New portraits
+* Image filesize reduced with ImageOptim
+* Campaign now uses its own local copy of the AI controller, since the mainline one is being deprecated in BfW 1.17
+* New debug utility for testing unit message display
+* New scenario: Raedwood East
+* Misc. minor dialogue changes
+* Removed some unnecessary loyal overlays when they clashed with the recruitment crowns
+* Team-coloring for some images used as fake units
+* Recruitment list/pattern changes for some AI sides
+* Add level 0 saurians from "Across The Ocean" for use in scenarios where saurians appear
+* All heroes should now be unrenamable
+* Akladians now use a context-free grammar for name generation
+* All units with leadership should now have at least a generic leading animation
+* See README_egallager_mods.txt for scenario-specific changes
 
 Changelog for 1.5.0:
 * The big one here is the new NIGHTMARE difficulty! If "Impossible" wasn't impossible enough for you previously, well, now it ought to be!

_main.cfg

@@ -54,6 +54,7 @@ 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
+    # 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?
 
 Note: This campaign contains mature themes, some of which may be unsuitable for children.

about.cfg

@@ -257,16 +257,21 @@
     [/entry]
 [/about]
 [about]
-    #po: Żwirek i Muchomorek are from a Czech movie for children. You are free to replace them with characters from a favourite foreign movie for children in your country:
+    #po: Żwirek i Muchomorek are fictional characters from a Czech movie for children. You are free to replace them with characters from a favourite foreign movie for children in your country:
     title=_"Żwirek i Muchomorek" # wmllint: no spellcheck
     [entry]
+        #po: this is based on the fact that in the Polish version of Shrek, there is a scene in which Lord Farquad learns that Żwirek flirts with Muchomorek.
+        #po: If you are changing the name of the characters for your localization, remember to change the name of the country that they're from here, too.
         name=_"Famous Czech gay actors"
     [/entry]
 [/about]
 [about]
-    #po: Polish president (from 2010 to 2015), he can't spell. Famous for dozens of idiotic sentences and sayings. You are free to replace him with some politician from your country:
+    #po: Polish president (from 2010 to 2015), he can't spell. Famous for dozens of idiotic sentences and sayings. You are free to replace him with some politician from your country.
+    #po: A good way to test to see if a particular politician would fit here would be to google their name along with the word "gaffe" and see if people have made articles out of lists of said gaffes.
+    #po: Please only make fun of politicians for their gaffes here, and not their actual policies, as the Wesnoth add-on server has a policy against overly political or ideological content.
     title=_"Bronisław Komorowski" # wmllint: no spellcheck
     [entry]
+        #po: if your language's politician holds some other office, remember to replace the "president" part with the relevant title:
         name=_"The living proof that you may not know how to spell and still be president"
     [/entry]
 [/about]

macros/ano-01_06macros.cfg

@@ -11,6 +11,7 @@
                 id=Gawen Hagarthen
             [/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."}
         # 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...
@@ -25,6 +26,7 @@
         [filter_second]
             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."}
     [/event]
     [event]
@@ -35,6 +37,7 @@
         [filter_second]
             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!"}
     [/event]
     [event]
@@ -47,6 +50,7 @@
         [filter_second]
             id=Assassin
         [/filter_second]
+        #po: Lorin is speaking to a unit (other than herself) that is attacking the Assassin:
         {MSG_Lorin _"Leave the final blow for me! I want to interrogate him!"}
     [/event]
 
@@ -58,7 +62,9 @@
         [filter_second]
             id=Assassin
         [/filter_second]
-        {MSG_Gawen  _"Why? Who sent you?"}
+        #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."}
     [/event]
 
@@ -75,6 +81,7 @@
                 id=Reme Carrenemoe
             [/not]
         [/filter_second]
+        #po: the "underling" in question here is the Assassin (male):
         {MESSAGE second_unit () ($second_unit.name) _"Die, underling!"}
         {MSG_Lorin _"Stop, don't kill him! We have to interrogate him!"}
         [set_variable]

macros/ano-20macros.cfg

@@ -98,6 +98,7 @@
 #from tRoW
 #define RISE_UP_RISE_UP
     # TODO: maybe don't let this capture villages, at least not on EASY?
+    # Actually, I guess that would be done instead in the "die" events where this macro is used...
     [unit]
         name= _ "A Former Friend"
         type={ON_DIFFICULTY4 "Walking Corpse" "Soulless" "Ghoul" "Necrophage"}
@@ -797,7 +798,7 @@
                 id=Ruvio
             [/not]
         [/filter_second]
-        #po: Ruvio is addressing Gawen here:
+        #po: Ruvio is addressing Gawen here, since he had asked Gawen to let him be the one to kill Bor Cryne, but instead someone else did:
         {MSGm_Ruvio _"Why... Why, my lord? I have only ever asked for but one thing, and yet it was denied me..."}
     [/event]
 

macros/conversations.cfg

@@ -58,8 +58,10 @@
     [/store_unit]
     # TODO: maybe provide some other free recall to make up for Lorin being unavailable on this mission? Possibly Karl Regven?
     {MSG_Ruvio _"Gawen, I've never seen your step-mother like this before. I think she is sick. Very sick. I saw her vomiting yesterday."}
-    {MESSAGE (Gawen Hagarthen) (portraits/gawen_was.png) (Gawen)
-    _"But... What happened? Why? Is she..."}
+    #po: Gawen is reacting to Ruvio informing him that he saw Lorin vomiting yesterday; the way he intended
+    #po: to complete the "Is she..." sentence at the end is left intentionally ambiguous so that Ruvio can complete
+    #po: it with his own assumption that Gawen meant "...poisoned?" to complete it.
+    {MESSAGE (Gawen Hagarthen) (portraits/gawen_was.png) (Gawen) _"But... What happened? Why? Is she..."}
     {MSG_Ruvio _"Poisoned? It's not impossible. We have Akladians in our army, don't we?"}
     {MESSAGE (Reme Carrenemoe) (portraits/reme.png) (Reme Carrenmoe)
     _"My lord, I do not wish to disturb you, but our scouts have reported about the enemy forces."}

macros/deaths.cfg

@@ -19,6 +19,7 @@
         [filter]
             id=Reumario
         [/filter]
+        #po: Reumario's "last breath" message:
         {MSG_Reumario _"My ancestors, I am coming to you! I hope I have not failed you..."}
     [/event]
 #enddef
@@ -40,6 +41,8 @@
         [filter]
             id=Majid Yahyazad
         [/filter]
+        #po: "last breath" message shared by multiple Dunefolk
+        #po: (both Majid Yahyazad campaign-wide, and Arsham Mahouri in S23, "Trapped")
         {MSG_Yahyazad _"Dunefolk die without fear!"}
     [/event]
     [event]
@@ -59,6 +62,7 @@
         [filter]
             id=Gawen Hagarthen
         [/filter]
+        #po: Gawen's "last breath" message:
         {MSG_Gawen _"No! It's impossible! I have just started!"}
     [/event]
     [event]
@@ -78,6 +82,7 @@
         [filter]
             id=Lady Lorin
         [/filter]
+        #po: Lorin's "last breath" message:
         {MSG_Lorin _"That's not fair!"}
     [/event]
     [event]
@@ -97,8 +102,14 @@
         [filter]
             id=Reme Carrenemoe
         [/filter]
-        {MSG_Reme
-        _"I can't hold my sword anymore... I can't..."}
+        #po: Reme's "last breath" message:
+        {MSG_Reme _"I can't hold my sword anymore... I can't..."}
+    [/event]
+    [event]
+        name=die
+        [filter]
+            id=Reme Carrenemoe
+        [/filter]
         [endlevel]
             result=defeat
         [/endlevel]
@@ -112,8 +123,14 @@
             id=Karen
         [/filter]
         #po: unsure how to complete this sentence... "life" seems the most obvious, but "sight" and "blood" also work
-        # (plus my mind can't stop completing it with "virginity" even though that makes no sense)
+        #po: (plus my mind can't stop completing it with "virginity" even though that makes no sense)
         {MSG_Karen _"Father! Father! I am losing my..."}
+    [/event]
+    [event]
+        name=die
+        [filter]
+            id=Karen
+        [/filter]
         [endlevel]
             result=defeat
         [/endlevel]
@@ -126,7 +143,14 @@
         [filter]
             id=Ruvio
         [/filter]
+        #po: Ruvio's "last breath" message:
         {MSG_Ruvio _"No! I have still so much to do!"}
+    [/event]
+    [event]
+        name=die
+        [filter]
+            id=Ruvio
+        [/filter]
         [endlevel]
             result=defeat
         [/endlevel]

macros/debug.cfg

@@ -62,7 +62,7 @@
                 (_"the path to your portrait") (portrait)
                 (_"your ID") (id)
                 (_"your usage") (usage)
-                (_"your alignment") (alignment)
+                (_"something I'd like you to repeat") (parrot)
                 (_"I changed my mind") (nvm)
                 }
                 {IF ano_opt equals name}
@@ -85,10 +85,22 @@
                     speaker=$selected_unit.id
                     message=_"My usage is $selected_unit.usage|."
                 [/message]
-                {ELSE_IF ano_opt equals alignment}
+                {ELSE_IF ano_opt equals parrot}
+                [message]
+                    speaker=narrator
+                    message=_"Please repeat the following:"
+                    [text_input]
+                        variable=ano_convo_input
+                        label=_"Phrase to repeat:"
+                        text=_"Hello world!"
+                    [/text_input]
+                    image=wesnoth-icon.png
+                [/message]
                 [message]
                     speaker=$selected_unit.id
-                    message=_"I am $selected_unit.alignment|."
+                    # wmllint: markcheck off
+                    message="$ano_convo_input"
+                    # wmllint: markcheck on
                 [/message]
                 {ELSE}
                 [redraw][/redraw]

macros/elvish_macros.cfg

@@ -217,6 +217,49 @@
         (_"All right, we will wait for the spring.") (no)}
         {IF ano_opt equals yes}
         {MESSAGE (Kyobaine) (portraits/kyobaine.png) (Kyobaine) _"You think you can bribe me, an elvish druid, with gold? Oh well. This will allow me to buy better winter clothes."}
+        {MSGOPTI2 (Gawen Hagarthen) (portraits/gawen_winter.png) (_"Maybe I should act gentlemanly here?")
+        (_"(Offer to get the clothes for her - longer conversation)") (patient)
+        (_"(Let her get the clothes herself - end event more quickly)") (hurried)}
+        {IF ano_opt equals patient}
+        {MSGW_Gawen _"Are you sure you wouldn't prefer it if I went and bought you better winter clothes instead? That way you could stay by a campfire while you wait."}
+        {MSG_Kyobaine _"To be honest, I don't really trust you after you called me out here like this. Someone with judgment like that can hardly be expected to correctly purchase the clothes I require."}
+        {MSGW_Gawen _"What, do you require them in a particular size or something? What are your measurements?"}
+        {MSG_Kyobaine _"My... measurements? What do you mean by that? Do you mean you humans measure yourselves before deciding what clothing to purchase?"}
+        {MSGW_Gawen _"I mean, yeah, we do; how do you elves make sure you get the proper fit?"}
+        {MSG_Kyobaine _"Why, we simply wander the woods hugging trees until -"}
+        {MSGW_Gawen _"Wait, hold up, you literally HUG TREES?!"}
+        {MSG_Kyobaine _"Why yes, of course, haven't you ever tried it?"}
+        {MSGW_Gawen _"Ha, that's hilarious! (*<i>catches breath from laughing</i>*) But, to answer your question, no, I haven't. Akladians raise their children to fear trees, and thus the only interaction we are allowed to have with trees is chopping them down."}
+        {MSG_Kyobaine _"How horrible! You really must try hugging a tree some day, for your own well-being. But, to return to the previous topic, the way we ensure our clothes fit is to wander the woods hugging trees until one lets the vines growing around it return our embrace in a way that feels just right, and then the vines will form new clothes for us based on this experience."}
+        {MSGW_Gawen _"OK, well, it's winter, so I don't think any of the trees around here have vines that would really feel up to that... Could you please try the human measurement system instead just this one time?"}
+        {MSG_Kyobaine _"All right, what measurements do you require? The length of my ears?"}
+        {MSGW_Gawen _"No, it's, ah, er... (*<i>blushes</i>*) ...you know what, maybe it would be better to have one of your fellow females explain this to you... look, there are Lorin and Karen over there; let's go ask one of them."}
+        {MSGOPTI2 (Gawen Hagarthen) (portraits/gawen_winter.png) (_"Let's ask...")
+        (_"person_to_ask^Lorin.") (lorin)
+        (_"person_to_ask^Karen.") (karen)}
+        {IF ano_opt equals lorin}
+        {MSGW_Gawen _"Hi, mother, I was just wondering if you could help explain human measurements to Kyobaine here?"}
+        {MSGW_Lorin _"Measurements? You mean like how far I can drive my knife into someone's back?"}
+        {MSGW_Gawen _"No, of course not! I meant for clothing."}
+        {MSGW_Lorin _"Oh right, THOSE kinds of measurements. I don't remember them myself. I usually let an underling servant take them, and then kill him after he has returned with the clothes, so that he can't go leaking my secrets to anyone else."}
+        {MSGW_Gawen _"..."}
+        {MSGW_Lorin _"What?"}
+        {MSGW_Gawen _"You know what, forget I asked. Kyobaine, maybe you should just go get your own clothes after all."}
+        {MSG_Kyobaine _"Well that was a waste of time. All that talk just to get back to what my original plan was in the first place..."}
+        {ELSE}
+        # Karen:
+        {MSGW_Gawen _"Hey Karen, I was just wondering if you could help explain human clothing measurements to Kyobaine here?"}
+        {MSGW_Karen _"Oooh, clothes shopping, are we? Got a big date coming up, eh, Kyobaine?"}
+        {MSG_Kyobaine _"What? No! I'm just cold and need a cloak."}
+        {MSG_Karen _"Oh, a cloak, that's all? You don't even need sizes for those, they're mostly one-size-fits-all. Size info would really only be necessary if you were going to replace your entire robe."}
+        {MSG_Kyobaine _"Oh. So, what was this fuss about sizes all about again? ...Gawen?"}
+        {MSGW_Gawen _"What? I was just trying to be helpful."}
+        {MSG_Karen _"(*<i>snickers</i>*)"}
+        {MSG_Kyobaine _"Well, I think I shall be fine buying my own cloak, Gawen. You just stay here while I go find a tailor."}
+        {END_IF}
+        {ELSE}
+        {MSGW_Gawen _"I think I saw a tailor just back that way that you could buy something from."}
+        {END_IF}
 
         [gold]
             amount=15
@@ -253,6 +296,7 @@
         {MESSAGE (Kyobaine) (portraits/kyobaine_winter.png) (Kyobaine) _"...yes?"}
         {MSGW_Gawen _"...!"}
         {MESSAGE (Kyobaine) (portraits/kyobaine_winter.png) (Kyobaine) _"...why do you look so surprised? I <i>did</i> say I was going to buy better winter clothes, didn't I? I think this cloak shall do just fine."}
+        #po: Gawen is tongue-tied by Kyobaine's reappearance:
         {MSGW_Gawen _"...yes, well, indeed! Carry on, then!"}
         {MESSAGE (Kyobaine) (portraits/kyobaine_winter.png) (Kyobaine) _"Humans... their reactions can be so strange sometimes..."}
         {ELSE}

macros/messages.cfg

@@ -30,6 +30,9 @@
 #enddef
 
 #define MSG_Rauke _TEXT
+    [scroll_to_unit]
+        id=Rauke Harnen
+    [/scroll_to_unit]
     {MESSAGE (Rauke Harnen) (portraits/akladian_lord2.png) (Rauke) ({_TEXT})}
 #enddef
 
@@ -138,6 +141,12 @@
     {END_IF}
     {END_IF}
 #enddef
+
+#define MSG_Kyobaine _TEXT
+    # only used before she has gotten her cloak, so ok to hardcode the image:
+    {MESSAGE (Kyobaine) (portraits/kyobaine.png) (Kyobaine) ({_TEXT})}
+#enddef
+
 #define MSGOPTION OPTION VAL
     [option]
         message={OPTION}