Added enclosure zones

A sprite with an enclosure zone will collide with it if it attempts to leave the area defined by the zone. This is used to make sure that wandering sprites don't end up in weird places.

5 files changed, 60 insertions, 0 deletions

@@ -66,6 +66,9 @@ void Game::loadMap(std::string filename) {
       getSystem<CharacterSystem>().initSprite(spriteId);
       getSprite(spriteId).wander = true;
     }
+    if (!p.enclosureZone.empty()) {
+      getSprite(spriteId).enclosureZone = p.enclosureZone;
+    }
   }
 
   for (const Trigger& t : map_->getTriggers()) {
@@ -78,6 +78,8 @@ Map::Map(std::string_view name) : name_(name) {
               p.shadow = property.getBoolValue();
             } else if (property.getName() == "wander") {
               p.wander = property.getBoolValue();
+            } else if (property.getName() == "enclosureZone") {
+              p.enclosureZone = property.getStringValue();
             }
           }
 
@@ -118,6 +120,14 @@ Map::Map(std::string_view name) : name_(name) {
           }
 
           prototypes_.push_back(std::move(p));
+        } else if (object.getType() == "zone") {
+          Zone z;
+          z.ul.x() = object.getPosition().x;
+          z.ul.y() = object.getPosition().y;
+          z.dr.x() = z.ul.x() + object.getAABB().width;
+          z.dr.y() = z.ul.y() + object.getAABB().height;
+
+          zones_[object.getName()] = std::move(z);
         }
       }
     }
@@ -25,6 +25,7 @@ struct Prototype {
   std::string interactionScript;
   bool shadow = false;
   bool wander = false;
+  std::string enclosureZone;
 };
 
 struct Trigger {
@@ -34,6 +35,11 @@ struct Trigger {
   std::string script;
 };
 
+struct Zone {
+  vec2i ul;
+  vec2i dr;
+};
+
 class Map {
 public:
 
@@ -61,6 +67,8 @@ public:
 
   const std::vector<Trigger>& getTriggers() const { return triggers_; }
 
+  const Zone& getZone(const std::string& name) const { return zones_.at(name); }
+
 private:
 
   std::string name_;
@@ -72,6 +80,7 @@ private:
   std::vector<Prototype> prototypes_;
   std::map<std::string, vec2i> warpPoints_;
   std::vector<Trigger> triggers_;
+  std::map<std::string, Zone> zones_;
 };
 
 #endif /* end of include guard: MAP_H_D95D6D47 */
@@ -53,6 +53,7 @@ public:
   vec2i collisionSize;
   std::string interactionScript;
   std::string walkthroughScript;
+  std::string enclosureZone;
 
   // Animation
   bool isAnimated = false;
@@ -67,6 +67,11 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i newLoc, Dire
   vec2i oldTileDR = oldColDR / map.getTileSize();
   vec2i newTileDR = newColDR / map.getTileSize();
 
+  const Zone* enclosureZone = nullptr;
+  if (!sprite.enclosureZone.empty()) {
+    enclosureZone = &map.getZone(sprite.enclosureZone);
+  }
+
   if (dirHasDir(sprite.dir, Direction::right)) {
     if (newTileDR.x() > oldTileDR.x() &&
         newColDR.x() < mapBounds.w()) {
@@ -80,6 +85,14 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i newLoc, Dire
       }
     }
 
+    if (!result.horiz.blocked && enclosureZone) {
+      if (oldColDR.x() <= enclosureZone->dr.x() &&
+          newColDR.x() > enclosureZone->dr.x()) {
+        result.horiz.blocked = true;
+        result.horiz.dir = Direction::right;
+      }
+    }
+
     if (!result.horiz.blocked) {
       auto it = rightCollidables_.lower_bound({oldColDR.x(), INT_MAX});
       for (;
@@ -113,6 +126,14 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i newLoc, Dire
       }
     }
 
+    if (!result.horiz.blocked && enclosureZone) {
+      if (oldColUL.x() >= enclosureZone->ul.x() &&
+          newColUL.x() < enclosureZone->ul.x()) {
+        result.horiz.blocked = true;
+        result.horiz.dir = Direction::left;
+      }
+    }
+
     if (!result.horiz.blocked) {
       auto it = leftCollidables_.lower_bound({oldColUL.x(), 0});
       for (;
@@ -146,6 +167,14 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i newLoc, Dire
       }
     }
 
+    if (!result.vert.blocked && enclosureZone) {
+      if (oldColDR.y() <= enclosureZone->dr.y() &&
+          newColDR.y() > enclosureZone->dr.y()) {
+        result.vert.blocked = true;
+        result.vert.dir = Direction::down;
+      }
+    }
+
     if (!result.vert.blocked) {
       auto it = downCollidables_.lower_bound({oldColDR.y(), INT_MAX});
       for (;
@@ -179,6 +208,14 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i newLoc, Dire
       }
     }
 
+    if (!result.vert.blocked && enclosureZone) {
+      if (oldColUL.y() >= enclosureZone->ul.y() &&
+          newColUL.y() < enclosureZone->ul.y()) {
+        result.vert.blocked = true;
+        result.vert.dir = Direction::up;
+      }
+    }
+
     if (!result.vert.blocked) {
       auto it = upCollidables_.lower_bound({oldColUL.y(), 0});
       for (;