0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Dead Water: Change "mermen" to "merfolk" (part of #2940)

Browse source 
This commit excludes changes to S05 Tirigaz, I think changing the dialogue
there is going to be more complicated, and it's better for that to have a
separate PR.

(cherry-picked from commit d5f6c17239)
This commit is contained in:
Steve Cotton 2018-05-31 16:10:54 +02:00 • committed by Severin Glöckner
parent b87c36274a
commit 175c95a2df
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/campaigns/Dead_Water/scenarios/07_Bilheld.cfg
View file

@ -64,7 +64,7 @@
[ai]
villages_per_scout=1
[/ai]
# The drakes need a lot of money. Mermen are pretty effective
# The drakes need a lot of money. Merfolk are pretty effective
# against them in the water.
{INCOME4 20 25 30 35}
{GOLD4 250 290 330 380}
@ -121,7 +121,7 @@
name=start
[message]
speaker=Vlagnor
message= _ "What are you mermen doing here?"
message= _ "What are you merfolk doing here?"
[/message]
[message]
speaker=Kai Krellis
@ -141,7 +141,7 @@
[/message]
[message]
speaker=Vlagnor
message= _ "She kill drakes. If you are her friend, we will kill you. We do not want MORE mermen blasting and stabbing."
message= _ "She kill drakes. If you are her friend, we will kill you. We do not want MORE merfolk blasting and stabbing."
[/message]
[message]
speaker=Kai Krellis

6
data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
View file

@ -503,10 +503,10 @@
# <empty>: Caladon is not a leader. He is still a unit on side 1
#
# "passive": His side still has "controller=null" set. (He is
# giving the mermen time to leave before attacking them.)
# giving the merfolk time to leave before attacking them.)
#
# "impatient": Caladon’s side now has "controller=ai" set. (He's
# tired of waiting for the mermen to leave.) This is actually
# tired of waiting for the merfolk to leave.) This is actually
# *set* on the players turn, because Caladon’s side doesn't *get*
# a turn until it is set. On his first turn after "impatient" is
# set, he will say something and summon fire guardians.
@ -567,7 +567,7 @@
[message]
speaker=narrator
message= _ "The mermen clapped their hands over their ears as a terrible wail echoed off the castle walls."
message= _ "The merfolk clapped their hands over their ears as a terrible wail echoed off the castle walls."
image=wesnoth-icon.png
[/message]

6
data/campaigns/Dead_Water/scenarios/12_Revenge.cfg
View file

@ -14,7 +14,7 @@
[/part]
[part]
{DW_BIGMAP}
story= _ "The tribe that had fled Jotha unable to fight returned as an army stiffened by veteran fighters and led by a warrior king. Though they were tired from their journey, weariness fell from them as they neared home. The mermen arrived during the night, and found the mouth of their bay guarded, so they headed south along the coast to some outlying villages to gather news of the invaders."
story= _ "The tribe that had fled Jotha unable to fight returned as an army stiffened by veteran fighters and led by a warrior king. Though they were tired from their journey, weariness fell from them as they neared home. The merfolk arrived during the night, and found the mouth of their bay guarded, so they headed south along the coast to some outlying villages to gather news of the invaders."
[/part]
[/story]
@ -149,7 +149,7 @@
{RING_OF_STRENGTH_EVENTS}
#The mermen have no villages left when they return (but a few are
#The merfolk have no villages left when they return (but a few are
#still unclaimed):
{STARTING_VILLAGES 2 15}
{STARTING_VILLAGES_AREA 2 28 24 4}
@ -488,7 +488,7 @@
name=turn 2
[message]
speaker=narrator
message= _ "At dawn, the mermen got a good look at their opponents."
message= _ "At dawn, the merfolk got a good look at their opponents."
image=wesnoth-icon.png
[/message]

2
data/campaigns/Dead_Water/scenarios/13_Epilogue.cfg
View file

@ -30,7 +30,7 @@
name=start
[message]
speaker=narrator
message= _ "After destroying Mal-Ravanal’s henchmen, Kai Krellis awaited another attack. But it never came. Krellis sent some messengers south to discover what they could. The news that came back was better than good. Mal-Ravanal was dead! Soldiers of Wesnoth had defeated him at about the same time the mermen had defeated the undead at Jotha. With the evil wizard gone, the mermen relaxed and began rebuilding in earnest, and soon Jotha was restored."
message= _ "After destroying Mal-Ravanal’s henchmen, Kai Krellis awaited another attack. But it never came. Krellis sent some messengers south to discover what they could. The news that came back was better than good. Mal-Ravanal was dead! Soldiers of Wesnoth had defeated him at about the same time the merfolk had defeated the undead at Jotha. With the evil wizard gone, the merfolk relaxed and began rebuilding in earnest, and soon Jotha was restored."
image=wesnoth-icon.png
[/message]

2
data/campaigns/Dead_Water/units/Citizen.cfg
View file

@ -14,7 +14,7 @@
advances_to=Merman Brawler,Merman Fighter,Merman Hunter
cost=9
usage=fighter
description= _ "Mermen are mostly peaceful, but will fight to defend their homes. In this situation, even mermen with no weapons or training can be dangerous."
description= _ "Merfolk are mostly peaceful, but will fight to defend their homes. In this situation, even merfolk with no weapons or training can be dangerous."
die_sound=mermen-die.ogg
{DEFENSE_ANIM "units/merfolk/citizen-defend.png" "units/merfolk/citizen-defend.png" mermen-hit.wav }
[attack]