Merge branch 'master' of https://github.com/joukestoel/jtech-nerding-…

…out-1
joukestoel · Mar 22, 2013 · 2b57e77 · 2b57e77
2 parents c246dd7 + 9b5c9fb
commit 2b57e77
Showing 1 changed file with 28 additions and 3 deletions.
diff --git a/your_code_here/src/nl/ordina/nerdingout/round_3/Veamer.java b/your_code_here/src/nl/ordina/nerdingout/round_3/Veamer.java
@@ -15,9 +15,13 @@ public class Veamer extends AdvancedRobot {
     private static final int DISTANCE = 100;
     private Random random = new Random();
     private volatile String nameToKill = "";
+    private double maxHeight;
+    private double maxWidth;
 
     @Override
     public void run() {
+        maxHeight = getBattleFieldHeight() - 20;
+        maxWidth =  getBattleFieldWidth() - 20;
 //        setAdjustRadarForRobotTurn(true);
         setColors(Color.BLACK, Color.BLACK, Color.WHITE);
         while (true) {
@@ -28,18 +32,19 @@ public void run() {
 
     @Override
     public void onScannedRobot(final ScannedRobotEvent e) {
-        System.out.println("e.getDistance() = " + e.getDistance());
-        System.out.println("e.getName() = " + e.getName());
         if (e.getDistance() < DISTANCE && nameToKill.isEmpty()) {
             nameToKill = e.getName();
             System.out.println("Go get m!!!");
         }
         if (!nameToKill.isEmpty()) {
             System.out.println("kill someone");
             setTurnRight(e.getBearing());
-            setFire(Math.min(250 / e.getDistance(), 3));
             setAhead(e.getDistance() - 10);
             turnGunRight(normalRelativeAngleDegrees(((getHeading() - getRadarHeading()) + e.getBearing())));
+            if (getGunHeat() == 0) {
+                fire(Math.min(250 / e.getDistance(), 3));
+            }
+            avoidWalls();
             return;
         }
 
@@ -56,6 +61,7 @@ public void onScannedRobot(final ScannedRobotEvent e) {
         } else {
             turnRight(180);
         }
+        avoidWalls();
     }
 
     private boolean chance(final double chance) {
@@ -90,6 +96,25 @@ public void onHitWall(final HitWallEvent e) {
         }
     }
 
+    private void avoidWalls() {
+        if (nearingNorth() || nearingSouth() || nearingEast() || nearingWest()) {
+            back(100);
+        }
+    }
+
+    private boolean nearingNorth() {
+        return getY() > maxHeight;
+    }
+    private boolean nearingSouth() {
+        return getY() < 20;
+    }
+    private boolean nearingEast() {
+        return getX() > maxWidth;
+    }
+    private boolean nearingWest() {
+        return getX() < 20;
+    }
+
     public void onWin(WinEvent e) {
    		// Victory dance
    		turnRight(36000);