bow & arrow draft

4 files changed, 38 insertions, 9 deletions

diff --git a/src/attack.cpp b/src/attack.cpp
index fd171a0..4047b0a 100644
--- a/src/attack.cpp
+++ b/src/attack.cpp
@@ -34,6 +34,7 @@ void AttackSystem::update(entityx::EntityManager& en, entityx::EventManager& ev,
 	for (const auto& a : attacks) {
 		switch (a.type) {
 		case AttackType::ShortSlash:
+		case AttackType::LongSlash:
 			en.each<Position, Solid, Health>(
 				[&a](entityx::Entity e, Position& pos, Solid& dim, Health& h) {
 					(void)e;
@@ -48,8 +49,6 @@ void AttackSystem::update(entityx::EntityManager& en, entityx::EventManager& ev,
 				}
 			);
 			break;
-		case AttackType::LongSlash:
-			break;
 		default:
 			break;
 		}
diff --git a/src/components.cpp b/src/components.cpp
index af746ab..6571e2f 100644
--- a/src/components.cpp
+++ b/src/components.cpp
@@ -50,7 +50,7 @@ void MovementSystem::update(entityx::EntityManager &en, entityx::EventManager &e
 
 			// make the entity wander
 			// TODO initialX and range?
-			if (entity.has_component<Aggro>()) {
+			if (0 && entity.has_component<Aggro>()) {
 				auto ppos = game::engine.getSystem<PlayerSystem>()->getPosition();
 				if (ppos.x > position.x && ppos.x < position.x + entity.component<Solid>()->width) {
 					auto& h = entity.component<Health>()->health;
diff --git a/src/player.cpp b/src/player.cpp
index 3d959ea..2fb7c44 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -211,10 +211,40 @@ vec2 PlayerSystem::getPosition(void) const
 
 void PlayerSystem::receive(const UseItemEvent& uie)
 {
-	if (uie.item->type == "Sword") {
-		auto loc = getPosition();
-		auto &solid = *player.component<Solid>().get();
-		loc.x += solid.width / 2, loc.y += solid.height / 2;
-		game::events.emit<AttackEvent>(loc, AttackType::ShortSlash);
+	static std::atomic_bool cool (true);
+
+	if (cool.load()) {
+		if (uie.item->sound != nullptr)
+			Mix_PlayChannel(0, uie.item->sound, 0);
+
+		if (uie.item->type == "Sword") {
+			auto loc = getPosition();
+			auto &solid = *player.component<Solid>().get();
+			loc.x += solid.width / 2, loc.y += solid.height / 2;
+			game::events.emit<AttackEvent>(loc, AttackType::ShortSlash);
+		} else if (uie.item->type == "Bow") {
+			if (game::engine.getSystem<InventorySystem>()->take("Arrow", 1)) {
+				auto e = game::entities.create();
+				auto pos = getPosition();
+				e.assign<Position>(pos.x, pos.y + 10);
+
+				auto angle = std::atan2(uie.curs.y - pos.y, uie.curs.x - pos.x);
+				e.assign<Direction>(1 * std::cos(angle), 1 * std::sin(angle));
+
+				e.assign<Visible>(-5);
+				e.assign<Physics>();
+				auto sprite = e.assign<Sprite>();
+				auto tex = game::engine.getSystem<InventorySystem>()->getItem("Arrow");
+				sprite->addSpriteSegment(SpriteData(tex.sprite), 0);
+				auto dim = HLINES(sprite->getSpriteSize());
+				e.assign<Solid>(dim.x, dim.y);
+			}
+		}
+
+		/*cool.store(false);
+		std::thread([&](void) {
+			std::this_thread::sleep_for(std::chrono::milliseconds(uie.item->cooldown));
+			cool.store(true);
+		}).detach();*/
 	}
 }
diff --git a/src/ui.cpp b/src/ui.cpp
index 58a6b97..00e43a2 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -1096,7 +1096,7 @@ namespace ui {
 		fadeWhite   = true;
 		fadeFast    = true;
 
-		Mix_PlayChannel(1, battleStart, 0);
+		//Mix_PlayChannel(1, battleStart, 0);
 	}
 
     void takeScreenshot(GLubyte* pixels) {