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

clean up double rescaling

Browse Source
This commit is contained in:
Christof Petig
2022-01-31 20:52:25 +01:00
parent 6b9180bba6
commit 47aba3e4cd
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,4 @@
#![warn(clippy::pedantic)] #![warn(clippy::pedantic)]
//#![warn(clippy::nursery)]
use crate::{ use crate::{
assets::{self, AssetExt}, assets::{self, AssetExt},
@ -27,7 +26,6 @@ pub struct TradePricing {
// good_scaling of coins // good_scaling of coins
coin_scale: f32, coin_scale: f32,
// rng: ChaChaRng,
// get amount of material per item // get amount of material per item
material_cache: HashMap<String, (Good, f32)>, material_cache: HashMap<String, (Good, f32)>,
@ -112,12 +110,7 @@ impl From<Vec<(f32, LootSpec<String>)>> for ProbabilityFile {
}, },
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 scale = p0 * rescale;
let scale = if total == 0.0 {
1.0
} else {
p0 * rescale / total
};
unscaled unscaled
.iter() .iter()
.map(|(p1, asset, amount)| (*p1 * scale, asset.clone(), *amount)) .map(|(p1, asset, amount)| (*p1 * scale, asset.clone(), *amount))
@ -370,12 +363,11 @@ impl TradePricing {
} }
let (frequency, can_sell, asset_path) = table; let (frequency, can_sell, asset_path) = table;
let loot = ProbabilityFile::load_expect(asset_path); let loot = ProbabilityFile::load_expect(asset_path);
let new_scale = frequency / loot.read().content.iter().fold(0.0, |s, i| s + i.0);
for (p, item_asset, amount) in &loot.read().content { for (p, item_asset, amount) in &loot.read().content {
result.get_list_by_path_mut(item_asset).add( result.get_list_by_path_mut(item_asset).add(
&eqset, &eqset,
item_asset, item_asset,
new_scale * p * *amount, frequency * p * *amount,
*can_sell, *can_sell,
); );
} }
@ -487,7 +479,6 @@ impl TradePricing {
loop { loop {
let index = let index =
(rand::random::<f32>() * ((upper - lower) as f32)).floor() as usize + lower; (rand::random::<f32>() * ((upper - lower) as f32)).floor() as usize + lower;
//.gen_range(lower..upper);
if table.get(index).map_or(false, |i| !selling || i.2) { if table.get(index).map_or(false, |i| !selling || i.2) {
break table.get(index).map(|i| i.0.clone()); break table.get(index).map(|i| i.0.clone());
} }