diff options
| -rw-r--r-- | include/attack.hpp | 3 | ||||
| -rw-r--r-- | src/attack.cpp | 15 | ||||
| -rw-r--r-- | src/world.cpp | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/include/attack.hpp b/include/attack.hpp index 412694e..027b93f 100644 --- a/include/attack.hpp +++ b/include/attack.hpp @@ -9,7 +9,8 @@ enum class AttackType : char { ShortSlash, - LongSlash + LongSlash, + SmallBoom }; struct AttackEvent { diff --git a/src/attack.cpp b/src/attack.cpp index 4047b0a..550b849 100644 --- a/src/attack.cpp +++ b/src/attack.cpp @@ -49,6 +49,21 @@ void AttackSystem::update(entityx::EntityManager& en, entityx::EventManager& ev, } ); break; + case AttackType::SmallBoom: + en.each<Position, Solid, Health>( + [&a](entityx::Entity e, Position& pos, Solid& dim, Health& h) { + (void)e; + if (e.has_component<Player>()) + return; + + if (inrange(a.pos.x, pos.x, pos.x + dim.width, shortSlashLength)) { + h.health -= a.power; + game::engine.getSystem<ParticleSystem>()->addMultiple(15, ParticleType::SmallBlast, + [&](){ return vec2(pos.x + dim.width / 2, pos.y + dim.height / 2); }, 300, 7); + } + } + ); + break; default: break; } diff --git a/src/world.cpp b/src/world.cpp index c41ab2a..353f4d9 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -1143,7 +1143,7 @@ void WorldSystem::detect(entityx::TimeDelta dt) vel.y = 0; if (e.has_component<Hit>()) { game::events.emit<AttackEvent>(vec2(loc.x, loc.y), - AttackType::ShortSlash, e.component<Hit>()->damage); + AttackType::SmallBoom, e.component<Hit>()->damage); e.destroy(); } if (!vel.grounded) { |