From e33961e1fa5d45ad0518cc4d8d17b0fecefdcd55 Mon Sep 17 00:00:00 2001 From: gGmMsS123 <82216659+gGmMsS123@users.noreply.github.com> Date: Fri, 16 Apr 2021 00:34:24 +0300 Subject: [PATCH] M2 Staff Final Touch --- Cargo.toml | 1 + assets/voxygen/i18n/en/buff.ron | 2 +- common/src/comp/buff.rs | 3 ++- voxygen/src/hud/mod.rs | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ac2e2d2a80..1b657f0627 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,6 +48,7 @@ opt-level = 2 [profile.dev.package."veloren-server-cli"] opt-level = 2 [profile.dev.package."veloren-voxygen"] +incremental = true opt-level = 2 [profile.dev.package."veloren-world"] opt-level = 2 diff --git a/assets/voxygen/i18n/en/buff.ron b/assets/voxygen/i18n/en/buff.ron index d8987d56a5..ea4187e202 100644 --- a/assets/voxygen/i18n/en/buff.ron +++ b/assets/voxygen/i18n/en/buff.ron @@ -25,7 +25,7 @@ "buff.title.cursed": "Cursed", "buff.desc.cursed": "You are cursed.", "buff.title.burn": "On Fire", - "buff.desc.burn": "Burn, baby, burn", + "buff.desc.burn": "You are burning alive", // Buffs stats "buff.stat.health": "Restores {str_total} Health", "buff.stat.increase_max_stamina": "Raises Maximum Stamina by {strength}", diff --git a/common/src/comp/buff.rs b/common/src/comp/buff.rs index c4e6b938f4..ae699a18ee 100644 --- a/common/src/comp/buff.rs +++ b/common/src/comp/buff.rs @@ -14,7 +14,7 @@ use std::{cmp::Ordering, time::Duration}; /// This is used to determine what effects a buff will have #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Serialize, Deserialize, PartialOrd, Ord)] pub enum BuffKind { - /// Lower a creature's max health over time + /// Does damage to a creature over time Burning, /// Restores health/time for some period Regeneration, @@ -247,6 +247,7 @@ impl Buff { }], data.duration, ), + }; Buff { kind, diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 22b707b82c..af20191ced 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -3447,7 +3447,7 @@ pub fn get_buff_image(buff: BuffKind, imgs: &Imgs) -> conrod_core::image::Id { // Debuffs BuffKind::Bleeding { .. } => imgs.debuff_bleed_0, BuffKind::Cursed { .. } => imgs.debuff_skull_0, - BuffKind::Burning { .. } => imgs.debuff_burning_0, + BuffKind::Burning { .. } => imgs.debuff_burning_0, } }