Merge pull request #4023 from nemaara/prose

Campaign/core prose fixes
This commit is contained in:
nemaara 2019-04-16 19:29:21 -04:00 committed by GitHub
commit b91cbf6040
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 89 additions and 83 deletions

View file

@ -121,6 +121,10 @@
* Update maps for S1 and S6
* Eastern Invasion:
* S9: add dialogue on victory
* Heir to the Throne:
* Remove 'Princess' as a direct address
* Northern Rebirth:
* Remove 'Princess' as a direct address
* Sceptre of Fire:
* S5: tell player that gryphon riders can now be recruited
* S9: objectives changed to be more accurate upon moving to the volcano
@ -128,6 +132,8 @@
* S10: add dialogue on victory
* The Rise of Wesnoth:
* S17a: prevent time over defeat if player chooses to defeat remaining saurians
### Miscellaneous and bug fixes
* Update various references of mermen to merfolk or mer
## Version 1.14.6+dev
### Campaigns

View file

@ -52,12 +52,12 @@
[part]
{DW_BIGMAP}
story= _ "Under the cover of darkness, the mermen slid into the bay, intending to launch a surprise attack at dawn. But the orcs were prepared for this, and had hastily devised a surprise of their own. Ships at the mouth of the bay that had seemed but derelict hulks disgorged hordes of orcs. More of them poured forth from the city. The merfolk were trapped, and found themselves vastly outnumbered."
story= _ "Under the cover of darkness, the merfolk slid into the bay, intending to launch a surprise attack at dawn. But the orcs were prepared for this, and had hastily devised a surprise of their own. Ships at the mouth of the bay that had seemed but derelict hulks disgorged hordes of orcs. More of them poured forth from the city. The merfolk were trapped, and found themselves vastly outnumbered."
[/part]
[part]
{DW_BIGMAP}
story= _ "Kai Laudisss army fought fiercely, slaying five orcs for every warrior they lost. The kai himself fought with reckless abandon; foes fell with each swing of his great mace. The orcs discovered that trapped mermen were tougher than they had imagined, and found themselves fleeing into the forest to escape their vengeful spears. As the kai had intended, it was a defeat the orcs would not soon forget; but the cost was heavy. Kai Laudiss was felled by a poisoned orcish dart, and the greater part of his army was destroyed. When the remaining soldiers returned to Jotha, Krellis, the young son of Kai Laudiss, learned that he had become kai."
story= _ "Kai Laudisss army fought fiercely, slaying five orcs for every warrior they lost. The kai himself fought with reckless abandon; foes fell with each swing of his great mace. The orcs discovered that trapped mer were tougher than they had imagined, and found themselves fleeing into the forest to escape their vengeful spears. As the kai had intended, it was a defeat the orcs would not soon forget; but the cost was heavy. Kai Laudiss was felled by a poisoned orcish dart, and the greater part of his army was destroyed. When the remaining soldiers returned to Jotha, Krellis, the young son of Kai Laudiss, learned that he had become kai."
[/part]
[part]

View file

@ -14,7 +14,7 @@
# necessary, but he helps someone level up, and he has a fair bit of
# gold. The next level is much easier with lots of gold.
# A lot of the code here is to activate the orc side if the mermen do
# A lot of the code here is to activate the orc side if the merfolk do
# anything wrong, and keep it passive until then. There is also some
# animation of the orcs coming out to tear down the keep after the
# first turn.
@ -158,7 +158,7 @@
[/goal]
village_value=0
# Even though they are less attractive targets, the ghosts
# will attack the orcs if they are in range and the mermen
# will attack the orcs if they are in range and the merfolk
# aren't. We will keep the ghosts from attacking the orcs
# by telling them to avoid the hexes around the guardians.
[avoid]
@ -447,9 +447,9 @@
name=turn 2
# If, at the end of turn 2, (actually, beginning of turn 3)
# the mermen are still ashore, the orcs attack. The event
# the merfolk are still ashore, the orcs attack. The event
# doesn't need to check for the turn being 3, because that's
# the only way the mermen could be ashore with the orcs still
# the only way the merfolk could be ashore with the orcs still
# passive.
[event]
name=side turn
@ -485,7 +485,7 @@
[/event]
[/event]
# After turn 3, if the mermen touch land, the orcs attack.
# After turn 3, if the merfolk touch land, the orcs attack.
[event]
name=turn 3
@ -557,7 +557,7 @@
[/if]
[/event]
# If a mermen attacks an orc, the orcs can attack back:
# If a merfolk attacks an orc, the orcs can attack back:
[event]
name=attack_end
first_time_only=yes
@ -590,7 +590,7 @@
[/if]
[/event]
# Remove the orcs movement points each turn if the mermen have
# Remove the orcs movement points each turn if the merfolk have
# stayed in the water.
[event]
name=turn refresh

