diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2017-03-28 10:21:04 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2017-03-28 10:21:04 -0400 |
| commit | ceef5de7d838e97c3d7f990023398181ee1500c2 (patch) | |
| tree | 43153a4a24bdc92929cfe5f4e23b2b67deb84ec1 | |
| parent | da4bd0b57b1ce5cdb56e6f8d9870998cbdd176f4 (diff) | |
better arrow collision
| -rw-r--r-- | include/attack.hpp | 1 | ||||
| -rw-r--r-- | src/attack.cpp | 46 | ||||
| -rw-r--r-- | src/world.cpp | 6 | ||||
| -rw-r--r-- | xml/!town.xml | 2 |
4 files changed, 31 insertions, 24 deletions
diff --git a/include/attack.hpp b/include/attack.hpp index 027b93f..ef67a79 100644 --- a/include/attack.hpp +++ b/include/attack.hpp @@ -10,7 +10,6 @@ enum class AttackType : char { ShortSlash, LongSlash, - SmallBoom }; struct AttackEvent { diff --git a/src/attack.cpp b/src/attack.cpp index 3dc1594..6fb6cec 100644 --- a/src/attack.cpp +++ b/src/attack.cpp @@ -1,7 +1,10 @@ #include <attack.hpp> + #include <components.hpp> #include <engine.hpp> #include <particle.hpp> +#include <player.hpp> +#include <world.hpp> constexpr int shortSlashLength = 20; constexpr int longSlashLength = 40; @@ -20,6 +23,11 @@ bool inrange(float point, float left, float right, float range) (point > left && point < right); } +bool inrange(float point, float left, float right) +{ + return point > left && point < right; +} + void AttackSystem::receive(const AttackEvent& ae) { attacks.emplace_front(ae); @@ -31,6 +39,26 @@ void AttackSystem::update(entityx::EntityManager& en, entityx::EventManager& ev, (void)ev; (void)dt; + auto pid = game::engine.getSystem<PlayerSystem>()->getId(); + + // handle attacking entities + en.each<Hit, Position>([&](entityx::Entity p, Hit& hit, Position& ppos) { + bool die = false; + en.each<Health, Position, Solid>([&](entityx::Entity e, Health& health, Position& pos, Solid& dim) { + if (e.id() != pid && inrange(ppos.x, pos.x, pos.x + dim.width) && inrange(ppos.y, pos.y - 2, pos.y + dim.height)) { + health.health -= hit.damage; + game::engine.getSystem<ParticleSystem>()->addMultiple(15, ParticleType::SmallBlast, + [&](){ return vec2(pos.x + dim.width / 2, pos.y + dim.height / 2); }, 300, 7); + die = true; + } else if (game::engine.getSystem<WorldSystem>()->isAboveGround(vec2(ppos.x, ppos.y))) + die = true; + }); + + if (die) + p.destroy(); + }); + + // handle emitted attacks for (const auto& a : attacks) { switch (a.type) { case AttackType::ShortSlash: @@ -41,7 +69,8 @@ void AttackSystem::update(entityx::EntityManager& en, entityx::EventManager& ev, if (e.has_component<Player>()) return; - if (inrange(a.pos.x, pos.x, pos.x + dim.width, HLINES(shortSlashLength))) { + if (inrange(a.pos.x, pos.x, pos.x + dim.width, HLINES(shortSlashLength)) && + inrange(a.pos.y, pos.y, pos.y + dim.height)) { h.health -= a.power; game::engine.getSystem<ParticleSystem>()->addMultiple(15, ParticleType::DownSlash, [&](){ return vec2(pos.x + dim.width / 2, pos.y + dim.height / 2); }, 300, 7); @@ -49,21 +78,6 @@ 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, 0)) { - 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 353f4d9..9a47576 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -14,7 +14,6 @@ using namespace std::literals::chrono_literals; using namespace tinyxml2; // game headers -#include <attack.hpp> #include <common.hpp> #include <components.hpp> #include <debug.hpp> @@ -1141,11 +1140,6 @@ void WorldSystem::detect(entityx::TimeDelta dt) } else { loc.y = data[line].groundHeight - 0.001f * dt; vel.y = 0; - if (e.has_component<Hit>()) { - game::events.emit<AttackEvent>(vec2(loc.x, loc.y), - AttackType::SmallBoom, e.component<Hit>()->damage); - e.destroy(); - } if (!vel.grounded) { vel.grounded = true; game::engine.getSystem<ParticleSystem>()->addMultiple(20, ParticleType::SmallPoof, diff --git a/xml/!town.xml b/xml/!town.xml index c50932b..7506f70 100644 --- a/xml/!town.xml +++ b/xml/!town.xml @@ -4,7 +4,7 @@ <World> <style background="0" bgm="assets/music/embark.wav" folder="assets/style/classic/"/> <generation width="320"/> - <weather>Sunny</weather> + <weather>Snowy</weather> <link right="!town2.xml"/> <spawnx>-300</spawnx> <time>8000</time> |