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

Addressed testing feedback.

Browse Source 
Particles better.
This commit is contained in:
Sam 2021-04-23 23:34:31 -04:00
parent b9d6bd2fd2
commit d2d8d43410
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/voxygen/shaders/particle-vert.glsl
View File

@ -202,7 +202,7 @@ void main() {
attr = Attr( attr = Attr(
linear_motion( linear_motion(
normalize(vec3(rand0, rand1, rand3)) * 0.3, 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), vec3(1.0),
vec4(3.5, 3 + rand7, 0, 1), vec4(3.5, 3 + rand7, 0, 1),

4
common/src/comp/ability.rs
View File

@ -350,8 +350,8 @@ impl CharacterAbility {
pub fn default_block() -> CharacterAbility { pub fn default_block() -> CharacterAbility {
CharacterAbility::BasicBlock { CharacterAbility::BasicBlock {
buildup_duration: 0.3, buildup_duration: 0.35,
recover_duration: 0.2, recover_duration: 0.3,
max_angle: 60.0, max_angle: 60.0,
block_strength: 0.5, block_strength: 0.5,
energy_cost: 50.0, energy_cost: 50.0,

2
voxygen/src/scene/particle.rs
View File

@ -205,7 +205,7 @@ impl ParticleMgr {
}, },
Outcome::Block { pos, parry } => { Outcome::Block { pos, parry } => {
if *parry { if *parry {
self.particles.resize_with(self.particles.len() + 20, || { self.particles.resize_with(self.particles.len() + 10, || {
Particle::new( Particle::new(
Duration::from_millis(200), Duration::from_millis(200),
time, time,