1 files changed, 22 insertions, 11 deletions

@@ -42,7 +42,7 @@ void Simulation::tick(
         {
           Entity& block = entities_.at(blockId);
 
-          if (!block.moving && block.playerCanPush)
+          if (!block.moving && block.canBePushedBy.count(ColliderType::player))
           {
             moveEntityOnGrid(blockId, lookDir);
           }
@@ -169,6 +169,8 @@ bool Simulation::moveEntityOnGrid(
   Direction moveDir,
   bool validate)
 {
+  bool actuallyMove = true;
+
   Entity& entity = entities_.at(id);
 
   vec2s shouldMoveTo = posInDir(entity.gridPos, moveDir);
@@ -216,18 +218,20 @@ bool Simulation::moveEntityOnGrid(
     }
   }
 
-  if (entity.colliderType == ColliderType::player)
+  if (!level_.getTileset().canEntityMoveTo(
+        entity.colliderType,
+        level_.at(shouldMoveTo)))
   {
-    if (!level_.getTileset().canPlayerMoveTo(level_.at(shouldMoveTo)))
-    {
-      return false;
-    }
+    return false;
+  }
 
-    for (id_type blockId : getGridEntities(shouldMoveTo))
-    {
-      Entity& block = entities_.at(blockId);
+  for (id_type blockId : getGridEntities(shouldMoveTo))
+  {
+    Entity& block = entities_.at(blockId);
 
-      if (block.moving || !block.playerCanPush)
+    if (!block.moving)
+    {
+      if (!block.canBePushedBy.count(entity.colliderType))
       {
         return false;
       }
@@ -238,13 +242,20 @@ bool Simulation::moveEntityOnGrid(
       }
     }
 
+    double entityTimeLeft = 1.0 / entity.speed;
+    double blockTimeLeft = (1.0 - block.movementTween) / block.speed;
+
+    if (entityTimeLeft < blockTimeLeft)
+    {
+      actuallyMove = false;
+    }
   }
 
 
 
 
 
-  if (!validate)
+  if (!validate && actuallyMove)
   {
     entity.moving = true;
     entity.destPos = shouldMoveTo;