Merge branch 'master' into release-config

Author: TheApplePieGod

build.gradle

@@ -51,6 +51,9 @@ task buildMaps(type: JavaExec, dependsOn: [':engine:build']) {
 
 def defaultClassLocation = project(':example-bots').sourceSets.main.output.classesDirs.getAsPath()
 def defaultReplay = 'matches/' + project.property('teamA') + '-vs-' + project.property('teamB') + '-on-' + project.property('maps') + new Date().format('yyyyMMddHHmmss') + '.bc24'
+def saveFileName = (project.findProperty('replay') ?: defaultReplay)
+saveFileName = saveFileName.substring(0, saveFileName.length() - 5)
+saveFileName = saveFileName.substring(0, Math.min(saveFileName.length(), 100)) + '.bc24'
 
 task headless(type: JavaExec, dependsOn: [':engine:build', ':example-bots:build']) {
   mainClass = 'battlecode.server.Main'
@@ -74,7 +77,7 @@ task headless(type: JavaExec, dependsOn: [':engine:build', ':example-bots:build'
     '-Dbc.game.maps=' + project.property('maps'),
     '-Dbc.server.validate-maps=' + project.property('validateMaps'),
     '-Dbc.server.alternate-order=' + project.property('alternateOrder'),
-    '-Dbc.server.save-file=' + (project.findProperty('replay') ?: defaultReplay),
+    '-Dbc.server.save-file=' + (saveFileName)
   ]
 }
 

client/src/constants.ts

@@ -1,7 +1,7 @@
 import { schema } from 'battlecode-schema'
 
-export const GAME_VERSION = '3.0.3'
-export const SPEC_VERSION = '3.0.3'
+export const GAME_VERSION = '3.0.5'
+export const SPEC_VERSION = '3.0.5'
 export const BATTLECODE_YEAR: number = 2024
 export const MAP_SIZE_RANGE = {
     min: 30,
@@ -29,6 +29,28 @@ export const ENGINE_BUILTIN_MAP_NAMES: string[] = [
     'DefaultLarge',
     'DefaultHuge',
 
+    'Alligator',
+    'Anchor',
+    'Battlefield',
+    'BreadPudding',
+    'Decision',
+    'English',
+    'Gated',
+    'Gauntlet',
+    'Hurricane',
+    'Islands',
+    'Mountain',
+    'Occulus',
+    'Randy',
+    'Skyline',
+    'Starfish',
+    'StarryNight',
+    'Swoop',
+    'TwistedTreeline',
+    'Valentine',
+    'Waterworld',
+    'WheresMyWater',
+
     'Asteroids',
     'Backslash',
     'Capacitance',

engine/src/main/battlecode/common/GameConstants.java

@@ -9,7 +9,7 @@ public class GameConstants {
     /**
      * The current spec version the server compiles with.
      */
-    public static final String SPEC_VERSION = "3.0.3";
+    public static final String SPEC_VERSION = "3.0.5";
 
     // *********************************
     // ****** MAP CONSTANTS ************