9 files changed, 22 insertions, 12 deletions

@@ -7,9 +7,10 @@
 #include "animation_system.h"
 #include "script_system.h"
 
-void CharacterSystem::initSprite(int spriteId) {
+void CharacterSystem::initSprite(int spriteId, int movementSpeed) {
   Sprite& sprite = game_.getSprite(spriteId);
   sprite.orientable = true;
+  sprite.movementSpeed = movementSpeed;
 }
 
 void CharacterSystem::addSpriteToParty(int leaderId, int followerId) {
@@ -29,8 +30,10 @@ void CharacterSystem::addSpriteToParty(int leaderId, int followerId) {
     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;
+  int truePartyDelay = PARTY_FRAME_DELAY / leader.movementSpeed;
+
+  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});
   }
 
@@ -101,7 +104,7 @@ void CharacterSystem::tick(double dt) {
           continue;
         }
 
-        int speed = MOVEMENT_SPEED;
+        int speed = sprite.movementSpeed;
         if (sprite.characterState == CharacterState::Running) {
           speed *= 2;
         }
@@ -17,7 +17,7 @@ public:
 
   CharacterSystem(Game& game) : game_(game) {}
 
-  void initSprite(int spriteId);
+  void initSprite(int spriteId, int movementSpeed);
 
   void tick(double dt) override;
 
@@ -7,8 +7,8 @@ const int GAME_HEIGHT = 480;
 const int CANVAS_WIDTH = 240;
 const int CANVAS_HEIGHT = 160;
 
-const int MOVEMENT_SPEED = 2;
-const int PARTY_FRAME_DELAY = 10;// / MOVEMENT_SPEED;
+const int LUCAS_MOVEMENT_SPEED = 2;
+const int PARTY_FRAME_DELAY = 20; // true delay is this divided by movement speed (so for Lucas walking it's 10)
 
 const int MESSAGE_TEXT_WIDTH = 196;
 
@@ -62,9 +62,11 @@ void Game::loadMap(std::string filename) {
       getSprite(spriteId).hasShadow = p.shadow;
     }
     getSprite(spriteId).interactionScript = p.interactionScript;
-    if (p.wander) {
-      getSystem<CharacterSystem>().initSprite(spriteId);
-      getSprite(spriteId).wander = true;
+    if (p.movementSpeed != -1) {
+      getSystem<CharacterSystem>().initSprite(spriteId, p.movementSpeed);
+      if (p.wander) {
+        getSprite(spriteId).wander = true;
+      }
     }
     if (!p.enclosureZone.empty()) {
       getSprite(spriteId).enclosureZone = p.enclosureZone;
@@ -40,7 +40,8 @@ void InputSystem::tick(double dt) {
           for (int spriteId : game_.getSprites()) {
             Sprite& sprite = game_.getSprite(spriteId);
             if (sprite.controllable) {
-              vec2i checkLoc = sprite.loc + (unitVecInDirection(sprite.dir) * MOVEMENT_SPEED);
+              // Interacting with objects always uses Lucas's movement speed.
+              vec2i checkLoc = sprite.loc + (unitVecInDirection(sprite.dir) * LUCAS_MOVEMENT_SPEED);
               CollisionResult collision = game_.getSystem<TransformSystem>().checkCollision(spriteId, checkLoc, sprite.dir);
 
               if (collision.horiz.blocked || collision.vert.blocked) {
@@ -40,7 +40,7 @@ void loop(Renderer& renderer, std::mt19937& rng) {
   game.getSprite(lucasSprite).player = true;
   game.getSprite(lucasSprite).controllable = true;
   game.getSprite(lucasSprite).persistent = true;
-  game.getSystem<CharacterSystem>().initSprite(lucasSprite);
+  game.getSystem<CharacterSystem>().initSprite(lucasSprite, LUCAS_MOVEMENT_SPEED);
   game.getSystem<CameraSystem>().setFollowingSprite(lucasSprite);
   game.getSystem<CameraSystem>().unlockCamera();
 
@@ -80,6 +80,8 @@ Map::Map(std::string_view name) : name_(name) {
               p.wander = property.getBoolValue();
             } else if (property.getName() == "enclosureZone") {
               p.enclosureZone = property.getStringValue();
+            } else if (property.getName() == "movementSpeed") {
+              p.movementSpeed = property.getIntValue();
             }
           }
 
@@ -25,6 +25,7 @@ struct Prototype {
   std::string interactionScript;
   bool shadow = false;
   bool wander = false;
+  int movementSpeed = -1;
   std::string enclosureZone;
 };
 
@@ -70,6 +70,7 @@ public:
 
   // Character
   bool orientable = false;
+  int movementSpeed = 0; // 1 is slow (good for NPCs), 2 is Lucas's default walking speed
   std::vector<int> followers;
   std::deque<Movement> trail;
   CharacterState characterState = CharacterState::Still;