Merge branch 'master' into public-release

Author: TheApplePieGod

client/src/client-config.tsx

@@ -36,6 +36,7 @@ const DEFAULT_CONFIG = {
     focusRobotTurn: true,
     enableFancyPaint: true,
     streamRunnerGames: true,
+    populateRunnerGames: true,
     profileGames: false,
     validateMaps: false,
     resolutionScale: 100,
@@ -68,6 +69,7 @@ const configDescription: Record<keyof ClientConfig, string> = {
     focusRobotTurn: 'Focus the robot when performing their turn during turn-stepping mode',
     enableFancyPaint: 'Enable fancy paint rendering',
     streamRunnerGames: 'Stream each round from the runner live as the game is being played',
+    populateRunnerGames: 'Display the finished game immediately when the runner is finished running',
     profileGames: 'Enable saving profiling data when running games',
     validateMaps: 'Validate maps before running a game',
     resolutionScale: 'Resolution scale for the game area. Decrease to help performance.',

client/src/components/button.tsx

@@ -2,6 +2,7 @@ import React, { MouseEvent, PropsWithChildren } from 'react'
 
 type Props = {
     className?: string
+    style?: React.CSSProperties
     onClick: (event: MouseEvent<HTMLButtonElement>) => void
     disabled?: boolean
 }
@@ -15,6 +16,7 @@ export const Button = (props: PropsWithChildren<Props>) => {
                 (props.disabled ? ' opacity-50 cursor-not-allowed' : '')
             }
             onClick={props.onClick}
+            style={props.style}
         >
             {props.children}
         </button>
@@ -28,6 +30,7 @@ export const SmallButton = (props: PropsWithChildren<Props>) => (
             (props.className ?? '')
         }
         onClick={props.onClick}
+        style={props.style}
     >
         {props.children}
     </button>
@@ -40,6 +43,7 @@ export const BrightButton = (props: PropsWithChildren<Props>) => (
             (props.className ?? '')
         }
         onClick={props.onClick}
+        style={props.style}
     >
         {props.children}
     </button>

client/src/components/sidebar/runner/runner.tsx

@@ -5,9 +5,7 @@ import { nativeAPI } from './native-api-wrapper'
 import { Select } from '../../forms'
 import { InputDialog } from '../../input-dialog'
 import Tooltip from '../../tooltip'
-import { SectionHeader } from '../../section-header'
 import { FixedSizeList, ListOnScrollProps } from 'react-window'
-import { OpenExternal } from '../../../icons/open-external'
 import { BasicDialog } from '../../basic-dialog'
 import { RingBuffer } from '../../../util/ring-buffer'
 import { ProfilerDialog } from './profiler'
@@ -141,11 +139,11 @@ export const RunnerPage: React.FC<RunnerPageProps> = ({ open, scaffold }) => {
                     <MapSelector
                         maps={maps}
                         availableMaps={availableMaps}
-                        onSelect={(m) => setMaps(new Set([...maps, m]))}
-                        onDeselect={(m) => setMaps(new Set([...maps].filter((x) => x !== m)))}
+                        onSelect={(m) => setMaps(new Set([...maps, ...m]))}
+                        onDeselect={(m) => setMaps(new Set([...maps].filter((x) => !m.includes(x))))}
                     />
                     <SmallButton
-                        className="mt-2"
+                        className="mt-3"
                         onClick={() => {
                             resetSettings()
                             reloadData()
@@ -330,8 +328,8 @@ const TeamSelector: React.FC<TeamSelectorProps> = ({ teamA, teamB, options, onCh
 interface MapSelectorProps {
     maps: Set<string>
     availableMaps: Set<string>
-    onSelect: (map: string) => void
-    onDeselect: (map: string) => void
+    onSelect: (map: string[]) => void
+    onDeselect: (map: string[]) => void
 }
 
 const MapSelector: React.FC<MapSelectorProps> = ({ maps, availableMaps, onSelect, onDeselect }) => {
@@ -354,7 +352,7 @@ const MapSelector: React.FC<MapSelectorProps> = ({ maps, availableMaps, onSelect
                             <div
                                 key={m}
                                 className={'cursor-pointer hover:bg-lightHighlight flex items-center justify-between'}
-                                onClick={() => (maps.has(m) ? onDeselect(m) : onSelect(m))}
+                                onClick={() => (maps.has(m) ? onDeselect([m]) : onSelect([m]))}
                             >
                                 {m}
                                 <input
@@ -368,6 +366,14 @@ const MapSelector: React.FC<MapSelectorProps> = ({ maps, availableMaps, onSelect
                     })}
                 </div>
             </Resizable>
+            <div className="flex gap-2 items-center mt-1 justify-center">
+                <SmallButton style={{ margin: 0 }} onClick={() => onSelect([...availableMaps])}>
+                    Select All
+                </SmallButton>
+                <SmallButton style={{ margin: 0 }} onClick={() => onDeselect([...availableMaps])}>
+                    Deselect All
+                </SmallButton>
+            </div>
         </div>
     )
 }

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

@@ -202,11 +202,16 @@ export const useScaffold = (): Scaffold => {
         }
 
         const onGameComplete = (game: Game) => {
-            appContext.setState((prevState) => ({
-                ...prevState,
-                queue: prevState.queue.find((g) => g == game) ? prevState.queue : prevState.queue.concat([game])
-            }))
-            if (game.matches.length > 0) GameRunner.setMatch(game.matches[0])
+            appContext.setState((prevState) => {
+                if (prevState.config.populateRunnerGames && game.matches.length > 0) {
+                    GameRunner.setMatch(game.matches[0])
+                }
+
+                return {
+                    ...prevState,
+                    queue: prevState.queue.find((g) => g == game) ? prevState.queue : prevState.queue.concat([game])
+                }
+            })
         }
 
         setWebSocketListener(

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

@@ -62,7 +62,7 @@ export default class WebSocketListener {
         // Auto progress the round if the user hasn't done it themselves
         // We only want to do this if the currently selected match is the one being updated
         if (this.activeMatch && this.activeMatch === GameRunner.match) {
-            const newRound = this.activeMatch.maxRound - 1
+            const newRound = Math.max(this.activeMatch.maxRound - 2, 1)
             if (this.lastSetRound == this.activeMatch.currentRound.roundNumber) {
                 GameRunner.jumpToRound(newRound)
                 this.lastSetRound = newRound

client/src/playback/Map.ts

@@ -191,7 +191,7 @@ export class CurrentMap {
 
         if (config.showSRPOutlines || config.showSRPText) {
             ctx.globalAlpha = 1
-            ctx.lineWidth = 0.03
+            ctx.lineWidth = 0.05
             this.resourcePatterns.forEach((srp) => {
                 const topLeftCoords = renderUtils.getRenderCoords(srp.center.x - 2, srp.center.y + 2, this.dimension)
                 const roundsRemaining = Math.max(srp.createRound + 50 - match.currentRound.roundNumber, -1)

client/src/playback/Match.ts

@@ -313,7 +313,7 @@ export default class Match {
         // Determine the maximum round we are allowed to jump to. If the game is
         // incomplete (still being updated with rounds), prevent jumping to the last
         // round to prevent issues (TODO: investigate why, but this seems to fix it)
-        const maxRound = this.maxRound - (this.game.complete ? 0 : 1)
+        const maxRound = this.maxRound - (this.game.complete ? 0 : 2)
 
         roundNumber = Math.max(1, Math.min(roundNumber, maxRound))
         if (roundNumber == this.currentRound.roundNumber) return

engine/src/main/battlecode/world/InternalRobot.java

@@ -601,8 +601,6 @@ public void processEndOfTurn() {
         if (!indicatorString.equals("")) {
             this.gameWorld.getMatchMaker().addIndicatorString(this.ID, this.indicatorString);
         }
-        this.gameWorld.getMatchMaker().endTurn(this.ID, this.health, this.paintAmount, this.movementCooldownTurns, this.actionCooldownTurns, this.bytecodesUsed, this.location);
-        this.roundsAlive++;
 
         if (this.getType().isRobotType()){
             Team owningTeam = this.gameWorld.teamFromPaint(this.gameWorld.getPaint(this.location));
@@ -627,6 +625,9 @@ public void processEndOfTurn() {
         if (this.paintAmount == 0 && type.isRobotType()){
             this.addHealth(-GameConstants.NO_PAINT_DAMAGE);
         }
+
+        this.gameWorld.getMatchMaker().endTurn(this.ID, this.health, this.paintAmount, this.movementCooldownTurns, this.actionCooldownTurns, this.bytecodesUsed, this.location);
+        this.roundsAlive++;
     }
 
     // *********************************

engine/src/main/battlecode/world/RobotControllerImpl.java

@@ -970,6 +970,7 @@ public boolean canMopSwing(Direction dir) {
 
     @Override
     public void mopSwing(Direction dir) throws GameActionException {
+        assertCanMopSwing(dir);
         this.robot.addActionCooldownTurns(GameConstants.ATTACK_MOPPER_SWING_COOLDOWN);
         this.robot.mopSwing(dir);
     }