diff --git a/CHANGELOG.md b/CHANGELOG.md index a34bfbec53..a0add171a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Animations for using consumables. - New danari character customizations - Bald hairstyles for humans and danari -- AI for sceptre weilders and sceptre cultists in Tier 5 dungeons +- AI for sceptre wielders and sceptre cultists in Tier 5 dungeons - HUD debug info now displays current biome and site ### Changed diff --git a/assets/voxygen/element/ui/char_select/icons/bin.png b/assets/voxygen/element/ui/char_select/icons/bin.png new file mode 100644 index 0000000000..6250843e0d --- /dev/null +++ b/assets/voxygen/element/ui/char_select/icons/bin.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7efe9c5b2e397f51990c1e23c64da03087ce6cd3e8a10f076c82e2396e5d9730 +size 238 diff --git a/assets/voxygen/element/ui/char_select/icons/bin_hover.png b/assets/voxygen/element/ui/char_select/icons/bin_hover.png new file mode 100644 index 0000000000..3b7fca004f --- /dev/null +++ b/assets/voxygen/element/ui/char_select/icons/bin_hover.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5114e6f5dacce502eae6ec270ffac478813103ebb9fe9f8aadb93f705b955159 +size 230 diff --git a/assets/voxygen/element/ui/char_select/icons/bin_press.png b/assets/voxygen/element/ui/char_select/icons/bin_press.png new file mode 100644 index 0000000000..1c5430d75c --- /dev/null +++ b/assets/voxygen/element/ui/char_select/icons/bin_press.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bc67f1ee0275fa9dad1d47245a5d6e6d8e2b93b42bbef56c96b5398fdc2dc87 +size 238 diff --git a/assets/voxygen/element/ui/char_select/icons/dice_hover.png b/assets/voxygen/element/ui/char_select/icons/dice_hover.png index 7704ab71ac..4c1f9088d1 100644 --- a/assets/voxygen/element/ui/char_select/icons/dice_hover.png +++ b/assets/voxygen/element/ui/char_select/icons/dice_hover.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c00e06f7929955e39e970ca03d32ac9f9a4f1d036beead75c036daf1ae59261 -size 283 +oid sha256:373e180741338afb3b7a1c9feb95cbdd57b34703fb9c302f4855f93d591bd824 +size 288 diff --git a/assets/voxygen/element/ui/char_select/icons/dice_press.png b/assets/voxygen/element/ui/char_select/icons/dice_press.png index 4c1f9088d1..7704ab71ac 100644 --- a/assets/voxygen/element/ui/char_select/icons/dice_press.png +++ b/assets/voxygen/element/ui/char_select/icons/dice_press.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:373e180741338afb3b7a1c9feb95cbdd57b34703fb9c302f4855f93d591bd824 -size 288 +oid sha256:6c00e06f7929955e39e970ca03d32ac9f9a4f1d036beead75c036daf1ae59261 +size 283 diff --git a/assets/voxygen/element/ui/generic/frames/selection.png b/assets/voxygen/element/ui/generic/frames/selection.png index f5ed7a50a8..76bc44e000 100644 --- a/assets/voxygen/element/ui/generic/frames/selection.png +++ b/assets/voxygen/element/ui/generic/frames/selection.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c3a2358eaea44693d3c9d64cea324099289aad0527a2cc3a23385c7aa4dd8cf -size 155 +oid sha256:1859c56ae8bb1eb5a92cf9509ff649eac6d1a0289d5683884c0e88a69b006e32 +size 323 diff --git a/assets/voxygen/element/ui/generic/frames/selection_hover.png b/assets/voxygen/element/ui/generic/frames/selection_hover.png index f967b31b1b..bcd561a6af 100644 --- a/assets/voxygen/element/ui/generic/frames/selection_hover.png +++ b/assets/voxygen/element/ui/generic/frames/selection_hover.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6debfde16c2d183184d8b2168235a12eba81c9e8ef639c2628fdc8436842e4d5 -size 155 +oid sha256:7e8a4145ad945d96d0597af4bd3884ef2885e90b05d4e0c44d9e8d13fc456f4a +size 299 diff --git a/assets/voxygen/element/ui/generic/frames/selection_press.png b/assets/voxygen/element/ui/generic/frames/selection_press.png index 6c56ae6dc5..8ef9cb9921 100644 --- a/assets/voxygen/element/ui/generic/frames/selection_press.png +++ b/assets/voxygen/element/ui/generic/frames/selection_press.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1c327915241d6ecc29caa3cb1599aa42222bec059f37ddd5a7b67e64e4de13e -size 155 +oid sha256:f1cfc9ca6625184f03c495d8b61f1f1eb35acab91a4fcad3cf31b51864293f49 +size 303 diff --git a/voxygen/src/hud/chat.rs b/voxygen/src/hud/chat.rs index c76b1d496e..65f42344c7 100644 --- a/voxygen/src/hud/chat.rs +++ b/voxygen/src/hud/chat.rs @@ -519,7 +519,7 @@ impl<'a> Widget for Chat<'a> { .filter(|t| t <= &1.5) { let alpha = 1.0 - (time_since_hover / 1.5).powi(4); - let shading = color::rgba(1.0, 1.0, 1.0, (chat_settings.chat_transp + 0.1) * alpha); + let shading = color::rgba(1.0, 0.82, 0.27, (chat_settings.chat_transp + 0.1) * alpha); Rectangle::fill([CHAT_BOX_WIDTH, CHAT_TAB_HEIGHT]) .rgba(0.0, 0.0, 0.0, (chat_settings.chat_transp + 0.1) * alpha) diff --git a/voxygen/src/hud/crafting.rs b/voxygen/src/hud/crafting.rs index 5b9135490c..58fe981605 100644 --- a/voxygen/src/hud/crafting.rs +++ b/voxygen/src/hud/crafting.rs @@ -488,7 +488,8 @@ impl<'a> Widget for Crafting<'a> { }) .w(157.0) .hover_image(self.imgs.selection_hover) - .press_image(self.imgs.selection_press); + .press_image(self.imgs.selection_press) + .image_color(color::rgba(1.0, 0.82, 0.27, 1.0)); let text = Text::new(recipe.output.0.name()) .color(if is_craftable { diff --git a/voxygen/src/hud/group.rs b/voxygen/src/hud/group.rs index be9e688835..663af1772e 100644 --- a/voxygen/src/hud/group.rs +++ b/voxygen/src/hud/group.rs @@ -752,6 +752,7 @@ impl<'a> Widget for Group<'a> { }) .hover_image(self.imgs.selection_hover) .press_image(self.imgs.selection_press) + .image_color(color::rgba(1.0, 0.82, 0.27, 1.0)) .crop_kids() .label_x(Relative::Place(Place::Start(Some(4.0)))) .label(&char_name) diff --git a/voxygen/src/hud/settings_window/chat.rs b/voxygen/src/hud/settings_window/chat.rs index 8c5b3ba816..4a211cfcf8 100644 --- a/voxygen/src/hud/settings_window/chat.rs +++ b/voxygen/src/hud/settings_window/chat.rs @@ -277,6 +277,7 @@ impl<'a> Widget for Chat<'a> { .w_h(390.0 / (MAX_CHAT_TABS as f64), 19.0) .hover_image(self.imgs.selection_hover) .press_image(self.imgs.selection_press) + .image_color(color::rgba(1.0, 0.82, 0.27, 1.0)) .label(chat_tab.label.as_str()) .label_font_size(self.fonts.cyri.scale(12)) .label_font_id(self.fonts.cyri.conrod_id) diff --git a/voxygen/src/hud/settings_window/mod.rs b/voxygen/src/hud/settings_window/mod.rs index 874ae01bad..58453ad905 100644 --- a/voxygen/src/hud/settings_window/mod.rs +++ b/voxygen/src/hud/settings_window/mod.rs @@ -224,6 +224,7 @@ impl<'a> Widget for SettingsWindow<'a> { .w_h(230.0, 48.0) .hover_image(self.imgs.selection_hover) .press_image(self.imgs.selection_press) + .image_color(color::rgba(1.0, 0.82, 0.27, 1.0)) .label(self.localized_strings.get(settings_tab.name_key())) .label_font_size(self.fonts.cyri.scale(tab_font_scale)) .label_font_id(self.fonts.cyri.conrod_id) diff --git a/voxygen/src/hud/social.rs b/voxygen/src/hud/social.rs index 1962c6de5c..fb8d9e0c9f 100644 --- a/voxygen/src/hud/social.rs +++ b/voxygen/src/hud/social.rs @@ -284,7 +284,8 @@ impl<'a> Widget for Social<'a> { } else { self.imgs.selection_press }) - .w_h(260.0, 20.0); + .w_h(260.0, 20.0) + .image_color(color::rgba(1.0, 0.82, 0.27, 1.0)); let button = if i == 0 { button.mid_top_with_margin_on(state.ids.online_align, 1.0) } else { diff --git a/voxygen/src/menu/char_selection/ui/mod.rs b/voxygen/src/menu/char_selection/ui/mod.rs index 55add069e1..5aa34f1639 100644 --- a/voxygen/src/menu/char_selection/ui/mod.rs +++ b/voxygen/src/menu/char_selection/ui/mod.rs @@ -16,7 +16,7 @@ use crate::{ }, Element, IcedRenderer, IcedUi as Ui, }, - img_ids::{BlankGraphic, ImageGraphic}, + img_ids::ImageGraphic, }, window, GlobalState, }; @@ -71,9 +71,9 @@ image_ids_ice! { selection_hover: "voxygen.element.ui.generic.frames.selection_hover", selection_press: "voxygen.element.ui.generic.frames.selection_press", - delete_button: "voxygen.element.ui.generic.buttons.x_red", - delete_button_hover: "voxygen.element.ui.generic.buttons.x_red_hover", - delete_button_press: "voxygen.element.ui.generic.buttons.x_red_press", + delete_button: "voxygen.element.ui.char_select.icons.bin", + delete_button_hover: "voxygen.element.ui.char_select.icons.bin_hover", + delete_button_press: "voxygen.element.ui.char_select.icons.bin_press", name_input: "voxygen.element.ui.generic.textbox", @@ -116,9 +116,6 @@ image_ids_ice! { // Tooltips tt_edge: "voxygen.element.ui.generic.frames.tooltip.edge", tt_corner: "voxygen.element.ui.generic.frames.tooltip.corner", - - - nothing: (), } } @@ -407,6 +404,7 @@ impl Controls { .style(style::container::Style::color(Rgba::new(0, 0, 0, 217))) .padding(12) .center_x() + .center_y() .width(Length::Fill); let characters = { @@ -433,31 +431,26 @@ impl Controls { .enumerate() .map( |(i, (character_id, character, (select_button, delete_button)))| { + let select_col = if Some(i) == selected { + (255, 208, 69) + } else { + (255, 255, 255) + }; Overlay::new( - // Delete button - Button::new( - delete_button, - Space::new(Length::Units(16), Length::Units(16)), + Container::new( + // Delete button + Button::new( + delete_button, + Space::new(Length::Units(16), Length::Units(16)), + ) + .style( + style::button::Style::new(imgs.delete_button) + .hover_image(imgs.delete_button_hover) + .press_image(imgs.delete_button_press), + ) + .on_press(Message::Delete(i)), ) - .style( - style::button::Style::new(if Some(i) != selected { - imgs.nothing - } else { - imgs.delete_button - }) - .hover_image(imgs.delete_button_hover) - .press_image(imgs.delete_button_press), - ) - .on_press(Message::Delete(i)) - .with_tooltip( - tooltip_manager, - move || { - tooltip::text( - i18n.get("char_selection.delete_permanently"), - tooltip_style, - ) - }, - ), + .padding(4), // Select Button AspectRatioContainer::new( Button::new( @@ -467,7 +460,7 @@ impl Controls { .size(fonts.cyri.scale(26)) .into(), Text::new( - i18n.get("char_selection.uncanny_valley"), + i18n.get("char_selection.uncanny_valley"), // TODO: Add actual location here ) .into(), ]), @@ -477,10 +470,16 @@ impl Controls { style::button::Style::new(if Some(i) == selected { imgs.selection_hover } else { - imgs.nothing + imgs.selection }) .hover_image(imgs.selection_hover) - .press_image(imgs.selection_press), + .press_image(imgs.selection_press) + .image_color(Rgba::new( + select_col.0, + select_col.1, + select_col.2, + 255, + )), ) .width(Length::Fill) .height(Length::Fill) @@ -488,8 +487,9 @@ impl Controls { ) .ratio_of_image(imgs.selection), ) - .padding(2) + .padding(0) .align_x(Align::End) + .align_y(Align::End) .into() }, )