View file

@ -305,7 +305,7 @@
[/message]
[message]
speaker=Mal-Govon
message= _ "What I remember, you old fool, is you leaving behind the smoldering bodies of the orcs you had hired to steal my sword. Now, you bring mermen. When they lay expiring like gasping fish on the shore, will you not flee again? Do not speak to <i>me</i> of fear."
message= _ "What I remember, you old fool, is you leaving behind the smoldering bodies of the orcs you had hired to steal my sword. Now, you bring mer to do your dirty work. When they lay expiring like gasping fish on the shore, will you not flee again? Do not speak to <i>me</i> of fear."
[/message]
[message]
speaker=Kai Krellis
@ -1146,7 +1146,7 @@
[message]
speaker=Caladon
message= _ "CURSE you mermen!"
message= _ "CURSE you merfolk!"
[/message]
{VARIABLE Caladon_leader_status dead}

View file

@ -504,7 +504,7 @@
[message]
speaker=Mel Daveth
message= _ "The mermen...they came back! Bring back the search parties! Call back the hordes!"
message= _ "The mer...they came back! Bring back the search parties! Call back the hordes!"
[/message]
[message]

View file

@ -14,7 +14,7 @@
advances_to=Merman Young King
cost=8
usage=fighter
description= _ "When a merman king dies, the next in line becomes king however young he is. It is his job to lead his troops in combat if necessary. Good soldiers will do as they are told, but a very young king will get little real respect."
description= _ "When a mer king dies, the next in line becomes king however young he is. It is his job to lead his troops in combat if necessary. Good soldiers will do as they are told, but a very young king will get little real respect."
die_sound=mermen-die.ogg
{DEFENSE_ANIM "units/merfolk/child_king.png" "units/merfolk/child_king.png" mermen-hit.wav }
[attack]

View file

@ -309,7 +309,7 @@
[message]
speaker=Seimus
message= _ "She has taken control of the Bay of Pearls, long held by the Mermen, and has turned them into slaves. There they dive for pearls by which she grows richer every day. There are even rumors that she may break the ancient treaty and attack Elensefar!"
message= _ "She has taken control of the Bay of Pearls, long held by the Mer, and has turned them into slaves. There they dive for pearls by which she grows richer every day. There are even rumors that she may break the ancient treaty and attack Elensefar!"
[/message]
[message]

View file

@ -551,7 +551,7 @@
#endif
[message]
speaker=Gwimli
message= _ "Thank you for rescuing us! Now we can help you fight the evil orcs! The main cage where they keep most of the mermen is in the northwest!"
message= _ "Thank you for rescuing us! Now we can help you fight the evil orcs! The main cage where they keep most of the merfolk is in the northwest!"
[/message]
[/event]
@ -661,7 +661,7 @@
[message]
speaker=Konrad
{KONRAD_VARIATION_ELF glad}
message= _ "At last, we have freed the mermen. Go back to the ocean and live in peace."
message= _ "At last, we have freed the merfolk. Go back to the ocean and live in peace."
[/message]
#define MERMAN_SPEAKS
[role]

View file

@ -92,7 +92,7 @@
show_title=no
[/part]
[part]
story= _ "The mermen finally saved Konrad from the sea, but were unable to get him back to the ship. By dint of great effort they reached a nearby island..."
story= _ "The merfolk finally saved Konrad from the sea, but were unable to get him back to the ship. By dint of great effort they reached a nearby island..."
{HTTT_BIGMAP}
show_title=no
[/part]
@ -174,7 +174,7 @@
gold=0
[/modify_side]
# disallow recruiting of everything except mermen
# disallow recruiting of everything except merfolk
[disallow_recruit]
side=1
type=Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout,Mage,Horseman

View file

@ -399,7 +399,7 @@
[/message]
[message]
speaker=Konrad
message= _ "Good day then, Princess. Come, men, to the northern road!"
message= _ "Good day to you, then. Come, men, to the northern road!"
[/message]
[message]
speaker=unit

View file

@ -353,7 +353,7 @@
[/message]
[message]
speaker=Kalenz
message= _ "Now we are surrounded! Do you still want to fight us, Princess? Surely that would lead to doom for us all!"
message= _ "Now we are surrounded! Do you still want to fight us, Lisar? Surely that would lead to doom for us all!"
[/message]
[message]
speaker="Li'sar"
@ -361,7 +361,7 @@
[/message]
[message]
speaker=Konrad
message= _ "Very well, I promise that you will reach the surface again, or we shall all perish together, Princess."
message= _ "Very well, I promise that you will reach the surface again, or we shall all perish together."
[/message]
[message]
speaker="Li'sar"
@ -374,7 +374,7 @@
[message]
speaker=Konrad
message= _ "Well, we have helped each other survive so far, Princess. Now lets continue together. What do you say?"
message= _ "Well, we have helped each other survive so far. Now lets continue together. What do you say?"
[/message]
[message]
speaker="Li'sar"
@ -383,7 +383,7 @@
[message]
speaker=Konrad
message= _ "Thank you, Princess. Come, men. Let us find the Sceptre!"
message= _ "Thank you. Come, men. Let us find the Sceptre!"
[/message]
[endlevel]

