skirl hostility

2 files changed, 14 insertions, 2 deletions

diff --git a/src/attack.cpp b/src/attack.cpp
index b104736..16c7f8a 100644
--- a/src/attack.cpp
+++ b/src/attack.cpp
@@ -109,6 +109,13 @@ void AttackSystem::update(entityx::EntityManager& en, entityx::EventManager& ev,
 					inrange(point.y, pos.y, pos.y + dim.height, HLINES(size.y))) {
 					lua::setEntity(&e);
 					a.attack.script("effect");
+					if (pos.x < point.x) {
+						e.component<Direction>()->x = -0.1;
+						e.component<Direction>()->y = 0.1;
+					} else {
+						e.component<Direction>()->x = 0.1;
+						e.component<Direction>()->y = 0.1;
+					}
 					if (a.attack.effect.size() > 0)
 						effects.emplace_back(point, a.attack.effect);
 					//ParticleSystem::addMultiple(15, ParticleType::DownSlash,
diff --git a/src/systems/movement.cpp b/src/systems/movement.cpp
index 73e5113..642fa6a 100644
--- a/src/systems/movement.cpp
+++ b/src/systems/movement.cpp
@@ -87,14 +87,16 @@ void MovementSystem::update(entityx::EntityManager &en, entityx::EventManager &e
 			// make the entity wander
 			// TODO initialX and range?
 			if (entity.has_component<Wander>()) {
+				auto dim = entity.component<Solid>();
 				float aggro = 0;
+				vec2 self (position.x + dim->width / 2, position.y + dim->height / 2);
 				LuaList vars = {
 					LuaVariable("vely", direction.y),
 					LuaVariable("velx", direction.x),
 					LuaVariable("playerx", ppos.x),
 					LuaVariable("playery", ppos.y),
-					LuaVariable("selfx", position.x),
-					LuaVariable("selfy", position.y),
+					LuaVariable("selfx", self.x),
+					LuaVariable("selfy", self.y),
 					LuaVariable("aggro", aggro)
 				};
 
@@ -106,6 +108,9 @@ void MovementSystem::update(entityx::EntityManager &en, entityx::EventManager &e
 				entity.component<Wander>()->script(aggro ? "hostile" : "update", vars);
 				if (hasAggro)
 					entity.component<Aggro>()->yes = aggro > 0 ? 1 : 0;
+
+				position.x = self.x - dim->width / 2;
+				position.y = self.y - dim->height / 2;
 			}
 		}
 	});