debugging commit

JasperGeurtz · JasperGeurtz · commit 72e714761ba5 · 2020-09-13T14:51:23.000+02:00
diff --git a/src/main/java/bwapi/Cache.java b/src/main/java/bwapi/Cache.java
@@ -17,6 +17,11 @@ boolean valid(int currentFrame) {
     T get() {
         return obj;
     }
+
+    @Override
+    public String toString() {
+        return obj != null ? obj.toString() : "null";
+    }
 }
 
 class IntegerCache extends Cache<Integer> {
diff --git a/src/main/java/bwapi/CommandTemp.java b/src/main/java/bwapi/CommandTemp.java
@@ -1,5 +1,7 @@
 package bwapi;
 
+import java.util.Arrays;
+
 /**
  * Latency Compensation:
  * Only need to implement LatCom for current frame, the server updates the next frame already if latcom is enabled.
@@ -722,8 +724,11 @@ void execute(boolean isCurrentFrame) {
                 }
 
                 // Happens on RLF + 1, we want to pretend this happens on RLF.
+                System.out.println("getTrainingQueueCount: " + unit.getTrainingQueueCount());
+                System.out.println("before: " + Arrays.toString(unit.self().trainingQueue) + ", " + unit.self().trainingQueueCount);
                 unit.self().trainingQueue[unit.getTrainingQueueCount()].set(unitType, frame);
                 unit.self().trainingQueueCount.setOrAdd(+1, frame);
+                System.out.println("after: " + Arrays.toString(unit.self().trainingQueue) + ", " + unit.self().trainingQueueCount);
                 player.self().supplyUsed[unitType.getRace().id]
                         .setOrAdd(unitType.supplyRequired(), frame);
 
diff --git a/src/main/java/bwapi/Game.java b/src/main/java/bwapi/Game.java
@@ -312,6 +312,7 @@ void addUnitCommand(final int type, final int unit, final int target, final int
         unitCommand.setX(x);
         unitCommand.setY(y);
         unitCommand.setExtra(extra);
+        System.out.println("added UnitCommand: " + unitCommand.getTid());
     }
 
     void addCommand(final CommandType type, final int value1, final int value2) {
diff --git a/src/main/java/bwapi/Unit.java b/src/main/java/bwapi/Unit.java
@@ -836,7 +836,7 @@ public UnitType getBuildType() {
      */
     public List<UnitType> getTrainingQueue() {
         return IntStream.range(0, getTrainingQueueCount())
-                .mapToObj(i -> game.isLatComEnabled() && self().trainingQueue[i].valid(game.getFrameCount()) ?
+                .mapToObj(i -> game.isLatComEnabled() && self().trainingQueueCount.valid(game.getFrameCount()) ?
                         self().trainingQueue[i].get() :
                         UnitType.idToEnum[unitData.getTrainingQueue(i)])
                 .collect(Collectors.toList());
diff --git a/src/test/java/game/TrainingQueueTest.java b/src/test/java/game/TrainingQueueTest.java
@@ -0,0 +1,52 @@
+package game;
+
+import bwapi.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+class TrainingQueueTest extends DefaultBWListener {
+    final BWClient bwClient;
+    Game game;
+    int mineralsReq = 250;
+    int workers = 1;
+
+    TrainingQueueTest() {
+        bwClient = new BWClient(this);
+        bwClient.startGame();
+    }
+
+    public void onStart() {
+        game = bwClient.getGame();
+        game.enableFlag(Flag.UserInput);
+        game.setLocalSpeed(0);
+        //game.setLatCom(false);
+    }
+
+    @Override
+    public void onFrame() {
+        List<Unit> minerals = game.getMinerals().stream().filter(Unit::isVisible).collect(Collectors.toList());
+        if (game.self().minerals() >= 230) {
+            game.setLocalSpeed(20);
+        }
+        for (Unit unit : game.self().getUnits()) {
+            UnitType type = unit.getType();
+
+            if (type.isWorker() && unit.isIdle()) {
+                unit.gather(minerals.get(unit.getID() % minerals.size()));
+            }
+            else if (type.isResourceDepot() && game.self().minerals() >= mineralsReq) {
+                System.out.println("######## FRAME " + game.getFrameCount() + " ########");
+                unit.train(game.self().getRace().getWorker());
+                System.out.println("training worker: " + workers);
+                mineralsReq -= 50;
+                workers += 1;
+                System.out.println("trainingQueue: " + unit.getTrainingQueue());
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        new TrainingQueueTest();
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,11 @@ boolean valid(int currentFrame) {`
`17`	`17`	`T get() {`
`18`	`18`	`return obj;`
`19`	`19`	`}`
	`20`	`+`
	`21`	`+ @Override`
	`22`	`+ public String toString() {`
	`23`	`+ return obj != null ? obj.toString() : "null";`
	`24`	`+ }`
`20`	`25`	`}`
`21`	`26`
`22`	`27`	`class IntegerCache extends Cache<Integer> {`
Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,7 @@ void addUnitCommand(final int type, final int unit, final int target, final int`
`312`	`312`	`unitCommand.setX(x);`
`313`	`313`	`unitCommand.setY(y);`
`314`	`314`	`unitCommand.setExtra(extra);`
	`315`	`+ System.out.println("added UnitCommand: " + unitCommand.getTid());`
`315`	`316`	`}`
`316`	`317`
`317`	`318`	`void addCommand(final CommandType type, final int value1, final int value2) {`