Merge pull request #41 from uku1928/main

Anvil: fixed EVERYTHING
IonutParau · Aug 19, 2023 · ed42fdf · ed42fdf
2 parents eb33b16 + 5cc8980
commit ed42fdf
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/lib/logic/update/anvil.dart b/lib/logic/update/anvil.dart
@@ -9,22 +9,30 @@ void anvil() {
     final double lossUponLethalImpact = cell.data["impact_loss"].toDouble();
     final double terminalVelocity = cell.data["speed_limit"].toDouble();
 
-    cell.data["velocity"] += gravity;
     velocity += gravity;
     if(velocity > terminalVelocity) {
       velocity = terminalVelocity;
-      cell.data["velocity"] = terminalVelocity;
     }
-
-    if(doSpeedMover(x, y, dir, velocity.toInt(), velocity.toInt())) {
-      if(velocity >= breakingVelocity) {
-        final dx = frontX(x, dir);
-        final dy = frontY(y, dir);
-        if(grid.inside(dx, dy) && breakable(grid.at(dx, dy), dx, dy, dir, BreakType.gravity)) {
-          grid.set(dx, dy, Cell(dx, dy));
+    final int intVelocity = velocity.toInt();
+
+    for (var i = 0; i < intVelocity; i++) {
+      if (!push(x, y, dir, intVelocity)) {
+        if(velocity >= breakingVelocity) {
+          final dx = frontX(x, dir);
+          final dy = frontY(y, dir);
+          if(grid.inside(dx, dy) && breakable(grid.at(dx, dy), dx, dy, dir, BreakType.gravity)) {
+            grid.addBroken(grid.at(dx, dy), dx, dy);
+            grid.set(dx, dy, Cell(dx, dy));
+            cell.data["velocity"] = velocity * (1 - lossUponLethalImpact);
+            return;
+          }
         }
+        cell.data["velocity"] = 0;
+        return;
       }
-      cell.data["velocity"] = velocity * (1 - lossUponLethalImpact / 100);
+      x = frontX(x, dir);
+      y = frontY(y, dir);
     }
+    cell.data["velocity"] = velocity;
   }, null, "anvil");
-}
+}