Skip to content

Commit

Permalink
Merge branch 'master' into release-config
Browse files Browse the repository at this point in the history
  • Loading branch information
TheApplePieGod committed Feb 1, 2024
2 parents 7c130f9 + 5bc1c46 commit 87dba5e
Show file tree
Hide file tree
Showing 25 changed files with 40 additions and 5 deletions.
5 changes: 4 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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)
]
}

Expand Down
26 changes: 24 additions & 2 deletions client/src/constants.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion engine/src/main/battlecode/common/GameConstants.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 ************
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
12 changes: 11 additions & 1 deletion specs/specs.md.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

# **Formal specification**

_This is the formal specification of the Battlecode 2024 game._ Current version: *3.0.3*
_This is the formal specification of the Battlecode 2024 game._ Current version: *3.0.5*

**Welcome to Battlecode 2024: Breadwars.**

Expand Down Expand Up @@ -286,6 +286,16 @@

# **Appendix: Changelog**

- Version 3.0.5 (February 1, 2024)
- Engine improvements
- Add HS & newbie maps
- Client improvements
- Add HS & newbie maps

- Version 3.0.4 (January 30, 2024)
- Engine improvements
- Replay filename now gets truncated if it is too long

- Version 3.0.3 (January 29, 2024)
- Engine improvements
- Add qualifier maps
Expand Down

0 comments on commit 87dba5e

Please sign in to comment.