Merge branch 'master' into public-release

battlecode · Jan 26, 2025 · 35574f3 · 35574f3
2 parents 653c403 + 28975a4
commit 35574f3
Show file tree

Hide file tree

Showing 40 changed files with 44 additions and 2 deletions.
diff --git a/client/src/constants.ts b/client/src/constants.ts
@@ -1,4 +1,4 @@
-export const CLIENT_VERSION = '3.0.0'
+export const CLIENT_VERSION = '3.1.0'
 export const SPEC_VERSION = '1'
 export const BATTLECODE_YEAR: number = 2025
 export const MAP_SIZE_RANGE = {
@@ -63,7 +63,49 @@ export const ENGINE_BUILTIN_MAP_NAMES: string[] = [
     'Snowglobe',
     'Barcode',
     'Flower',
-    'Piglets2'
+    'Piglets2',
+
+    // HS
+    'lighthouse',
+    'shell',
+    'walalilongla',
+    'mit',
+    'defensetower',
+    'maze',
+    'box',
+    'roads',
+    'Paintball',
+    'FourCorners',
+    'Snowman',
+    'Crab',
+    'Oasis',
+    'TheBest',
+    'starburst',
+    'Portal',
+    'Jail',
+    'PlumberGame',
+
+    // Quals
+    'boxofchocolates',
+    'sunrise',
+    'yearofthesnake',
+    'Circuit',
+    'headphones',
+    'Brat',
+    'Parking_lot',
+    'Rose',
+    'HungerGames',
+    'Castle',
+    'Bunny',
+    'Terminal',
+    'Leaf',
+    'BatSignal',
+    'CastleDefense',
+    'AlarmClock',
+    'DonkeyKong',
+    'rain',
+    'Dominoes',
+    'SandyBeach'
 ]
 
 export const TEAM_COLOR_NAMES = ['Silver', 'Gold']

diff --git a/engine/src/main/battlecode/world/resources/AlarmClock.map25 b/engine/src/main/battlecode/world/resources/AlarmClock.map25
diff --git a/engine/src/main/battlecode/world/resources/BatSignal.map25 b/engine/src/main/battlecode/world/resources/BatSignal.map25
diff --git a/engine/src/main/battlecode/world/resources/Brat.map25 b/engine/src/main/battlecode/world/resources/Brat.map25
diff --git a/engine/src/main/battlecode/world/resources/Bunny.map25 b/engine/src/main/battlecode/world/resources/Bunny.map25
diff --git a/engine/src/main/battlecode/world/resources/Castle.map25 b/engine/src/main/battlecode/world/resources/Castle.map25
diff --git a/engine/src/main/battlecode/world/resources/CastleDefense.map25 b/engine/src/main/battlecode/world/resources/CastleDefense.map25
diff --git a/engine/src/main/battlecode/world/resources/Circuit.map25 b/engine/src/main/battlecode/world/resources/Circuit.map25
diff --git a/engine/src/main/battlecode/world/resources/Crab.map25 b/engine/src/main/battlecode/world/resources/Crab.map25
diff --git a/engine/src/main/battlecode/world/resources/Dominoes.map25 b/engine/src/main/battlecode/world/resources/Dominoes.map25
diff --git a/engine/src/main/battlecode/world/resources/DonkeyKong.map25 b/engine/src/main/battlecode/world/resources/DonkeyKong.map25
diff --git a/engine/src/main/battlecode/world/resources/FourCorners.map25 b/engine/src/main/battlecode/world/resources/FourCorners.map25
diff --git a/engine/src/main/battlecode/world/resources/HungerGames.map25 b/engine/src/main/battlecode/world/resources/HungerGames.map25
diff --git a/engine/src/main/battlecode/world/resources/Jail.map25 b/engine/src/main/battlecode/world/resources/Jail.map25
diff --git a/engine/src/main/battlecode/world/resources/Leaf.map25 b/engine/src/main/battlecode/world/resources/Leaf.map25
diff --git a/engine/src/main/battlecode/world/resources/Oasis.map25 b/engine/src/main/battlecode/world/resources/Oasis.map25
diff --git a/engine/src/main/battlecode/world/resources/Paintball.map25 b/engine/src/main/battlecode/world/resources/Paintball.map25
diff --git a/engine/src/main/battlecode/world/resources/Parking_lot.map25 b/engine/src/main/battlecode/world/resources/Parking_lot.map25
diff --git a/engine/src/main/battlecode/world/resources/PlumberGame.map25 b/engine/src/main/battlecode/world/resources/PlumberGame.map25
diff --git a/engine/src/main/battlecode/world/resources/Portal.map25 b/engine/src/main/battlecode/world/resources/Portal.map25
diff --git a/engine/src/main/battlecode/world/resources/Rose.map25 b/engine/src/main/battlecode/world/resources/Rose.map25
diff --git a/engine/src/main/battlecode/world/resources/SandyBeach.map25 b/engine/src/main/battlecode/world/resources/SandyBeach.map25
diff --git a/engine/src/main/battlecode/world/resources/Snowman.map25 b/engine/src/main/battlecode/world/resources/Snowman.map25
diff --git a/engine/src/main/battlecode/world/resources/Terminal.map25 b/engine/src/main/battlecode/world/resources/Terminal.map25
diff --git a/engine/src/main/battlecode/world/resources/TheBest.map25 b/engine/src/main/battlecode/world/resources/TheBest.map25
diff --git a/engine/src/main/battlecode/world/resources/box.map25 b/engine/src/main/battlecode/world/resources/box.map25
diff --git a/engine/src/main/battlecode/world/resources/boxofchocolates.map25 b/engine/src/main/battlecode/world/resources/boxofchocolates.map25
diff --git a/engine/src/main/battlecode/world/resources/defensetower.map25 b/engine/src/main/battlecode/world/resources/defensetower.map25
diff --git a/engine/src/main/battlecode/world/resources/headphones.map25 b/engine/src/main/battlecode/world/resources/headphones.map25
diff --git a/engine/src/main/battlecode/world/resources/lighthouse.map25 b/engine/src/main/battlecode/world/resources/lighthouse.map25
diff --git a/engine/src/main/battlecode/world/resources/maze.map25 b/engine/src/main/battlecode/world/resources/maze.map25
diff --git a/engine/src/main/battlecode/world/resources/mit.map25 b/engine/src/main/battlecode/world/resources/mit.map25
diff --git a/engine/src/main/battlecode/world/resources/rain.map25 b/engine/src/main/battlecode/world/resources/rain.map25
diff --git a/engine/src/main/battlecode/world/resources/roads.map25 b/engine/src/main/battlecode/world/resources/roads.map25
diff --git a/engine/src/main/battlecode/world/resources/shell.map25 b/engine/src/main/battlecode/world/resources/shell.map25
diff --git a/engine/src/main/battlecode/world/resources/starburst.map25 b/engine/src/main/battlecode/world/resources/starburst.map25
diff --git a/engine/src/main/battlecode/world/resources/sunrise.map25 b/engine/src/main/battlecode/world/resources/sunrise.map25
diff --git a/engine/src/main/battlecode/world/resources/walalilongla.map25 b/engine/src/main/battlecode/world/resources/walalilongla.map25
diff --git a/engine/src/main/battlecode/world/resources/yearofthesnake.map25 b/engine/src/main/battlecode/world/resources/yearofthesnake.map25
diff --git a/specs/specs.pdf b/specs/specs.pdf