View file

@ -507,7 +507,7 @@
[/message]
[message]
speaker=Kalenz
message= _ "No, not an earthquake, Princess. I feel it too. Something is... aware... of us."
message= _ "No, not an earthquake, but I feel it too. Something is... aware... of us."
[/message]
[message]
speaker="Li'sar"

View file

@ -173,7 +173,7 @@
[/message]
[message]
speaker=Konrad
message= _ "You still want to fight me, do you, Princess?"
message= _ "You still want to fight me, do you, Lisar?"
[/message]
[message]
speaker="Li'sar"
@ -185,7 +185,7 @@
[/message]
[message]
speaker=Konrad
message= _ "Indeed there are. We shall have to fight our way out. Are you with us, Princess, or against us?"
message= _ "Indeed there are. We shall have to fight our way out. Are you with us or against us?"
[/message]
[message]
speaker="Li'sar"
@ -205,7 +205,7 @@
[/message]
[message]
speaker=Konrad
message= _ "Yes, we have. Now I suppose you want to use the Sceptre against me, Princess?"
message= _ "Yes, we have. Now I suppose you want to use the Sceptre against me, Lisar?"
[/message]
[message]
speaker="Li'sar"
@ -213,7 +213,7 @@
[/message]
[message]
speaker=Kalenz
message= _ "With all due respect, Princess, it is once again we who will spare you, Sceptre or no Sceptre."
message= _ "With all due respect, <i>Princess</i>, it is once again we who will spare you, Sceptre or no Sceptre."
[/message]
[message]
speaker="Li'sar"
@ -253,7 +253,7 @@
[/message]
[message]
speaker=Konrad
message= _ "And will you join us in seeking refuge with the North Elves, Princess?"
message= _ "And will you join us in seeking refuge with the North Elves, Lisar?"
[/message]
[message]
speaker="Li'sar"
@ -261,7 +261,7 @@
[/message]
[message]
speaker=Kalenz
message= _ "That we will, Princess. Even though you are the daughter of the Queen, our enemy, we shall not harm you on this encounter, for you have helped us."
message= _ "That we will. Even though you are the daughter of the Queen, our enemy, we shall not harm you on this encounter, for you have helped us."
[/message]
[message]
speaker=Delfador

View file

@ -171,7 +171,7 @@
[message]
speaker=Konrad
{KONRAD_VARIATION mad}
message= _ "Enough! I can listen to no more of this. Princess, you may want to end your mothers rule, but I will end her life as she ended the life of my father and my brothers. Ashevieres masterwork of treachery will end, and it will end by my blade!"
message= _ "Enough! I can listen to no more of this. Lisar, you may want to end your mothers rule, but I will end her life as she ended the life of my father and my brothers. Ashevieres masterwork of treachery will end, and it will end by my blade!"
[/message]
[/event]

View file

@ -378,7 +378,7 @@
[message]
speaker=Konrad
{KONRAD_VARIATION mad}
message= _ "Enough! I can listen to no more of this. Princess, you may want to end your mothers rule, but I will end her life as she ended the life of my father and my brothers. Ashevieres masterwork of treachery will end, and it will end by my blade!"
message= _ "Enough! I can listen to no more of this. Lisar, you may want to end your mothers rule, but I will end her life as she ended the life of my father and my brothers. Ashevieres masterwork of treachery will end, and it will end by my blade!"
[/message]
[endlevel]
result=victory

View file

