diff --git a/assets/common/loadout/village/merchant.ron b/assets/common/loadout/village/merchant.ron index eea18d6c36..91ff58b185 100644 --- a/assets/common/loadout/village/merchant.ron +++ b/assets/common/loadout/village/merchant.ron @@ -6,7 +6,6 @@ Armor(Feet): Item("common.items.armor.merchant.foot"), Armor(Belt): Item("common.items.armor.merchant.belt"), Armor(Head): Item("common.items.armor.merchant.turban"), - Lantern: Item("common.items.lantern.black_0"), Armor(Neck): Item("common.items.armor.misc.neck.gem_of_resilience"), Armor(Ring1): Item("common.items.armor.misc.ring.gold"), diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index db744abbdd..53b303f6c2 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -351,6 +351,8 @@ pub fn ability_image(imgs: &img_ids::Imgs, ability_id: &str) -> image::Id { "common.abilities.shield.block" => imgs.onehshield_m2, // Dagger "common.abilities.dagger.tempbasic" => imgs.onehdagger_m1, + // Pickaxe + "common.abilities.pick.swing" => imgs.mining, _ => imgs.not_found, } diff --git a/world/src/site/settlement/mod.rs b/world/src/site/settlement/mod.rs index 8af5f4c7bd..a95749655e 100644 --- a/world/src/site/settlement/mod.rs +++ b/world/src/site/settlement/mod.rs @@ -1108,7 +1108,7 @@ fn weapon_bag(economy: Option<&trade::SiteInformation>) -> 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.back.backpack"); + let mut bag = Item::new_from_asset_expect("common.items.armor.merchant.back"); let slots = bag.slots_mut(); // It's safe to truncate here, because coins clamped to 3000 max