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

Change various references of mermen to merfolk

Browse source
This commit is contained in:
nemaara 2019-04-14 11:21:59 -04:00
parent fe904140df
commit 0cd6f5238d
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/core/images/portraits/ARTISTS
View file

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

2
data/multiplayer/scenarios/Random_Scenario.cfg
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

2
data/multiplayer/scenarios/Random_Scenario_Desert.cfg
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

2
data/multiplayer/scenarios/Random_Scenario_Marsh.cfg
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

2
data/multiplayer/scenarios/test_lua_mapgen.lua
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",

2
data/scenario-test.cfg
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]