5 files changed, 27 insertions, 3 deletions

@@ -59,6 +59,7 @@ void BehaviourSystem::tick(double dt) {
 
 void BehaviourSystem::directSpriteToLocation(int spriteId, vec2i pos, PathfindingOptions options) {
   Sprite& sprite = game_.getSprite(spriteId);
+  sprite.orientable = true;
   sprite.behaviourType = BehaviourType::Path;
   sprite.pathfindingDestination = pos;
   sprite.cardinalDirectionsOnly = pathfindingOptionsContains(options, PathfindingOptions::CardinalDirectionsOnly);
@@ -17,6 +17,7 @@ void CharacterSystem::initSprite(int spriteId, int movementSpeed) {
 void CharacterSystem::addSpriteToParty(int leaderId, int followerId) {
   Sprite& leader = game_.getSprite(leaderId);
   Sprite& follower = game_.getSprite(followerId);
+  follower.orientable = false;
 
   vec2i targetPos = leader.loc;
 
@@ -90,4 +90,21 @@ inline Direction directionFacingPoint(vec2i point) {
   }
 }
 
+inline Direction cardinalDirectionFacingPoint(vec2i point) {
+  double theta = atan2(point.y(), point.x());
+  theta /= M_PI;
+
+  if (theta < -3.0/4.0) {
+    return Direction::left;
+  } else if (theta < -1.0/4.0) {
+    return Direction::down;
+  } else if (theta < 1.0/4.0) {
+    return Direction::right;
+  } else if (theta < 3.0/4.0) {
+    return Direction::up;
+  } else {
+    return Direction::left;
+  }
+}
+
 #endif /* end of include guard: DIRECTION_H_AB66A90E */
@@ -27,9 +27,9 @@ void loop(Renderer& renderer, std::mt19937& rng) {
   game.emplaceSystem<MessageSystem>();
   game.emplaceSystem<EffectSystem>();
 
-  game.loadMap("hallucination_interior");
+  game.loadMap("pink_shell");
 
-  vec2i warpLoc = game.getMap().getWarpPoint("debugWarp_rightside");
+  vec2i warpLoc = game.getMap().getWarpPoint("fromOutside");
 
   int lucasSprite = game.emplaceSprite("lucas");
   game.getSystem<TransformSystem>().initSprite(lucasSprite, warpLoc);
@@ -44,7 +44,10 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     "cantCrouch", &Sprite::cantCrouch,
     "bobsWhenNormal", &Sprite::bobsWhenNormal,
     "animSlowdown", &Sprite::animSlowdown,
-    "enclosureZone", &Sprite::enclosureZone);
+    "enclosureZone", &Sprite::enclosureZone,
+    "movementSpeed", &Sprite::movementSpeed,
+    "solid", &Sprite::solid,
+    "behaviourType", &Sprite::behaviourType);
 
   engine_.new_usertype<MessageSystem>(
     "message",
@@ -230,6 +233,8 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
       loadMapScripts(filename);
     });
 
+  engine_.set_function("cardinalDirectionFacingPoint", &cardinalDirectionFacingPoint);
+
   engine_.script_file("../res/scripts/common.lua");
 }