maybe this time

mate-academy · Mar 12, 2024 · 4fd9f9a · 4fd9f9a
1 parent 7cdac69
commit 4fd9f9a
Showing 1 changed file with 20 additions and 54 deletions.
diff --git a/src/main/java/core/basesyntax/RobotRoute.java b/src/main/java/core/basesyntax/RobotRoute.java
@@ -2,67 +2,33 @@
 
 public class RobotRoute {
     public void moveRobot(Robot robot, int toX, int toY) {
-        if (robot.getX() < toX) {
-            if (robot.getDirection() == Direction.DOWN) {
-                robot.turnRight();
-            }
-            if (robot.getDirection() == Direction.LEFT) {
-                robot.turnRight();
-            }
-            if (robot.getDirection() == Direction.RIGHT) {
-                robot.turnLeft();
-            }
-            while (robot.getX() != toX) {
+        int currentX = robot.getX();
+        int currentY = robot.getY();
+
+        while (robot.getX() != toX || robot.getY() != toY) {
+            if (currentX > toX) {
+                while (robot.getDirection() != Direction.UP) {
+                    robot.turnRight();
+                }
                 robot.stepForward();
-            }
-
-        }
-
-        if (robot.getX() > toX) {
-            if (robot.getDirection() == Direction.UP) {
-                robot.turnRight();
-            }
-            if (robot.getDirection() == Direction.LEFT) {
-                robot.turnLeft();
-            }
-            if (robot.getDirection() == Direction.RIGHT) {
-                robot.turnRight();
-            }
-            while (robot.getX() != toX) {
+            } else if (currentX < toX) {
+                while (robot.getDirection() != Direction.DOWN) {
+                    robot.turnRight();
+                }
                 robot.stepForward();
             }
 
-        }
-
-        if (robot.getY() > toY) {
-            if (robot.getDirection() == Direction.UP) {
-                robot.turnLeft();
-            }
-
-            if (robot.getDirection() == Direction.RIGHT) {
-                robot.turnLeft();
-            }
-
-            while (robot.getY() != toY) {
+            if (currentY > toY) {
+                while (robot.getDirection() != Direction.LEFT) {
+                    robot.turnRight();
+                }
                 robot.stepForward();
-            }
-
-        }
-
-        if (robot.getY() < toY) {
-            if (robot.getDirection() == Direction.DOWN) {
-                robot.turnLeft();
-            }
-
-            if (robot.getDirection() == Direction.UP) {
-                robot.turnRight();
-            }
-
-            while (robot.getY() != toY) {
+            } else if (currentY < toY) {
+                while (robot.getDirection() != Direction.RIGHT) {
+                    robot.turnRight();
+                }
                 robot.stepForward();
             }
-
         }
-
     }
 }