8 files changed, 76 insertions, 18 deletions

@@ -5,6 +5,7 @@
 #include "game.h"
 #include "transform_system.h"
 #include "animation_system.h"
+#include "script_system.h"
 
 void CharacterSystem::initSprite(int spriteId) {
   Sprite& sprite = game_.getSprite(spriteId);
@@ -83,10 +84,22 @@ void CharacterSystem::tick(double dt) {
 
         if (collision.horiz.blocked) {
           pLoc.x() = sprite.loc.x();//(newColPosDR * map.getTileSize() - (collisionBox / 2)).x() - 1;
+        } else if (collision.horiz.colliderSprite != -1) {
+          Sprite& collider = game_.getSprite(collision.horiz.colliderSprite);
+
+          if (collider.walkthroughScript != "") {
+            game_.getSystem<ScriptSystem>().runScript(collider.walkthroughScript);
+          }
         }
 
         if (collision.vert.blocked) {
           pLoc.y() = sprite.loc.y();//(newColPosDR * map.getTileSize() - (collisionBox / 2)).x() - 1;
+        } else if (collision.vert.colliderSprite != -1) {
+          Sprite& collider = game_.getSprite(collision.vert.colliderSprite);
+
+          if (collider.walkthroughScript != "") {
+            game_.getSystem<ScriptSystem>().runScript(collider.walkthroughScript);
+          }
         }
 
         if (blocked && sprite.characterState == CharacterState::Running) {
@@ -27,7 +27,7 @@ void loop(Renderer& renderer) {
 
   int lucasSprite = game.emplaceSprite("lucas");
   game.getSystem<TransformSystem>().initSprite(lucasSprite, game.getMap().getWarpPoint("spawn"));
-  game.getSystem<TransformSystem>().setUpCollision(lucasSprite, {-8, -8}, {12, 8});
+  game.getSystem<TransformSystem>().setUpCollision(lucasSprite, {-8, -8}, {12, 8}, true);
   game.getSystem<AnimationSystem>().initSprite(lucasSprite, "../res/sprites/lucas_anim.txt", renderer);
   game.getSprite(lucasSprite).controllable = true;
   game.getSystem<CharacterSystem>().initSprite(lucasSprite);
@@ -50,11 +50,18 @@ void loop(Renderer& renderer) {
   for (const Prototype& p : game.getMap().getPrototypes()) {
     int spriteId = game.emplaceSprite(p.name);
     game.getSystem<TransformSystem>().initSprite(spriteId, p.pos);
-    game.getSystem<TransformSystem>().setUpCollision(spriteId, p.collisionOffset, p.collisionSize);
+    game.getSystem<TransformSystem>().setUpCollision(spriteId, p.collisionOffset, p.collisionSize, true);
     game.getSystem<AnimationSystem>().initSprite(spriteId, p.animationFilename, renderer);
     game.getSprite(spriteId).interactionScript = p.interactionScript;
   }
 
+  for (const Trigger& t : game.getMap().getTriggers()) {
+    int spriteId = game.emplaceSprite(t.name);
+    game.getSystem<TransformSystem>().initSprite(spriteId, t.pos);
+    game.getSystem<TransformSystem>().setUpCollision(spriteId, {0, 0}, t.size, false);
+    game.getSprite(spriteId).walkthroughScript = t.script;
+  }
+
   game.getSystem<CameraSystem>().setFollowingSprite(lucasSprite);
   game.getSystem<CameraSystem>().unlockCamera();
 
@@ -84,6 +84,21 @@ Map::Map(std::string_view filename, Renderer& renderer) {
           point.y() = object.getPosition().y;
 
           warpPoints_[object.getName()] = std::move(point);
+        } else if (object.getType() == "trigger") {
+          Trigger t;
+          t.name = object.getName();
+          t.pos.x() = object.getPosition().x;
+          t.pos.y() = object.getPosition().y;
+          t.size.w() = object.getAABB().width;
+          t.size.h() = object.getAABB().height;
+
+          for (const tmx::Property& property : object.getProperties()) {
+            if (property.getName() == "script") {
+              t.script = property.getStringValue();
+            }
+          }
+
+          triggers_.push_back(std::move(t));
         }
       }
     }
@@ -28,6 +28,13 @@ struct Prototype {
   std::string interactionScript;
 };
 
+struct Trigger {
+  std::string name;
+  vec2i pos;
+  vec2i size;
+  std::string script;
+};
+
 class Map {
 public:
 
@@ -51,6 +58,8 @@ public:
 
   const vec2i& getWarpPoint(const std::string& name) const { return warpPoints_.at(name); }
 
+  const std::vector<Trigger>& getTriggers() const { return triggers_; }
+
 private:
 
   vec2i mapSize_;
@@ -60,6 +69,7 @@ private:
   int tilesetColumns_;
   std::vector<Prototype> prototypes_;
   std::map<std::string, vec2i> warpPoints_;
+  std::vector<Trigger> triggers_;
 };
 
 #endif /* end of include guard: MAP_H_D95D6D47 */
@@ -114,10 +114,12 @@ void Renderer::render(Game& game) {
   SDL_RenderCopy(ren_.get(), renLay1_.get(), nullptr, nullptr);
 
   for (const Sprite& sprite : game.getSystem<TransformSystem>().getSpritesByY() | game.spriteView()) {
-    const SpriteFrame& frame = sprite.frames.at(sprite.animations.at(sprite.animationId).at(sprite.animationFrame));
-    const SDL_Rect& src = frame.srcRect;
-    SDL_Rect dest { sprite.loc.x() - frame.center.x(), sprite.loc.y() - frame.center.y(), frame.size.w(), frame.size.h() };
-    SDL_RenderCopy(ren_.get(), textures_.at(sprite.textureId).get(), &src, &dest);
+    if (sprite.isAnimated) {
+      const SpriteFrame& frame = sprite.frames.at(sprite.animations.at(sprite.animationId).at(sprite.animationFrame));
+      const SDL_Rect& src = frame.srcRect;
+      SDL_Rect dest { sprite.loc.x() - frame.center.x(), sprite.loc.y() - frame.center.y(), frame.size.w(), frame.size.h() };
+      SDL_RenderCopy(ren_.get(), textures_.at(sprite.textureId).get(), &src, &dest);
+    }
   }
 
   SDL_RenderCopy(ren_.get(), renLay0_.get(), nullptr, nullptr);
@@ -34,9 +34,11 @@ public:
   // Transform
   vec2i loc { 0, 0 };
   bool collidable = false;
+  bool solid = false;
   vec2i collisionOffset;
   vec2i collisionSize;
   std::string interactionScript;
+  std::string walkthroughScript;
 
   // Animation
   bool isAnimated = false;
@@ -8,11 +8,12 @@ void TransformSystem::initSprite(int spriteId, vec2i loc) {
   spritesByY_.emplace(loc.y(), spriteId);
 }
 
-void TransformSystem::setUpCollision(int spriteId, vec2i offset, vec2i size) {
+void TransformSystem::setUpCollision(int spriteId, vec2i offset, vec2i size, bool solid) {
   Sprite& sprite = game_.getSprite(spriteId);
   sprite.collidable = true;
   sprite.collisionOffset = offset;
   sprite.collisionSize = size;
+  sprite.solid = solid;
 
   addCollidable(spriteId);
 }
@@ -74,9 +75,11 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i newLoc, Dire
            it++) {
         if (newColDR.y() >= it->second.lower &&
             newColUL.y() <= it->second.upper) {
-          result.horiz.blocked = true;
+          int colliderSpriteId = std::get<1>(it->first);
+          Sprite& collider = game_.getSprite(colliderSpriteId);
+          result.horiz.blocked = collider.solid;
           result.horiz.dir = Direction::right;
-          result.horiz.colliderSprite = std::get<1>(it->first);
+          result.horiz.colliderSprite = colliderSpriteId;
 
           break;
         }
@@ -104,9 +107,11 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i newLoc, Dire
            it++) {
         if (newColDR.y() >= it->second.lower &&
             newColUL.y() <= it->second.upper) {
-          result.horiz.blocked = true;
+          int colliderSpriteId = std::get<1>(it->first);
+          Sprite& collider = game_.getSprite(colliderSpriteId);
+          result.horiz.blocked = collider.solid;
           result.horiz.dir = Direction::left;
-          result.horiz.colliderSprite = std::get<1>(it->first);
+          result.horiz.colliderSprite = colliderSpriteId;
 
           break;
         }
@@ -134,9 +139,11 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i newLoc, Dire
            it++) {
         if (newColDR.x() >= it->second.lower &&
             newColUL.x() <= it->second.upper) {
-          result.vert.blocked = true;
-          result.vert.dir = Direction::down;
-          result.vert.colliderSprite = std::get<1>(it->first);
+          int colliderSpriteId = std::get<1>(it->first);
+          Sprite& collider = game_.getSprite(colliderSpriteId);
+          result.horiz.blocked = collider.solid;
+          result.horiz.dir = Direction::down;
+          result.horiz.colliderSprite = colliderSpriteId;
 
           break;
         }
@@ -164,9 +171,11 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i newLoc, Dire
            it++) {
         if (newColDR.x() >= it->second.lower &&
             newColUL.x() <= it->second.upper) {
-          result.vert.blocked = true;
-          result.vert.dir = Direction::up;
-          result.vert.colliderSprite = std::get<1>(it->first);
+          int colliderSpriteId = std::get<1>(it->first);
+          Sprite& collider = game_.getSprite(colliderSpriteId);
+          result.horiz.blocked = collider.solid;
+          result.horiz.dir = Direction::up;
+          result.horiz.colliderSprite = colliderSpriteId;
 
           break;
         }
@@ -31,7 +31,7 @@ public:
 
   void initSprite(int spriteId, vec2i loc);
 
-  void setUpCollision(int spriteId, vec2i offset, vec2i size);
+  void setUpCollision(int spriteId, vec2i offset, vec2i size, bool solid);
 
   void moveSprite(int spriteId, vec2i newLoc);