Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

PoI icon

Browse Source
This commit is contained in:
Monty 2021-02-12 22:59:33 +01:00 committed by Joshua Barretto
parent 3aff271a05
commit 8214c9df82
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/element/map/excl.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

1
voxygen/src/hud/img_ids.rs
View File

@ -364,6 +364,7 @@ image_ids! {
mmap_site_cave_bg: "voxygen.element.map.cave_bg", mmap_site_cave_bg: "voxygen.element.map.cave_bg",
mmap_site_cave_hover: "voxygen.element.map.cave_hover", mmap_site_cave_hover: "voxygen.element.map.cave_hover",
mmap_site_cave: "voxygen.element.map.cave", mmap_site_cave: "voxygen.element.map.cave",
mmap_site_excl: "voxygen.element.map.excl",
// Window Parts // Window Parts
window_3: "voxygen.element.frames.window_3", window_3: "voxygen.element.frames.window_3",

4
voxygen/src/hud/map.rs
View File

@ -528,6 +528,7 @@ impl<'a> Widget for Map<'a> {
SiteKind::Dungeon { .. } => self.imgs.mmap_site_dungeon, SiteKind::Dungeon { .. } => self.imgs.mmap_site_dungeon,
SiteKind::Castle => self.imgs.mmap_site_castle, SiteKind::Castle => self.imgs.mmap_site_castle,
SiteKind::Cave => self.imgs.mmap_site_cave, SiteKind::Cave => self.imgs.mmap_site_cave,
_ => self.imgs.mmap_site_excl,
}) })
.x_y_position_relative_to( .x_y_position_relative_to(
state.ids.grid, state.ids.grid,
@ -540,6 +541,7 @@ impl<'a> Widget for Map<'a> {
SiteKind::Dungeon { .. } => self.imgs.mmap_site_dungeon_hover, SiteKind::Dungeon { .. } => self.imgs.mmap_site_dungeon_hover,
SiteKind::Castle => self.imgs.mmap_site_castle_hover, SiteKind::Castle => self.imgs.mmap_site_castle_hover,
SiteKind::Cave => self.imgs.mmap_site_cave_hover, SiteKind::Cave => self.imgs.mmap_site_cave_hover,
_ => self.imgs.mmap_site_excl,
}) })
.image_color(UI_HIGHLIGHT_0) .image_color(UI_HIGHLIGHT_0)
.with_tooltip( .with_tooltip(
@ -560,6 +562,7 @@ impl<'a> Widget for Map<'a> {
_ => TEXT_COLOR, _ => TEXT_COLOR,
}, },
SiteKind::Cave => TEXT_COLOR, SiteKind::Cave => TEXT_COLOR,
_ => TEXT_COLOR,
}, },
); );
// Only display sites that are toggled on // Only display sites that are toggled on
@ -584,6 +587,7 @@ impl<'a> Widget for Map<'a> {
site_btn.set(state.ids.mmap_site_icons[i], ui); site_btn.set(state.ids.mmap_site_icons[i], ui);
} }
}, },
_ => {site_btn.set(state.ids.mmap_site_icons[i], ui);},
} }
// Difficulty from 0-6 // Difficulty from 0-6

2
voxygen/src/hud/minimap.rs
View File

@ -303,6 +303,7 @@ impl<'a> Widget for MiniMap<'a> {
SiteKind::Dungeon { .. } => self.imgs.mmap_site_dungeon_bg, SiteKind::Dungeon { .. } => self.imgs.mmap_site_dungeon_bg,
SiteKind::Castle => self.imgs.mmap_site_castle_bg, SiteKind::Castle => self.imgs.mmap_site_castle_bg,
SiteKind::Cave => self.imgs.mmap_site_cave_bg, SiteKind::Cave => self.imgs.mmap_site_cave_bg,
_ => self.imgs.mmap_site_excl,
}) })
.x_y_position_relative_to( .x_y_position_relative_to(
state.ids.grid, state.ids.grid,
@ -331,6 +332,7 @@ impl<'a> Widget for MiniMap<'a> {
SiteKind::Dungeon { .. } => self.imgs.mmap_site_dungeon, SiteKind::Dungeon { .. } => self.imgs.mmap_site_dungeon,
SiteKind::Castle => self.imgs.mmap_site_castle, SiteKind::Castle => self.imgs.mmap_site_castle,
SiteKind::Cave => self.imgs.mmap_site_cave, SiteKind::Cave => self.imgs.mmap_site_cave,
_ => self.imgs.mmap_site_excl,
}) })
.middle_of(state.ids.mmap_site_icons_bgs[i]) .middle_of(state.ids.mmap_site_icons_bgs[i])
.w_h(20.0, 20.0) .w_h(20.0, 20.0)