Merge branch 'master' of github.com:battlecode/battlecode26

Author: hannah-y-gao

client/src/components/sidebar/map-editor/map-editor.tsx

@@ -187,6 +187,7 @@ export const MapEditorPage: React.FC<Props> = (props) => {
     }
 
     useEffect(() => {
+        if (!canvasMouseDown || !hoveredTile) return;
         if (canvasMouseDown && hoveredTile) applyBrush(hoveredTile)
         // added defensive checks just in case stuff is null for some reason
         if (canvasMouseDown && hoveredTile && typeof hoveredTile.x === 'number' && typeof hoveredTile.y === 'number') {

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

@@ -150,13 +150,15 @@ public class GameConstants {
     public static final int SQUEAK_RADIUS_SQUARED = 16;
 
     /** The base damage a thrown rat takes upon hitting the ground */
-    public static final int THROW_DAMAGE = 20;
+    public static final int THROW_DAMAGE = 10;
 
     /**
      * The damage a thrown rat takes per tile it impacts early (i.e. rats that hit a
      * wall after 1 turn take 20+3*5=35 damage)
      */
-    public static final int THROW_DAMAGE_PER_TILE = 5;
+    public static final int THROW_DAMAGE_PER_TILE = 4;
+
+    public static final int TILES_FLOWN_PER_TURN = 2; // how many tiles the flying rat travels per turn
 
     /** The damage a robot takes after being bitten by a rat */
     public static final int RAT_BITE_DAMAGE = 10;
@@ -167,12 +169,6 @@ public class GameConstants {
     /** The distance squared a cat can pounce to */
     public static final int CAT_POUNCE_MAX_DISTANCE_SQUARED = 9;
 
-    /**
-     * Percent damage a rat takes when a cat pounces to an adjacent location (eg. 50
-     * = 50% damage)
-     */
-    public static final int CAT_POUNCE_ADJACENT_DAMAGE_PERCENT = 50;
-
     public static final int CAT_DIG_ADDITIONAL_COOLDOWN = 5;
 
     /**
@@ -250,11 +246,16 @@ public class GameConstants {
      */
     public static final int THROW_DURATION = 4;
 
+    /**
+     * Incurred cooldown for throwing a rat
+     */
+    public static final int THROW_RAT_COOLDOWN = 20;
+
     /** The stun cooldown after hitting the ground after being thrown */
-    public static final int HIT_GROUND_COOLDOWN = 10;
+    public static final int HIT_GROUND_COOLDOWN = 10;    
 
     /** The stun cooldown after hitting the target after being thrown */
-    public static final int HIT_TARGET_COOLDOWN = 30;
+    public static final int HIT_TARGET_COOLDOWN = 20;
 
     /** Amount of rounds a cat sleeps for when fed */
     public static final int CAT_SLEEP_TIME = 2;

engine/src/main/battlecode/world/InternalRobot.java

@@ -748,7 +748,7 @@ public void hitGround() {
 
     public void hitTarget(boolean isSecondMove) {
         int damage = GameConstants.THROW_DAMAGE
-                + GameConstants.THROW_DAMAGE_PER_TILE * (2 * this.remainingThrowDuration + (isSecondMove ? 0 : 1));
+                + GameConstants.THROW_DAMAGE_PER_TILE * (GameConstants.TILES_FLOWN_PER_TURN * this.remainingThrowDuration + (isSecondMove ? 0 : 1));
 
         if (this.gameWorld.getRobot(this.getLocation().add(this.thrownDir)) != null) {
             InternalRobot robot = this.gameWorld.getRobot(this.getLocation().add(this.thrownDir));

engine/src/main/battlecode/world/RobotControllerImpl.java

@@ -1322,6 +1322,7 @@ public boolean canThrowRat() {
     @Override
     public void throwRat() throws GameActionException {
         assertCanThrowRat(this.robot.getDirection());
+        this.robot.addActionCooldownTurns(GameConstants.THROW_RAT_COOLDOWN);
         this.robot.throwRobot();
     }