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 'qutrin/another-fix' into 'master'

Browse Source 
Fix loot table (again)

See merge request veloren/veloren!1157
This commit is contained in:
Joshua Barretto 2020-07-05 19:13:58 +00:00
commit 5ae6582f2f
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/common/loot_table.ron
View File

@ -7,6 +7,8 @@
// miscellaneous
(0.4, "common.items.velorite"),
(0.6, "common.items.veloritefrag"),
(0.6, "common.items.cheese"),
(0.6, "common.items.apple"),
(1.5, "common.items.potion_minor"),
(0.5, "common.items.collar"),
(0.5, "common.items.bomb_pile"),
@ -79,7 +81,6 @@
(0.2, "common.items.armor.pants.cloth_blue_0"),
(0.2, "common.items.armor.pants.cloth_green_0"),
(0.2, "common.items.armor.pants.cloth_purple_0"),
(0.15, "common.items.armor.pants.green_0"),
(0.15, "common.items.armor.pants.leather_0"),
(0.1, "common.items.armor.pants.steel_0"),
(0.05, "common.items.armor.pants.plate_green_0"),

23
common/src/comp/inventory/item/lottery.rs
View File

@ -44,4 +44,27 @@ impl<T> Lottery<T> {
.unwrap_or_else(|i| i.saturating_sub(1))]
.1
}
pub fn iter(&self) -> impl Iterator<Item = &(f32, T)> { self.items.iter() }
}
#[cfg(test)]
mod tests {
use crate::{
assets,
comp::inventory::item::{lottery::Lottery, Item},
};
#[test]
fn test_loot_table() {
let test = assets::load_expect::<Lottery<_>>("common.loot_table");
let test = test;
for (_, item) in test.iter() {
assert!(
assets::load::<Item>(item).is_ok(),
"Invalid loot table item '{}'",
item
);
}
}
}