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

bg icons

Browse Source
This commit is contained in:
Monty Marz 2022-03-29 23:48:17 +02:00 committed by Sam
parent af1a44264a
commit c3f92622c1
5 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/element/ui/crafting/icons/ingot.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/ui/crafting/icons/log.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/ui/crafting/icons/pelt.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

24
voxygen/src/hud/crafting.rs
View File

@ -1052,6 +1052,26 @@ impl<'a> Widget for Crafting<'a> {
let prim_item_placed = primary_slot.invslot.is_some();
let sec_item_placed = secondary_slot.invslot.is_some();
let prim_icon = match recipe_kind {
RecipeKind::Component(ToolKind::Sword) => self.imgs.ing_ico_prim,
RecipeKind::Component(ToolKind::Axe) => self.imgs.ing_ico_prim,
RecipeKind::Component(ToolKind::Hammer) => self.imgs.ing_ico_prim,
RecipeKind::Component(ToolKind::Bow) => self.imgs.ing_ico_prim,
RecipeKind::Component(ToolKind::Staff) => self.imgs.ing_ico_prim,
RecipeKind::Component(ToolKind::Sceptre) => self.imgs.ing_ico_prim,
_ => self.imgs.ing_ico_prim,
};
let sec_icon = match recipe_kind {
RecipeKind::Component(ToolKind::Sword) => self.imgs.ing_ico_sec,
RecipeKind::Component(ToolKind::Axe) => self.imgs.ing_ico_sec,
RecipeKind::Component(ToolKind::Hammer) => self.imgs.ing_ico_sec,
RecipeKind::Component(ToolKind::Bow) => self.imgs.ing_ico_sec,
RecipeKind::Component(ToolKind::Staff) => self.imgs.ing_ico_sec,
RecipeKind::Component(ToolKind::Sceptre) => self.imgs.ing_ico_sec,
_ => self.imgs.ing_ico_sec,
};
// Output Image
Image::new(self.imgs.inv_slot)
.w_h(80.0, 80.0)
@ -1060,7 +1080,7 @@ impl<'a> Widget for Crafting<'a> {
.set(state.ids.output_img_frame, ui);
let bg_col = Color::Rgba(1.0, 1.0, 1.0, 0.4);
if !prim_item_placed {
Image::new(self.imgs.ing_ico_prim)
Image::new(prim_icon)
.middle_of(state.ids.modular_inputs[0])
.color(Some(bg_col))
.w_h(34.0, 34.0)
@ -1068,7 +1088,7 @@ impl<'a> Widget for Crafting<'a> {
.set(state.ids.modular_wep_ing_1_bg, ui);
}
if !sec_item_placed {
Image::new(self.imgs.ing_ico_sec)
Image::new(sec_icon)
.middle_of(state.ids.modular_inputs[1])
.color(Some(bg_col))
.w_h(50.0, 50.0)

3
voxygen/src/hud/img_ids.rs
View File

@ -113,6 +113,9 @@ image_ids! {
crafting_icon_hover: "voxygen.element.ui.generic.buttons.anvil_hover",
crafting_icon_press: "voxygen.element.ui.generic.buttons.anvil_press",
quality_indicator: "voxygen.element.ui.crafting.quality_indicator",
icon_pelt: "voxygen.element.ui.crafting.icons.pelt",
icon_ingot: "voxygen.element.ui.crafting.icons.ingot",
icon_log: "voxygen.element.ui.crafting.icons.log",
icon_armor: "voxygen.element.ui.crafting.icons.armors",
icon_tools: "voxygen.element.ui.crafting.icons.crafting_tools",
icon_dismantle: "voxygen.element.ui.crafting.icons.dismantle",