@ -243,7 +243,7 @@
[message]
speaker=narrator
image=wesnoth-icon.png
message= _ "One day they saw a gruesome sight — a fleet of boats and rafts sunk or shattered among the river islands. Konrad sent some of the mermen to investigate."
message= _ "One day they saw a gruesome sight — a fleet of boats and rafts sunk or shattered among the river islands. Konrad sent some of the merfolk to investigate."
[/message]
[message]
role=merman-advisor
@ -336,7 +336,7 @@
[/message]
[message]
role=merman-advisor
# po: Yes, "Eastern Shore" is correct. Mermen are water-oriented;
# po: Yes, "Eastern Shore" is correct. Merfolk are water-oriented;
# po: it's the eastern shore of the Great Ocean.
message= _ "I was born in the Bay of Pearls and spent my entire life on the Eastern Shore. But I have spoken with those who have traveled the Western Ocean and met drakes on their journeys. Therefore, I am certain beyond doubt that the creature flying in front of us is a drake, Delfador. Concerning the drakes having never been seen in Wesnoth, must I remind you that we are not in Wesnoth anymore? There are many unthinkable things and creatures which can be found outside of Wesnoth."
[/message]
@ -351,7 +351,7 @@
[/message]
[message]
speaker="Li'sar"
message= _ "And I am Princess Lisar, the only daughter of the late King Garard II and Queen Asheviere. I too am an heir to the throne of Wesnoth!"
message= _ "And I am the Princess, Lisar, the only daughter of the late King Garard II and Queen Asheviere. I, too, am an heir to the throne of Wesnoth!"
[/message]
[message]
speaker=Keh Ohn
@ -764,7 +764,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when weve des
[/message]
[message]
speaker=Delfador
message= _ "Princess Lisar, do I have to remind you again that it is Konrad, not you, who is the rightful heir?"
message= _ "Lisar, do I have to remind you again that it is Konrad, not you, who is the rightful heir?"
[/message]
[message]
speaker="Li'sar"
@ -831,7 +831,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when weve des
[/message]
[message]
speaker="Li'sar"
message= _ "I am Princess Lisar, and we are friends. Join us and wait for the healers to help you, young sergeant."
message= _ "I am the Princess, Lisar, and we are friends. Join us and wait for the healers to help you, young sergeant."
[/message]
[message]
speaker=Warven

View file

@ -457,7 +457,7 @@
[/message]
[message]
speaker=Konrad
message= _ "I think these wild lands are too dangerous for that! Anyhow... I expected you to be on the side of Wesnoth, Princess?"
message= _ "I think these wild lands are too dangerous for that! Anyhow... I expected you to be on the side of Wesnoth, Lisar?"
[/message]
[message]
speaker="Li'sar"
@ -516,7 +516,7 @@
[/message]
[message]
speaker=Konrad
message= _ "Stop for a moment, Princess. Look — you can barely see them in the distance there, but the advance scouts have found each other. The Queens troops are marching full speed for the orcs camp, and vice-versa. These armies are out for blood."
message= _ "Stop for a moment, Lisar. Look — you can barely see them in the distance there, but the advance scouts have found each other. The Queens troops are marching full speed for the orcs camp, and vice-versa. These armies are out for blood."
[/message]
[message]
speaker="Li'sar"
@ -524,7 +524,7 @@
[/message]
[message]
speaker=Konrad
message= _ "(hushed) Our soldiers will defend us as we rush across the field. Sorry to be blunt, Princess, but you and I are the only ones who need to make it across alive."
message= _ "(hushed) Our soldiers will defend us as we rush across the field. Sorry to be blunt, but you and I are the only ones who need to make it across alive."
[/message]
[message]
speaker=Delfador

View file

@ -215,7 +215,7 @@
[message]
speaker=Konrad
{KONRAD_VARIATION mad}
message= _ "Enough! I can listen to no more of this. Princess, you may want to end your mothers rule, but I will end her life as she ended the life of my father and my brothers. Ashevieres masterwork of treachery will end, and it will end by my blade!"
message= _ "Enough! I can listen to no more of this. Lisar, you may want to end your mothers rule, but I will end her life as she ended the life of my father and my brothers. Ashevieres masterwork of treachery will end, and it will end by my blade!"
[/message]
[/event]

View file

@ -148,7 +148,7 @@
[/message]
[message]
speaker=Parandra
message= _ "Princess, when Delfador the Great speaks of the Queen Dowager, Asheviere, ordering the princes of Wesnoth to be put to death, he speaks the truth."
message= _ "When Delfador the Great speaks of the Queen Dowager, Asheviere, ordering the princes of Wesnoth to be put to death, he speaks the truth."
[/message]
[message]
speaker="Li'sar"
@ -156,7 +156,7 @@
[/message]
[message]
speaker=Uradredia
message= _ "I did not see it myself, Princess, but I have heard many reliable reports. Asheviere indeed has the blood of the princes on her hands. She has also allowed orcs to desecrate the lands, abandoning all respect for the peoples around her."
message= _ "I did not see it myself, but I have heard many reliable reports. Asheviere indeed has the blood of the princes on her hands. She has also allowed orcs to desecrate the lands, abandoning all respect for the peoples around her."
[/message]
[if]
[variable]
@ -171,7 +171,7 @@
[message]
speaker=Delfador
{DELFADOR_MENTORING}
message= _ "Princess, there is some good in you, but the throne is not yours to claim. Konrad has the Sceptre. He will take the throne."
message= _ "Young lady, there is some good in you, but the throne is not yours to claim. Konrad has the Sceptre. He will take the throne."
[/message]
[/then]
[else]
@ -182,7 +182,7 @@
[message]
speaker=Delfador
{DELFADOR_MENTORING}
message= _ "Though you have the Sceptre, Princess, it is rightfully Konrads. You have it now only because we helped you get it."
message= _ "Though you have the Sceptre, Lisar, it is rightfully Konrads. You have it now only because we helped you get it."
[/message]
[message]
speaker="Li'sar"
@ -191,7 +191,7 @@
[message]
speaker=Delfador
{DELFADOR_MENTORING}
message= _ "If it is necessary, Princess, I will ask Konrad to fight you in a duel for it."
message= _ "If it is necessary, I will ask Konrad to fight you in a duel for it."
[/message]
[message]
speaker=Konrad

