From f30e879cf5219089adaae3af56d47605e51dd718 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 14 Feb 2022 17:16:33 -0500 Subject: [PATCH] Clippy fixes --- assets/voxygen/shaders/particle-vert.glsl | 2 +- voxygen/src/hud/map.rs | 5 ++--- voxygen/src/hud/mod.rs | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/assets/voxygen/shaders/particle-vert.glsl b/assets/voxygen/shaders/particle-vert.glsl index 49a85e3085..a84160a9b3 100644 --- a/assets/voxygen/shaders/particle-vert.glsl +++ b/assets/voxygen/shaders/particle-vert.glsl @@ -399,7 +399,7 @@ void main() { attr = Attr( spiral_motion(inst_dir, 0.3 * (floor(2 * rand0 + 0.5) - 0.5) * min(linear_scale(10), 1), lifetime / inst_lifespan, 10.0, inst_time), vec3((1.7 - 0.7 * abs(floor(2 * rand0 - 0.5) + 0.5)) * (1.5 + 0.5 * sin(tick.x * 10 - lifetime * 4))), - vec4(vec3(purple_col, green_col, 0.75 * purple_col), 1), + vec4(vec3(red_col + purple_col * 0.6, green_col + purple_col * 0.35, purple_col), 1), spin_in_axis(inst_dir, tick.z) ); break; diff --git a/voxygen/src/hud/map.rs b/voxygen/src/hud/map.rs index 90b4b30ec6..f4cfeb1c4f 100644 --- a/voxygen/src/hud/map.rs +++ b/voxygen/src/hud/map.rs @@ -1,8 +1,7 @@ use super::{ img_ids::{Imgs, ImgsRot}, - Show, QUALITY_COMMON, QUALITY_EPIC, QUALITY_HIGH, QUALITY_LEGENDARY, QUALITY_LOW, - QUALITY_MODERATE, TEXT_BG, TEXT_BLUE_COLOR, TEXT_COLOR, TEXT_GRAY_COLOR, TEXT_VELORITE, - UI_HIGHLIGHT_0, UI_MAIN, + Show, QUALITY_COMMON, QUALITY_EPIC, QUALITY_HIGH, QUALITY_LOW, QUALITY_MODERATE, TEXT_BG, + TEXT_BLUE_COLOR, TEXT_COLOR, TEXT_GRAY_COLOR, TEXT_VELORITE, UI_HIGHLIGHT_0, UI_MAIN, }; use crate::{ game_input::GameInput, diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 2e8c55e16e..efbb890ca4 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -4301,7 +4301,6 @@ pub fn get_buff_image(buff: BuffKind, imgs: &Imgs) -> conrod_core::image::Id { BuffKind::Invulnerability => imgs.buff_invincibility_0, BuffKind::ProtectingWard => imgs.buff_dmg_red_0, BuffKind::Frenzied { .. } => imgs.buff_frenzy_0, - // TODO: Get unique icon BuffKind::Hastened { .. } => imgs.buff_haste_0, // Debuffs BuffKind::Bleeding { .. } => imgs.debuff_bleed_0,