Fixed a bug with armories turning on the wrong mines while building.

Stebalien · Jan 22, 2011 · 5ac2743 · 5ac2743
1 parent 6e493a6
commit 5ac2743
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 13 deletions.
diff --git a/team094/castes/Armory.java b/team094/castes/Armory.java
@@ -8,15 +8,18 @@ private static enum State {
         START,
         IDLE,
         BUILD,
+        DELAY,
         YIELD
     }
-    private static final int MAX_UNITS = 10;
+    private static final int MAX_UNITS = 10,
+                             DELAY = 100;
     private State state;
 
     private final Builder builder;
     private MapLocation[] locations;
     private int locIndex,
-                units;
+                units,
+                cooldown;
 
     public Armory(RobotProperties rp) {
         super(rp);
@@ -40,6 +43,9 @@ public void SM() {
                     case BUILD:
                         build();
                         break;
+                    case DELAY:
+                        delay();
+                        break;
                     case YIELD:
                     default:
                         yield();
@@ -78,25 +84,26 @@ private void start() throws GameActionException {
     }
 
     private void idle() throws GameActionException {
-        Robot r = (Robot)myRP.sensor.senseObjectAtLocation(locations[locIndex], RobotLevel.ON_GROUND);
-
-        if(myRP.sensor.senseObjectAtLocation(locations[locIndex], RobotLevel.IN_AIR) == null &&
-           r != null) {
+        if(myRP.sensor.senseObjectAtLocation(locations[locIndex], RobotLevel.IN_AIR) == null) {
             builder.startBuild(false, 2, locations[locIndex], Chassis.FLYING);
-            if(r.getTeam() == myRP.myTeam && !myRP.sensor.senseRobotInfo(r).on)
-                myRC.turnOn(locations[locIndex], RobotLevel.ON_GROUND);
             state = state.BUILD;
             build(); // Call build function here to save time.
         }
-
-        locIndex = (locIndex+1+locations.length)%locations.length;
     }
 
-    @SuppressWarnings("fallthrough")
     private void build() throws GameActionException {
         switch (builder.doBuild()) {
+            case ACTIVE:
+                Robot r = (Robot)myRP.sensor.senseObjectAtLocation(locations[locIndex], RobotLevel.ON_GROUND);
+                if(r.getTeam() == myRP.myTeam && !myRP.sensor.senseRobotInfo(r).on)
+                    myRC.turnOn(locations[locIndex], RobotLevel.ON_GROUND);
+                break;
             case DONE:
                 units++;
+                locIndex = (locIndex+1+locations.length)%locations.length;
+                cooldown = DELAY;
+                state = state.DELAY;
+                break;
             case FAIL:
                 if(units >= MAX_UNITS)
                     state = State.YIELD;
@@ -107,4 +114,13 @@ private void build() throws GameActionException {
                 break;
         }
     }
+
+    private void delay() {
+        if(--cooldown <= 0) {
+            if(units >= MAX_UNITS)
+                state = State.YIELD;
+            else
+                state = State.IDLE;
+        }
+    }
 }
diff --git a/team094/castes/Miner.java b/team094/castes/Miner.java
@@ -10,8 +10,8 @@ private static enum State {
         BUILD,
         YIELD
     }
-    private static final int MAX_SCOUTS = 3,
-                             OFF_ROUNDS = 20;
+    private static final int MAX_SCOUTS = 10,
+                             OFF_ROUNDS = 5;
 
     private final Builder builder;
     private final MapLocation myLoc; // Buildings can't move.