From d2d8d43410d5beae676fad918c3e790fb356a94f Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 23 Apr 2021 23:34:31 -0400 Subject: [PATCH] Addressed testing feedback. Particles better. --- assets/voxygen/shaders/particle-vert.glsl | 2 +- common/src/comp/ability.rs | 4 ++-- voxygen/src/scene/particle.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/voxygen/shaders/particle-vert.glsl b/assets/voxygen/shaders/particle-vert.glsl index a2c8a89ee4..dd3ca7b466 100644 --- a/assets/voxygen/shaders/particle-vert.glsl +++ b/assets/voxygen/shaders/particle-vert.glsl @@ -202,7 +202,7 @@ void main() { attr = Attr( linear_motion( normalize(vec3(rand0, rand1, rand3)) * 0.3, - normalize(vec3(rand4, rand5, rand6)) * 2.0 + grav_vel(earth_gravity) + normalize(vec3(rand4, rand5, rand6)) * 4.0 + grav_vel(earth_gravity) ), vec3(1.0), vec4(3.5, 3 + rand7, 0, 1), diff --git a/common/src/comp/ability.rs b/common/src/comp/ability.rs index 7e55976bb1..aecb1775dd 100644 --- a/common/src/comp/ability.rs +++ b/common/src/comp/ability.rs @@ -350,8 +350,8 @@ impl CharacterAbility { pub fn default_block() -> CharacterAbility { CharacterAbility::BasicBlock { - buildup_duration: 0.3, - recover_duration: 0.2, + buildup_duration: 0.35, + recover_duration: 0.3, max_angle: 60.0, block_strength: 0.5, energy_cost: 50.0, diff --git a/voxygen/src/scene/particle.rs b/voxygen/src/scene/particle.rs index 852cc28325..9fafde5e5f 100644 --- a/voxygen/src/scene/particle.rs +++ b/voxygen/src/scene/particle.rs @@ -205,7 +205,7 @@ impl ParticleMgr { }, Outcome::Block { pos, parry } => { if *parry { - self.particles.resize_with(self.particles.len() + 20, || { + self.particles.resize_with(self.particles.len() + 10, || { Particle::new( Duration::from_millis(200), time,