View file

@ -197,7 +197,7 @@
[message]
speaker=Tallin
message= _ "Not at all, Princess. I am no more than a humble peasant trying to free my people from enslavement."
message= _ "Not at all, Your Highness. I am no more than a humble peasant trying to free my people from enslavement."
[/message]
[message]
@ -217,7 +217,7 @@
[message]
speaker=Tallin
message= _ "Ahh, it was nothing, princess."
message= _ "Ahh, it was nothing, my lady."
[/message]
[message]
@ -227,7 +227,7 @@
[message]
speaker=Tallin
message= _ "Princess, as Elenia has said, we are currently locked in a death-struggle with the orcs led by a warlord named Rakshas. You could help us most by joining us in our quest to crush this menace once and for all."
message= _ "As Elenia has said, we are currently locked in a death-struggle with the orcs led by a warlord named Rakshas. You could help us most by joining us in our quest to crush this menace once and for all."
[/message]
[message]
@ -237,7 +237,7 @@
[message]
speaker=Tallin
message= _ "Princess, we are not seeking to do business here: <i>“I do this for you and you do this for me.”</i> No, we seek to build everlasting friendships which will forever ensure the peace and prosperity of these Northlands. Therefore, let there be no talk of debts and repayments between us."
message= _ "My lady, we are not seeking to do business here: <i>“I do this for you and you do this for me.”</i> No, we seek to build everlasting friendships which will forever ensure the peace and prosperity of these Northlands. Therefore, let there be no talk of debts and repayments between us."
[/message]
[message]
@ -317,7 +317,7 @@
[message]
speaker=Tallin
message= _ "Well, what about the orcs then, princess? Dont you wish to be rid of them?"
message= _ "Well, what about the orcs then, <i>princess</i>? Dont you wish to be rid of them?"
[/message]
[message]
@ -350,7 +350,7 @@
[message]
speaker=Father Morvin
message= _ "Frankly, princess, I am disappointed. I was always under the impression that elves were an honorable lot who took their debts seriously."
message= _ "Frankly, my lady, I am disappointed. I was always under the impression that elves were an honorable lot who took their debts seriously."
[/message]
[message]

View file

@ -771,7 +771,7 @@
[message]
speaker=Hidel
message= _ "Princess! We have finally found you!"
message= _ "Your Highness! We have finally found you!"
[/message]
[message]
@ -781,7 +781,7 @@
[message]
speaker=Hidel
message= _ "They are all here, princess! Hand picked by your father — the finest and bravest elvish troops in the entire Northlands. We will follow you to the end of the world if need be."
message= _ "They are all here, my lady! Hand picked by your father — the finest and bravest elvish troops in the entire Northlands. We will follow you to the end of the world if need be."
[/message]
[message]
@ -791,7 +791,7 @@
[message]
speaker=Hidel
message= _ "With pleasure, Princess! Quickly men, set up a base!"
message= _ "With pleasure! Quickly men, set up a base!"
[/message]
[terrain]
@ -1082,7 +1082,7 @@
[message]
speaker=Hidel
message= _ "Princess! We have finally found you! Thank the Bright Gods you are free! Your father had originally sent us to rescue you."
message= _ "Your Highness! We have finally found you! Thank the Bright Gods you are free! Your father had originally sent us to rescue you."
[/message]
[message]
@ -1127,7 +1127,7 @@
[message]
speaker=Hidel
message= _ "They are all here, princess! Hand picked by your father — the finest and bravest elvish troops in the entire Northlands."
message= _ "They are all here, my lady! Hand picked by your father — the finest and bravest elvish troops in the entire Northlands."
[/message]
[message]
@ -1137,7 +1137,7 @@
[message]
speaker=Hidel
message= _ "As you wish, princess."
message= _ "As you wish, my lady."
[/message]
[message]

View file

