lew/rust-rl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

unid wand names

Browse source
This commit is contained in:
Llywelwyn 2023-08-13 22:49:23 +01:00
parent 1ec876a10d
commit 3474a782d7
3 changed files with 57 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/map/dungeon.rs
View file

@ -11,6 +11,7 @@ pub struct MasterDungeonMap {
pub identified_items: HashSet<String>,
pub scroll_map: HashMap<String, (String, String)>,
pub potion_map: HashMap<String, String>,
pub wand_map: HashMap<String, String>,
}
impl MasterDungeonMap {
@ -21,6 +22,7 @@ impl MasterDungeonMap {
identified_items: HashSet::new(),
scroll_map: HashMap::new(),
potion_map: HashMap::new(),
wand_map: HashMap::new(),
};
// TODO: Use stored RNG
let mut rng = RandomNumberGenerator::new();
@ -33,6 +35,11 @@ impl MasterDungeonMap {
let unid_singular = make_potion_name(&mut rng, &mut used_potion_names);
dm.potion_map.insert(potion_tag.to_string(), unid_singular);
}
let mut used_wand_names: HashSet<String> = HashSet::new();
for wand_tag in crate::raws::get_wand_tags().iter() {
let unid_singular = make_wand_name(&mut rng, &mut used_wand_names);
dm.wand_map.insert(wand_tag.to_string(), unid_singular);
}
return dm;
}
@ -98,8 +105,10 @@ fn make_scroll_name(rng: &mut RandomNumberGenerator) -> (String, String) {
return (singular, plural);
}
const POTION_COLOURS: &[&str] =
&["red", "orange", "yellow", "green", "blue", "indigo", "violet", "black", "white", "silver", "gold"];
const POTION_COLOURS: &[&str] = &[
"red", "orange", "yellow", "green", "blue", "indigo", "violet", "black", "white", "silver", "gold", "rainbow",
"blood", "purple", "cyan", "brown", "grey",
];
const POTION_ADJECTIVES: &[&str] = &["swirling", "viscous", "effervescent", "slimy", "oily", "metallic"];
fn make_potion_name(rng: &mut RandomNumberGenerator, used_names: &mut HashSet<String>) -> String {
@ -117,6 +126,32 @@ fn make_potion_name(rng: &mut RandomNumberGenerator, used_names: &mut HashSet<St
}
}
const WAND_TYPES: &[&str] = &[
"iron",
"steel",
"silver",
"gold",
"octagonal",
"pointed",
"curved",
"jeweled",
"mahogany",
"crystalline",
"lead",
];
fn make_wand_name(rng: &mut RandomNumberGenerator, used_names: &mut HashSet<String>) -> String {
loop {
let mut name: String = WAND_TYPES[rng.roll_dice(1, WAND_TYPES.len() as i32) as usize - 1].to_string();
name += " wand";
if !used_names.contains(&name) {
used_names.insert(name.clone());
return name;
}
}
}
pub fn level_transition(ecs: &mut World, new_id: i32, offset: i32) -> Option<Vec<Map>> {
// Obtain master
let dungeon_master = ecs.read_resource::<MasterDungeonMap>();