Merge branch 'name_areas_based_on_biome' into 'master'

fix Swamp-naming

See merge request veloren/veloren!3124
This commit is contained in:
Joshua Barretto 2022-01-20 21:17:13 +00:00
commit 9601462f6c

View File

@ -592,25 +592,22 @@ impl Civs {
.choose(&mut ctx.rng)
.unwrap()
)),
common::terrain::BiomeKind::Mountain if biome.1.len() as u32 > 750 => {
Some(format!(
"{} {}",
NameGen::location(&mut ctx.rng).generate_biome(),
[
"Swamp",
"Swamps",
"Swamplands",
"Marsh",
"Marshlands",
"Morass",
"Mire",
"Bog",
"Snowlands"
]
.choose(&mut ctx.rng)
.unwrap()
))
},
common::terrain::BiomeKind::Swamp if biome.1.len() as u32 > 750 => Some(format!(
"{} {}",
NameGen::location(&mut ctx.rng).generate_biome(),
[
"Swamp",
"Swamps",
"Swamplands",
"Marsh",
"Marshlands",
"Morass",
"Mire",
"Bog"
]
.choose(&mut ctx.rng)
.unwrap()
)),
common::terrain::BiomeKind::Jungle if biome.1.len() as u32 > 750 => Some(format!(
"{} {}",
NameGen::location(&mut ctx.rng).generate_biome(),