Merge branch 'master' into release-config

battlecode · Jan 26, 2024 · 7ecc8ea · 7ecc8ea
2 parents 2472926 + de8949e
commit 7ecc8ea
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/client/src/constants.ts b/client/src/constants.ts
@@ -1,7 +1,7 @@
 import { schema } from 'battlecode-schema'
 
-export const GAME_VERSION = '3.0.0'
-export const SPEC_VERSION = '3.0.0'
+export const GAME_VERSION = '3.0.1'
+export const SPEC_VERSION = '3.0.1'
 export const BATTLECODE_YEAR: number = 2024
 export const MAP_SIZE_RANGE = {
     min: 30,

diff --git a/engine/src/main/battlecode/common/GameConstants.java b/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.0";
+    public static final String SPEC_VERSION = "3.0.1";
 
     // *********************************
     // ****** MAP CONSTANTS ************

diff --git a/engine/src/main/battlecode/world/InternalRobot.java b/engine/src/main/battlecode/world/InternalRobot.java
@@ -296,7 +296,7 @@ public void addActionCooldownTurns(int numActionCooldownToAdd) {
     public void addMovementCooldownTurns() {
         if (hasFlag() && this.gameWorld.getTeamInfo().getGlobalUpgrades(team)[1]) {
             setMovementCooldownTurns(this.movementCooldownTurns + GameConstants.FLAG_MOVEMENT_COOLDOWN
-                    - GlobalUpgrade.CAPTURING.movementDelayChange);
+                    + GlobalUpgrade.CAPTURING.movementDelayChange);
         } else {
             setMovementCooldownTurns(this.movementCooldownTurns
                     + (hasFlag() ? GameConstants.FLAG_MOVEMENT_COOLDOWN : GameConstants.MOVEMENT_COOLDOWN));

diff --git a/specs/specs.md.html b/specs/specs.md.html
@@ -16,7 +16,7 @@
 
 # **Formal specification**
 
-_This is the formal specification of the Battlecode 2024 game._ Current version: *3.0.0* 
+_This is the formal specification of the Battlecode 2024 game._ Current version: *3.0.1* 
 
 **Welcome to Battlecode 2024: Breadwars.**
 
@@ -286,6 +286,10 @@
 
 # **Appendix: Changelog**
 
+- Version 3.0.1 (January 26, 2024)
+  - Bug fixes
+    - Fix issue with capturing upgrade movement cooldown
+
 - Version 3.0.0 (January 24, 2024)
   - Balance changes
     - Explosive trap cost 250 -> 200