diff --git a/assets/voxygen/background/bg_1.png b/assets/voxygen/background/bg_1.png deleted file mode 100644 index 9bb5baf5fe..0000000000 Binary files a/assets/voxygen/background/bg_1.png and /dev/null differ diff --git a/assets/voxygen/background/bg_10.png b/assets/voxygen/background/bg_10.png index 7b60ddcfc5..56aad75d60 100644 Binary files a/assets/voxygen/background/bg_10.png and b/assets/voxygen/background/bg_10.png differ diff --git a/assets/voxygen/background/bg_11.png b/assets/voxygen/background/bg_11.png deleted file mode 100644 index 4022a8dff6..0000000000 Binary files a/assets/voxygen/background/bg_11.png and /dev/null differ diff --git a/assets/voxygen/background/bg_12.png b/assets/voxygen/background/bg_12.png index 0df2b0bd67..ac4d42e1a0 100644 Binary files a/assets/voxygen/background/bg_12.png and b/assets/voxygen/background/bg_12.png differ diff --git a/assets/voxygen/background/bg_14.png b/assets/voxygen/background/bg_14.png deleted file mode 100644 index 8d6cb5b3dd..0000000000 Binary files a/assets/voxygen/background/bg_14.png and /dev/null differ diff --git a/assets/voxygen/background/bg_15.png b/assets/voxygen/background/bg_15.png deleted file mode 100644 index 13aa973e18..0000000000 Binary files a/assets/voxygen/background/bg_15.png and /dev/null differ diff --git a/assets/voxygen/background/bg_16.png b/assets/voxygen/background/bg_16.png deleted file mode 100644 index 321806416c..0000000000 Binary files a/assets/voxygen/background/bg_16.png and /dev/null differ diff --git a/assets/voxygen/background/bg_2.png b/assets/voxygen/background/bg_2.png index 0c2b8b577e..3dad16cd6e 100644 Binary files a/assets/voxygen/background/bg_2.png and b/assets/voxygen/background/bg_2.png differ diff --git a/assets/voxygen/background/bg_3.png b/assets/voxygen/background/bg_3.png index ba26c92227..7f74537ca6 100644 Binary files a/assets/voxygen/background/bg_3.png and b/assets/voxygen/background/bg_3.png differ diff --git a/assets/voxygen/background/bg_4.png b/assets/voxygen/background/bg_4.png index fb5440a14f..4e26ada275 100644 Binary files a/assets/voxygen/background/bg_4.png and b/assets/voxygen/background/bg_4.png differ diff --git a/assets/voxygen/background/bg_5.png b/assets/voxygen/background/bg_5.png index 6c2976d0ad..61682c425e 100644 Binary files a/assets/voxygen/background/bg_5.png and b/assets/voxygen/background/bg_5.png differ diff --git a/assets/voxygen/background/bg_6.png b/assets/voxygen/background/bg_6.png index e607dec4cc..8d52f68c46 100644 Binary files a/assets/voxygen/background/bg_6.png and b/assets/voxygen/background/bg_6.png differ diff --git a/assets/voxygen/background/bg_7.png b/assets/voxygen/background/bg_7.png index bb8b691024..3daf2db3a0 100644 Binary files a/assets/voxygen/background/bg_7.png and b/assets/voxygen/background/bg_7.png differ diff --git a/assets/voxygen/background/bg_9.png b/assets/voxygen/background/bg_9.png deleted file mode 100644 index 9d08feef5e..0000000000 Binary files a/assets/voxygen/background/bg_9.png and /dev/null differ diff --git a/assets/voxygen/background/bg_main.png b/assets/voxygen/background/bg_main.png index 7b60ddcfc5..4dc0970c74 100644 Binary files a/assets/voxygen/background/bg_main.png and b/assets/voxygen/background/bg_main.png differ diff --git a/assets/voxygen/element/buttons/indicator_mmap.png b/assets/voxygen/element/buttons/indicator_mmap.png index 755ff9791f..d5c7329055 100644 Binary files a/assets/voxygen/element/buttons/indicator_mmap.png and b/assets/voxygen/element/buttons/indicator_mmap.png differ diff --git a/assets/voxygen/element/map/cave.png b/assets/voxygen/element/map/cave.png index a0a58a8d39..8219613c1d 100644 Binary files a/assets/voxygen/element/map/cave.png and b/assets/voxygen/element/map/cave.png differ diff --git a/assets/voxygen/element/map/cave_bg.png b/assets/voxygen/element/map/cave_bg.png index 7cbce991e4..58c7d58a3e 100644 Binary files a/assets/voxygen/element/map/cave_bg.png and b/assets/voxygen/element/map/cave_bg.png differ diff --git a/assets/voxygen/element/map/cave_hover.png b/assets/voxygen/element/map/cave_hover.png index 1668276b7d..98d0bb7c34 100644 Binary files a/assets/voxygen/element/map/cave_hover.png and b/assets/voxygen/element/map/cave_hover.png differ diff --git a/assets/voxygen/element/map/dif_0.png b/assets/voxygen/element/map/dif_0.png deleted file mode 100644 index bf7211abd5..0000000000 Binary files a/assets/voxygen/element/map/dif_0.png and /dev/null differ diff --git a/assets/voxygen/element/map/dif_1.png b/assets/voxygen/element/map/dif_1.png index b4fcd54bbc..bf7211abd5 100644 Binary files a/assets/voxygen/element/map/dif_1.png and b/assets/voxygen/element/map/dif_1.png differ diff --git a/assets/voxygen/element/map/dif_2.png b/assets/voxygen/element/map/dif_2.png index 6a06b5f729..b4fcd54bbc 100644 Binary files a/assets/voxygen/element/map/dif_2.png and b/assets/voxygen/element/map/dif_2.png differ diff --git a/assets/voxygen/element/map/dif_4.png b/assets/voxygen/element/map/dif_4.png index 461a5c1b1b..dcabfc7e28 100644 Binary files a/assets/voxygen/element/map/dif_4.png and b/assets/voxygen/element/map/dif_4.png differ diff --git a/assets/voxygen/element/map/dif_5.png b/assets/voxygen/element/map/dif_5.png index 6f62ebbaa6..461a5c1b1b 100644 Binary files a/assets/voxygen/element/map/dif_5.png and b/assets/voxygen/element/map/dif_5.png differ diff --git a/assets/voxygen/element/map/dif_6.png b/assets/voxygen/element/map/dif_6.png new file mode 100644 index 0000000000..6f62ebbaa6 Binary files /dev/null and b/assets/voxygen/element/map/dif_6.png differ diff --git a/common/src/loadout_builder.rs b/common/src/loadout_builder.rs index 5a89ec7231..86d96b98ba 100644 --- a/common/src/loadout_builder.rs +++ b/common/src/loadout_builder.rs @@ -558,7 +558,7 @@ impl LoadoutBuilder { back: None, ring: None, neck: None, - lantern: Some(Item::new_from_asset_expect("common.items.lantern.black_0")), + lantern: None, glider: None, head: None, tabard: None, diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index c68a98253a..2c93a68ff2 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -6,7 +6,7 @@ rotation_image_ids! { - indicator_mmap_small: "voxygen.element.buttons.indicator_mmap_small", + indicator_mmap_small: "voxygen.element.buttons.indicator_mmap", // Tooltip Test tt_side: "voxygen/element/frames/tt_test_edge", tt_corner: "voxygen/element/frames/tt_test_corner_tr", @@ -178,6 +178,7 @@ image_ids! { map_frame: "voxygen.element.misc_bg.map_frame", map_frame_art: "voxygen.element.misc_bg.map_frame_art", indicator_mmap: "voxygen.element.buttons.indicator_mmap", + indicator_map_overlay: "voxygen.element.buttons.indicator_mmap_small", // MiniMap mmap_frame: "voxygen.element.frames.mmap", @@ -195,12 +196,12 @@ image_ids! { mmap_minus: "voxygen.element.buttons.min_plus.mmap_button-min", mmap_minus_hover: "voxygen.element.buttons.min_plus.mmap_button-min_hover", mmap_minus_press: "voxygen.element.buttons.min_plus.mmap_button-min_press", - map_dif_0: "voxygen.element.map.dif_0", map_dif_1: "voxygen.element.map.dif_1", map_dif_2: "voxygen.element.map.dif_2", map_dif_3: "voxygen.element.map.dif_3", map_dif_4: "voxygen.element.map.dif_4", map_dif_5: "voxygen.element.map.dif_5", + map_dif_6: "voxygen.element.map.dif_6", mmap_site_town: "voxygen.element.map.town", mmap_site_town_hover: "voxygen.element.map.town_hover", mmap_site_town_bg: "voxygen.element.map.town_bg", diff --git a/voxygen/src/hud/map.rs b/voxygen/src/hud/map.rs index 498babea7d..4564a4f9da 100644 --- a/voxygen/src/hud/map.rs +++ b/voxygen/src/hud/map.rs @@ -18,8 +18,6 @@ use conrod_core::{ use specs::WorldExt; use vek::*; -use inline_tweak::*; - widget_ids! { struct Ids { frame, @@ -31,6 +29,7 @@ widget_ids! { qlog_align, location_name, indicator, + indicator_overlay, grid, map_title, qlog_title, @@ -61,11 +60,6 @@ widget_ids! { } } -#[cfg(target_os = "windows")] -const PLATFORM_FACTOR: f64 = 1.0; -#[cfg(not(target_os = "windows"))] -const PLATFORM_FACTOR: f64 = -1.0; - #[derive(WidgetCommon)] pub struct Map<'a> { client: &'a Client, @@ -181,7 +175,7 @@ impl<'a> Widget for Map<'a> { // Map Content Alignment Rectangle::fill_with([814.0, 834.0], color::TRANSPARENT) - .top_left_with_margins_on(state.ids.frame, 46.0, tweak!(240.0)) + .top_left_with_margins_on(state.ids.frame, 46.0, 240.0) .set(state.ids.map_align, ui); // Questlog Content Alignment @@ -288,23 +282,6 @@ impl<'a> Widget for Map<'a> { .parent(state.ids.bg) .source_rectangle(rect_src) .set(state.ids.grid, ui); - - /*if let Some(new_val) = ImageSlider::discrete( - self.global_state.settings.gameplay.map_zoom as i32, - 1, - 30, - self.imgs.slider_indicator_small, - self.imgs.slider, - ) - .w_h(600.0, 22.0 * 2.0) - .mid_bottom_with_margin_on(state.ids.grid, -55.0) - .track_breadth(12.0 * 2.0) - .slider_length(22.0 * 2.0) - .pad_track((12.0, 12.0)) - .set(state.ids.zoom_slider, ui) - { - events.push(Event::MapZoom(new_val as f64)); - }*/ // Handle zooming with the mousewheel let scrolled: f64 = ui .widget_input(state.ids.grid) @@ -312,8 +289,8 @@ impl<'a> Widget for Map<'a> { .map(|scroll| scroll.y) .sum(); let new_zoom_lvl = (self.global_state.settings.gameplay.map_zoom - * (scrolled * 0.05 * PLATFORM_FACTOR).exp2()) - .clamped(0.75, max_zoom / 64.0); + * (scrolled * 0.05 * -1.0).exp2()) + .clamped(1.25, max_zoom / 64.0); events.push(Event::MapZoom(new_zoom_lvl as f64)); // Icon settings // Alignment @@ -322,7 +299,7 @@ impl<'a> Widget for Map<'a> { .set(state.ids.map_settings_align, ui); // Checkboxes // Show difficulties - Image::new(self.imgs.map_dif_5) + Image::new(self.imgs.map_dif_6) .top_left_with_margins_on(state.ids.map_settings_align, 5.0, 5.0) .w_h(20.0, 20.0) .set(state.ids.show_difficulty_img, ui); @@ -544,34 +521,10 @@ impl<'a> Widget for Map<'a> { SiteKind::Cave => (0, i18n.get("hud.map.cave").to_string()), }; let site_btn = Button::image(match &site.kind { - SiteKind::Town => { - if show_towns { - self.imgs.mmap_site_town - } else { - self.imgs.nothing - } - }, - SiteKind::Dungeon { .. } => { - if show_dungeons { - self.imgs.mmap_site_dungeon - } else { - self.imgs.nothing - } - }, - SiteKind::Castle => { - if show_castles { - self.imgs.mmap_site_castle - } else { - self.imgs.nothing - } - }, - SiteKind::Cave => { - if show_caves { - self.imgs.mmap_site_cave - } else { - self.imgs.nothing - } - }, + SiteKind::Town => self.imgs.mmap_site_town, + SiteKind::Dungeon { .. } => self.imgs.mmap_site_dungeon, + SiteKind::Castle => self.imgs.mmap_site_castle, + SiteKind::Cave => self.imgs.mmap_site_cave, }) .x_y_position_relative_to( state.ids.grid, @@ -635,12 +588,11 @@ impl<'a> Widget for Map<'a> { if show_difficulty { let size = 1.8; // Size factor for difficulty indicators let dif_img = Image::new(match difficulty { - 0 => self.imgs.map_dif_0, 1 => self.imgs.map_dif_1, 2 => self.imgs.map_dif_2, 3 => self.imgs.map_dif_3, 4 => self.imgs.map_dif_4, - 5 => self.imgs.map_dif_5, + 5 => self.imgs.map_dif_6, _ => self.imgs.nothing, }) .mid_top_with_margin_on(state.ids.mmap_site_icons[i], match difficulty { @@ -707,8 +659,8 @@ impl<'a> Widget for Map<'a> { let rpos = rfpos.map2(map_size, |e, sz| e * sz as f32 * zoom as f32); // Don't show if outside or near the edge of the map let arrow_sz = { - let scale = 0.6f64; - Vec2::new(32.0, 37.0) * scale + let scale = 0.5; + Vec2::new(36.0, 37.0) * scale }; // Hide if icon could go off of the edge of the map let arrow_mag = arrow_sz.map(|e| e as f32 / 2.0).magnitude(); @@ -728,7 +680,7 @@ impl<'a> Widget for Map<'a> { } // Info about controls - let icon_size = Vec2::new(tweak!(25.6), tweak!(28.8)); + let icon_size = Vec2::new(25.6, 28.8); let recenter: bool; if drag.x != 0.0 || drag.y != 0.0 { recenter = true @@ -737,7 +689,7 @@ impl<'a> Widget for Map<'a> { }; if Button::image(self.imgs.button) .w_h(92.0, icon_size.y) - .mid_bottom_with_margin_on(state.ids.grid, tweak!(-36.0)) + .mid_bottom_with_margin_on(state.ids.grid, -36.0) .hover_image(if recenter { self.imgs.button_hover } else { @@ -769,24 +721,24 @@ impl<'a> Widget for Map<'a> { }; Image::new(self.imgs.m_move_ico) - .bottom_left_with_margins_on(state.ids.grid, tweak!(-36.0), 0.0) + .bottom_left_with_margins_on(state.ids.grid, -36.0, 0.0) .w_h(icon_size.x, icon_size.y) .color(Some(UI_HIGHLIGHT_0)) .set(state.ids.drag_ico, ui); Text::new(i18n.get("hud.map.drag")) - .right_from(state.ids.drag_ico, tweak!(5.0)) + .right_from(state.ids.drag_ico, 5.0) .font_size(self.fonts.cyri.scale(14)) .font_id(self.fonts.cyri.conrod_id) .graphics_for(state.ids.grid) .color(TEXT_COLOR) .set(state.ids.drag_txt, ui); Image::new(self.imgs.m_scroll_ico) - .right_from(state.ids.drag_txt, tweak!(5.0)) + .right_from(state.ids.drag_txt, 5.0) .w_h(icon_size.x, icon_size.y) .color(Some(UI_HIGHLIGHT_0)) .set(state.ids.zoom_ico, ui); Text::new(i18n.get("hud.map.zoom")) - .right_from(state.ids.zoom_ico, tweak!(5.0)) + .right_from(state.ids.zoom_ico, 5.0) .font_size(self.fonts.cyri.scale(14)) .font_id(self.fonts.cyri.conrod_id) .graphics_for(state.ids.grid) diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 519007da7a..62a253d72f 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -73,7 +73,6 @@ use conrod_core::{ widget::{self, Button, Image, Text}, widget_ids, Color, Colorable, Labelable, Positionable, Sizeable, Widget, }; -use inline_tweak::*; use specs::{Join, WorldExt}; use std::{ collections::{HashMap, VecDeque}, @@ -645,7 +644,7 @@ impl Hud { let ids = Ids::new(ui.id_generator()); // NOTE: Use a border the same color as the LOD ocean color (but with a // translucent alpha since UI have transparency and LOD doesn't). - let water_color = srgba_to_linear(Rgba::new(0.0, tweak!(0.18), tweak!(0.37), tweak!(1.0))); + let water_color = srgba_to_linear(Rgba::new(0.0, 0.18, 0.37, 1.0)); // Load world map let world_map = ( ui.add_graphic_with_rotations(Graphic::Image( diff --git a/voxygen/src/menu/main/ui/mod.rs b/voxygen/src/menu/main/ui/mod.rs index 0790e4eb37..dcd42ddd73 100644 --- a/voxygen/src/menu/main/ui/mod.rs +++ b/voxygen/src/menu/main/ui/mod.rs @@ -63,8 +63,8 @@ image_ids_ice! { } // Randomly loaded background images -const BG_IMGS: [&str; 13] = [ - "voxygen.background.bg_1", +const BG_IMGS: [&str; 10] = [ + //"voxygen.background.bg_1", "voxygen.background.bg_2", "voxygen.background.bg_3", "voxygen.background.bg_4", @@ -72,14 +72,14 @@ const BG_IMGS: [&str; 13] = [ "voxygen.background.bg_6", "voxygen.background.bg_7", "voxygen.background.bg_8", - "voxygen.background.bg_9", - //"voxygen.background.bg_10", - "voxygen.background.bg_11", - //"voxygen.background.bg_12", + //"voxygen.background.bg_9", + "voxygen.background.bg_10", + //"voxygen.background.bg_11", + "voxygen.background.bg_12", "voxygen.background.bg_13", //"voxygen.background.bg_14", - "voxygen.background.bg_15", - "voxygen.background.bg_16", + //"voxygen.background.bg_15", + //"voxygen.background.bg_16", ]; pub enum Event {