better arrow collision

2 files changed, 30 insertions, 22 deletions

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,