@ -36,7 +36,7 @@
story= _ "With tears streaming down her face, Eryssa approached the fallen hero and cradled his head in her lap. As she stroked his face, his eyes fluttered open."
[/part]
{STORY_PART_HIDEL (_ "I am sorry, princess... We held him for... as long as we could... but his bodyguards... were... just too many and powerful... And then... the orcish... reinforcements arrived...")}
{STORY_PART_HIDEL (_ "I am sorry, my lady... We held him for... as long as we could... but his bodyguards... were... just too many and powerful... And then... the orcish... reinforcements arrived...")}
[part]
story= _ "Her face streaked with tears, Eryssa gazed imploringly at Father Morvin and Sister Thera. They simply sighed and shook their heads. It was too late to save Hidel. In a broken voice Eryssa addressed him:"
@ -44,7 +44,7 @@
{STORY_PART_ERYSSA (_ "Hidel, I am sorry. I have sent you to your death, and I grieve.")}
{STORY_PART_HIDEL (_ "... Dont tax yourself... princess... I have died... a warriors death... You should be proud...")}
{STORY_PART_HIDEL (_ "... Dont tax yourself... Eryssa... I have died... a warriors death... You should be proud...")}
{STORY_PART_HIDEL (_ "... But... there is... one thing... we... could do. We... managed to... recover the gold... Sisal... took it and... retreated south...")}
@ -78,7 +78,7 @@
story= _ "As Tallin comforted Eryssa, the rest of the party spread out and rallied the scattered elves, and tending to the wounded. This being done, they once again came before Tallin and Eryssa."
[/part]
{STORY_PART_FATHER_MORVIN (_ "Princess... it is a hard thing, I know, but you must put your grief behind you. Or at least, put it aside for a little while. We must go quickly to the aid of Sisal and recover our gold.")}
{STORY_PART_FATHER_MORVIN (_ "My lady... it is a hard thing, I know, but you must put your grief behind you. Or at least, put it aside for a little while. We must go quickly to the aid of Sisal and recover our gold.")}
{STORY_PART_ARTHIAN (_ "Forge your sorrow into rage, girl, and visit it on the slayers of your kinsmen. Teach them what happens to those who make an enemy of an elf.")}
@ -422,7 +422,7 @@
[message]
id=Sisal
message= _ "Princess! You are here! How fares Hidel?"
message= _ "Your Highness! You are here! How fares Hidel?"
[/message]
[message]

View file

@ -399,7 +399,7 @@
[/event]
#endif
# Mermen - You find mermen who will become allies and protect your waterways.
# Merfolk - You find merfolk who will become allies and protect your waterways.
[event]
name=moveto
@ -462,7 +462,7 @@
[message]
speaker=narrator
image="units/merfolk/hunter.png~RC(magenta>red)"
message= _ "You may now recruit Merman Hunters. Mermen are aquatic creatures and fight best in rivers and swamps. They are much less effective on dry land."
message= _ "You may now recruit Merman Hunters. Merfolk are aquatic creatures and fight best in rivers and swamps. They are much less effective on dry land."
[/message]
#endif
@ -470,7 +470,7 @@
side=1
type=Merman Hunter
[/allow_recruit]
{VARIABLE has_mermen "yes"}
{VARIABLE has_merfolk "yes"}
[/event]
# Dusk - Sir Gerrick suggests that you should hold the north banks of the river.

View file

@ -454,7 +454,7 @@
[/if]
[/event]
# you can get some mermen reinforcements if you go on the village here
# you can get some merfolk reinforcements if you go on the village here
# it will replay the event from the first scenario if you didn't get them there
[event]
@ -466,7 +466,7 @@
[if]
[variable]
name=has_mermen
name=has_merfolk
equals="yes"
[/variable]
[then]
@ -552,7 +552,7 @@
[message]
speaker=narrator
image="units/merfolk/hunter.png~RC(magenta>red)"
message= _ "You may now recruit Merman Hunters. Mermen are aquatic creatures and fight best in rivers and swamps. They are much less effective on dry land."
message= _ "You may now recruit Merman Hunters. Merfolk are aquatic creatures and fight best in rivers and swamps. They are much less effective on dry land."
[/message]
#endif
@ -560,7 +560,7 @@
side=1
type=Merman Hunter
[/allow_recruit]
{VARIABLE has_mermen "yes"}
{VARIABLE has_merfolk "yes"}
[/else]
[/if]
[/event]
@ -852,7 +852,7 @@
message= _ "Very well. Although it will probably take too long to send word to the King for reinforcements, I remember there being a small outpost within a couple days ride of here. I will send a message to them asking for a few riders, then we should make haste toward the Aethenwood to find the elves."
[/message]
{CLEAR_VARIABLE citadel_secured}
{CLEAR_VARIABLE citadel_secured,has_merfolk}
[endlevel]
result=victory

View file

