diff options
| -rw-r--r-- | data/particles.png | bin | 31096 -> 50659 bytes | |||
| -rw-r--r-- | datasrc/content.py | 1 | ||||
| -rw-r--r-- | src/game/client/components/effects.cpp | 6 |
3 files changed, 4 insertions, 3 deletions
diff --git a/data/particles.png b/data/particles.png index 94d0d166..fbfdad47 100644 --- a/data/particles.png +++ b/data/particles.png Binary files differdiff --git a/datasrc/content.py b/datasrc/content.py index 1f16e317..4b1c88e4 100644 --- a/datasrc/content.py +++ b/datasrc/content.py @@ -280,6 +280,7 @@ container.sprites.Add(Sprite("part_smoke", set_particles, 0,1,1,1)) container.sprites.Add(Sprite("part_shell", set_particles, 0,2,2,2)) container.sprites.Add(Sprite("part_expl01", set_particles, 0,4,4,4)) container.sprites.Add(Sprite("part_airjump", set_particles, 2,2,2,2)) +container.sprites.Add(Sprite("part_hit01", set_particles, 4,1,4,4)) container.sprites.Add(Sprite("health_full", set_game, 21,0,2,2)) container.sprites.Add(Sprite("health_empty", set_game, 23,0,2,2)) diff --git a/src/game/client/components/effects.cpp b/src/game/client/components/effects.cpp index 20c9b055..9a5ff2d3 100644 --- a/src/game/client/components/effects.cpp +++ b/src/game/client/components/effects.cpp @@ -235,10 +235,10 @@ void CEffects::HammerHit(vec2 Pos) // add the explosion CParticle p; p.SetDefault(); - p.m_Spr = SPRITE_PART_EXPL01; + p.m_Spr = SPRITE_PART_HIT01; p.m_Pos = Pos; - p.m_LifeSpan = 0.4f; - p.m_StartSize = 150.0f; + p.m_LifeSpan = 0.3f; + p.m_StartSize = 120.0f; p.m_EndSize = 0; p.m_Rot = frandom()*pi*2; m_pClient->m_pParticles->Add(CParticles::GROUP_EXPLOSIONS, &p); |
