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

cargo fmt

Browse Source
This commit is contained in:
Christof Petig 2022-01-30 18:13:36 +01:00
parent a98b9ad049
commit 66c431ba86
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
use crate::{
assets::{self, AssetExt},
lottery::{LootSpec},
lottery::LootSpec,
recipe::{default_recipe_book, RecipeInput},
trade::Good,
};
@ -358,7 +358,7 @@ impl TradePricing {
}
let (frequency, can_sell, asset_path) = table;
let loot = ProbabilityFile::load_expect(asset_path);
let new_scale = frequency / loot.read().content.iter().fold(0.0, |s, i| s+i.0);
let new_scale = frequency / loot.read().content.iter().fold(0.0, |s, i| s + i.0);
for (p, item_asset) in &loot.read().content {
result.get_list_by_path_mut(item_asset).add(
&eqset,
@ -601,10 +601,7 @@ impl TradePricing {
}
/// hierarchically combine and scale this loot table
pub fn lootspec_to_vec_item(
probability_sum: f32,
loot: &LootSpec<String>,
) -> Vec<(f32, String)> {
pub fn lootspec_to_vec_item(probability_sum: f32, loot: &LootSpec<String>) -> Vec<(f32, String)> {
ProbabilityFile::from(vec![(probability_sum, loot.clone())]).content
}
@ -613,7 +610,7 @@ pub fn lootspec_to_vec_item(
#[cfg(test)]
mod tests {
use crate::{
comp::inventory::trade_pricing::{TradePricing, lootspec_to_vec_item},
comp::inventory::trade_pricing::{lootspec_to_vec_item, TradePricing},
lottery::LootSpec,
trade::Good,
};