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

fix some test cases

Browse Source
This commit is contained in:
Christof Petig 2022-01-30 20:29:28 +01:00
parent 45ba21796c
commit 12fedef98f
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/comp/inventory/trade_pricing.rs
View File

@ -81,6 +81,8 @@ lazy_static! {
} }
#[derive(Clone)] #[derive(Clone)]
/// A collection of items with probabilty (normalized to one), created
/// hierarchically from `LootSpec`s
pub struct ProbabilityFile { pub struct ProbabilityFile {
pub content: Vec<(f32, String)>, pub content: Vec<(f32, String)>,
} }
@ -94,18 +96,27 @@ impl assets::Asset for ProbabilityFile {
impl From<Vec<(f32, LootSpec<String>)>> for ProbabilityFile { impl From<Vec<(f32, LootSpec<String>)>> for ProbabilityFile {
#[allow(clippy::cast_precision_loss)] #[allow(clippy::cast_precision_loss)]
fn from(content: Vec<(f32, LootSpec<String>)>) -> Self { fn from(content: Vec<(f32, LootSpec<String>)>) -> Self {
let rescale = if content.is_empty() {
1.0
} else {
1.0 / content.iter().fold(0.0, |s, e| s + e.0)
};
Self { Self {
content: content content: content
.into_iter() .into_iter()
.flat_map(|(p0, loot)| match loot { .flat_map(|(p0, loot)| match loot {
LootSpec::Item(asset) => vec![(p0, asset)].into_iter(), LootSpec::Item(asset) => vec![(p0 * rescale, asset)].into_iter(),
LootSpec::ItemQuantity(asset, a, b) => { LootSpec::ItemQuantity(asset, a, b) => {
vec![(p0 * (a + b) as f32 / 2.0, asset)].into_iter() vec![(p0 * rescale * (a + b) as f32 / 2.0, asset)].into_iter()
}, },
LootSpec::LootTable(table_asset) => { LootSpec::LootTable(table_asset) => {
let unscaled = &Self::load_expect(&table_asset).read().content; let unscaled = &Self::load_expect(&table_asset).read().content;
let total = unscaled.iter().fold(0.0, |s, i| s + i.0); let total = unscaled.iter().fold(0.0, |s, i| s + i.0);
let scale = if total == 0.0 { 1.0 } else { p0 / total }; let scale = if total == 0.0 {
1.0
} else {
p0 * rescale / total
};
unscaled unscaled
.iter() .iter()
.map(|(p1, asset)| (*p1 * scale, asset.clone())) .map(|(p1, asset)| (*p1 * scale, asset.clone()))