3 files changed, 14 insertions, 14 deletions

@@ -35,7 +35,7 @@ void loop(Renderer& renderer, std::mt19937& rng) {
 
   int lucasSprite = game.emplaceSprite("lucas");
   game.getSystem<TransformSystem>().initSprite(lucasSprite, warpLoc);
-  game.getSystem<TransformSystem>().setUpCollision(lucasSprite, {-8, -8}, {12, 8}, true);
+  game.getSystem<TransformSystem>().setUpCollision(lucasSprite, {-8, -8}, {16, 8}, true);
   game.getSystem<AnimationSystem>().initSprite(lucasSprite, "../res/sprites/lucas_anim.txt");
   game.getSystem<AnimationSystem>().setSpriteDirection(lucasSprite, Direction::down);
   game.getSprite(lucasSprite).normallyHasShadow = true;
@@ -48,7 +48,7 @@ void loop(Renderer& renderer, std::mt19937& rng) {
 
   int kumaSprite = game.emplaceSprite("kuma");
   game.getSystem<TransformSystem>().initSprite(kumaSprite, warpLoc);
-  game.getSystem<TransformSystem>().setUpCollision(kumaSprite, {-8, -8}, {12, 8}, false);
+  game.getSystem<TransformSystem>().setUpCollision(kumaSprite, {-8, -8}, {16, 8}, false);
   game.getSystem<AnimationSystem>().initSprite(kumaSprite, "../res/sprites/kuma_anim.txt");
   game.getSystem<AnimationSystem>().setSpriteDirection(kumaSprite, Direction::down);
   game.getSprite(kumaSprite).normallyHasShadow = true;
@@ -57,7 +57,7 @@ void loop(Renderer& renderer, std::mt19937& rng) {
 
   int dusterSprite = game.emplaceSprite("duster");
   game.getSystem<TransformSystem>().initSprite(dusterSprite, warpLoc);
-  game.getSystem<TransformSystem>().setUpCollision(dusterSprite, {-8, -8}, {12, 8}, false);
+  game.getSystem<TransformSystem>().setUpCollision(dusterSprite, {-8, -8}, {16, 8}, false);
   game.getSystem<AnimationSystem>().initSprite(dusterSprite, "../res/sprites/duster_anim.txt");
   game.getSystem<AnimationSystem>().setSpriteDirection(dusterSprite, Direction::down);
   game.getSprite(dusterSprite).normallyHasShadow = true;
@@ -66,7 +66,7 @@ void loop(Renderer& renderer, std::mt19937& rng) {
 
   int boneySprite = game.emplaceSprite("boney");
   game.getSystem<TransformSystem>().initSprite(boneySprite, warpLoc);
-  game.getSystem<TransformSystem>().setUpCollision(boneySprite, {-8, -8}, {12, 8}, false);
+  game.getSystem<TransformSystem>().setUpCollision(boneySprite, {-8, -8}, {16, 8}, false);
   game.getSystem<AnimationSystem>().initSprite(boneySprite, "../res/sprites/boney_anim.txt");
   game.getSystem<AnimationSystem>().setSpriteDirection(boneySprite, Direction::down);
   game.getSprite(boneySprite).normallyHasShadow = true;
@@ -22,7 +22,7 @@ struct Prototype {
   std::string name;
   vec2i pos;
   vec2i collisionOffset {-8, -8};
-  vec2i collisionSize {12, 8};
+  vec2i collisionSize {16, 8};
   std::string animationFilename;
   std::string animName;
   Direction dir = Direction::down;
@@ -61,9 +61,9 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i curLoc, vec2
   vec2i horizMovement = { newLoc.x(), curLoc.y() };
 
   vec2i oldColUL = curLoc + sprite.collisionOffset;
-  vec2i oldColDR = oldColUL + sprite.collisionSize;
+  vec2i oldColDR = oldColUL + sprite.collisionSize - vec2i{1,1};
   vec2i newColUL = horizMovement + sprite.collisionOffset;
-  vec2i newColDR = newColUL + sprite.collisionSize;
+  vec2i newColDR = newColUL + sprite.collisionSize - vec2i{1,1};
 
   vec2i oldTileUL = oldColUL / map.getTileSize();
   vec2i newTileUL = newColUL / map.getTileSize();
@@ -89,8 +89,8 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i curLoc, vec2
     }
 
     if (!result.horiz.blocked && enclosureZone) {
-      if (oldColDR.x() <= enclosureZone->dr.x() &&
-          newColDR.x() > enclosureZone->dr.x()) {
+      if (oldColDR.x() <= enclosureZone->dr.x()-1 &&
+          newColDR.x() > enclosureZone->dr.x()-1) {
         result.horiz.blocked = true;
         result.horiz.dir = Direction::right;
       }
@@ -168,9 +168,9 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i curLoc, vec2
   }
 
   oldColUL = effectiveCurLoc + sprite.collisionOffset;
-  oldColDR = oldColUL + sprite.collisionSize;
+  oldColDR = oldColUL + sprite.collisionSize - vec2i{1,1};
   newColUL = vertMovement + sprite.collisionOffset;
-  newColDR = newColUL + sprite.collisionSize;
+  newColDR = newColUL + sprite.collisionSize - vec2i{1,1};
 
   oldTileUL = oldColUL / map.getTileSize();
   newTileUL = newColUL / map.getTileSize();
@@ -191,8 +191,8 @@ CollisionResult TransformSystem::checkCollision(int spriteId, vec2i curLoc, vec2
     }
 
     if (!result.vert.blocked && enclosureZone) {
-      if (oldColDR.y() <= enclosureZone->dr.y() &&
-          newColDR.y() > enclosureZone->dr.y()) {
+      if (oldColDR.y() <= enclosureZone->dr.y()-1 &&
+          newColDR.y() > enclosureZone->dr.y()-1) {
         result.vert.blocked = true;
         result.vert.dir = Direction::down;
       }
@@ -268,7 +268,7 @@ CharacterMedium TransformSystem::getMediumAtPosition(int spriteId, vec2i newLoc)
   const Map& map = game_.getMap();
 
   vec2i newColUL = newLoc + sprite.collisionOffset;
-  vec2i newColDR = newColUL + sprite.collisionSize;
+  vec2i newColDR = newColUL + sprite.collisionSize - vec2i{1,1};
   vec2i newTileUL = newColUL / map.getTileSize();
   vec2i newTileDR = newColDR / map.getTileSize();