From 7d366aa09a3d89fcf958798b696f4287f004e8f3 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Sat, 27 Feb 2021 19:02:26 +0000 Subject: [PATCH] reroute the F1 key to open the controls settings, removed loading screen tips about levels and the stats button --- CHANGELOG.md | 1 + assets/voxygen/element/help.png | Bin 22160 -> 0 bytes assets/voxygen/i18n/en/_manifest.ron | 6 +- assets/voxygen/i18n/en/hud/misc.ron | 50 +++-------- voxygen/src/hud/img_ids.rs | 2 - voxygen/src/hud/mod.rs | 126 ++++++++++++++++++++++----- voxygen/src/settings.rs | 2 +- 7 files changed, 120 insertions(+), 67 deletions(-) delete mode 100644 assets/voxygen/element/help.png diff --git a/CHANGELOG.md b/CHANGELOG.md index a10efd77ee..ae521df40a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Changed default controller key bindings - Improved network efficiency by ≈ factor 10 by using tokio. - Added item tooltips to trade window. +- "Quest" given to new players converted to being a short tutorial ### Removed diff --git a/assets/voxygen/element/help.png b/assets/voxygen/element/help.png deleted file mode 100644 index cd079fe251a4f38418a407cf7d7f47f2d4d6403f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22160 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 { + if Button::image(self.imgs.button) + .w_h(150.0, 40.0) + .hover_image(self.imgs.button_hover) + .press_image(self.imgs.button_press) + .bottom_left_with_margins_on(ui_widgets.window, 200.0, 120.0) + .label(&i18n.get("hud.tutorial_btn")) + .label_font_id(self.fonts.cyri.conrod_id) + .label_font_size(self.fonts.cyri.scale(18)) + .label_color(TEXT_COLOR) + .label_y(conrod_core::position::Relative::Scalar(2.0)) + .image_color(ENEMY_HP_COLOR) + .set(self.ids.intro_button, ui_widgets) + .was_clicked() + { + self.show.intro = true; + self.show.want_grab = true; + } + Image::new(self.imgs.sp_indicator_arrow) + .w_h(20.0, 11.0) + .mid_top_with_margin_on(self.ids.intro_button, -20.0 + arrow_ani as f64) + .color(Some(QUALITY_LEGENDARY)) + .set(self.ids.tut_arrow, ui_widgets); + Text::new( + &i18n + .get("hud.tutorial_click_here") + .replace("{key}", toggle_cursor_key.to_string().as_str()), + ) + .mid_top_with_margin_on(self.ids.tut_arrow, -18.0) + .font_id(self.fonts.cyri.conrod_id) + .font_size(self.fonts.cyri.scale(14)) + .color(BLACK) + .set(self.ids.tut_arrow_txt_bg, ui_widgets); + Text::new( + &i18n + .get("hud.tutorial_click_here") + .replace("{key}", toggle_cursor_key.to_string().as_str()), + ) + .bottom_right_with_margins_on(self.ids.tut_arrow_txt_bg, 1.0, 1.0) + .font_id(self.fonts.cyri.conrod_id) + .font_size(self.fonts.cyri.scale(14)) + .color(QUALITY_LEGENDARY) + .set(self.ids.tut_arrow_txt, ui_widgets); + }, + Intro::Never => { + self.show.intro = false; + }, + } + } + } + // TODO: Add event/stat based tutorial system if self.show.intro && !self.show.esc_menu { match global_state.settings.gameplay.intro_show { Intro::Show => { - if self.pulse > 20.0 { + if self.show.intro { self.show.want_grab = false; let quest_headline = &i18n.get("hud.temp_quest_headline"); let quest_text = &i18n.get("hud.temp_quest_text"); @@ -1643,13 +1696,15 @@ impl Hud { .set(self.ids.q_headline, ui_widgets); Text::new(quest_text) - .down_from(self.ids.q_headline_bg, 40.0) + .mid_top_with_margin_on(self.ids.quest_bg, 360.0) + .w(350.0) .font_size(self.fonts.cyri.scale(17)) .font_id(self.fonts.cyri.conrod_id) .color(TEXT_BG) .set(self.ids.q_text_bg, ui_widgets); Text::new(quest_text) .bottom_left_with_margins_on(self.ids.q_text_bg, 1.0, 1.0) + .w(350.0) .font_size(self.fonts.cyri.scale(17)) .font_id(self.fonts.cyri.conrod_id) .color(TEXT_COLOR) @@ -1659,8 +1714,8 @@ impl Hud { .w_h(212.0, 52.0) .hover_image(self.imgs.button_hover) .press_image(self.imgs.button_press) - .mid_bottom_with_margin_on(self.ids.q_text_bg, -120.0) - .label(&i18n.get("common.accept")) + .mid_bottom_with_margin_on(self.ids.q_text_bg, -80.0) + .label(&i18n.get("common.close")) .label_font_id(self.fonts.cyri.conrod_id) .label_font_size(self.fonts.cyri.scale(22)) .label_color(TEXT_COLOR) @@ -1668,10 +1723,35 @@ impl Hud { .set(self.ids.accept_button, ui_widgets) .was_clicked() { - self.show.intro = !self.show.intro; + self.show.intro = false; events.push(Event::Intro(Intro::Never)); self.show.want_grab = true; } + if !self.show.crafting && !self.show.bag { + Image::new(self.imgs.sp_indicator_arrow) + .w_h(20.0, 11.0) + .bottom_right_with_margins_on( + ui_widgets.window, + 40.0 + arrow_ani as f64, + 205.0, + ) + .color(Some(QUALITY_LEGENDARY)) + .set(self.ids.tut_arrow, ui_widgets); + Text::new(&i18n.get("hud.tutorial_elements")) + .mid_top_with_margin_on(self.ids.tut_arrow, -50.0) + .font_id(self.fonts.cyri.conrod_id) + .font_size(self.fonts.cyri.scale(40)) + .color(BLACK) + .floating(true) + .set(self.ids.tut_arrow_txt_bg, ui_widgets); + Text::new(&i18n.get("hud.tutorial_elements")) + .bottom_right_with_margins_on(self.ids.tut_arrow_txt_bg, 1.0, 1.0) + .font_id(self.fonts.cyri.conrod_id) + .font_size(self.fonts.cyri.scale(40)) + .color(QUALITY_LEGENDARY) + .floating(true) + .set(self.ids.tut_arrow_txt, ui_widgets); + } } }, Intro::Never => { @@ -1918,7 +1998,8 @@ impl Hud { } // Help Text - if self.show.help && !self.show.map && !self.show.esc_menu { + // TODO Add dynamic controls display + /*if self.show.help && !self.show.map && !self.show.esc_menu { Image::new(self.imgs.help) .middle_of(ui_widgets.window) .w_h(1260.0, 519.0) @@ -1935,7 +2016,7 @@ impl Hud { { self.show.help = false; }; - } + }*/ // Bag button and nearby icons let ecs = client.state().ecs(); @@ -2884,7 +2965,8 @@ impl Hud { true }, GameInput::Help if state => { - self.show.toggle_help(); + self.show.toggle_settings(global_state); + self.show.settings_tab = SettingsTab::Controls; true }, GameInput::ToggleDebug if state => { diff --git a/voxygen/src/settings.rs b/voxygen/src/settings.rs index cd23e98113..ff86afeda6 100644 --- a/voxygen/src/settings.rs +++ b/voxygen/src/settings.rs @@ -120,7 +120,7 @@ impl ControlSettings { match game_input { GameInput::Primary => KeyMouse::Mouse(MouseButton::Left), GameInput::Secondary => KeyMouse::Mouse(MouseButton::Right), - GameInput::ToggleCursor => KeyMouse::Key(VirtualKeyCode::Caret), + GameInput::ToggleCursor => KeyMouse::Key(VirtualKeyCode::Comma), GameInput::Escape => KeyMouse::Key(VirtualKeyCode::Escape), GameInput::Chat => KeyMouse::Key(VirtualKeyCode::Return), GameInput::Command => KeyMouse::Key(VirtualKeyCode::Slash),