1 files changed, 13 insertions, 2 deletions

@@ -15,8 +15,19 @@ void CharacterSystem::addSpriteToParty(int leaderId, int followerId) {
   Sprite& leader = game_.getSprite(leaderId);
   Sprite& follower = game_.getSprite(followerId);
 
-  int index = leader.followers.size() + 1;
-  follower.trail = std::deque<Movement>(PARTY_FRAME_DELAY * index, {.pos = follower.loc, .dir = follower.dir});
+  vec2i targetPos = leader.loc;
+
+  if (!leader.followers.empty()) {
+    Sprite& backFollower = game_.getSprite(leader.followers.back());
+    follower.trail = backFollower.trail;
+    targetPos = backFollower.loc;
+  }
+
+  Direction toFace = directionFacingPoint(targetPos - follower.loc);
+  for (int i=0; i<PARTY_FRAME_DELAY; i++) {
+    vec2i tween = ((follower.loc - targetPos) * i) / static_cast<double>(PARTY_FRAME_DELAY) + targetPos;
+    follower.trail.push_front({.pos = tween, .dir = toFace});
+  }
 
   leader.followers.push_back(followerId);