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

Merge branch 'fix-typo-en-i18n' into 'master'

Browse Source 
fix typo in en.ron, fixed unfinished weapons dropping from chests

See merge request veloren/veloren!761
This commit is contained in:
Monty Marz 2020-01-26 22:57:06 +00:00
commit 84d48b3a56
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/voxygen/i18n/en.ron
View File

@ -281,7 +281,7 @@ Chat commands:
"hud.social.online": "Online",
"hud.social.friends": "Friends",
"hud.social.not_yet_available": "Not yet available",
"hud.social.Faction": "Faction",
"hud.social.faction": "Faction",
"hud.social.play_online_fmt": "{nb_player} player(s) online",
"hud.spell": "Spell",

32
common/src/comp/inventory/item.rs
View File

@ -3,7 +3,8 @@ use crate::{
effect::Effect,
terrain::{Block, BlockKind},
};
use rand::prelude::*;
//use rand::prelude::*;
use rand::seq::SliceRandom;
use specs::{Component, FlaggedStorage};
use specs_idvs::IDVStorage;
use std::fs::File;
@ -157,19 +158,22 @@ impl Item {
Some(assets::load_expect_cloned("common.items.grasses.medium"))
}
BlockKind::ShortGrass => Some(assets::load_expect_cloned("common.items.grasses.short")),
BlockKind::Chest => Some(match rand::random::<usize>() % 6 {
0 => assets::load_expect_cloned("common.items.apple"),
1 => assets::load_expect_cloned("common.items.velorite"),
2 => (**assets::load_glob::<Item>("common.items.weapons.*")
.expect("Error getting glob")
.choose(&mut rand::thread_rng())
.expect("Empty glob"))
.clone(),
3 => assets::load_expect_cloned("common.items.veloritefrag"),
4 => assets::load_expect_cloned("common.items.cheese"),
5 => assets::load_expect_cloned("common.items.potion_minor"),
_ => unreachable!(),
}),
BlockKind::Chest => Some(assets::load_expect_cloned(
[
"common.items.apple",
"common.items.velorite",
"common.items.veloritefrag",
"common.items.cheese",
"common.items.potion_minor",
"common.items.weapons.starter_sword",
"common.items.weapons.starter_axe",
"common.items.weapons.starter_hammer",
"common.items.weapons.starter_bow",
"common.items.weapons.starter_staff",
]
.choose(&mut rand::thread_rng())
.unwrap(), // Can't fail
)),
_ => None,
}
}