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) Use backpack item for merchant's ingredients

Browse Source
This commit is contained in:
juliancoffee 2021-07-05 16:11:12 +03:00
parent 3ee123b745
commit 1ed9d8d455
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
world/src/site/settlement/mod.rs
View File

@ -1038,7 +1038,7 @@ fn merchant_loadout(
let rng = &mut rand::thread_rng();
// Fill backpack with ingredients and coins
let backpack = ingredient_bag(economy, rng);
let backpack = ingredient_backpack(economy, rng);
// Fill bags with stuff
let (food_bag, potion_bag) = consumable_bags(economy, rng);
@ -1066,7 +1066,7 @@ fn sort_bag(bag: &mut Item) {
fn armor_bag(economy: Option<&trade::SiteInformation>) -> Item {
#![warn(clippy::pedantic)]
let mut bag = Item::new_from_asset_expect("common.items.armor.misc.back.backpack");
let mut bag = Item::new_from_asset_expect("common.items.armor.misc.bag.sturdy_red_backpack");
let armor_items = economy
.and_then(|e| e.unconsumed_stock.get(&Good::Armor))
@ -1115,10 +1115,10 @@ fn weapon_bag(economy: Option<&trade::SiteInformation>) -> Item {
bag
}
fn ingredient_bag(economy: Option<&trade::SiteInformation>, rng: &mut impl Rng) -> Item {
fn ingredient_backpack(economy: Option<&trade::SiteInformation>, rng: &mut impl Rng) -> Item {
#![warn(clippy::pedantic)]
let mut bag = Item::new_from_asset_expect("common.items.armor.misc.bag.sturdy_red_backpack");
let mut bag = Item::new_from_asset_expect("common.items.armor.misc.back.backpack");
let slots = bag.slots_mut();
// It's safe to truncate here, because coins clamped to 3000 max