Merge branch 'schema' into client-release

Author: xqlcn

.github/workflows/release-engine.yml

@@ -14,7 +14,7 @@ env:
   RELEASE_ARTIFACT_ID: battlecode26
 
   # IS_PUBLIC is whether to release deployments publicly. Set to exactly the text "YES" to do so.
-  IS_PUBLIC: NO
+  IS_PUBLIC: YES
 
 jobs:
   release-java:

build.gradle

@@ -44,7 +44,7 @@ task installPythonPackage(type: Exec) {
   if (project.findProperty('forceInstallPythonPackage') ?: false) {
     commandLine 'python', '-m', 'pip', 'install', '-e', 'engine/src/crossplay_python'
   } else {
-    commandLine 'python', '-c', "import importlib.util,subprocess,sys; pkg='battlecode26'; importlib.util.find_spec(pkg) or subprocess.check_call([sys.executable,'-m','pip','install','-e',pkg])"
+    commandLine 'python', '-c', "import importlib.util,subprocess,sys; assert sys.version_info[0] == 3 and sys.version_info[1] == 12, 'Error: Must use Python 3.12!'; pkg='battlecode26'; importlib.util.find_spec(pkg) or subprocess.check_call([sys.executable,'-m','pip','install','-e','engine/src/crossplay_python'])"
   }
 }
 

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/crossplay_python/battlecode26/classes.py

@@ -189,18 +189,16 @@ def __repr__(self) -> str:
 
 
 class TrapType(_Enum):
-    RAT_TRAP = (30, 50, 20, 25, 15, 0, 25, 2)
-    CAT_TRAP = (10, 100, 20, 5, 10, 0, 10, 2)
-    NONE = (0, 0, 0, 0, 0, 0, 0, 0)
+    RAT_TRAP = (30, 50, 20, 15, 25, 2)
+    CAT_TRAP = (10, 100, 20, 10, 10, 2)
+    NONE = (0, 0, 0, 0, 0, 0)
 
-    def __init__(self, build_cost: int, damage: int, stun_time: int, trap_limit: int,
-                 action_cooldown: int, spawn_cheese_amount: int, max_count: int, trigger_radius_squared: int):
+    def __init__(self, build_cost: int, damage: int, stun_time: int,
+                 action_cooldown: int, max_count: int, trigger_radius_squared: int):
         self.build_cost = build_cost
         self.damage = damage
         self.stun_time = stun_time
-        self.trap_limit = trap_limit
         self.action_cooldown = action_cooldown
-        self.spawn_cheese_amount = spawn_cheese_amount
         self.max_count = max_count
         self.trigger_radius_squared = trigger_radius_squared
 
@@ -281,6 +279,8 @@ class GameConstants:
     EXCEPTION_BYTECODE_PENALTY = 500
     INITIAL_TEAM_CHEESE = 2500
     MAX_NUMBER_OF_RAT_KINGS = 5
+    MAX_NUMBER_OF_RAT_KINGS_AFTER_CUTOFF = 2
+    RAT_KING_CUTOFF_ROUND = 1200
     MAX_TEAM_EXECUTION_TIME = 1200000000000
     MOVE_STRAFE_COOLDOWN = 18
     CHEESE_COOLDOWN_PENALTY = 0.01
@@ -297,6 +297,8 @@ class GameConstants:
     BUILD_ROBOT_COST_INCREASE = 10
     NUM_ROBOTS_FOR_COST_INCREASE = 4
     BUILD_DISTANCE_SQUARED = 2
+    RAT_KING_BUILD_DISTANCE_SQUARED = 8
+    ATTACK_DISTANCE_SQUARED = 2
     RAT_KING_ATTACK_DISTANCE_SQUARED = 8
     MESSAGE_ROUND_DURATION = 5
     MAX_MESSAGES_SENT_ROBOT = 1
@@ -309,8 +311,8 @@ class GameConstants:
     CAT_DIG_ADDITIONAL_COOLDOWN = 5
     HEALTH_GRAB_THRESHOLD = 0
     RAT_KING_UPGRADE_CHEESE_COST = 50
-    DIG_DIRT_CHEESE_COST = 10
-    PLACE_DIRT_CHEESE_COST = 10
+    DIG_DIRT_CHEESE_COST = 5
+    PLACE_DIRT_CHEESE_COST = 3
     SHARED_ARRAY_SIZE = 64
     COMM_ARRAY_MAX_VALUE = 1023
     COOLDOWN_LIMIT = 10
@@ -322,6 +324,7 @@ class GameConstants:
     CARRY_COOLDOWN_MULTIPLIER = 1.5
     MAX_CARRY_TOWER_HEIGHT = 2
     MAX_CARRY_DURATION = 10
+    SAME_ROBOT_CARRY_COOLDOWN_TURNS = 2
     THROW_DURATION = 4
     HIT_GROUND_COOLDOWN = 10
     HIT_TARGET_COOLDOWN = 30