1 files changed, 98 insertions, 0 deletions
diff --git a/src/systems/movement.cpp b/src/systems/movement.cpp
new file mode 100644
index 0000000..00baa40
--- /dev/null
+++ b/src/systems/movement.cpp
@@ -0,0 +1,98 @@
+#include <systems/movement.hpp>
+
+#include <components/position.hpp>
+#include <components/direction.hpp>
+#include <components/solid.hpp>
+#include <components/animate.hpp>
+#include <components/sprite.hpp>
+#include <components/aggro.hpp>
+#include <components/dialog.hpp>
+
+#include <thread>
+
+#include <attack.hpp>
+#include <events.hpp>
+#include <player.hpp>
+#include <ui.hpp>
+
+void MovementSystem::update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt)
+{
+	//bool fight = false;
+	entityx::Entity toFight;
+
+	(void)ev;
+	en.each<Position, Direction>([&](entityx::Entity entity, Position &position, Direction &direction) {
+		position.x += HLINES(direction.x) * dt;
+		position.y += HLINES(direction.y) * dt;
+
+		if (entity.has_component<Animate>() && entity.has_component<Sprite>()) {
+			auto animate = entity.component<Animate>();
+			auto sprite =  entity.component<Sprite>();
+		
+			if (direction.x)	
+				animate->updateAnimation(1, sprite->sprite, dt);
+			else
+				animate->firstFrame(1, sprite->sprite);
+		}
+		if (entity.has_component<Dialog>() && entity.component<Dialog>()->talking) {
+			direction.x = 0;
+		} else {
+			if (entity.has_component<Sprite>()) {
+				auto& fl = entity.component<Sprite>()->faceLeft;
+				if (direction.x != 0)
+					fl = (direction.x < 0);
+			}
+
+			auto ppos = PlayerSystem::getPosition();
+			if (ppos.x > position.x && ppos.x < position.x + entity.component<Solid>()->width) {
+				if (entity.has_component<Aggro>()) {
+					auto dim = entity.component<Solid>();
+					ev.emit<AttackEvent>(vec2(position.x + dim->width, position.y + dim->height),
+						AttackType::ShortSlash, false);
+					/*auto& h = entity.component<Health>()->health;
+					if (h > 0) {
+						fight = true;
+						toFight = entity;
+						h = 0;
+					}*/
+				} else if (entity.has_component<Trigger>()) {
+					static bool triggering = false;
+					if (!triggering) {
+						triggering = true;
+						std::thread([&](entityx::Entity e) {
+							UISystem::fadeToggle();
+							UISystem::waitForCover();
+							UISystem::dialogImportant(e.component<Trigger>()->text);
+							UISystem::waitForDialog();
+							UISystem::fadeToggle();
+							e.destroy();
+							triggering = false;
+						}, entity).detach();
+					}
+					return;
+				}
+			}
+
+			// make the entity wander
+			// TODO initialX and range?
+			if (entity.has_component<Wander>()) {
+				auto& countdown = entity.component<Wander>()->countdown;
+
+				if (countdown > 0) {
+					countdown--;
+				} else {
+					countdown = 5000 + randGet() % 10 * 100;
+					direction.x = (randGet() % 3 - 1) * 0.004f;
+				}
+			}
+		}
+	});
+
+//	if (fight) {
+//		UISystem::fadeToggleFast();
+//		UISystem::waitForCover();
+		//game::engine.getSystem<WorldSystem>()->fight(toFight);
+//		UISystem::fadeToggleFast();
+//	}
+}
+