1 files changed, 93 insertions, 29 deletions

@@ -34,7 +34,7 @@ void CharacterSystem::addSpriteToParty(int leaderId, int followerId) {
 
   for (int i=0; i<truePartyDelay; i++) {
     vec2i tween = ((follower.loc - targetPos) * i) / static_cast<double>(truePartyDelay) + targetPos;
-    follower.trail.push_front({.pos = tween, .dir = toFace});
+    follower.trail.push_front({.pos = tween, .dir = toFace, .medium = CharacterMedium::Normal});
   }
 
   leader.followers.push_back(followerId);
@@ -70,14 +70,31 @@ void CharacterSystem::transplantParty(int leaderId, vec2i pos, Direction dir) {
 
 void CharacterSystem::moveInDirection(int spriteId, Direction dir) {
   Sprite& sprite = game_.getSprite(spriteId);
+  sprite.movementDir = dir;
 
-  game_.getSystem<AnimationSystem>().setSpriteDirection(spriteId, dir);
+  switch (sprite.characterMedium) {
+    case CharacterMedium::Normal: {
+      game_.getSystem<AnimationSystem>().setSpriteDirection(spriteId, dir);
+      break;
+    }
+    case CharacterMedium::Ladder: {
+      if (dirHasDir(dir, Direction::up)) {
+        game_.getSystem<AnimationSystem>().setSpriteDirection(spriteId, Direction::up);
+      } else if (dirHasDir(dir, Direction::down)) {
+        game_.getSystem<AnimationSystem>().setSpriteDirection(spriteId, Direction::down);
+      }
+      break;
+    }
+  }
 
   if (sprite.characterState == CharacterState::Still) {
     setPartyState(spriteId, CharacterState::Walking);
   } else if (sprite.characterState == CharacterState::Crouching) {
     for (int followerId : sprite.followers) {
-      game_.getSystem<AnimationSystem>().setSpriteDirection(followerId, dir);
+      Sprite& follower = game_.getSprite(followerId);
+      if (follower.characterMedium == CharacterMedium::Normal) {
+        game_.getSystem<AnimationSystem>().setSpriteDirection(followerId, dir);
+      }
     }
   }
 }
@@ -107,14 +124,18 @@ void CharacterSystem::tick(double dt) {
         }
 
         int speed = sprite.movementSpeed;
-        if (sprite.characterState == CharacterState::Running) {
+        if (sprite.characterState == CharacterState::Running && sprite.characterMedium == CharacterMedium::Normal) {
           speed *= 2;
         }
 
-        pLoc += (unitVecInDirection(sprite.dir) * speed);
+        if (sprite.characterMedium == CharacterMedium::Ladder) {
+          //game_.getSystem<AnimationSystem>().advanceAnimation(spriteId);
+        }
+
+        pLoc += (unitVecInDirection(sprite.movementDir) * speed);
 
         // Check collision.
-        CollisionResult collision = game_.getSystem<TransformSystem>().checkCollision(spriteId, pLoc, sprite.dir);
+        CollisionResult collision = game_.getSystem<TransformSystem>().checkCollision(spriteId, pLoc, sprite.movementDir);
         bool blocked = collision.horiz.blocked || collision.vert.blocked;
 
         if (collision.horiz.blocked && !sprite.clipping) {
@@ -146,6 +167,12 @@ void CharacterSystem::tick(double dt) {
         if (pLoc != sprite.loc) {
           game_.getSystem<TransformSystem>().moveSprite(spriteId, pLoc);
 
+          CharacterMedium newMedium = game_.getSystem<TransformSystem>().getMediumAtPosition(spriteId, pLoc);
+          if (newMedium != sprite.characterMedium) {
+            sprite.characterMedium = newMedium;
+            setAnimationFor(spriteId, sprite.characterState);
+          }
+
           if (sprite.characterState == CharacterState::Running) {
             const Map& map = game_.getMap();
 
@@ -164,12 +191,20 @@ void CharacterSystem::tick(double dt) {
 
           for (int followerId : sprite.followers) {
             Sprite& pNext = game_.getSprite(followerId);
+            if (pNext.characterMedium == CharacterMedium::Ladder) {
+              //game_.getSystem<AnimationSystem>().advanceAnimation(followerId);
+            }
+
             const Movement& posdir = pNext.trail.front();
             game_.getSystem<TransformSystem>().moveSprite(followerId, posdir.pos);
             game_.getSystem<AnimationSystem>().setSpriteDirection(followerId, posdir.dir);
+            if (posdir.medium != pNext.characterMedium) {
+              pNext.characterMedium = posdir.medium;
+              setAnimationFor(followerId, sprite.characterState);
+            }
 
             pNext.trail.pop_front();
-            pNext.trail.push_back({.pos = pLoc, .dir = sprite.dir});
+            pNext.trail.push_back({.pos = pLoc, .dir = sprite.dir, .medium = sprite.characterMedium});
           }
         }
       }
@@ -180,6 +215,10 @@ void CharacterSystem::tick(double dt) {
 void CharacterSystem::beginCrouch(int spriteId) {
   Sprite& sprite = game_.getSprite(spriteId);
 
+  if (sprite.characterMedium == CharacterMedium::Ladder) {
+    return;
+  }
+
   if (sprite.characterState == CharacterState::Running) {
     stopRunning(spriteId);
   } else {
@@ -242,32 +281,12 @@ void CharacterSystem::stopRunning(int spriteId) {
 }
 
 void CharacterSystem::setPartyState(int spriteId, CharacterState state) {
-  std::string animName;
-  switch (state) {
-    case CharacterState::Still: {
-      animName = "still";
-      break;
-    }
-    case CharacterState::Walking: {
-      animName = "walk";
-      break;
-    }
-    case CharacterState::Crouching: {
-      animName = "crouch";
-      break;
-    }
-    case CharacterState::Running: {
-      animName = "run";
-      break;
-    }
-  }
-
   Sprite& sprite = game_.getSprite(spriteId);
   sprite.characterState = state;
 
-  game_.getSystem<AnimationSystem>().setSpriteAnimation(spriteId, animName);
+  setAnimationFor(spriteId, state);
   for (int followerId : sprite.followers) {
-    game_.getSystem<AnimationSystem>().setSpriteAnimation(followerId, animName);
+    setAnimationFor(followerId, state);
   }
 }
 
@@ -297,3 +316,48 @@ void CharacterSystem::destroySprite(int spriteId) {
     stopRunningSound(sprite);
   }
 }
+
+void CharacterSystem::setAnimationFor(int spriteId, CharacterState state) {
+  Sprite& sprite = game_.getSprite(spriteId);
+  std::string animName;
+
+  switch (sprite.characterMedium) {
+    case CharacterMedium::Normal: {
+      std::string animName;
+
+      switch (state) {
+        case CharacterState::Still: {
+          animName = "still";
+          break;
+        }
+        case CharacterState::Walking: {
+          animName = "walk";
+          break;
+        }
+        case CharacterState::Crouching: {
+          animName = "crouch";
+          break;
+        }
+        case CharacterState::Running: {
+          animName = "run";
+          break;
+        }
+      }
+
+      game_.getSystem<AnimationSystem>().setSpriteAnimation(spriteId, animName);
+
+      break;
+    }
+    case CharacterMedium::Ladder: {
+      game_.getSystem<AnimationSystem>().setSpriteAnimation(spriteId, "climb.");
+
+      if (state == CharacterState::Still || state == CharacterState::Crouching) {
+        sprite.animPaused = true;
+      } else {
+        sprite.animPaused = false;
+      }
+
+      break;
+    }
+  }
+}