From 62e7ec4087aeb5721b5b5c0fab34857cf01e25e4 Mon Sep 17 00:00:00 2001 From: Tymofii Mazurenko <tymofii.mazurenko@student.griffith.ie> Date: Tue, 25 Mar 2025 18:22:59 +0000 Subject: [PATCH] Small adjustments --- PrimeBot.class | Bin 330 -> 5284 bytes PrimeBot.java | 31 +++++++++++++------------------ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/PrimeBot.class b/PrimeBot.class index 0a0bac71b2847b3c2d6dd5f781f7196464967b99..3cdbfb544bd90552e87e4e3394920ddddb9faef1 100644 GIT binary patch literal 5284 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 delta 236 zcmZ3Yd5TH-)W2Q(7#J9w83ef)m>8JZ8CZB2SQ*$D8Tg9wlk$`EQ&ROOYD)?Wr5ELw z7GxBs80rTUW#*<j<(Ev}%o$S86`WsMl$`38nUl)MzzdVo%StRuWKd*aXJBFg0VW1U zkf98W44e!M4EhX=42%p646It)85lP*FfcGNa4|42ut5YFxEUB2c%W<^23`gR21W)x cuq;TkHki)<)u@4_lLJX7BLhq)KiGT$0D!a~{{R30 diff --git a/PrimeBot.java b/PrimeBot.java index d6be705..daa0eb4 100644 --- a/PrimeBot.java +++ b/PrimeBot.java @@ -37,7 +37,6 @@ public class PrimeBot extends AdvancedRobot { private static double myEnergy; private Point2D.Double nextDestination; - @Override public void run() { // Robot initialization setColors(bodyColor, gunColor, radarColor, bulletColor, scanColor); @@ -68,7 +67,8 @@ public class PrimeBot extends AdvancedRobot { handleGunControl(); // Movement control - handleMovement(); + setAhead(100); + setTurnRight(30); } /** @@ -96,13 +96,6 @@ public class PrimeBot extends AdvancedRobot { setTurnGunLeftRadians(gunTurnAngle); } - /** - * Controls robot movement to avoid enemies and walls - */ - private void handleMovement() { - - } - /** * Calculates a point at specified distance and angle from origin */ @@ -136,31 +129,33 @@ public class PrimeBot extends AdvancedRobot { } - + /** + * Controls robot movement + */ // Maksym Marochko basic movement-features // moves when hit by a bullet public void onHitByBullet(HitByBulletEvent event) { - back(150); - turnLeft(45); + setBack(150); + setTurnLeft(45); } // avoids walls when hitting them public void onHitWall(HitWallEvent event) { - back(150); - turnRight(90); + setBack(150); + setTurnRight(90); } // reacts when colliding with another robot public void onHitRobot(HitRobotEvent event) { - back(100); - turnLeft(60); - ahead(50); + setBack(100); + setTurnLeft(60); + setAhead(50); } // reacts when winning a round public void onWin(WinEvent e) { for (int i = 0; i < 3; i++) { - turnRight(360); + setTurnRight(360); } } } -- GitLab