Merge remote-tracking branch 'origin/engine-testing-3' into crossplay

Author: TheApplePieGod

client/src/playback/RoundStat.ts

@@ -76,7 +76,7 @@ export default class RoundStat {
             let totalCatDamage = 0
             let totalRatKings = 0
             for (let i = 0; i < delta.teamIdsLength(); i++) {
-                totalCheese += delta.teamCheeseAmounts(i)!
+                totalCheese += delta.teamCheeseTransferred(i)!
                 totalCatDamage += delta.teamCatDamage(i)!
                 totalRatKings += delta.teamAliveRatKings(i)!
             }
@@ -86,7 +86,7 @@ export default class RoundStat {
                 assert(team != undefined, `team ${i} not found in game.teams in round`)
                 const teamStat = this.teams.get(team) ?? assert.fail(`team ${i} not found in team stats in round`)
 
-                teamStat.cheeseAmount = delta.teamEnemyDamage(i) ?? assert.fail('missing cheese amount')
+                teamStat.cheeseAmount = delta.teamCheeseTransferred(i) ?? assert.fail('missing cheese amount')
                 teamStat.cheesePercent = teamStat.cheeseAmount / totalCheese
                 teamStat.catDamageAmount = delta.teamCatDamage(i) ?? assert.fail('missing cat damage amount')
                 teamStat.catDamagePercent = teamStat.catDamageAmount / totalCatDamage

crossplay_temp/started_java.txt

@@ -357,9 +357,8 @@ public class MatchMaker {
 
         // Round statistics
         private TIntArrayList teamIDs;
-        private TIntArrayList teamEnemyDamage;
         private TIntArrayList teamCatDamage;
-        private TIntArrayList teamCheeseAmounts;
+        private TIntArrayList teamCheeseTransferred;
         private TIntArrayList teamAliveRatKings;
         private TIntArrayList teamAliveBabyRats;
         private TIntArrayList teamRatTrapCount;
@@ -389,9 +388,8 @@ public class MatchMaker {
 
         public MatchMaker() {
             this.teamIDs = new TIntArrayList();
-            this.teamEnemyDamage = new TIntArrayList();
             this.teamCatDamage = new TIntArrayList();
-            this.teamCheeseAmounts = new TIntArrayList();
+            this.teamCheeseTransferred = new TIntArrayList();
             this.teamAliveRatKings = new TIntArrayList();
             this.teamAliveBabyRats = new TIntArrayList();
             this.teamDirtCount = new TIntArrayList();
@@ -508,9 +506,8 @@ public void endRound() {
             createEvent((builder) -> {
                 // Round statistics
                 int teamIDsP = Round.createTeamIdsVector(builder, teamIDs.toNativeArray());
-                int teamCheeseAmountsP = Round.createTeamCheeseAmountsVector(builder,
-                        teamCheeseAmounts.toNativeArray());
-                int teamEnemyDamageP = Round.createTeamEnemyDamageVector(builder, teamEnemyDamage.toNativeArray());
+                int teamCheeseTransferredP = Round.createTeamCheeseTransferredVector(builder,
+                        teamCheeseTransferred.toNativeArray());
                 int teamCatDamageP = Round.createTeamCatDamageVector(builder, teamCatDamage.toNativeArray());
                 int teamAliveRatKingsP = Round.createTeamAliveRatKingsVector(builder, teamAliveRatKings.toNativeArray());
                 int teamAliveBabyRatsP = Round.createTeamAliveBabyRatsVector(builder, teamAliveBabyRats.toNativeArray());
@@ -524,8 +521,7 @@ public void endRound() {
 
                 Round.addTeamIds(builder, teamIDsP);
                 Round.addRoundId(builder, this.currentRound);
-                Round.addTeamCheeseAmounts(builder, teamCheeseAmountsP);
-                Round.addTeamEnemyDamage(builder, teamEnemyDamageP);
+                Round.addTeamCheeseTransferred(builder, teamCheeseTransferredP);
                 Round.addTeamCatDamage(builder, teamCatDamageP);
                 Round.addTeamAliveBabyRats(builder, teamAliveBabyRatsP);
                 Round.addTeamAliveRatKings(builder, teamAliveRatKingsP);
@@ -581,9 +577,9 @@ public void addDamageAction(int damagedRobotID, int damage) {
             });
         }
 
-        public void addRatNapAction(int grabbedRobotID) {
+        public void addRatNapAction(int grabberRobotID) {
             applyToBuilders((builder) -> {
-                int action = RatNap.createRatNap(builder, grabbedRobotID);
+                int action = RatNap.createRatNap(builder, grabberRobotID);
                 builder.addAction(action, Action.RatNap);
             });
         }
@@ -604,9 +600,9 @@ public void addThrowAction(int thrownRobotID, MapLocation throwDirLocation) {
         }
 
         /// Visually indicate an rat bite
-        public void addBiteAction(int otherID) {
+        public void addBiteAction(int biterID) {
             applyToBuilders((builder) -> {
-                int action = RatAttack.createRatAttack(builder, otherID);
+                int action = RatAttack.createRatAttack(builder, biterID);
                 builder.addAction(action, Action.RatAttack);
             });
         }
@@ -722,10 +718,9 @@ public void addDieAction(int id, boolean fromException) {
             });
         }
 
-        public void addTeamInfo(Team team, int totalCheeseAmount, int enemyDamage, int catDamage, int aliveRatKings, int aliveBabyRats, int amountDirtCollected, int ratTrapCount, int catTrapCount) {
+        public void addTeamInfo(Team team, int cheeseTransferred, int catDamage, int aliveRatKings, int aliveBabyRats, int amountDirtCollected, int ratTrapCount, int catTrapCount) {
             teamIDs.add(TeamMapping.id(team));
-            teamCheeseAmounts.add(totalCheeseAmount);
-            teamEnemyDamage.add(enemyDamage);
+            teamCheeseTransferred.add(cheeseTransferred);
             teamCatDamage.add(catDamage);
             teamAliveRatKings.add(aliveRatKings);
             teamAliveBabyRats.add(aliveBabyRats);
@@ -803,9 +798,8 @@ private int locationToInt(MapLocation loc) {
 
         private void clearRoundData() {
             this.teamIDs.clear();
-            this.teamEnemyDamage.clear();
             this.teamCatDamage.clear();
-            this.teamCheeseAmounts.clear();
+            this.teamCheeseTransferred.clear();
             this.teamAliveRatKings.clear();
             this.teamAliveBabyRats.clear();
             this.teamDirtCount.clear();

engine/src/main/battlecode/schema/Round.java

@@ -230,10 +230,16 @@ public void bfsFromTarget(MapLocation target, int chirality){
             for (Direction d : Direction.allDirections()){
                 if (d == Direction.CENTER)
                     continue;
-                if (chirality == 1)
-                    d = flipDirBySymmetry(d);
+
+                Direction useDir;
+                if (chirality == 1){
+                    useDir = flipDirBySymmetry(d);
+                }
+                else{
+                    useDir = d;
+                }
 
-                MapLocation neighbor = nextLoc.add(d);
+                MapLocation neighbor = nextLoc.add(useDir);
 
                 if (this.gameMap.onTheMap(neighbor) && bfs_map[locationToIndex(neighbor)][locationToIndex(target)] != null){
                     // visited already
@@ -259,7 +265,7 @@ public void bfsFromTarget(MapLocation target, int chirality){
                     }
                 }
                 if (validPath){
-                    Direction reverseDirection = d.opposite();
+                    Direction reverseDirection = useDir.opposite();
                     bfs_map[locationToIndex(neighbor)][locationToIndex(target)] = reverseDirection;
                     queue.add(neighbor);
                 }
@@ -851,32 +857,32 @@ public boolean setWinnerIfMoreRatsAlive() {
     public boolean setWinnerIfMorePoints() {
         double cat_weight; // cat damage
         double king_weight; // number of kings
-        double rat_damage_weight; // amount damage lost by other team throughout the game
+        double cheese_transfer_weight; // amount cheese transferred
 
         if (isCooperation()) {
             cat_weight = 0.5;
             king_weight = 0.3;
-            rat_damage_weight = 0.2;
+            cheese_transfer_weight = 0.2;
         } else {
             cat_weight = 0.3;
             king_weight = 0.5;
-            rat_damage_weight = 0.2;
+            cheese_transfer_weight = 0.2;
         }
 
         ArrayList<Integer> teamPoints = new ArrayList<>();
 
         int total_num_rat_kings = teamInfo.getNumRatKings(Team.A) + teamInfo.getNumRatKings(Team.B);
-        int total_amount_rat_damage = teamInfo.getDamageSuffered(Team.A) + teamInfo.getDamageSuffered(Team.B);
+        int total_amount_cheese_transferred = teamInfo.getCheeseTransferred(Team.A) + teamInfo.getCheeseTransferred(Team.B);
         int total_amount_cat_damage = teamInfo.getDamageToCats(Team.A) + teamInfo.getDamageToCats(Team.B);
 
         for (Team team : List.of(Team.A, Team.B)) {
 
             float proportion_rat_kings = teamInfo.getNumRatKings(team) / total_num_rat_kings;
-            float proportion_damage_to_other_rats = teamInfo.getDamageSuffered(team.opponent()) / total_amount_rat_damage;
+            float proportion_cheese_transferred = teamInfo.getCheeseTransferred(team) / total_amount_cheese_transferred;
             float proportion_cat_damage = teamInfo.getDamageToCats(team) / total_amount_cat_damage;
 
             int points = (int) (cat_weight * 100 * (proportion_cat_damage) + king_weight * 100 * proportion_rat_kings
-                    + rat_damage_weight * 100 * proportion_damage_to_other_rats);
+                    + cheese_transfer_weight * 100 * proportion_cheese_transferred);
             this.teamInfo.addPoints(team, points);
             teamPoints.add(points);
         }
@@ -939,7 +945,7 @@ public void processEndOfRound() {
 
         Team[] teams = {Team.A, Team.B};
         for (Team t : teams){
-            this.matchMaker.addTeamInfo(t, this.teamInfo.getCheese(t), this.teamInfo.getDamageSuffered(t.opponent()), this.teamInfo.getDamageToCats(t), this.teamInfo.getNumRatKings(t), this.teamInfo.getNumBabyRats(t), this.teamInfo.getDirt(t), this.getTrapCount(TrapType.RAT_TRAP, t), this.getTrapCount(TrapType.CAT_TRAP, t));
+            this.matchMaker.addTeamInfo(t, this.teamInfo.getCheeseTransferred(t), this.teamInfo.getDamageToCats(t), this.teamInfo.getNumRatKings(t), this.teamInfo.getNumBabyRats(t), this.teamInfo.getDirt(t), this.getTrapCount(TrapType.RAT_TRAP, t), this.getTrapCount(TrapType.CAT_TRAP, t));
         }
         this.teamInfo.processEndOfRound();
 
@@ -970,7 +976,7 @@ public int spawnRobot(int ID, UnitType type, MapLocation location, Direction dir
 
         InternalRobot robot = new InternalRobot(this, ID, team, type, location, dir, chirality);
 
-        for (MapLocation loc : type.getAllTypeLocations(location)) {
+        for (MapLocation loc : robot.getAllPartLocations()) {
             addRobot(loc, robot);
         }
 
@@ -1071,6 +1077,13 @@ public void destroyRobot(int id, boolean fromException, boolean fromDamage) {
                 InternalRobot carryingRobot = robot.getCarryingRobot();
                 carryingRobot.getDropped(loc);
             }
+            if (robot.isGrabbedByRobot()) {
+                InternalRobot carrier = robot.getGrabbedByRobot();
+                robot.clearGrabbedByRobot();
+                if (carrier != null && carrier.getCarryingRobot() == robot) {
+                    carrier.clearCarryingRobot();
+                }
+            }
             if (robot.getCheese() > 0) {
                 addCheese(loc, robot.getCheese());
                 matchMaker.addCheeseSpawnAction(loc, robot.getCheese());