@ -1118,7 +1118,7 @@
image=portraits/deoran-sad.png
message= _ "Then we shall retreat towards Westin and prepare for the oncoming battle. I pray our only chance at victory was not lost today."
[/message]
{CLEAR_VARIABLE side_with_bandits,found_urza_afalas,has_mermen,know_about_lich}
{CLEAR_VARIABLE side_with_bandits,found_urza_afalas,know_about_lich}
[endlevel]
result=victory
next_scenario=06b_The_Long_March

View file

@ -213,7 +213,7 @@ Drakes:
Clasher
Fighter
Glider
Mermen:
Merfolk:
Fighter
Hunter
Others:

View file

@ -18,7 +18,7 @@
usage=mixed fighter
description= _ "Merfolk tend to use a combination of both nets and clubs in fishing; nets to collect the fish, and clubs to finish the kill. Both of these tools have seen adaptation for warfare, and are valuable enough that auxiliaries who specialize in using them are deliberately brought to battle.
Mermen often find themselves in a standoff with land-based enemies; the merfolk are too strong in the water, and are too weak to make any offense on land. Nets are a key bit of leverage; without nets, mermen cant give any effective chase over land, and are at a great disadvantage in hand-to-hand combat."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}
Merfolk often find themselves in a standoff with land-based enemies; the mer are too strong in the water, and are too weak to make any offense on land. Nets are a key bit of leverage; without nets, merfolk cannot give any effective chase over land, and are at a great disadvantage in hand-to-hand combat."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}
{DEFENSE_ANIM "units/merfolk/entangler-defend2.png" "units/merfolk/entangler-defend1.png" mermen-hit.wav }
die_sound=mermen-die.ogg
[attack]

View file

@ -15,7 +15,7 @@
advances_to=Merman Spearman,Merman Netcaster
cost=15
usage=mixed fighter
description= _ "The skills employed by mermen in spear-fishing are easily translated into warfare, especially against those who are not at home in the water. In times of need, many mermen of that occupation will volunteer to swell the ranks of their military."
description= _ "The skills employed by merfolk in spear-fishing are easily translated into warfare, especially against those who are not at home in the water. In times of need, many mer of that occupation will volunteer to swell the ranks of their military."
die_sound=mermen-die.ogg
{DEFENSE_ANIM_RANGE "units/merfolk/hunter.png" "units/merfolk/hunter.png" mermen-hit.wav melee}
{DEFENSE_ANIM_RANGE "units/merfolk/hunter-javelin-defend-2.png" "units/merfolk/hunter-javelin-defend-1.png" mermen-hit.wav ranged}

View file

@ -15,7 +15,7 @@
{AMLA_DEFAULT}
cost=48
usage=mixed fighter
description= _ "Those mermen who master the art of the javelin can become nearly as effective as an archer — though the heft of their weapons impedes their range, the impact of one is considerably greater. In the water, the mobility of the mermen more than makes up for this when facing foes who cannot swim."
description= _ "Those mer who master the art of the javelin can become nearly as effective as an archer — though the heft of their weapons impedes their range, the impact of one is considerably greater. In the water, the mobility of the merfolk more than makes up for this when facing foes who cannot swim."
die_sound=mermen-die.ogg
{DEFENSE_ANIM "units/merfolk/javelineer-defend2.png" "units/merfolk/javelineer-defend1.png" mermen-hit.wav }
[attack]

View file

@ -15,7 +15,7 @@
advances_to=Merman Entangler
cost=27
usage=mixed fighter
description= _ "Fishing, as practiced by mermen, is largely a matter of chasing schools of fish into waiting nets, where oar-like clubs are used to dispatch the prey. The improvisation of using these against soldiers proved very effective; most land-native creatures are already quite awkward when waist-deep in water, and getting caught in a net can render them nearly helpless.
description= _ "Fishing, as practiced by merfolk, is largely a matter of chasing schools of fish into waiting nets, where oar-like clubs are used to dispatch the prey. The improvisation of using these against soldiers proved very effective; most land-native creatures are already quite awkward when waist-deep in water, and getting caught in a net can render them nearly helpless.
The effectiveness of this method led to the development of smaller, weighted nets, which could be cast through the air; these were useless for fishing, but were useful both in combat and in hunting game that came too close to shore. Clubs were used in combat with little or no adaptation from fishing, since they were already quite deadly."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}
{DEFENSE_ANIM "units/merfolk/netcaster-defend2.png" "units/merfolk/netcaster-defend1.png" mermen-hit.wav }

View file

