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

Merge branch 'pfau/smöl_fixes' into 'master'

Browse Source 
change merchant backpack visuals and add mining skill icons

See merge request veloren/veloren!3089
This commit is contained in:
Monty Marz 2022-01-08 09:32:51 +00:00
commit bc1c84aa76
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/common/loadout/village/merchant.ron
View File

@ -6,7 +6,6 @@
Armor(Feet): Item("common.items.armor.merchant.foot"), Armor(Feet): Item("common.items.armor.merchant.foot"),
Armor(Belt): Item("common.items.armor.merchant.belt"), Armor(Belt): Item("common.items.armor.merchant.belt"),
Armor(Head): Item("common.items.armor.merchant.turban"), Armor(Head): Item("common.items.armor.merchant.turban"),
Lantern: Item("common.items.lantern.black_0"), Lantern: Item("common.items.lantern.black_0"),
Armor(Neck): Item("common.items.armor.misc.neck.gem_of_resilience"), Armor(Neck): Item("common.items.armor.misc.neck.gem_of_resilience"),
Armor(Ring1): Item("common.items.armor.misc.ring.gold"), Armor(Ring1): Item("common.items.armor.misc.ring.gold"),

2
voxygen/src/hud/util.rs
View File

@ -351,6 +351,8 @@ pub fn ability_image(imgs: &img_ids::Imgs, ability_id: &str) -> image::Id {
"common.abilities.shield.block" => imgs.onehshield_m2, "common.abilities.shield.block" => imgs.onehshield_m2,
// Dagger // Dagger
"common.abilities.dagger.tempbasic" => imgs.onehdagger_m1, "common.abilities.dagger.tempbasic" => imgs.onehdagger_m1,
// Pickaxe
"common.abilities.pick.swing" => imgs.mining,
_ => imgs.not_found, _ => imgs.not_found,
} }

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

@ -1108,7 +1108,7 @@ fn weapon_bag(economy: Option<&trade::SiteInformation>) -> Item {
fn ingredient_backpack(economy: Option<&trade::SiteInformation>, rng: &mut impl Rng) -> Item { fn ingredient_backpack(economy: Option<&trade::SiteInformation>, rng: &mut impl Rng) -> Item {
#![warn(clippy::pedantic)] #![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(); let slots = bag.slots_mut();
// It's safe to truncate here, because coins clamped to 3000 max // It's safe to truncate here, because coins clamped to 3000 max