Merge pull request #92 from battlecode/master

release engine 1.2.3

Author: hannah-y-gao

client/src/components/sidebar/game/team-table.tsx

@@ -5,7 +5,7 @@ import { schema } from 'battlecode-schema'
 import { TeamRoundStat } from '../../../playback/RoundStat'
 import { DoubleChevronUpIcon } from '../../../icons/chevron'
 import { CurrentMap } from '../../../playback/Map'
-import { useRound } from '../../../playback/GameRunner'
+import { useRound, useTurnNumber } from '../../../playback/GameRunner'
 
 interface UnitsIconProps {
     teamIdx: 0 | 1
@@ -34,6 +34,8 @@ interface TeamTableProps {
 
 export const TeamTable: React.FC<TeamTableProps> = (props: TeamTableProps) => {
     const round = useRound()
+    // force react to re-render when using turn playback
+    const _turn = useTurnNumber()
     const teamStat = round?.stat?.getTeamStat(round?.match.game.teams[props.teamIdx])
     const map = round?.map
 
@@ -63,6 +65,7 @@ export const ResourceTable: React.FC<ResourceTableProps> = ({ map, teamStat, tea
     let ratKingCount = 0
     let ratKingPercent = 0
     let globalCheese = 0
+    let rawCheese = 0
 
     if (map && teamStat) {
         cheeseAmount = teamStat.cheeseAmount
@@ -72,6 +75,7 @@ export const ResourceTable: React.FC<ResourceTableProps> = ({ map, teamStat, tea
         ratKingCount = teamStat.ratKingCount
         ratKingPercent = teamStat.ratKingPercent
         globalCheese = teamStat.globalCheeseAmount
+        rawCheese = teamStat.globalRawCheeseAmount
     }
 
     const formatPercent = (val: number) => (val * 100).toFixed(1).toString() + '%'
@@ -133,7 +137,11 @@ export const ResourceTable: React.FC<ResourceTableProps> = ({ map, teamStat, tea
                     </div>
                 </div>
             </div>
-            <div className="flex items-center w-full mt-2 mb-1 text-xs font-bold justify-around">Global Cheese Amount: {globalCheese}</div>
+            <div className="flex items-center w-full mt-2 mb-1 text-xs font-bold justify-around">
+                <div>Global Cheese: {globalCheese}</div>
+                <div>Raw Cheese: {rawCheese}</div>
+                </div>
+
         </div>
     )
 }

client/src/components/sidebar/map-editor/map-editor.tsx

@@ -145,6 +145,7 @@ export const MapEditorPage: React.FC<Props> = (props) => {
 
     const applyBrush = (point: { x: number; y: number }) => {
         if (!openBrush) return
+        if (point === null) return
 
         const undoFunc = openBrush.apply(point.x, point.y, openBrush.fields, true)
         strokeUndoStack.current.push(undoFunc)

client/src/constants.ts

@@ -25,9 +25,47 @@ export const ENGINE_BUILTIN_MAP_NAMES: string[] = [
     // Default
     'DefaultSmall',
     'DefaultMedium',
-    'DefaultLarge'
+    'DefaultLarge',
     // Sprint 1
+    'sittingducks',
+    'starvation',
+    'thunderdome',
+    'popthecork',
+    'cheesefarm',
+    'rift',
+    'ZeroDay',
+    'pipes',
+    'Nofreecheese',
+    'wallsofparadis',
+    'dirtpassageway',
+    'trapped',
+    'arrows',
+    'Meow',
+    'dirtfulcat',
+    'keepout',
     // Sprint 2
+    '5t4rv4t10n_1337',
+    'cheesebottles',
+    'hatefullattice',
+    'knifefight',
+    'mercifullattice',
+    'peaceinourtime',
+    'jail',
+    'safelycontained',
+    'minimaze',
+    'averyfineline',
+    'averystrangespace',
+    'canyoudig',
+    'streetsofnewyork',
+    'TheHeist',
+    'closeup',
+    'corridorofdoomanddespair',
+    'EscapeTheNight',
+    'tiny',
+    'toomuchcheese',
+    'uneruesansfin',
+    'whatsthecatdoin',
+    'whereisthecheese'
     // HS
     // Quals
 ]

client/src/playback/RoundStat.ts

@@ -20,6 +20,7 @@ export class TeamRoundStat {
     ratKingPercent: number = 0
     dirtAmount: number = 0
     globalCheeseAmount: number = 0
+    globalRawCheeseAmount: number = 0
     babyRatCount: number = 0
     ratTrapAmount: number = 0
     catTrapAmount: number = 0
@@ -132,7 +133,10 @@ export default class RoundStat {
             // Count number of alive robots
             if (body.dead) continue
 
-            if (body.robotType == schema.RobotType.RAT) teamStat.babyRatCount++
+            if (body.robotType == schema.RobotType.RAT) {
+                teamStat.babyRatCount++
+                teamStat.globalRawCheeseAmount += body.cheese
+            }
         }
 
         const timems = Date.now() - time

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

@@ -556,8 +556,7 @@ public RobotInfo senseRobotAtLocation(MapLocation loc) throws GameActionExceptio
     @Override
     public boolean canSenseRobot(int id) {
         InternalRobot sensedRobot = getRobotByID(id);
-        Boolean isFlying = sensedRobot.isBeingThrown();
-        return sensedRobot != null && isFlying && canSenseLocation(sensedRobot.getLocation());
+        return sensedRobot != null && !sensedRobot.isBeingThrown() && canSenseLocation(sensedRobot.getLocation());
     }
 
     @Override