From 658d2acca161902b53ee7e7eafa2585b6b9ed3ec Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Sun, 12 Jul 2020 13:10:26 +0200 Subject: [PATCH] colors --- voxygen/src/hud/mod.rs | 4 ++++ voxygen/src/hud/overhead.rs | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 01293cee13..773e4897e9 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -111,6 +111,10 @@ const WORLD_COLOR: Color = Color::Rgba(0.95, 1.0, 0.95, 1.0); /// Color for collected loot messages const LOOT_COLOR: Color = Color::Rgba(0.69, 0.57, 1.0, 1.0); +//Nametags +const GROUP_MEMBER: Color = Color::Rgba(0.47, 0.84, 1.0, 1.0); +const DEFAULT_NPC: Color = Color::Rgba(1.0, 1.0, 1.0, 1.0); + // UI Color-Theme const UI_MAIN: Color = Color::Rgba(0.61, 0.70, 0.70, 1.0); // Greenish Blue //const UI_MAIN: Color = Color::Rgba(0.1, 0.1, 0.1, 0.97); // Dark diff --git a/voxygen/src/hud/overhead.rs b/voxygen/src/hud/overhead.rs index 7f54b8d6fd..abcf9ebdd5 100644 --- a/voxygen/src/hud/overhead.rs +++ b/voxygen/src/hud/overhead.rs @@ -1,6 +1,6 @@ use super::{ - img_ids::Imgs, FACTION_COLOR, GROUP_COLOR, HP_COLOR, LOW_HP_COLOR, MANA_COLOR, REGION_COLOR, - SAY_COLOR, TELL_COLOR, TEXT_BG, TEXT_COLOR, + img_ids::Imgs, DEFAULT_NPC, FACTION_COLOR, GROUP_COLOR, GROUP_MEMBER, HP_COLOR, LOW_HP_COLOR, + MANA_COLOR, REGION_COLOR, SAY_COLOR, TELL_COLOR, TEXT_BG, TEXT_COLOR, }; use crate::{ i18n::VoxygenLocalization, @@ -149,9 +149,9 @@ impl<'a> Widget for Overhead<'a> { .font_id(self.fonts.cyri.conrod_id) .font_size(30) .color(if self.in_group { - Color::Rgba(1.0, 0.5, 0.6, 1.0) + GROUP_MEMBER } else { - Color::Rgba(0.61, 0.61, 0.89, 1.0) + DEFAULT_NPC }) .x_y(0.0, MANA_BAR_Y + 50.0) .set(state.ids.name, ui);