Merge branch 'master' into release-config

battlecode · Jan 20, 2024 · a300a53 · a300a53
2 parents 3185085 + 8fffe88
commit a300a53
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 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 = '2.0.1'
-export const SPEC_VERSION = '2.0.1'
+export const GAME_VERSION = '2.0.2'
+export const SPEC_VERSION = '2.0.2'
 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 = "2.0.1";
+    public static final String SPEC_VERSION = "2.0.2";
 
     // *********************************
     // ****** MAP CONSTANTS ************

diff --git a/engine/src/main/battlecode/world/GameWorld.java b/engine/src/main/battlecode/world/GameWorld.java
@@ -389,8 +389,8 @@ public void triggerTrap(Trap trap, InternalRobot robot, boolean entered){
         switch(type){
             case STUN:
                 for (InternalRobot rob : getAllRobotsWithinRadiusSquared(loc, type.enterRadius, trap.getTeam().opponent())){
-                    rob.setMovementCooldownTurns(40);
-                    rob.setActionCooldownTurns(40);
+                    rob.setMovementCooldownTurns(type.opponentCooldown);
+                    rob.setActionCooldownTurns(type.opponentCooldown);
                 }
                 break;
             case EXPLOSIVE:

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: *2.0.1* 
+_This is the formal specification of the Battlecode 2024 game._ Current version: *2.0.2* 
 
 **Welcome to Battlecode 2024: Breadwars.**
 
@@ -286,6 +286,10 @@
 
 # **Appendix: Changelog**
 
+- Version 2.0.2 (January 20, 2024)
+  - Engine fixes
+    - Corrected issue where stun trap was using old cooldown (40)
+
 - Version 2.0.1 (January 17, 2024)
   - Engine fixes
     - getSpawnZoneTeam() will still return int for backwards compatability