diff --git a/assets/voxygen/element/ui/crafting/icons/ingot.png b/assets/voxygen/element/ui/crafting/icons/ingot.png new file mode 100644 index 0000000000..285840a681 --- /dev/null +++ b/assets/voxygen/element/ui/crafting/icons/ingot.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c2f81a51114406948fee7c660d7554d9ee2177c71857e5d3a5a5c5352ed4430 +size 622 diff --git a/assets/voxygen/element/ui/crafting/icons/log.png b/assets/voxygen/element/ui/crafting/icons/log.png new file mode 100644 index 0000000000..031e066fd7 --- /dev/null +++ b/assets/voxygen/element/ui/crafting/icons/log.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c45bcc007f2cda5aa17c304c8c5aa9437c0dd128fc9c7d3633bb62975877d41 +size 631 diff --git a/assets/voxygen/element/ui/crafting/icons/pelt.png b/assets/voxygen/element/ui/crafting/icons/pelt.png new file mode 100644 index 0000000000..97f975ba9f --- /dev/null +++ b/assets/voxygen/element/ui/crafting/icons/pelt.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e638b77a04a66d6133d5d872cd81064a2c05b393073d18c2af848d80fb16aaf0 +size 556 diff --git a/voxygen/src/hud/crafting.rs b/voxygen/src/hud/crafting.rs index dafc91a744..58c2f3a0b7 100644 --- a/voxygen/src/hud/crafting.rs +++ b/voxygen/src/hud/crafting.rs @@ -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) diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 161d5dde9b..af3c6cd6a6 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -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",