diff --git a/assets/voxygen/element/frames/gray/corner.png b/assets/voxygen/element/frames/gray/corner.png
deleted file mode 100644
index 3198145f21..0000000000
--- a/assets/voxygen/element/frames/gray/corner.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a0552a82f1ed00e0b66cd4c3c16aa4b6e8b882f016e4f5ff75a6d504ec4531c7
-size 142
diff --git a/assets/voxygen/element/frames/gray/edge.png b/assets/voxygen/element/frames/gray/edge.png
deleted file mode 100644
index 1908f56c8a..0000000000
--- a/assets/voxygen/element/frames/gray/edge.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:11efb91e86e260754ebcb39a6b3f1904a3f9040b250f74e5db06f8e3d99b3a3b
-size 133
diff --git a/voxygen/src/menu/char_selection/mod.rs b/voxygen/src/menu/char_selection/mod.rs
index f312da2705..7fc03783de 100644
--- a/voxygen/src/menu/char_selection/mod.rs
+++ b/voxygen/src/menu/char_selection/mod.rs
@@ -111,6 +111,9 @@ impl PlayState for CharSelectionState {
Rc::clone(&self.client),
)));
},
+ ui::Event::ClearCharacterListError => {
+ self.client.borrow_mut().character_list.error = None;
+ },
}
}
diff --git a/voxygen/src/menu/char_selection/old_ui.rs b/voxygen/src/menu/char_selection/old_ui.rs
deleted file mode 100644
index bf3ae697af..0000000000
--- a/voxygen/src/menu/char_selection/old_ui.rs
+++ /dev/null
@@ -1,1609 +0,0 @@
-use crate::{
- i18n::{i18n_asset_key, Localization},
- render::{Consts, Globals, Renderer},
- ui::{
- fonts::Fonts,
- img_ids::{BlankGraphic, ImageGraphic, VoxelGraphic, VoxelSs9Graphic},
- ImageFrame, ImageSlider, Tooltip, Tooltipable, Ui,
- },
- window::{Event as WinEvent, PressState},
- GlobalState,
-};
-use client::Client;
-use common::{
- assets::Asset,
- character::{Character, CharacterId, CharacterItem, MAX_CHARACTERS_PER_PLAYER},
- comp::{self, humanoid},
- npc, LoadoutBuilder,
-};
-use conrod_core::{
- color,
- color::TRANSPARENT,
- event::{Event as WorldEvent, Input},
- input::{Button as ButtonType, Key},
- position::Relative,
- widget::{text_box::Event as TextBoxEvent, Button, Image, Rectangle, Scrollbar, Text, TextBox},
- widget_ids, Borderable, Color, Colorable, Labelable, Positionable, Sizeable, UiCell, Widget,
-};
-use rand::{thread_rng, Rng};
-
-const STARTER_HAMMER: &str = "common.items.weapons.hammer.starter_hammer";
-const STARTER_BOW: &str = "common.items.weapons.bow.starter_bow";
-const STARTER_AXE: &str = "common.items.weapons.axe.starter_axe";
-const STARTER_STAFF: &str = "common.items.weapons.staff.starter_staff";
-const STARTER_SWORD: &str = "common.items.weapons.sword.starter_sword";
-const STARTER_SCEPTRE: &str = "common.items.weapons.sceptre.starter_sceptre";
-// // Use in future MR to make this a starter weapon
-
-// UI Color-Theme
-const UI_MAIN: Color = Color::Rgba(0.61, 0.70, 0.70, 1.0); // Greenish Blue
-//const UI_HIGHLIGHT_0: Color = Color::Rgba(0.79, 1.09, 1.09, 1.0);
-
-widget_ids! {
- struct Ids {
- // Background and logo
- charlist_bg,
- charlist_frame,
- charlist_bottom,
- selection_bot,
- charlist_alignment,
- selection_scrollbar,
- creation_bot,
- creation_frame,
- creation_alignment,
- server_name_text,
- change_server,
- server_frame_bg,
- server_frame,
- v_logo,
- version,
- divider,
- bodyspecies_text,
- facialfeatures_text,
- info_bg,
- info_frame,
- info_button_align,
- info_ok,
- info_no,
- delete_text,
- space,
- loading_characters_text,
- creating_character_text,
- deleting_character_text,
- character_error_message,
-
- //Alpha Disclaimer
- alpha_text,
-
-
- // Characters
- character_boxes[],
- character_deletes[],
- character_names[],
- character_locations[],
- character_levels[],
-
- character_box_2,
- character_name_2,
- character_location_2,
- character_level_2,
-
-
- // Windows
- selection_window,
- char_name,
- char_level,
- creation_window,
- select_window_title,
- creation_buttons_alignment_1,
- creation_buttons_alignment_2,
- weapon_heading,
- weapon_description,
- human_skin_bg,
- orc_skin_bg,
- dwarf_skin_bg,
- undead_skin_bg,
- elf_skin_bg,
- danari_skin_bg,
- name_input_bg,
- info,
-
- // Sliders
- hairstyle_slider,
- hairstyle_text,
- haircolor_slider,
- haircolor_text,
- skin_slider,
- skin_text,
- eyecolor_slider,
- eyecolor_text,
- eyebrows_slider,
- eyebrows_text,
- beard_slider,
- beard_text,
- accessories_slider,
- accessories_text,
- chest_slider,
- chest_text,
- pants_slider,
- pants_text,
-
- // Buttons
- enter_world_button,
- back_button,
- logout_button,
- create_character_button,
- delete_button,
- create_button,
- name_input,
- name_field,
- species_1,
- species_2,
- species_3,
- species_4,
- species_5,
- species_6,
- body_type_1,
- body_type_2,
- random_button,
-
- // Tools
- sword,
- sword_button,
- sceptre,
- sceptre_button,
- axe,
- axe_button,
- hammer,
- hammer_button,
- bow,
- bow_button,
- staff,
- staff_button,
- // Char Creation
- // Species Icons
- male,
- female,
- human,
- orc,
- dwarf,
- undead,
- elf,
- danari,
- }
-}
-
-image_ids! {
- struct Imgs {
- <VoxelGraphic>
-
- // Info Window
- info_frame: "voxygen.element.frames.info_frame",
-
- <VoxelSs9Graphic>
- delete_button: "voxygen.element.buttons.x_red",
- delete_button_hover: "voxygen.element.buttons.x_red_hover",
- delete_button_press: "voxygen.element.buttons.x_red_press",
-
- <ImageGraphic>
- frame_bot: "voxygen.element.frames.banner_bot",
- selection: "voxygen.element.frames.selection",
- selection_hover: "voxygen.element.frames.selection_hover",
- selection_press: "voxygen.element.frames.selection_press",
-
- name_input: "voxygen.element.misc_bg.textbox",
-
- slider_range: "voxygen.element.slider.track",
- slider_indicator: "voxygen.element.slider.indicator",
-
- // Tool Icons
- sceptre: "voxygen.element.icons.sceptre",
- sword: "voxygen.element.icons.sword",
- axe: "voxygen.element.icons.axe",
- hammer: "voxygen.element.icons.hammer",
- bow: "voxygen.element.icons.bow",
- staff: "voxygen.element.icons.staff",
-
- // Dice icons
- dice: "voxygen.element.icons.dice",
- dice_hover: "voxygen.element.icons.dice_hover",
- dice_press: "voxygen.element.icons.dice_press",
-
- // Species Icons
- human_m: "voxygen.element.icons.human_m",
- human_f: "voxygen.element.icons.human_f",
- orc_m: "voxygen.element.icons.orc_m",
- orc_f: "voxygen.element.icons.orc_f",
- dwarf_m: "voxygen.element.icons.dwarf_m",
- dwarf_f: "voxygen.element.icons.dwarf_f",
- undead_m: "voxygen.element.icons.ud_m",
- undead_f: "voxygen.element.icons.ud_f",
- elf_m: "voxygen.element.icons.elf_m",
- elf_f: "voxygen.element.icons.elf_f",
- danari_m: "voxygen.element.icons.danari_m",
- danari_f: "voxygen.element.icons.danari_f",
- //unknown: "voxygen.element.icons.missing_icon_grey",
- // Icon Borders
- icon_border: "voxygen.element.buttons.border",
- icon_border_mo: "voxygen.element.buttons.border_mo",
- icon_border_press: "voxygen.element.buttons.border_press",
- icon_border_pressed: "voxygen.element.buttons.border_pressed",
-
- <ImageGraphic>
- button: "voxygen.element.buttons.button",
- button_hover: "voxygen.element.buttons.button_hover",
- button_press: "voxygen.element.buttons.button_press",
-
- <BlankGraphic>
- nothing: (),
- }
-}
-rotation_image_ids! {
- pub struct ImgsRot {
- <ImageGraphic>
- // Tooltip Test
- tt_side: "voxygen/element/frames/tt_test_edge",
- tt_corner: "voxygen/element/frames/tt_test_corner_tr",
- }
-}
-
-pub enum Event {
- Logout,
- Play,
- AddCharacter {
- alias: String,
- tool: Option<String>,
- body: comp::Body,
- },
- DeleteCharacter(CharacterId),
-}
-
-const TEXT_COLOR: Color = Color::Rgba(1.0, 1.0, 1.0, 1.0);
-const TEXT_COLOR_2: Color = Color::Rgba(1.0, 1.0, 1.0, 0.2);
-
-#[derive(PartialEq)]
-enum InfoContent {
- None,
- Deletion(usize),
- LoadingCharacters,
- CreatingCharacter,
- DeletingCharacter,
- CharacterError,
-}
-
-impl InfoContent {
- pub fn has_content(&self, character_list_loading: &bool) -> bool {
- match self {
- Self::None => false,
- Self::CreatingCharacter | Self::DeletingCharacter | Self::LoadingCharacters => {
- *character_list_loading
- },
- _ => true,
- }
- }
-}
-
-#[allow(clippy::large_enum_variant)] // TODO: Pending review in #587
-pub enum Mode {
- Select(Option<Vec<CharacterItem>>),
- Create {
- name: String,
- body: humanoid::Body,
- loadout: comp::Loadout,
- tool: Option<&'static str>,
- },
-}
-
-pub struct CharSelectionUi {
- ui: Ui,
- ids: Ids,
- imgs: Imgs,
- rot_imgs: ImgsRot,
- fonts: Fonts,
- info_content: InfoContent,
- i18n: std::sync::Arc<Localization>,
- enter: bool,
- pub mode: Mode,
- pub selected_character: usize,
-}
-
-impl CharSelectionUi {
- pub fn new(global_state: &mut GlobalState) -> Self {
- let window = &mut global_state.window;
- let settings = &global_state.settings;
-
- let mut ui = Ui::new(window).unwrap();
- ui.set_scaling_mode(settings.gameplay.ui_scale);
- // Generate ids
- let ids = Ids::new(ui.id_generator());
- // Load images
- let imgs = Imgs::load(&mut ui).expect("Failed to load images!");
- let rot_imgs = ImgsRot::load(&mut ui).expect("Failed to load images!");
- // Load language
- let i18n = Localization::load_expect(&i18n_asset_key(
- &global_state.settings.language.selected_language,
- ));
- // Load fonts.
- let fonts = Fonts::load(&i18n.fonts, &mut ui).expect("Impossible to load fonts!");
-
- Self {
- ui,
- ids,
- imgs,
- rot_imgs,
- fonts,
- info_content: InfoContent::LoadingCharacters,
- selected_character: 0,
- i18n,
- mode: Mode::Select(None),
- enter: false,
- }
- }
-
- pub fn get_character_list(&self) -> Option<Vec<CharacterItem>> {
- match &self.mode {
- Mode::Select(data) => data.clone(),
- Mode::Create {
- name, body, tool, ..
- } => {
- let body = comp::Body::Humanoid(*body);
-
- Some(vec![CharacterItem {
- character: Character {
- id: None,
- alias: name.clone(),
- },
- body,
- level: 1,
- loadout: LoadoutBuilder::new()
- .defaults()
- .active_item(Some(LoadoutBuilder::default_item_config_from_str(
- (*tool).expect(
- "Attempted to create character with non-existent \
- item_definition_id for tool",
- ),
- )))
- .build(),
- }])
- },
- }
- }
-
- pub fn get_loadout(&mut self) -> Option<comp::Loadout> {
- match &mut self.mode {
- Mode::Select(character_list) => {
- if let Some(data) = character_list {
- data.get(self.selected_character).map(|c| c.loadout.clone())
- } else {
- None
- }
- },
- Mode::Create { loadout, tool, .. } => {
- loadout.active_item = tool.map(|tool| comp::ItemConfig {
- // FIXME: Error gracefully.
- item: comp::Item::new_from_asset_expect(tool),
- ability1: None,
- ability2: None,
- ability3: None,
- block_ability: None,
- dodge_ability: None,
- });
- // FIXME: Error gracefully
- loadout.chest = Some(comp::Item::new_from_asset_expect(
- "common.items.armor.starter.rugged_chest",
- ));
- // FIXME: Error gracefully
- loadout.pants = Some(comp::Item::new_from_asset_expect(
- "common.items.armor.starter.rugged_pants",
- ));
- // FIXME: Error gracefully
- loadout.foot = Some(comp::Item::new_from_asset_expect(
- "common.items.armor.starter.sandals_0",
- ));
- loadout.glider = Some(comp::Item::new_from_asset_expect(
- "common.items.armor.starter.glider",
- ));
- Some(loadout.clone())
- },
- }
- }
-
- // TODO: Split this into multiple modules or functions.
- #[allow(clippy::useless_let_if_seq)] // TODO: Pending review in #587
- #[allow(clippy::unnecessary_operation)] // TODO: Pending review in #587
- #[allow(clippy::unnested_or_patterns)] // TODO: Pending review in #587
- fn update_layout(&mut self, client: &mut Client) -> Vec<Event> {
- let mut events = Vec::new();
-
- let can_enter_world = match &self.mode {
- Mode::Select(opt) => opt.is_some(),
- Mode::Create { .. } => false,
- };
-
- // Handle enter keypress to enter world
- if can_enter_world {
- for event in self.ui.ui.global_input().events() {
- match event {
- // TODO allow this to be rebound
- WorldEvent::Raw(Input::Press(ButtonType::Keyboard(Key::Return)))
- | WorldEvent::Raw(Input::Press(ButtonType::Keyboard(Key::Return2)))
- | WorldEvent::Raw(Input::Press(ButtonType::Keyboard(Key::NumPadEnter))) => {
- events.push(Event::Play)
- },
- _ => {},
- }
- }
- }
- let (ref mut ui_widgets, ref mut tooltip_manager) = self.ui.set_widgets();
- let version = common::util::DISPLAY_VERSION_LONG.clone();
-
- // Tooltip
- let tooltip_human = Tooltip::new({
- // Edge images [t, b, r, l]
- // Corner images [tr, tl, br, bl]
- let edge = &self.rot_imgs.tt_side;
- let corner = &self.rot_imgs.tt_corner;
- ImageFrame::new(
- [edge.cw180, edge.none, edge.cw270, edge.cw90],
- [corner.none, corner.cw270, corner.cw90, corner.cw180],
- Color::Rgba(0.08, 0.07, 0.04, 1.0),
- 5.0,
- )
- })
- .title_font_size(self.fonts.cyri.scale(15))
- .desc_font_size(self.fonts.cyri.scale(10))
- .parent(ui_widgets.window)
- .font_id(self.fonts.cyri.conrod_id)
- .desc_text_color(TEXT_COLOR_2);
-
- // Set the info content if we encountered an error related to characters
- if client.character_list.error.is_some() {
- self.info_content = InfoContent::CharacterError;
- }
-
- // Information Window
- if self
- .info_content
- .has_content(&client.character_list.loading)
- {
- Rectangle::fill_with([520.0, 150.0], color::rgba(0.0, 0.0, 0.0, 0.9))
- .mid_top_with_margin_on(ui_widgets.window, 300.0)
- .set(self.ids.info_bg, ui_widgets);
- Image::new(self.imgs.info_frame)
- .w_h(550.0, 150.0)
- .middle_of(self.ids.info_bg)
- .color(Some(UI_MAIN))
- .set(self.ids.info_frame, ui_widgets);
- Rectangle::fill_with([275.0, 150.0], color::TRANSPARENT)
- .bottom_left_with_margins_on(self.ids.info_frame, 0.0, 0.0)
- .set(self.ids.info_button_align, ui_widgets);
-
- match self.info_content {
- InfoContent::None => unreachable!(),
- InfoContent::Deletion(character_index) => {
- Text::new(&self.i18n.get("char_selection.delete_permanently"))
- .mid_top_with_margin_on(self.ids.info_frame, 40.0)
- .font_size(self.fonts.cyri.scale(24))
- .font_id(self.fonts.cyri.conrod_id)
- .color(TEXT_COLOR)
- .set(self.ids.delete_text, ui_widgets);
- if Button::image(self.imgs.button)
- .w_h(150.0, 40.0)
- .bottom_right_with_margins_on(self.ids.info_button_align, 20.0, 50.0)
- .hover_image(self.imgs.button_hover)
- .press_image(self.imgs.button_press)
- .label_y(Relative::Scalar(2.0))
- .label(&self.i18n.get("common.no"))
- .label_font_id(self.fonts.cyri.conrod_id)
- .label_font_size(self.fonts.cyri.scale(18))
- .label_color(TEXT_COLOR)
- .set(self.ids.info_no, ui_widgets)
- .was_clicked()
- {
- self.info_content = InfoContent::None;
- };
- if Button::image(self.imgs.button)
- .w_h(150.0, 40.0)
- .right_from(self.ids.info_no, 100.0)
- .hover_image(self.imgs.button_hover)
- .press_image(self.imgs.button_press)
- .label_y(Relative::Scalar(2.0))
- .label(&self.i18n.get("common.yes"))
- .label_font_id(self.fonts.cyri.conrod_id)
- .label_font_size(self.fonts.cyri.scale(18))
- .label_color(TEXT_COLOR)
- .set(self.ids.info_ok, ui_widgets)
- .was_clicked()
- {
- self.info_content = InfoContent::None;
-
- if let Some(character_item) =
- client.character_list.characters.get(character_index)
- {
- // Unsaved characters have no id, this should never be the case here
- if let Some(character_id) = character_item.character.id {
- self.info_content = InfoContent::DeletingCharacter;
-
- events.push(Event::DeleteCharacter(character_id));
- }
- }
- };
- },
- InfoContent::LoadingCharacters => {
- Text::new(&self.i18n.get("char_selection.loading_characters"))
- .mid_top_with_margin_on(self.ids.info_frame, 40.0)
- .font_size(self.fonts.cyri.scale(24))
- .font_id(self.fonts.cyri.conrod_id)
- .color(TEXT_COLOR)
- .set(self.ids.loading_characters_text, ui_widgets);
- },
- InfoContent::CreatingCharacter => {
- Text::new(&self.i18n.get("char_selection.creating_character"))
- .mid_top_with_margin_on(self.ids.info_frame, 40.0)
- .font_size(self.fonts.cyri.scale(24))
- .font_id(self.fonts.cyri.conrod_id)
- .color(TEXT_COLOR)
- .set(self.ids.creating_character_text, ui_widgets);
- },
- InfoContent::DeletingCharacter => {
- Text::new(&self.i18n.get("char_selection.deleting_character"))
- .mid_top_with_margin_on(self.ids.info_frame, 40.0)
- .font_size(self.fonts.cyri.scale(24))
- .font_id(self.fonts.cyri.conrod_id)
- .color(TEXT_COLOR)
- .set(self.ids.deleting_character_text, ui_widgets);
- },
- InfoContent::CharacterError => {
- if let Some(error_message) = &client.character_list.error {
- Text::new(&format!(
- "{}: {}",
- &self.i18n.get("common.error"),
- error_message
- ))
- .mid_top_with_margin_on(self.ids.info_frame, 40.0)
- .font_size(self.fonts.cyri.scale(24))
- .font_id(self.fonts.cyri.conrod_id)
- .color(TEXT_COLOR)
- .set(self.ids.character_error_message, ui_widgets);
-
- if Button::image(self.imgs.button)
- .w_h(150.0, 40.0)
- .bottom_right_with_margins_on(self.ids.info_button_align, 20.0, 20.0)
- .hover_image(self.imgs.button_hover)
- .press_image(self.imgs.button_press)
- .label_y(Relative::Scalar(2.0))
- .label(&self.i18n.get("common.close"))
- .label_font_id(self.fonts.cyri.conrod_id)
- .label_font_size(self.fonts.cyri.scale(18))
- .label_color(TEXT_COLOR)
- .set(self.ids.info_ok, ui_widgets)
- .was_clicked()
- {
- self.info_content = InfoContent::None;
- client.character_list.error = None;
- }
- } else {
- self.info_content = InfoContent::None;
- }
- },
- }
- }
-
- // Character Selection /////////////////
- match &mut self.mode {
- Mode::Select(data) => {
- // Set active body
- *data = if client
- .character_list
- .characters
- .get(self.selected_character)
- .is_some()
- {
- Some(client.character_list.characters.clone())
- } else {
- None
- };
-
- // Background for Server Frame
- Rectangle::fill_with([400.0, 95.0], color::rgba(0.0, 0.0, 0.0, 0.8))
- .top_left_with_margins_on(ui_widgets.window, 30.0, 30.0)
- .set(self.ids.server_frame_bg, ui_widgets);
-
- // Background for Char List
- Rectangle::fill_with([400.0, 800.0], color::rgba(0.0, 0.0, 0.0, 0.8))
- .down_from(self.ids.server_frame_bg, 5.0)
- .set(self.ids.charlist_frame, ui_widgets);
- Image::new(self.imgs.frame_bot)
- .w_h(400.0, 48.0)
- .down_from(self.ids.charlist_frame, 0.0)
- .color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.8)))
- .set(self.ids.selection_bot, ui_widgets);
- Rectangle::fill_with([386.0, 800.0], color::TRANSPARENT)
- .mid_top_with_margin_on(self.ids.charlist_frame, 2.0)
- .scroll_kids()
- .scroll_kids_vertically()
- .set(self.ids.charlist_alignment, ui_widgets);
- Scrollbar::y_axis(self.ids.charlist_alignment)
- .thickness(5.0)
- .auto_hide(true)
- .color(UI_MAIN)
- .set(self.ids.selection_scrollbar, ui_widgets);
- // Server Name
- Text::new(&client.server_info.name)
- .mid_top_with_margin_on(self.ids.server_frame_bg, 5.0)
- .font_size(self.fonts.cyri.scale(26))
- .font_id(self.fonts.cyri.conrod_id)
- .color(TEXT_COLOR)
- .set(self.ids.server_name_text, ui_widgets);
- //Change Server
- if Button::image(self.imgs.button)
- .mid_top_with_margin_on(self.ids.server_frame_bg, 45.0)
- .w_h(200.0, 40.0)
- .parent(self.ids.charlist_bg)
- .hover_image(self.imgs.button_hover)
- .press_image(self.imgs.button_press)
- .label(&self.i18n.get("char_selection.change_server"))
- .label_color(TEXT_COLOR)
- .label_font_id(self.fonts.cyri.conrod_id)
- .label_font_size(self.fonts.cyri.scale(18))
- .label_y(conrod_core::position::Relative::Scalar(3.0))
- .set(self.ids.change_server, ui_widgets)
- .was_clicked()
- {
- events.push(Event::Logout);
- }
-
- // Enter World Button
- let character_count = client.character_list.characters.len();
- let enter_world_str = &self.i18n.get("char_selection.enter_world");
- let enter_button = Button::image(self.imgs.button)
- .mid_bottom_with_margin_on(ui_widgets.window, 10.0)
- .w_h(250.0, 60.0)
- .label(enter_world_str)
- .label_font_size(self.fonts.cyri.scale(26))
- .label_font_id(self.fonts.cyri.conrod_id)
- .label_y(conrod_core::position::Relative::Scalar(3.0));
-
- if can_enter_world {
- if enter_button
- .hover_image(self.imgs.button_hover)
- .press_image(self.imgs.button_press)
- .label_color(TEXT_COLOR)
- .set(self.ids.enter_world_button, ui_widgets)
- .was_clicked()
- {
- self.enter = !self.enter;
- if self.enter {
- events.push(Event::Play)
- };
- }
- } else {
- &enter_button
- .label_color(TEXT_COLOR_2)
- .set(self.ids.enter_world_button, ui_widgets);
- }
-
- // Logout_Button
- if Button::image(self.imgs.button)
- .bottom_left_with_margins_on(ui_widgets.window, 10.0, 10.0)
- .w_h(150.0, 40.0)
- .hover_image(self.imgs.button_hover)
- .press_image(self.imgs.button_press)
- .label(&self.i18n.get("char_selection.logout"))
- .label_font_id(self.fonts.cyri.conrod_id)
- .label_color(TEXT_COLOR)
- .label_font_size(self.fonts.cyri.scale(20))
- .label_y(conrod_core::position::Relative::Scalar(3.0))
- .set(self.ids.logout_button, ui_widgets)
- .was_clicked()
- {
- events.push(Event::Logout);
- }
-
- // Alpha Version
- Text::new(&version)
- .top_right_with_margins_on(ui_widgets.window, 5.0, 5.0)
- .font_size(self.fonts.cyri.scale(14))
- .font_id(self.fonts.cyri.conrod_id)
- .color(TEXT_COLOR)
- .set(self.ids.version, ui_widgets);
- // Alpha Disclaimer
- Text::new(&format!(
- "Veloren {}",
- common::util::DISPLAY_VERSION.as_str()
- ))
- .font_id(self.fonts.cyri.conrod_id)
- .font_size(self.fonts.cyri.scale(10))
- .color(TEXT_COLOR)
- .mid_top_with_margin_on(ui_widgets.window, 2.0)
- .set(self.ids.alpha_text, ui_widgets);
-
- // Resize character selection widgets
- self.ids
- .character_boxes
- .resize(character_count, &mut ui_widgets.widget_id_generator());
- self.ids
- .character_deletes
- .resize(character_count, &mut ui_widgets.widget_id_generator());
- self.ids
- .character_names
- .resize(character_count, &mut ui_widgets.widget_id_generator());
- self.ids
- .character_levels
- .resize(character_count, &mut ui_widgets.widget_id_generator());
- self.ids
- .character_locations
- .resize(character_count, &mut ui_widgets.widget_id_generator());
-
- // Character selection
- for (i, character_item) in client.character_list.characters.iter().enumerate() {
- let character_box = Button::image(if self.selected_character == i {
- self.imgs.selection_hover
- } else {
- self.imgs.selection
- });
- let character_box = if i == 0 {
- character_box.top_left_with_margins_on(
- self.ids.charlist_alignment,
- 0.0,
- 2.0,
- )
- } else {
- character_box.down_from(self.ids.character_boxes[i - 1], 5.0)
- };
- if character_box
- .w_h(386.0, 80.0)
- .image_color(Color::Rgba(1.0, 1.0, 1.0, 0.8))
- .hover_image(self.imgs.selection_hover)
- .press_image(self.imgs.selection_press)
- .label_font_id(self.fonts.cyri.conrod_id)
- .label_y(conrod_core::position::Relative::Scalar(20.0))
- .set(self.ids.character_boxes[i], ui_widgets)
- .was_clicked()
- {
- self.selected_character = i;
- }
- if Button::image(self.imgs.delete_button)
- .w_h(30.0 * 0.5, 30.0 * 0.5)
- .top_right_with_margins_on(self.ids.character_boxes[i], 15.0, 15.0)
- .hover_image(self.imgs.delete_button_hover)
- .press_image(self.imgs.delete_button_press)
- .with_tooltip(
- tooltip_manager,
- &self.i18n.get("char_selection.delete_permanently"),
- "",
- &tooltip_human,
- TEXT_COLOR,
- )
- .set(self.ids.character_deletes[i], ui_widgets)
- .was_clicked()
- {
- self.info_content = InfoContent::Deletion(i);
- }
- Text::new(&character_item.character.alias)
- .top_left_with_margins_on(self.ids.character_boxes[i], 6.0, 9.0)
- .font_size(self.fonts.cyri.scale(19))
- .font_id(self.fonts.cyri.conrod_id)
- .color(TEXT_COLOR)
- .set(self.ids.character_names[i], ui_widgets);
-
- Text::new(
- &self
- .i18n
- .get("char_selection.level_fmt")
- .replace("{level_nb}", &character_item.level.to_string()),
- )
- .down_from(self.ids.character_names[i], 4.0)
- .font_size(self.fonts.cyri.scale(17))
- .font_id(self.fonts.cyri.conrod_id)
- .color(TEXT_COLOR)
- .set(self.ids.character_levels[i], ui_widgets);
-
- Text::new(&self.i18n.get("char_selection.uncanny_valley"))
- .down_from(self.ids.character_levels[i], 4.0)
- .font_size(self.fonts.cyri.scale(17))
- .font_id(self.fonts.cyri.conrod_id)
- .color(TEXT_COLOR)
- .set(self.ids.character_locations[i], ui_widgets);
- }
-
- // Create Character Button
- let create_char_button = Button::image(self.imgs.selection);
-
- let create_char_button = if character_count > 0 {
- create_char_button.down_from(self.ids.character_boxes[character_count - 1], 5.0)
- } else {
- create_char_button.top_left_with_margins_on(
- self.ids.charlist_alignment,
- 0.0,
- 2.0,
- )
- };
-
- let character_limit_reached = character_count >= MAX_CHARACTERS_PER_PLAYER;
-
- let color = if character_limit_reached {
- Color::Rgba(0.38, 0.38, 0.10, 1.0)
- } else {
- Color::Rgba(0.38, 1.0, 0.07, 1.0)
- };
-
- if create_char_button
- .w_h(386.0, 80.0)
- .hover_image(self.imgs.selection_hover)
- .press_image(self.imgs.selection_press)
- .label(&self.i18n.get("char_selection.create_new_charater"))
- .label_color(color)
- .label_font_id(self.fonts.cyri.conrod_id)
- .image_color(color)
- .set(self.ids.character_box_2, ui_widgets)
- .was_clicked()
- && !character_limit_reached
- {
- self.mode = Mode::Create {
- name: "Character Name".to_string(),
- body: humanoid::Body::random(),
- loadout: comp::Loadout::default(),
- tool: Some(STARTER_SWORD),
- };
- }
-
- // LOADING SCREEN HERE
- if self.enter { /*stuff*/ };
- },
- // Character_Creation
- // //////////////////////////////////////////////////////////////////////
- Mode::Create {
- name,
- body,
- loadout: _,
- tool,
- } => {
- let mut rng = thread_rng();
- let mut to_select = false;
- // Back Button
- if Button::image(self.imgs.button)
- .bottom_left_with_margins_on(ui_widgets.window, 10.0, 10.0)
- .w_h(150.0, 40.0)
- .hover_image(self.imgs.button_hover)
- .press_image(self.imgs.button_press)
- .label(&self.i18n.get("common.back"))
- .label_font_id(self.fonts.cyri.conrod_id)
- .label_color(TEXT_COLOR)
- .label_font_size(self.fonts.cyri.scale(20))
- .label_y(conrod_core::position::Relative::Scalar(3.0))
- .set(self.ids.back_button, ui_widgets)
- .was_clicked()
- {
- to_select = true;
- }
- // Create Button
- let create_button = Button::image(self.imgs.button)
- .bottom_right_with_margins_on(ui_widgets.window, 10.0, 10.0)
- .w_h(150.0, 40.0)
- .hover_image(if *name != "Character Name" && *name != "" {
- self.imgs.button_hover
- } else {
- self.imgs.button
- })
- .press_image(if *name != "Character Name" && *name != "" {
- self.imgs.button_press
- } else {
- self.imgs.button
- })
- .label(&self.i18n.get("common.create"))
- .label_font_id(self.fonts.cyri.conrod_id)
- .label_color(if *name != "Character Name" && *name != "" {
- TEXT_COLOR
- } else {
- TEXT_COLOR_2
- })
- .label_font_size(self.fonts.cyri.scale(20))
- .label_y(conrod_core::position::Relative::Scalar(3.0));
-
- if *name == "Character Name" || *name == "" {
- //TODO: We need a server side list of disallowed names and certain naming rules
- if create_button
- .with_tooltip(
- tooltip_manager,
- &self.i18n.get("char_selection.create_info_name"),
- "",
- &tooltip_human,
- TEXT_COLOR,
- )
- .set(self.ids.create_button, ui_widgets)
- .was_clicked()
- {}
- } else if create_button
- .set(self.ids.create_button, ui_widgets)
- .was_clicked()
- {
- self.info_content = InfoContent::CreatingCharacter;
-
- events.push(Event::AddCharacter {
- alias: name.clone(),
- tool: tool.map(|tool| tool.to_string()),
- body: comp::Body::Humanoid(*body),
- });
-
- to_select = true;
- }
- // Character Name Input
- Rectangle::fill_with([320.0, 50.0], color::rgba(0.0, 0.0, 0.0, 0.97))
- .mid_bottom_with_margin_on(ui_widgets.window, 20.0)
- .set(self.ids.name_input_bg, ui_widgets);
- Button::image(self.imgs.name_input)
- .image_color(Color::Rgba(1.0, 1.0, 1.0, 0.9))
- .w_h(337.0, 67.0)
- .middle_of(self.ids.name_input_bg)
- .set(self.ids.name_input, ui_widgets);
- for event in TextBox::new(name)
- .w_h(300.0, 60.0)
- .mid_top_with_margin_on(self.ids.name_input, 2.0)
- .font_size(self.fonts.cyri.scale(26))
- .font_id(self.fonts.cyri.conrod_id)
- .center_justify()
- .text_color(TEXT_COLOR)
- .font_id(self.fonts.cyri.conrod_id)
- .color(TRANSPARENT)
- .border_color(TRANSPARENT)
- .set(self.ids.name_field, ui_widgets)
- {
- match event {
- TextBoxEvent::Update(new_name) => *name = new_name,
- TextBoxEvent::Enter => {},
- }
- }
-
- // Window
- Rectangle::fill_with(
- [400.0, ui_widgets.win_h - ui_widgets.win_h * 0.15],
- color::rgba(0.0, 0.0, 0.0, 0.8),
- )
- .top_left_with_margins_on(ui_widgets.window, 30.0, 30.0)
- .set(self.ids.creation_frame, ui_widgets);
- Image::new(self.imgs.frame_bot)
- .w_h(400.0, 48.0)
- .down_from(self.ids.creation_frame, 0.0)
- .color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.8)))
- .set(self.ids.creation_bot, ui_widgets);
- Rectangle::fill_with(
- [386.0, ui_widgets.win_h - ui_widgets.win_h * 0.15],
- color::TRANSPARENT,
- )
- .mid_top_with_margin_on(self.ids.creation_frame, 10.0)
- .scroll_kids_vertically()
- .set(self.ids.creation_alignment, ui_widgets);
- Scrollbar::y_axis(self.ids.creation_alignment)
- .thickness(5.0)
- .auto_hide(true)
- .rgba(0.33, 0.33, 0.33, 1.0)
- .set(self.ids.selection_scrollbar, ui_widgets);
-
- // BodyType/Species Icons
- let body_m_ico = match body.species {
- humanoid::Species::Human => self.imgs.human_m,
- humanoid::Species::Orc => self.imgs.orc_m,
- humanoid::Species::Dwarf => self.imgs.dwarf_m,
- humanoid::Species::Elf => self.imgs.elf_m,
- humanoid::Species::Undead => self.imgs.undead_m,
- humanoid::Species::Danari => self.imgs.danari_m,
- };
- let body_f_ico = match body.species {
- humanoid::Species::Human => self.imgs.human_f,
- humanoid::Species::Orc => self.imgs.orc_f,
- humanoid::Species::Dwarf => self.imgs.dwarf_f,
- humanoid::Species::Elf => self.imgs.elf_f,
- humanoid::Species::Undead => self.imgs.undead_f,
- humanoid::Species::Danari => self.imgs.danari_f,
- };
- // Alignment
- Rectangle::fill_with([140.0, 72.0], color::TRANSPARENT)
- .mid_top_with_margin_on(self.ids.creation_alignment, 60.0)
- .set(self.ids.creation_buttons_alignment_1, ui_widgets);
- // Bodytype M
- Image::new(body_m_ico)
- .w_h(70.0, 70.0)
- .top_left_with_margins_on(self.ids.creation_buttons_alignment_1, 0.0, 0.0)
- .set(self.ids.male, ui_widgets);
- if Button::image(if let humanoid::BodyType::Male = body.body_type {
- self.imgs.icon_border_pressed
- } else {
- self.imgs.icon_border
- })
- .middle_of(self.ids.male)
- .hover_image(self.imgs.icon_border_mo)
- .press_image(self.imgs.icon_border_press)
- .set(self.ids.body_type_1, ui_widgets)
- .was_clicked()
- {
- body.body_type = humanoid::BodyType::Male;
- body.validate();
- }
- // Bodytype F
- Image::new(body_f_ico)
- .w_h(70.0, 70.0)
- .top_right_with_margins_on(self.ids.creation_buttons_alignment_1, 0.0, 0.0)
- .set(self.ids.female, ui_widgets);
- if Button::image(if let humanoid::BodyType::Female = body.body_type {
- self.imgs.icon_border_pressed
- } else {
- self.imgs.icon_border
- })
- .middle_of(self.ids.female)
- .hover_image(self.imgs.icon_border_mo)
- .press_image(self.imgs.icon_border_press)
- .set(self.ids.body_type_2, ui_widgets)
- .was_clicked()
- {
- body.body_type = humanoid::BodyType::Female;
- body.validate();
- }
-
- // Alignment for Species and Tools
- Rectangle::fill_with([214.0, 304.0], color::TRANSPARENT)
- .mid_bottom_with_margin_on(self.ids.creation_buttons_alignment_1, -324.0)
- .set(self.ids.creation_buttons_alignment_2, ui_widgets);
-
- let (human_icon, orc_icon, dwarf_icon, elf_icon, undead_icon, danari_icon) =
- match body.body_type {
- humanoid::BodyType::Male => (
- self.imgs.human_m,
- self.imgs.orc_m,
- self.imgs.dwarf_m,
- self.imgs.elf_m,
- self.imgs.undead_m,
- self.imgs.danari_m,
- ),
- humanoid::BodyType::Female => (
- self.imgs.human_f,
- self.imgs.orc_f,
- self.imgs.dwarf_f,
- self.imgs.elf_f,
- self.imgs.undead_f,
- self.imgs.danari_f,
- ),
- };
- // Human
- Image::new(human_icon)
- .w_h(70.0, 70.0)
- .top_left_with_margins_on(self.ids.creation_buttons_alignment_2, 0.0, 0.0)
- .set(self.ids.human, ui_widgets);
- if Button::image(if let humanoid::Species::Human = body.species {
- self.imgs.icon_border_pressed
- } else {
- self.imgs.icon_border
- })
- .middle_of(self.ids.human)
- .hover_image(self.imgs.icon_border_mo)
- .press_image(self.imgs.icon_border_press)
- .with_tooltip(
- tooltip_manager,
- &self.i18n.get("common.species.human"),
- "",
- &tooltip_human,
- TEXT_COLOR,
- )
- .set(self.ids.species_1, ui_widgets)
- .was_clicked()
- {
- body.species = humanoid::Species::Human;
- body.validate();
- }
-
- // Orc
- Image::new(orc_icon)
- .w_h(70.0, 70.0)
- .right_from(self.ids.human, 2.0)
- .set(self.ids.orc, ui_widgets);
- if Button::image(if let humanoid::Species::Orc = body.species {
- self.imgs.icon_border_pressed
- } else {
- self.imgs.icon_border
- })
- .middle_of(self.ids.orc)
- .hover_image(self.imgs.icon_border_mo)
- .press_image(self.imgs.icon_border_press)
- .with_tooltip(
- tooltip_manager,
- &self.i18n.get("common.species.orc"),
- "",
- &tooltip_human,
- TEXT_COLOR,
- )
- .set(self.ids.species_2, ui_widgets)
- .was_clicked()
- {
- body.species = humanoid::Species::Orc;
- body.validate();
- }
- // Dwarf
- Image::new(dwarf_icon)
- .w_h(70.0, 70.0)
- .right_from(self.ids.orc, 2.0)
- .set(self.ids.dwarf, ui_widgets);
- if Button::image(if let humanoid::Species::Dwarf = body.species {
- self.imgs.icon_border_pressed
- } else {
- self.imgs.icon_border
- })
- .middle_of(self.ids.dwarf)
- .hover_image(self.imgs.icon_border_mo)
- .press_image(self.imgs.icon_border_press)
- .with_tooltip(
- tooltip_manager,
- &self.i18n.get("common.species.dwarf"),
- "",
- &tooltip_human,
- TEXT_COLOR,
- )
- .set(self.ids.species_3, ui_widgets)
- .was_clicked()
- {
- body.species = humanoid::Species::Dwarf;
- body.validate();
- }
- // Elf
- Image::new(elf_icon)
- .w_h(70.0, 70.0)
- .down_from(self.ids.human, 2.0)
- .set(self.ids.elf, ui_widgets);
- if Button::image(if let humanoid::Species::Elf = body.species {
- self.imgs.icon_border_pressed
- } else {
- self.imgs.icon_border
- })
- .middle_of(self.ids.elf)
- .hover_image(self.imgs.icon_border_mo)
- .press_image(self.imgs.icon_border_press)
- .with_tooltip(
- tooltip_manager,
- &self.i18n.get("common.species.elf"),
- "",
- &tooltip_human,
- TEXT_COLOR,
- )
- .set(self.ids.species_4, ui_widgets)
- .was_clicked()
- {
- body.species = humanoid::Species::Elf;
- body.validate();
- }
-
- // Undead
- Image::new(undead_icon)
- .w_h(70.0, 70.0)
- .right_from(self.ids.elf, 2.0)
- .set(self.ids.undead, ui_widgets);
- if Button::image(if let humanoid::Species::Undead = body.species {
- self.imgs.icon_border_pressed
- } else {
- self.imgs.icon_border
- })
- .middle_of(self.ids.undead)
- .hover_image(self.imgs.icon_border_mo)
- .press_image(self.imgs.icon_border_press)
- .with_tooltip(
- tooltip_manager,
- &self.i18n.get("common.species.undead"),
- "",
- &tooltip_human,
- TEXT_COLOR,
- )
- .set(self.ids.species_5, ui_widgets)
- .was_clicked()
- {
- body.species = humanoid::Species::Undead;
- body.validate();
- }
- // Danari
- Image::new(danari_icon)
- .w_h(70.0, 70.0)
- .right_from(self.ids.undead, 2.0)
- .set(self.ids.danari, ui_widgets);
- if Button::image(if let humanoid::Species::Danari = body.species {
- self.imgs.icon_border_pressed
- } else {
- self.imgs.icon_border
- })
- .middle_of(self.ids.danari)
- .hover_image(self.imgs.icon_border_mo)
- .press_image(self.imgs.icon_border_press)
- .with_tooltip(
- tooltip_manager,
- &self.i18n.get("common.species.danari"),
- "",
- &tooltip_human,
- TEXT_COLOR,
- )
- .set(self.ids.species_6, ui_widgets)
- .was_clicked()
- {
- body.species = humanoid::Species::Danari;
- body.validate();
- }
- // Healing Sceptre
- Image::new(self.imgs.sceptre)
- .w_h(70.0, 70.0)
- .bottom_left_with_margins_on(self.ids.creation_buttons_alignment_2, 0.0, 0.0)
- .set(self.ids.sceptre, ui_widgets);
- if Button::image(if let Some(STARTER_SCEPTRE) = tool {
- self.imgs.icon_border_pressed
- } else {
- self.imgs.icon_border
- })
- .middle_of(self.ids.sceptre)
- .hover_image(self.imgs.icon_border_mo)
- .press_image(self.imgs.icon_border_press)
- .with_tooltip(
- tooltip_manager,
- &self.i18n.get("common.weapons.sceptre"),
- "",
- &tooltip_human,
- TEXT_COLOR,
- )
- .set(self.ids.sceptre_button, ui_widgets)
- .was_clicked()
- {
- *tool = Some(STARTER_SCEPTRE);
- }
-
- // Bow
- Image::new(self.imgs.bow)
- .w_h(70.0, 70.0)
- .right_from(self.ids.sceptre, 2.0)
- .set(self.ids.bow, ui_widgets);
- if Button::image(if let Some(STARTER_BOW) = tool {
- self.imgs.icon_border_pressed
- } else {
- self.imgs.icon_border
- })
- .middle_of(self.ids.bow)
- .hover_image(self.imgs.icon_border_mo)
- .press_image(self.imgs.icon_border_press)
- .with_tooltip(
- tooltip_manager,
- &self.i18n.get("common.weapons.bow"),
- "",
- &tooltip_human,
- TEXT_COLOR,
- )
- .set(self.ids.bow_button, ui_widgets)
- .was_clicked()
- {
- *tool = Some(STARTER_BOW);
- }
- // Staff
- Image::new(self.imgs.staff)
- .w_h(70.0, 70.0)
- .right_from(self.ids.bow, 2.0)
- .set(self.ids.staff, ui_widgets);
- if Button::image(if let Some(STARTER_STAFF) = tool {
- self.imgs.icon_border_pressed
- } else {
- self.imgs.icon_border
- })
- .middle_of(self.ids.staff)
- .hover_image(self.imgs.icon_border_mo)
- .press_image(self.imgs.icon_border_press)
- .with_tooltip(
- tooltip_manager,
- &self.i18n.get("common.weapons.staff"),
- "",
- &tooltip_human,
- TEXT_COLOR,
- )
- .set(self.ids.staff_button, ui_widgets)
- .was_clicked()
- {
- *tool = Some(STARTER_STAFF);
- }
- // Sword
- Image::new(self.imgs.sword)
- .w_h(70.0, 70.0)
- .up_from(self.ids.sceptre, 2.0)
- .set(self.ids.sword, ui_widgets);
- if Button::image(if let Some(STARTER_SWORD) = tool {
- self.imgs.icon_border_pressed
- } else {
- self.imgs.icon_border
- })
- .middle_of(self.ids.sword)
- .hover_image(self.imgs.icon_border_mo)
- .press_image(self.imgs.icon_border_press)
- .with_tooltip(
- tooltip_manager,
- &self.i18n.get("common.weapons.sword"),
- "",
- &tooltip_human,
- TEXT_COLOR,
- )
- .set(self.ids.sword_button, ui_widgets)
- .was_clicked()
- {
- *tool = Some(STARTER_SWORD);
- }
-
- // Hammer
- Image::new(self.imgs.hammer)
- .w_h(70.0, 70.0)
- .right_from(self.ids.sword, 2.0)
- .set(self.ids.hammer, ui_widgets);
- if Button::image(if let Some(STARTER_HAMMER) = tool {
- self.imgs.icon_border_pressed
- } else {
- self.imgs.icon_border
- })
- .middle_of(self.ids.hammer)
- .hover_image(self.imgs.icon_border_mo)
- .press_image(self.imgs.icon_border_press)
- .with_tooltip(
- tooltip_manager,
- &self.i18n.get("common.weapons.hammer"),
- "",
- &tooltip_human,
- TEXT_COLOR,
- )
- .set(self.ids.hammer_button, ui_widgets)
- .was_clicked()
- {
- *tool = Some(STARTER_HAMMER);
- }
-
- // Axe
- Image::new(self.imgs.axe)
- .w_h(70.0, 70.0)
- .right_from(self.ids.hammer, 2.0)
- .set(self.ids.axe, ui_widgets);
- if Button::image(if let Some(STARTER_AXE) = tool {
- self.imgs.icon_border_pressed
- } else {
- self.imgs.icon_border
- })
- .middle_of(self.ids.axe)
- .hover_image(self.imgs.icon_border_mo)
- .press_image(self.imgs.icon_border_press)
- .with_tooltip(
- tooltip_manager,
- &self.i18n.get("common.weapons.axe"),
- "",
- &tooltip_human,
- TEXT_COLOR,
- )
- .set(self.ids.axe_button, ui_widgets)
- .was_clicked()
- {
- *tool = Some(STARTER_AXE);
- }
- // Random button
- if Button::image(self.imgs.dice)
- .wh([35.0; 2])
- .bottom_left_with_margins_on(self.ids.name_input, 15.0, -45.0)
- .hover_image(self.imgs.dice_hover)
- .press_image(self.imgs.dice_press)
- .with_tooltip(
- tooltip_manager,
- &self.i18n.get("common.rand_appearance"),
- "",
- &tooltip_human,
- TEXT_COLOR,
- )
- .set(self.ids.random_button, ui_widgets)
- .was_clicked()
- {
- body.hair_style =
- rng.gen_range(0, body.species.num_hair_styles(body.body_type));
- body.beard = rng.gen_range(0, body.species.num_beards(body.body_type));
- body.accessory = rng.gen_range(0, body.species.num_accessories(body.body_type));
- body.hair_color = rng.gen_range(0, body.species.num_hair_colors());
- body.skin = rng.gen_range(0, body.species.num_skin_colors());
- body.eye_color = rng.gen_range(0, body.species.num_eye_colors());
- body.eyes = rng.gen_range(0, body.species.num_eyes(body.body_type));
- *name = npc::get_npc_name(npc::NpcKind::Humanoid).to_string();
- }
- // Sliders
- let (cyri, cyri_size, slider_indicator, slider_range) = (
- self.fonts.cyri.conrod_id,
- self.fonts.cyri.scale(18),
- self.imgs.slider_indicator,
- self.imgs.slider_range,
- );
- let char_slider = move |prev_id,
- text: &str,
- text_id,
- max,
- selected_val,
- slider_id,
- ui_widgets: &mut UiCell| {
- Text::new(text)
- .down_from(prev_id, 22.0)
- .align_middle_x_of(prev_id)
- .font_size(cyri_size)
- .font_id(cyri)
- .color(TEXT_COLOR)
- .set(text_id, ui_widgets);
- ImageSlider::discrete(selected_val, 0, max, slider_indicator, slider_range)
- .w_h(208.0, 22.0)
- .down_from(text_id, 8.0)
- .align_middle_x()
- .track_breadth(12.0)
- .slider_length(10.0)
- .pad_track((5.0, 5.0))
- .set(slider_id, ui_widgets)
- };
- // Hair Style
- if let Some(new_val) = char_slider(
- self.ids.creation_buttons_alignment_2,
- self.i18n.get("char_selection.hair_style"),
- self.ids.hairstyle_text,
- body.species.num_hair_styles(body.body_type) as usize - 1,
- body.hair_style as usize,
- self.ids.hairstyle_slider,
- ui_widgets,
- ) {
- body.hair_style = new_val as u8;
- }
- // Hair Color
- if let Some(new_val) = char_slider(
- self.ids.hairstyle_slider,
- self.i18n.get("char_selection.hair_color"),
- self.ids.haircolor_text,
- body.species.num_hair_colors() as usize - 1,
- body.hair_color as usize,
- self.ids.haircolor_slider,
- ui_widgets,
- ) {
- body.hair_color = new_val as u8;
- }
- // Skin
- if let Some(new_val) = char_slider(
- self.ids.haircolor_slider,
- self.i18n.get("char_selection.skin"),
- self.ids.skin_text,
- body.species.num_skin_colors() as usize - 1,
- body.skin as usize,
- self.ids.skin_slider,
- ui_widgets,
- ) {
- body.skin = new_val as u8;
- }
- // Eyebrows
- if let Some(new_val) = char_slider(
- self.ids.skin_slider,
- self.i18n.get("char_selection.eyeshape"),
- self.ids.eyebrows_text,
- body.species.num_eyes(body.body_type) as usize - 1,
- body.eyes as usize,
- self.ids.eyebrows_slider,
- ui_widgets,
- ) {
- body.eyes = new_val as u8;
- }
- // EyeColor
- if let Some(new_val) = char_slider(
- self.ids.eyebrows_slider,
- self.i18n.get("char_selection.eye_color"),
- self.ids.eyecolor_text,
- body.species.num_eye_colors() as usize - 1,
- body.eye_color as usize,
- self.ids.eyecolor_slider,
- ui_widgets,
- ) {
- body.eye_color = new_val as u8;
- }
- // Accessories
- let _current_accessory = body.accessory;
- if let Some(new_val) = char_slider(
- self.ids.eyecolor_slider,
- self.i18n.get("char_selection.accessories"),
- self.ids.accessories_text,
- body.species.num_accessories(body.body_type) as usize - 1,
- body.accessory as usize,
- self.ids.accessories_slider,
- ui_widgets,
- ) {
- body.accessory = new_val as u8;
- }
- // Beard
- if body.species.num_beards(body.body_type) > 1 {
- if let Some(new_val) = char_slider(
- self.ids.accessories_slider,
- self.i18n.get("char_selection.beard"),
- self.ids.beard_text,
- body.species.num_beards(body.body_type) as usize - 1,
- body.beard as usize,
- self.ids.beard_slider,
- ui_widgets,
- ) {
- body.beard = new_val as u8;
- }
- } else {
- Text::new(&self.i18n.get("char_selection.beard"))
- .mid_bottom_with_margin_on(self.ids.accessories_slider, -40.0)
- .font_size(self.fonts.cyri.scale(18))
- .font_id(self.fonts.cyri.conrod_id)
- .color(TEXT_COLOR_2)
- .set(self.ids.beard_text, ui_widgets);
- ImageSlider::discrete(5, 0, 10, self.imgs.nothing, self.imgs.slider_range)
- .w_h(208.0, 22.0)
- .mid_bottom_with_margin_on(self.ids.beard_text, -30.0)
- .track_breadth(12.0)
- .slider_length(10.0)
- .track_color(Color::Rgba(1.0, 1.0, 1.0, 0.2))
- .slider_color(Color::Rgba(1.0, 1.0, 1.0, 0.2))
- .pad_track((5.0, 5.0))
- .set(self.ids.beard_slider, ui_widgets);
- }
- // Chest
- /*let armor = load_glob::<comp::Item>("common.items.armor.chest.*")
- .expect("Unable to load armor!");
- if let Some(new_val) = char_slider(
- self.ids.beard_slider,
- self.i18n.get("char_selection.chest_color"),
- self.ids.chest_text,
- armor.len() - 1,
- armor
- .iter()
- .position(|c| {
- loadout
- .chest
- .as_ref()
- .map(|lc| lc == c.borrow())
- .unwrap_or_default()
- })
- .unwrap_or(0),
- self.ids.chest_slider,
- ui_widgets,
- ) {
- loadout.chest = Some((*armor[new_val]).clone());
- }*/
- // Pants
- /*let current_pants = body.pants;
- if let Some(new_val) = char_slider(
- self.ids.chest_slider,
- "Pants",
- self.ids.pants_text,
- humanoid::ALL_PANTS.len() - 1,
- humanoid::ALL_PANTS
- .iter()
- .position(|&c| c == current_pants)
- .unwrap_or(0),
- self.ids.pants_slider,
- ui_widgets,
- ) {
- body.pants = humanoid::ALL_PANTS[new_val];
- }*/
- Rectangle::fill_with([20.0, 20.0], color::TRANSPARENT)
- .down_from(self.ids.beard_slider, 15.0)
- .set(self.ids.space, ui_widgets);
-
- if to_select {
- self.mode = Mode::Select(None);
- }
- }, // Char Creation fin
- }
-
- events
- }
-
- pub fn handle_event(&mut self, event: WinEvent) -> bool {
- match event {
- WinEvent::Ui(event) => {
- self.ui.handle_event(event);
- true
- },
- WinEvent::MouseButton(_, PressState::Pressed) => !self.ui.no_widget_capturing_mouse(),
- _ => false,
- }
- }
-
- pub fn maintain(&mut self, global_state: &mut GlobalState, client: &mut Client) -> Vec<Event> {
- let events = self.update_layout(client);
- self.ui.maintain(global_state.window.renderer_mut(), None);
- events
- }
-
- pub fn render(&self, renderer: &mut Renderer, globals: &Consts<Globals>) {
- self.ui.render(renderer, Some(globals));
- }
-}
diff --git a/voxygen/src/menu/char_selection/ui/mod.rs b/voxygen/src/menu/char_selection/ui/mod.rs
index 3993ff82f5..3281c2ac53 100644
--- a/voxygen/src/menu/char_selection/ui/mod.rs
+++ b/voxygen/src/menu/char_selection/ui/mod.rs
@@ -55,8 +55,8 @@ const STARTER_SCEPTRE: &str = "common.items.weapons.sceptre.starter_sceptre";
// TODO: what does this comment mean?
// // Use in future MR to make this a starter weapon
-// TODO: use for info popup frame/background and for char list scrollbar
-const UI_MAIN: iced::Color = iced::Color::from_rgba(0.61, 0.70, 0.70, 1.0); // Greenish Blue
+// TODO: use for info popup frame/background
+const UI_MAIN: Rgba<u8> = Rgba::new(156, 179, 179, 255); // Greenish Blue
image_ids_ice! {
struct Imgs {
@@ -66,9 +66,6 @@ image_ids_ice! {
slider_range: "voxygen.element.slider.track",
slider_indicator: "voxygen.element.slider.indicator",
- gray_corner: "voxygen.element.frames.gray.corner",
- gray_edge: "voxygen.element.frames.gray.edge",
-
selection: "voxygen.element.frames.selection",
selection_hover: "voxygen.element.frames.selection_hover",
selection_press: "voxygen.element.frames.selection_press",
@@ -130,6 +127,7 @@ pub enum Event {
body: comp::Body,
},
DeleteCharacter(CharacterId),
+ ClearCharacterListError,
}
enum Mode {
@@ -165,9 +163,9 @@ enum Mode {
}
impl Mode {
- pub fn select() -> Self {
+ pub fn select(info_content: Option<InfoContent>) -> Self {
Self::Select {
- info_content: None,
+ info_content,
selected: None,
characters_scroll: Default::default(),
character_buttons: Vec::new(),
@@ -212,23 +210,9 @@ enum InfoContent {
LoadingCharacters,
CreatingCharacter,
DeletingCharacter,
- CharacterError,
+ CharacterError(String),
}
-/*
-impl InfoContent {
- pub fn has_content(&self, character_list_loading: &bool) -> bool {
- match self {
- Self::None => false,
- Self::CreatingCharacter | Self::DeletingCharacter | Self::LoadingCharacters => {
- *character_list_loading
- },
- _ => true,
- }
- }
-}
-*/
-
struct Controls {
fonts: Fonts,
imgs: Imgs,
@@ -261,6 +245,7 @@ enum Message {
RandomizeCharacter,
CancelDeletion,
ConfirmDeletion,
+ ClearCharacterListError,
HairStyle(u8),
HairColor(u8),
Skin(u8),
@@ -287,14 +272,13 @@ impl Controls {
tooltip_manager: TooltipManager::new(TOOLTIP_HOVER_DUR, TOOLTIP_FADE_DUR),
mouse_detector: Default::default(),
- mode: Mode::select(),
+ mode: Mode::select(Some(InfoContent::LoadingCharacters)),
}
}
- fn view(&mut self, settings: &Settings, client: &Client) -> Element<Message> {
+ fn view(&mut self, _settings: &Settings, client: &Client) -> Element<Message> {
// TODO: use font scale thing for text size (use on button size for buttons with
// text)
- // TODO: if enter key pressed and character is selected then enter the world
// Maintain tooltip manager
self.tooltip_manager.maintain();
@@ -340,7 +324,7 @@ impl Controls {
let content = match &mut self.mode {
Mode::Select {
- info_content,
+ ref mut info_content,
selected,
ref mut characters_scroll,
ref mut character_buttons,
@@ -350,6 +334,26 @@ impl Controls {
ref mut yes_button,
ref mut no_button,
} => {
+ if let Some(error) = &client.character_list.error {
+ // TODO: use more user friendly errors with suggestions on potential solutions
+ // instead of directly showing error message here
+ *info_content = Some(InfoContent::CharacterError(format!(
+ "{}: {}",
+ i18n.get("common.error"),
+ error
+ )))
+ } else if let Some(InfoContent::CharacterError(_)) = info_content {
+ *info_content = None;
+ } else if matches!(
+ info_content,
+ Some(InfoContent::LoadingCharacters)
+ | Some(InfoContent::CreatingCharacter)
+ | Some(InfoContent::DeletingCharacter)
+ ) && !client.character_list.loading
+ {
+ *info_content = None;
+ }
+
let server = Container::new(
Column::with_children(vec![
Text::new(&client.server_info.name)
@@ -493,9 +497,15 @@ impl Controls {
Container::new(
Scrollable::new(characters_scroll)
.push(Column::with_children(characters).spacing(4))
- .width(Length::Fill),
+ .padding(5)
+ .scrollbar_width(5)
+ .scroller_width(5)
+ .width(Length::Fill)
+ .style(style::scrollable::Style {
+ track: None,
+ scroller: style::scrollable::Scroller::Color(UI_MAIN),
+ }),
)
- .padding(5)
.style(style::container::Style::color(Rgba::from_translucent(
0,
BANNER_ALPHA,
@@ -538,7 +548,7 @@ impl Controls {
let enter_world = neat_button(
enter_world_button,
i18n.get("char_selection.enter_world"),
- FILL_FRAC_ONE,
+ FILL_FRAC_TWO,
button_style,
selected.map(|_| Message::EnterWorld),
);
@@ -563,35 +573,67 @@ impl Controls {
// Overlay delete prompt
if let Some(info_content) = info_content {
- let over: Element<_> = match info_content {
- InfoContent::Deletion(_) => Container::new(
- Column::with_children(vec![
- Text::new(i18n.get("char_selection.delete_permanently"))
- .size(fonts.cyri.scale(24))
- .into(),
- Row::with_children(vec![
- neat_button(
- no_button,
- i18n.get("common.no"),
- FILL_FRAC_ONE,
- button_style,
- Some(Message::CancelDeletion),
- ),
- neat_button(
- yes_button,
- i18n.get("common.yes"),
- FILL_FRAC_ONE,
- button_style,
- Some(Message::ConfirmDeletion),
- ),
- ])
- .height(Length::Units(28))
- .spacing(30)
+ let over_content: Element<_> = match &info_content {
+ InfoContent::Deletion(_) => Column::with_children(vec![
+ Text::new(i18n.get("char_selection.delete_permanently"))
+ .size(fonts.cyri.scale(24))
.into(),
+ Row::with_children(vec![
+ neat_button(
+ no_button,
+ i18n.get("common.no"),
+ FILL_FRAC_ONE,
+ button_style,
+ Some(Message::CancelDeletion),
+ ),
+ neat_button(
+ yes_button,
+ i18n.get("common.yes"),
+ FILL_FRAC_ONE,
+ button_style,
+ Some(Message::ConfirmDeletion),
+ ),
])
- .align_items(Align::Center)
- .spacing(10),
- )
+ .height(Length::Units(28))
+ .spacing(30)
+ .into(),
+ ])
+ .align_items(Align::Center)
+ .spacing(10)
+ .into(),
+ InfoContent::LoadingCharacters => {
+ Text::new(i18n.get("char_selection.loading_characters"))
+ .size(fonts.cyri.scale(24))
+ .into()
+ },
+ InfoContent::CreatingCharacter => {
+ Text::new(i18n.get("char_selection.creating_character"))
+ .size(fonts.cyri.scale(24))
+ .into()
+ },
+ InfoContent::DeletingCharacter => {
+ Text::new(i18n.get("char_selection.deleting_character"))
+ .size(fonts.cyri.scale(24))
+ .into()
+ },
+ InfoContent::CharacterError(error) => Column::with_children(vec![
+ Text::new(error).size(fonts.cyri.scale(24)).into(),
+ Container::new(neat_button(
+ no_button,
+ i18n.get("common.close"),
+ FILL_FRAC_ONE,
+ button_style,
+ Some(Message::ClearCharacterListError),
+ ))
+ .height(Length::Units(28))
+ .into(),
+ ])
+ .align_items(Align::Center)
+ .spacing(10)
+ .into(),
+ };
+
+ let over = Container::new(over_content)
.style(
style::container::Style::color_with_double_cornerless_border(
(0, 0, 0, 200).into(),
@@ -605,11 +647,7 @@ impl Controls {
.max_height(130)
.padding(16)
.center_x()
- .center_y()
- .into(),
- // TODO
- _ => Space::new(Length::Shrink, Length::Shrink).into(),
- };
+ .center_y();
Overlay::new(over, content)
.width(Length::Fill)
@@ -624,7 +662,7 @@ impl Controls {
Mode::Create {
name,
body,
- loadout,
+ loadout: _,
tool,
ref mut scroll,
ref mut body_type_buttons,
@@ -990,7 +1028,11 @@ impl Controls {
)
.padding(5)
.width(Length::Fill)
- .align_items(Align::Center),
+ .align_items(Align::Center)
+ .style(style::scrollable::Style {
+ track: None,
+ scroller: style::scrollable::Scroller::Color(UI_MAIN),
+ }),
)
.width(Length::Units(320)) // TODO: see if we can get iced to work with settings below
//.max_width(360)
@@ -1126,7 +1168,7 @@ impl Controls {
match message {
Message::Back => {
if matches!(&self.mode, Mode::Create { .. }) {
- self.mode = Mode::select();
+ self.mode = Mode::select(None);
}
},
Message::Logout => {
@@ -1169,7 +1211,7 @@ impl Controls {
tool: String::from(*tool),
body: comp::Body::Humanoid(*body),
});
- self.mode = Mode::select();
+ self.mode = Mode::select(Some(InfoContent::CreatingCharacter));
}
},
Message::Name(value) => {
@@ -1208,17 +1250,20 @@ impl Controls {
if let Some(id) = characters.get(*idx).and_then(|i| i.character.id) {
events.push(Event::DeleteCharacter(id));
}
- *info_content = None;
+ *info_content = Some(InfoContent::DeletingCharacter);
}
}
},
Message::CancelDeletion => {
if let Mode::Select { info_content, .. } = &mut self.mode {
- if let Some(InfoContent::Deletion(idx)) = info_content {
+ if let Some(InfoContent::Deletion(_)) = info_content {
*info_content = None;
}
}
},
+ Message::ClearCharacterListError => {
+ events.push(Event::ClearCharacterListError);
+ },
Message::HairStyle(value) => {
if let Mode::Create { body, .. } = &mut self.mode {
body.hair_style = value;
diff --git a/voxygen/src/ui/ice/mod.rs b/voxygen/src/ui/ice/mod.rs
index 619839c731..88eb96481a 100644
--- a/voxygen/src/ui/ice/mod.rs
+++ b/voxygen/src/ui/ice/mod.rs
@@ -66,6 +66,10 @@ impl IcedUi {
self.renderer.add_graphic(graphic)
}
+ pub fn replace_graphic(&mut self, id: graphic::Id, graphic: Graphic) {
+ self.renderer.replace_graphic(id, graphic);
+ }
+
pub fn scale(&self) -> Scale { self.scale }
pub fn set_scaling_mode(&mut self, mode: ScaleMode) {
diff --git a/voxygen/src/ui/ice/renderer/mod.rs b/voxygen/src/ui/ice/renderer/mod.rs
index 2a64e8e64a..284146e215 100644
--- a/voxygen/src/ui/ice/renderer/mod.rs
+++ b/voxygen/src/ui/ice/renderer/mod.rs
@@ -29,6 +29,8 @@ enum DrawKind {
// Text and non-textured geometry
Plain,
}
+
+#[allow(dead_code)] // TODO: remove once WorldPos is used
enum DrawCommand {
Draw { kind: DrawKind, verts: Range<u32> },
Scissor(Aabr<u16>),
@@ -149,6 +151,10 @@ impl IcedRenderer {
self.cache.add_graphic(graphic)
}
+ pub fn replace_graphic(&mut self, id: graphic::Id, graphic: Graphic) {
+ self.cache.replace_graphic(id, graphic);
+ }
+
fn image_dims(&self, handle: image::Handle) -> (u32, u32) {
self
.cache