@ -14,7 +14,7 @@
advances_to=Merman Javelineer
cost=27
usage=mixed fighter
description= _ "Archery is little favored by the mermen, for whom use of javelins serves a similar function. Though thrown javelins are of little use under the water, they are extremely effective at the surface, where their weight allows them to plunge several feet below the water while retaining enough momentum to wreak damage. They are also useful in melee, even deep under the surface, which is something that certainly cannot be said of arrows."
description= _ "Archery is little favored by the mer, for whom use of javelins serves a similar function. Though thrown javelins are of little use under the water, they are extremely effective at the surface, where their weight allows them to plunge several feet below the water while retaining enough momentum to wreak damage. They are also useful in melee, even deep under the surface, which is something that certainly cannot be said of arrows."
die_sound=mermen-die.ogg
{DEFENSE_ANIM "units/merfolk/spearman-defend2.png" "units/merfolk/spearman-defend1.png" mermen-hit.wav }
[attack]

View file

@ -14,7 +14,7 @@
advances_to=Merman Triton,Merman Hoplite
cost=28
usage=fighter
description= _ "The Mermen Warriors form the core of the mermen armies. They wield their tridents with a skill and diligence impressive even compared to the soldiers of other races, but doubly so considering the difficulties of fighting underwater, as any who try to match them in their homes can attest."
description= _ "Mermen Warriors form the core of merfolk armies. They wield their tridents with a skill and diligence impressive even compared to the soldiers of other races, but doubly so considering the difficulties of fighting underwater, as any who try to match them in their homes can attest."
die_sound=mermen-die.ogg
{DEFENSE_ANIM "units/merfolk/warrior-defend-2.png" "units/merfolk/warrior-defend-1.png" mermen-hit.wav }
[attack]

View file

@ -234,7 +234,7 @@
adjacent_liked=Gg, Ww, Ww, Ww, Ww^Bw|, Ww^Bw/, Ww^Bw\, Rr, Rr, Re, Re, Gg^Ve, Gg^Vh, Hh, Gs^Fp
[/village]
#mermen villages - give them low chance of appearing
#merfolk villages - give them low chance of appearing
[village]
terrain=Ww
convert_to=Ww^Vm

View file

@ -171,7 +171,7 @@
adjacent_liked=Gs, Dd, Ww, Ww, Ww, Ww^Bw|, Ww^Bw/, Ww^Bw\, Rr, Rr, Re, Re, Rd, Rd, Gg^Ve, Gg^Vh, Hd, Gs^Ft
[/village]
#mermen villages - give them low chance of appearing
#merfolk villages - give them low chance of appearing
[village]
terrain=Ww
convert_to=Ww^Vm

View file

@ -192,7 +192,7 @@
adjacent_liked=Gg, Ss, Ww, Ww, Ww, Ww^Bw|, Ww^Bw/, Ww^Bw\, Rr, Rr, Re, Re, Gg^Ve, Gg^Vh, Hh, Gs^Fp
[/village]
#mermen villages - give them low chance of appearing
#merfolk villages - give them low chance of appearing
[village]
terrain=Ww
convert_to=Ww^Vm

View file

@ -322,7 +322,7 @@ local d_mapgen_data_village = {
rating=2,
adjacent_liked="Gg, Ww, Ww, Ww, Ww^Bsb|, Ww^Bsb/, Ww^Bsb\\, Rr, Rr, Re, Re, Gg^Ve, Gg^Vh, Hh, Gs^Fp",
},
-- mermen villages - give them low chance of appearing
-- merfolk villages - give them low chance of appearing
{
terrain="Wwg",
convert_to="Wwg^Vm",

View file

@ -2344,7 +2344,7 @@ Over the land are scattered villages where you can heal your troops and gather t
The Creatures
^^^^^^^^^^^^^
In the world of Wesnoth there dwell humans, elves, dwarves, orcs, drakes, saurians, mermen, nagas, and many other races yet more obscure and wondrous. In accursed lands walk undead and ghosts and specters; monsters lurk in its ruins and dungeons. Each has adapted to particular terrains. Humans inhabit primarily the temperate grasslands. In the hills, mountains and underground caves orcs and dwarves are most at home. In the forests the elves reign supreme. In the oceans and rivers mermen and nagas dominate.
In the world of Wesnoth there dwell humans, elves, dwarves, orcs, drakes, saurians, merfolk, nagas, and many other races yet more obscure and wondrous. In accursed lands walk undead and ghosts and specters; monsters lurk in its ruins and dungeons. Each has adapted to particular terrains. Humans inhabit primarily the temperate grasslands. In the hills, mountains and underground caves orcs and dwarves are most at home. In the forests the elves reign supreme. In the oceans and rivers, merfolk and nagas dominate.
For game purposes, the races group into factions; for example, orcs often cooperate with trolls, and elves or dwarves with humans. Some other factions reflect divisions within human society — loyalists vs. outlaws, for example. In most campaigns, you will control units drawn a single faction. But sometimes factions make alliances with others, so you may face more than one faction in a scenario."
[/message]