Merge branch 'client'

Author: TheApplePieGod

client/icons/icon.ico

@@ -32,6 +32,8 @@ export const QueuedGame: React.FC<Props> = (props) => {
                 return 'by resignation '
             case schema.WinType.MAJORITY_PAINTED:
                 return 'by having paint majority '
+            case schema.WinType.ALL_UNITS_DESTROYED:
+                return 'by destroying all enemy units '
             case schema.WinType.AREA_PAINTED:
                 return 'by painting more territory '
             case schema.WinType.MORE_TOWERS:

client/src/components/sidebar/queue/queue-game.tsx

@@ -376,7 +376,7 @@ async function dispatchMatch(
             break
         }
         case SupportedLanguage.Python: {
-            options = [`run.py`, `run`, `--p1=${teamA}`, `--p2=${teamB}`, `--map=${[...selectedMaps][0]}`]
+            options = [`run.py`, `run`, `--p1=${teamA}`, `--p2=${teamB}`, `--maps=${[...selectedMaps].join(',')}`]
             break
         }
     }

client/src/components/sidebar/runner/scaffold.ts

@@ -33,8 +33,8 @@ export const UpdateWarning = () => {
             <p className="text-yellow-800 text-xs">
                 <b>NEW VERSION AVAILABLE!</b>
                 <br />
-                download with <code>gradle update</code> followed by <code>gradle build</code>, and then restart the
-                client: v{update.latest}
+                download with (<code>gradle update</code> followed by <code>gradle build</code>) for java and (
+                <code>python run.py update</code>) for python, and then restart the client: v{update.latest}
             </p>
         </div>
     )

client/src/components/sidebar/update-warning.tsx

@@ -93,7 +93,7 @@ export const ACTION_DEFINITIONS: Record<schema.Action, typeof Action<ActionUnion
             const target = round.bodies.getById(this.actionData.id())
 
             // Apply damage to the target
-            target.hp -= this.actionData.damage()
+            target.hp = Math.max(target.hp - this.actionData.damage(), 0)
         }
     },
     [schema.Action.SplashAction]: class SplashAction extends Action<schema.SplashAction> {

client/src/playback/Actions.ts

@@ -115,7 +115,7 @@ export default class Bodies {
 
         // Update properties
         body.pos = { x: turn.x(), y: turn.y() }
-        body.hp = turn.health()
+        body.hp = Math.max(turn.health(), 0)
         body.paint = turn.paint()
         body.moveCooldown = turn.moveCooldown()
         body.actionCooldown = turn.actionCooldown()

client/src/playback/Bodies.ts

@@ -108,8 +108,9 @@ export default class Match {
         for (let i = 0; i < footer.timelineMarkersLength(); i++) {
             const marker = footer.timelineMarkers(i)!
 
+            // Add one to round so that the visualizer properly shows the action completed state
             this.timelineMarkers.push({
-                round: marker.round(),
+                round: marker.round() + 1,
                 team: marker.team(),
                 colorHex: marker.colorHex(),
                 label: marker.label() ?? 'Unknown'

client/src/playback/Match.ts

@@ -7,14 +7,15 @@ public final class WinType {
   private WinType() { }
   public static final byte RESIGNATION = 0;
   public static final byte MAJORITY_PAINTED = 1;
-  public static final byte AREA_PAINTED = 2;
-  public static final byte MORE_TOWERS = 3;
-  public static final byte MORE_MONEY = 4;
-  public static final byte MORE_STORED_PAINT = 5;
-  public static final byte MORE_ROBOTS = 6;
-  public static final byte COIN_FLIP = 7;
+  public static final byte ALL_UNITS_DESTROYED = 2;
+  public static final byte AREA_PAINTED = 3;
+  public static final byte MORE_TOWERS = 4;
+  public static final byte MORE_MONEY = 5;
+  public static final byte MORE_STORED_PAINT = 6;
+  public static final byte MORE_ROBOTS = 7;
+  public static final byte COIN_FLIP = 8;
 
-  public static final String[] names = { "RESIGNATION", "MAJORITY_PAINTED", "AREA_PAINTED", "MORE_TOWERS", "MORE_MONEY", "MORE_STORED_PAINT", "MORE_ROBOTS", "COIN_FLIP", };
+  public static final String[] names = { "RESIGNATION", "MAJORITY_PAINTED", "ALL_UNITS_DESTROYED", "AREA_PAINTED", "MORE_TOWERS", "MORE_MONEY", "MORE_STORED_PAINT", "MORE_ROBOTS", "COIN_FLIP", };
 
   public static String name(int e) { return names[e]; }
 }

schema/java/battlecode/schema/WinType.java

@@ -1,10 +1,11 @@
 export declare enum WinType {
     RESIGNATION = 0,
     MAJORITY_PAINTED = 1,
-    AREA_PAINTED = 2,
-    MORE_TOWERS = 3,
-    MORE_MONEY = 4,
-    MORE_STORED_PAINT = 5,
-    MORE_ROBOTS = 6,
-    COIN_FLIP = 7
+    ALL_UNITS_DESTROYED = 2,
+    AREA_PAINTED = 3,
+    MORE_TOWERS = 4,
+    MORE_MONEY = 5,
+    MORE_STORED_PAINT = 6,
+    MORE_ROBOTS = 7,
+    COIN_FLIP = 8
 }

schema/js/battlecode/schema/win-type.d.ts

@@ -7,10 +7,11 @@ var WinType;
 (function (WinType) {
     WinType[WinType["RESIGNATION"] = 0] = "RESIGNATION";
     WinType[WinType["MAJORITY_PAINTED"] = 1] = "MAJORITY_PAINTED";
-    WinType[WinType["AREA_PAINTED"] = 2] = "AREA_PAINTED";
-    WinType[WinType["MORE_TOWERS"] = 3] = "MORE_TOWERS";
-    WinType[WinType["MORE_MONEY"] = 4] = "MORE_MONEY";
-    WinType[WinType["MORE_STORED_PAINT"] = 5] = "MORE_STORED_PAINT";
-    WinType[WinType["MORE_ROBOTS"] = 6] = "MORE_ROBOTS";
-    WinType[WinType["COIN_FLIP"] = 7] = "COIN_FLIP";
+    WinType[WinType["ALL_UNITS_DESTROYED"] = 2] = "ALL_UNITS_DESTROYED";
+    WinType[WinType["AREA_PAINTED"] = 3] = "AREA_PAINTED";
+    WinType[WinType["MORE_TOWERS"] = 4] = "MORE_TOWERS";
+    WinType[WinType["MORE_MONEY"] = 5] = "MORE_MONEY";
+    WinType[WinType["MORE_STORED_PAINT"] = 6] = "MORE_STORED_PAINT";
+    WinType[WinType["MORE_ROBOTS"] = 7] = "MORE_ROBOTS";
+    WinType[WinType["COIN_FLIP"] = 8] = "COIN_FLIP";
 })(WinType || (exports.WinType = WinType = {}));