From afcb3eb1e7982d5d7ea080cd23265e1de6adc0e0 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Mon, 12 Jul 2021 15:02:40 +0200 Subject: [PATCH] char selection frames, adjustments --- CHANGELOG.md | 2 +- .../element/ui/char_select/icons/bin.png | Bin 0 -> 238 bytes .../ui/char_select/icons/bin_hover.png | Bin 0 -> 230 bytes .../ui/char_select/icons/bin_press.png | Bin 0 -> 238 bytes .../ui/char_select/icons/dice_hover.png | Bin 283 -> 288 bytes .../ui/char_select/icons/dice_press.png | Bin 288 -> 283 bytes .../element/ui/generic/frames/selection.png | Bin 155 -> 323 bytes .../ui/generic/frames/selection_hover.png | Bin 155 -> 299 bytes .../ui/generic/frames/selection_press.png | Bin 155 -> 303 bytes voxygen/src/hud/chat.rs | 2 +- voxygen/src/hud/crafting.rs | 3 +- voxygen/src/hud/group.rs | 1 + voxygen/src/hud/settings_window/chat.rs | 1 + voxygen/src/hud/settings_window/mod.rs | 1 + voxygen/src/hud/social.rs | 3 +- voxygen/src/menu/char_selection/ui/mod.rs | 68 +++++++++--------- 16 files changed, 43 insertions(+), 38 deletions(-) create mode 100644 assets/voxygen/element/ui/char_select/icons/bin.png create mode 100644 assets/voxygen/element/ui/char_select/icons/bin_hover.png create mode 100644 assets/voxygen/element/ui/char_select/icons/bin_press.png 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 0000000000000000000000000000000000000000..02a01ae4cd8c30dc00ae31f479ce9733164dc6c0 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP*5S+ zBgmJ5p-Pp3p`n?9;pcxK{gQ#9)PRBERRRNp)eHs(@%%~gN8NyGOFUg1Ln>~)nS7D6 z!9c)SxN!RJ#*$NI3#@$q2-!dSBbeS0s?9r)kI??OQ<7V}#dPDk|1+(uz5N6xxbLQQy-wrqb gUh&ws_Olhkfd!fSCcfSo2ehBT)78&qol`;+09q+m#{d8T literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..177aaa4bac38f4988eb1e300894b9982693c65ec GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP*5S+ zBgmJ5p-Pp3p`n?9;pcxK{gQ#9)PRBERRRNp)eHs(@%%~gN8NyGb39!fLn>~)nHg z`xSdb(xQ&}tdZnkh~P@&*lBn)VTtnoPTOR*(|_3J8=Qzeedp_s#yh*+KIP8+&d6}9 XAXDMyveUUhdl@`k{an^LB{Ts5hx1My literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0189d787606de0277b45bdea89fd03ca5331cd39 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP*5S+ zBgmJ5p-Pp3p`n?9;pcxK{gQ#9)PRBERRRNp)eHs(@%%~gN8NyGOFUg1Ln>~)nS7D6 z!9c)SxUg;a+gmqFcJFfeBWT+lvadm?gqn4Gs zXFPez)bO_N+jKSKuanLk(Pd^lut%rD=|rzHkDJw}>J8~<7RfUINCXP*HWD8!W63NyQgQ=oW|Dz&Yr)L_ z{M=egteM`0-FMmB!4GROjJby000000Kb(0v$M0z%*_A)|J~i)`19oW^yT^W=pG&( z^6ugH^WkN=uJ-@{00DGTPE!Ct=GbNc005#%L_t(|+O5(@nuI_ML*WrsGV%WB9k)K4 z=^Wb!T0krOZlWw0yx;dnV&OCMlnoXGKV0z-1| z-E17k(+SKjtRPR|*jl@=g3WmqUKogAWFSy*=P0~znn$EqE4cv`Yr!hYYg6!(@3+wL)Kbe9vLmHleI8b^G#3#H5q!n2F$aNrmYybBZ2G`_;Y()S7002ovPDHLk FV1hzYdPo2O 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 76dee561812a61e4b13cac34abd9147f8a67659f..2d755a8c322a1cd104659d1fb699f91ef9ca1a46 100644 GIT binary patch delta 255 zcmV0-FMmB!4GROjJby000000Kb(0v$M0z%*_A)|J~i)`19oW^yT^W=pG&( z^6ugH^WkN=uJ-@{00DGTPE!Ct=GbNc005#%L_t(|+O5(@nuI_ML*WrsGV%WB9k)K4 z=^Wb!T0krOZlWw0yx;dnV&OCMlnoXGKV0z-1| z-E17k(+SKjtRPR|*jl@=g3WmqUKogAWFSy*=P0~znn$EqE4cv`Yr!hYYg6!(@3+wL)Kbe9vLmHleI8b^G#3#H5q!n2F$aNrmYybBZ2G`_;Y()S7002ovPDHLk FV1hzYdPo2O delta 260 zcmV+f0sH=&0-yqrB!4PUOjJby000000RP4Sv$M0z%*_A)|J~i)`19od`Q`rjfUINCXP*HWD8!W63NyQgQ=oW|Dz&Yr)L_ z{M=egteM`8&EL#Y7+!>a@a2CEqi4C48d;*Yuk)t>ZpaSW-r_2%wI zUS>rBSH}(OTHf|3t;p=Yaqa~p`?ZtTn?Cw@{P?;>)7CiJr?}rRDs=1hzZyk;pL2et^8IVPAZW!Q+rsC>zOea%;|qlnB&GmJ zrVlI%Wzeg;ohKbLh*2~7YF$SU;! diff --git a/assets/voxygen/element/ui/generic/frames/selection_hover.png b/assets/voxygen/element/ui/generic/frames/selection_hover.png index f939aec320eac4c5152a67ea53f4af4f8879a5b4..51140c19edc3dcb23779b0a6b85e56157be45711 100644 GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^yMS1qgAGWAEWN-8q&N#aB8wRqxP?KOkzv*x380`t zvPY0F14ET614BbI1H;e%K>8&EL#Y7+!>a@a2CEqi4C48d;*Yuk)o%23aSW-r_2%wI z-Ub66SI7Dz|FmZ_H3>*3ywkdVZSqvTm+w}s(wm|EyUV7t)Zm=eli%7!Ta8zJR=Ik2 ztL^#Sdkx;6+|+hf?+5cjx3D*Uw-)-`RnoQk{Q9jW|lvdiYZn*4fOB-|I7?BnNs1QIaB$8j%V<6^>bP0l+XkK DmXK-L literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^DL^dA!VDx$3#L^7DbWC*5LY1m|AK2%EJJS&!@Np{ z!T<(KEruV-UQ$2_#*!evUzeg;ohKbLh*2~7YAfhx2B diff --git a/assets/voxygen/element/ui/generic/frames/selection_press.png b/assets/voxygen/element/ui/generic/frames/selection_press.png index c2b117232d546088948f06b3ab8589bf24a41d41..7fc0e518ce7029ee685935eb9c2f2a3176d6bad0 100644 GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^yMS1qgAGWAEWN-8q&N#aB8wRqxP?KOkzv*x380`t zvPY0F14ET614BbI1H;e%K>8&EL#Y7+!>a@a2CEqi4C48d;*Yuk)o%54aSW-r_2$Y( z-op+&EROpY#6?~X{q3joFxtRY*vLj_$E1+Zw@o{*{dKu__gTW6=M(RzKk=NFIb+f8 z^78OWyZS!4p4*cD&#ZQ4bG<@I3!fAF!sZK(FBD1ytT<$mm|z)YuqcuuBqm6GOCMP4 zkEs`SSI=(tJhv=-(qG%Cw!%q!7KVrZeCD&w4(Q_l|Ct#kS}S}mWMp3k 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() }, )