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

Remove coin counter at the bottom of inventories.

Browse Source
This commit is contained in:
Avi Weinstock 2023-06-26 10:55:01 -04:00
parent 2a4187e769
commit 7f06607899
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1090,6 +1090,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Removed ### Removed
- Remove heaptrack as it is now deprecated - Remove heaptrack as it is now deprecated
- Remove coin counter at the bottom of inventories.
## [0.4.0] - 2019-10-10 ## [0.4.0] - 2019-10-10

11
voxygen/src/hud/bag.rs
View File

@ -497,15 +497,16 @@ impl<'a> InventoryScroller<'a> {
let space_max = self.inventory.slots().count(); let space_max = self.inventory.slots().count();
let bag_space = format!("{}/{}", space_used, space_max); let bag_space = format!("{}/{}", space_used, space_max);
let bag_space_percentage = space_used as f32 / space_max as f32; let bag_space_percentage = space_used as f32 / space_max as f32;
let coin_itemdef = Arc::<ItemDef>::load_expect_cloned("common.items.utility.coins"); //let coin_itemdef =
let coin_count = self.inventory.item_count(&coin_itemdef); // Arc::<ItemDef>::load_expect_cloned("common.items.utility.coins"); let
// TODO: Reuse this to generally count a stackable item the player selected // coin_count = self.inventory.item_count(&coin_itemdef); TODO: Reuse
// this to generally count a stackable item the player selected
// let cheese_itemdef = // let cheese_itemdef =
// Arc::<ItemDef>::load_expect_cloned("common.items.food.cheese"); // Arc::<ItemDef>::load_expect_cloned("common.items.food.cheese");
// let cheese_count = self.inventory.item_count(&cheese_itemdef); // let cheese_count = self.inventory.item_count(&cheese_itemdef);
// Coin Icon and Coin Text // Coin Icon and Coin Text
Image::new(self.imgs.coin_ico) /*Image::new(self.imgs.coin_ico)
.w_h(16.0, 17.0) .w_h(16.0, 17.0)
.bottom_left_with_margins_on(self.bg_ids.bg_frame, 2.0, 43.0) .bottom_left_with_margins_on(self.bg_ids.bg_frame, 2.0, 43.0)
.set(state.ids.coin_ico, ui); .set(state.ids.coin_ico, ui);
@ -514,7 +515,7 @@ impl<'a> InventoryScroller<'a> {
.font_id(self.fonts.cyri.conrod_id) .font_id(self.fonts.cyri.conrod_id)
.font_size(self.fonts.cyri.scale(14)) .font_size(self.fonts.cyri.scale(14))
.color(Color::Rgba(0.871, 0.863, 0.05, 1.0)) .color(Color::Rgba(0.871, 0.863, 0.05, 1.0))
.set(state.ids.coin_txt, ui); .set(state.ids.coin_txt, ui);*/
// TODO: Add a customizable counter for stackable items here // TODO: Add a customizable counter for stackable items here
// TODO: Cheese is funny until it's real // TODO: Cheese is funny until it's real
/*Image::new(self.imgs.cheese_ico) /*Image::new(self.imgs.cheese_ico)