Merge branch 'tormeh/rtsim-first' into 'master'

Tormeh/rtsim first

See merge request veloren/veloren!2053
This commit is contained in:
Marcel 2021-04-25 18:53:39 +00:00
commit ecb176158c

View File

@ -75,10 +75,6 @@ impl Entity {
}
}
pub fn get_level(&self) -> u32 {
(self.rng(PERM_LEVEL).gen::<f32>().powi(2) * 15.0).ceil() as u32
}
pub fn get_loadout(&self) -> comp::inventory::loadout::Loadout {
let mut rng = self.rng(PERM_LOADOUT);
let main_tool = comp::Item::new_from_asset_expect(
@ -109,13 +105,16 @@ impl Entity {
_ => None,
};
let lantern = match rng.gen_range(0..3) {
let lantern = match rng.gen_range(0..4) {
0 => Some(comp::Item::new_from_asset_expect(
"common.items.lantern.black_0",
)),
1 => Some(comp::Item::new_from_asset_expect(
"common.items.lantern.blue_0",
)),
2 => Some(comp::Item::new_from_asset_expect(
"common.items.lantern.green_0",
)),
_ => Some(comp::Item::new_from_asset_expect(
"common.items.lantern.red_0",
)),