Merge pull request #8 from CoffeeCoder1015/soldierClean

#6 Moved SRP building into seperate function for clarity and resovled tesselation issue

Author: CoffeeCoder1015

java/src/s2/Soldier.java

@@ -13,78 +13,21 @@ public class Soldier implements GenericRobotContoller {
     Pathing pathing_engine;
     boolean buildPaintTowerNext = false;
 
+    MapLocation currentLocation;
+
     public Soldier(RobotController handler) throws GameActionException {
         rc = handler;
         pathing_engine = new Pathing(handler);
         SRP_pattern = rc.getResourcePattern();
     }
 
     public void run() throws GameActionException {
-        if (SRP_built == false && cant_find_tower_for > 40) {
-            boolean early_exit = false;
-            if (!rc.canMarkResourcePattern(rc.getLocation())) {
-                early_exit = true;
-            }
-            if (rc.getChips() < 700) {
-               early_exit = true; 
-            }
-            if (!isBuildingSRP && early_exit == false) {
-                MapInfo[] info = rc.senseNearbyMapInfos();
-                for (MapInfo mapInfo : info) {
-                    if (mapInfo.isResourcePatternCenter()) {
-                        early_exit = true;
-                        break;
-                    }
-
-                    // Locations within SRP range
-                    boolean noRobot = rc.senseRobotAtLocation(mapInfo.getMapLocation()) == null;
-                    boolean in_range = mapInfo.getMapLocation().isWithinDistanceSquared(rc.getLocation(), 1);
-                    if (in_range) {
-                        // boolean isPaintedbyAlly =mapInfo.getPaint().isAlly(); 
-                        boolean hasTower = mapInfo.hasRuin() && !noRobot;
-                        if (mapInfo.isWall() || hasTower) {
-                            early_exit = true;
-                            break;
-                        }
-                    }
-
-                    boolean noTower = mapInfo.hasRuin() && noRobot;
-                    if (noTower) {
-                        early_exit = true;
-                        break;
-                    }
-                }
-            }
-            if (!early_exit && rc.isActionReady()) {
-                isBuildingSRP = true;
-                MapLocation curr_loc = rc.getLocation();
-                MapInfo[] key_squares = rc.senseNearbyMapInfos(8);
-                if (rc.senseMapInfo(rc.getLocation()).getPaint() != PaintType.ALLY_SECONDARY) {
-                   rc.attack(curr_loc, true); 
-                }else{
-                    for (MapInfo mapInfo : key_squares) {
-                    MapLocation relative_loc = mapInfo.getMapLocation().translate(-curr_loc.x, -curr_loc.y);
-                    rc.setIndicatorDot(curr_loc, 0,0,255);
-                    // System.out.println(relative_loc);
-                    boolean color = SRP_pattern[relative_loc.x+2][-(relative_loc.y-2)];
-                    PaintType correct_paint = PaintType.ALLY_PRIMARY;
-                    if (color) {
-                       correct_paint = PaintType.ALLY_SECONDARY; 
-                    }
-                    if (mapInfo.getPaint() != correct_paint) {
-                       rc.attack(mapInfo.getMapLocation(),color); 
-                       break;
-                    }
-                }
-                }
-                if (rc.canCompleteResourcePattern(curr_loc)) {
-                   rc.completeResourcePattern(curr_loc); 
-                   rc.setTimelineMarker("Built SRP", 255,0,0);
-                   SRP_built = true;
-                   isBuildingSRP = false;
-                }
-            }
+        //get our current location at the start of each run
+        currentLocation = rc.getLocation();
+        if (shouldBuildSRP()) {
+           buildSRP(); 
         }
+
         boolean found = false;
         if (!isBuildingSRP) {
             found = buildRuins();
@@ -125,7 +68,7 @@ private boolean buildRuins() throws GameActionException {
         for (MapInfo tile : nearbyTiles) {
             // Make sure the ruin is not already complete (has no tower on it)
             if (tile.hasRuin() && rc.senseRobotAtLocation(tile.getMapLocation()) == null) {
-                int checkDist = tile.getMapLocation().distanceSquaredTo(rc.getLocation());
+                int checkDist = tile.getMapLocation().distanceSquaredTo(currentLocation);
                 if (checkDist < curDist) {
                     curDist = checkDist;
                     curRuin = tile;
@@ -136,7 +79,7 @@ private boolean buildRuins() throws GameActionException {
 
         if (curRuin != null) {
             MapLocation targetLoc = curRuin.getMapLocation();
-            Direction dir = rc.getLocation().directionTo(targetLoc);
+            Direction dir = currentLocation.directionTo(targetLoc);
             if (rc.canMove(dir))
                 rc.move(dir);
             // Mark the pattern we need to draw to build a tower here if we haven't already.
@@ -185,4 +128,71 @@ private boolean buildRuins() throws GameActionException {
         return false;
     }
 
+    private boolean shouldBuildSRP() throws GameActionException{
+        /* early exit conditions */
+        if (SRP_built || cant_find_tower_for < 40 || !rc.canMarkResourcePattern(currentLocation) || rc.getChips() < 700 || !rc.isActionReady()) {
+           return false; 
+        }
+        /* bad location exit */
+        if (!isBuildingSRP) { // not already doing it
+            MapInfo[] info = rc.senseNearbyMapInfos(-1);
+            for (MapInfo mapInfo : info) {
+                MapLocation tileLocation = mapInfo.getMapLocation();
+                if (mapInfo.isResourcePatternCenter()) { // will overlap already built SRP
+                    // Resource centers at the very edge of the vision radius 
+                    // that are on the same x or y axis as the current are overlappable without issue
+                    // relative locations (0,4) (-4,0) (0,-4) (4,0)
+                    MapLocation relativeLocation = tileLocation.translate(-currentLocation.x, -currentLocation.y);
+                    int x = relativeLocation.x;
+                    int y = relativeLocation.y;
+                    boolean case1 = x == 0 && (y == 4 || y == -4); 
+                    boolean case2 = y == 0 && (x == 4 || x == -4); 
+                    if (!(case1 || case2)) {
+                        return false;
+                    }
+                }
+
+                // Has wall or tower blocking
+                // Locations within SRP range
+                boolean noRobot = rc.senseRobotAtLocation(tileLocation) == null;
+                // cant build if there is uncompleted ruin
+                // this makes sure SRPs wont overlap onto TowerPatterns
+                boolean noTower = mapInfo.hasRuin() && noRobot;
+                if (noTower) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    private void buildSRP() throws GameActionException{
+        isBuildingSRP = true;
+        MapInfo[] key_squares = rc.senseNearbyMapInfos(8);
+        if (rc.senseMapInfo(currentLocation).getPaint() != PaintType.ALLY_SECONDARY) {
+            rc.attack(currentLocation, true);
+        } else {
+            for (MapInfo mapInfo : key_squares) {
+                MapLocation relative_loc = mapInfo.getMapLocation().translate(-currentLocation.x, -currentLocation.y);
+                rc.setIndicatorDot(currentLocation, 0, 0, 255);
+                // System.out.println(relative_loc);
+                boolean color = SRP_pattern[relative_loc.x + 2][-(relative_loc.y - 2)];
+                PaintType correct_paint = PaintType.ALLY_PRIMARY;
+                if (color) {
+                    correct_paint = PaintType.ALLY_SECONDARY;
+                }
+                if (mapInfo.getPaint() != correct_paint) {
+                    rc.attack(mapInfo.getMapLocation(), color);
+                    break;
+                }
+            }
+        }
+        if (rc.canCompleteResourcePattern(currentLocation)) {
+            rc.completeResourcePattern(currentLocation);
+            rc.setTimelineMarker("Built SRP", 255, 0, 0);
+            SRP_built = true;
+            isBuildingSRP = false;
+        }
+    }
+
 }