Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

- use common fn generate_from_parts to generate biome-names

Browse Source 
- arrays for bricks instead of vecs
This commit is contained in:
floppy 2022-01-27 12:25:17 +01:00
parent 87ea7a906a
commit 52c4c170fc
1 changed files with 31 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
world/src/site/namegen.rs
View File

@ -91,106 +91,89 @@ impl<'a, R: Rng> NameGen<'a, R> {
.collect()
}
pub fn generate_temp_forest(self) -> String {
let cons = vec![
fn generate_from_parts(&mut self, start: &[&str], end: &[&str]) -> String {
let mut name = String::new();
name += start.choose(self.rng).unwrap();
name += end.choose(self.rng).unwrap();
name.chars()
.enumerate()
.map(|(i, c)| if i == 0 { c.to_ascii_uppercase() } else { c })
.collect()
}
pub fn generate_temp_forest(&mut self) -> String {
let start = [
"green", "moss", "ever", "briar", "thorn", "oak", "deep", "moon", "star", "sun",
"bright", "glare", "fair", "calm", "mistral", "whisper", "clover", "hollow", "spring",
"morrow", "dim", "dusk", "dawn", "night", "shimmer", "silver", "gold", "fern", "quiet",
"still", "gleam", "wild", "blind", "swift", "gnarl", "flutter", "silent", "honey",
"bramble", "rose", "aspen",
];
let start = cons.clone();
let end = vec![
//let start = cons.clone();
let end = [
"root", "bark", "log", "brook", "well", "shire", "leaf", "more", "bole", "heart",
"song", "dew", "bough", "path", "wind", "breeze", "light", "branch", "bloom", "vale",
"glen", "rest", "shade", "fall", "sward", "shrub", "bush", "grasp", "grip", "gale",
"crawl", "run", "shadow", "rise", "glow", "wish", "will", "walk", "wander", "wake",
"eye", "blossom", "sprout", "barb",
];
let mut name = String::new();
name += start.choose(self.rng).unwrap();
name += end.choose(self.rng).unwrap();
name.chars()
.enumerate()
.map(|(i, c)| if i == 0 { c.to_ascii_uppercase() } else { c })
.collect()
self.generate_from_parts(&start, &end)
}
pub fn generate_grassland(self) -> String {
let cons = vec![
pub fn generate_grassland(&mut self) -> String {
let start = [
"green", "heather", "flower", "blue", "yellow", "vast", "moon", "star", "sun",
"bright", "fair", "calm", "mistral", "whisper", "clover", "sooth", "spring", "morrow",
"dim", "dusk", "dawn", "night", "shimmer", "silver", "gold", "amber", "quiet", "still",
"gleam", "wild", "corm", "mint", "petal", "feather", "silent", "bronze", "bistre",
"thistle", "bristle", "dew", "bramble", "sorrel", "broad",
];
let start = cons.clone();
let end = vec![
//let start = cons.clone();
let end = [
"brook", "well", "flight", "more", "heart", "song", "barb", "wort", "hoof", "foot",
"herd", "path", "wind", "breeze", "light", "bloom", "rest", "balm", "reach", "flow",
"graze", "trail", "fall", "shrub", "bush", "gale", "run", "stem", "glare", "gaze",
"rove", "brew", "rise", "glow", "wish", "will", "walk", "wander", "wake", "sky",
"burrow", "cross", "roam",
];
let mut name = String::new();
name += start.choose(self.rng).unwrap();
name += end.choose(self.rng).unwrap();
name.chars()
.enumerate()
.map(|(i, c)| if i == 0 { c.to_ascii_uppercase() } else { c })
.collect()
self.generate_from_parts(&start, &end)
}
pub fn generate_savannah(self) -> String {
let cons = vec![
pub fn generate_savannah(&mut self) -> String {
let start = [
"red", "pride", "dry", "copper", "vast", "war", "star", "sun", "bright", "blood",
"dawn", "shimmer", "gold", "amber", "gleam", "wild", "rust", "fire", "earth", "spirit",
"bronze", "broad", "scorch", "sear", "gold", "prowl", "marl", "gleam", "rage", "ghost",
"soul", "specter", "scald", "singe", "heat", "torch", "rite", "bone", "petal",
];
let start = cons.clone();
let end = vec![
//let start = cons.clone();
let end = [
"dust", "grass", "swarm", "more", "heart", "song", "claw", "fang", "hoof", "foot",
"herd", "path", "wind", "breeze", "howl", "sway", "rest", "reach", "flow", "graze",
"trail", "sting", "fall", "growl", "mane", "bush", "gale", "run", "field", "glare",
"gaze", "wallow", "brew", "rise", "glow", "wade", "wander", "wake", "sky", "roam",
"breath", "shard", "scar", "lurk", "hill", "blaze", "fury", "hunt",
];
let mut name = String::new();
name += start.choose(self.rng).unwrap();
name += end.choose(self.rng).unwrap();
name.chars()
.enumerate()
.map(|(i, c)| if i == 0 { c.to_ascii_uppercase() } else { c })
.collect()
self.generate_from_parts(&start, &end)
}
pub fn generate_taiga(self) -> String {
let cons = vec![
pub fn generate_taiga(&mut self) -> String {
let start = [
"green", "blue", "ever", "pale", "needle", "cold", "moon", "star", "chill", "shiver",
"bitter", "fair", "calm", "mistral", "whisper", "grey", "hollow", "morrow", "dim",
"dusk", "dawn", "night", "shimmer", "silver", "iron", "quill", "grizzle", "quiet",
"still", "wild", "blind", "silent", "somber", "sleet", "silent", "sharp", "somber",
"sleet", "silent", "sharp", "rime", "drizzle", "resin",
];
let start = cons.clone();
let end = vec![
//let start = cons.clone();
let end = [
"root", "bark", "log", "brook", "well", "shire", "more", "bole", "heart", "song",
"dew", "bough", "path", "wind", "breeze", "light", "branch", "bloom", "pine", "spruce",
"rest", "shade", "fall", "fir", "grasp", "grip", "gale", "hunt", "run", "shadow",
"hill", "shadow", "larch", "rise", "bite", "wish", "will", "walk", "wander", "wake",
"stone", "howl", "moss",
];
let mut name = String::new();
name += start.choose(self.rng).unwrap();
name += end.choose(self.rng).unwrap();
name.chars()
.enumerate()
.map(|(i, c)| if i == 0 { c.to_ascii_uppercase() } else { c })
.collect()
self.generate_from_parts(&start, &end)
}
}