[AtB] Chase scenario uses unit speed to determine deployment turn.

Author: neoancient

MekHQ/docs/history.txt

@@ -10,6 +10,7 @@ v0.41.29-git
 + Fix #295: Variable contract length option no longer works
 + Fix #292: Starleague cache 1: IndexOutOfBoundsException when generating enemy
 + Fix #250: [AtB] Wrong deployment edge for bot reinforcements in Chase(Att) scenario.
++ [AtB] Chase scenario uses unit speed to determine deployment turn.
 
 v0.41.28 (2016-12-18 17:35 UTC)
 + Issue #237: Remove Tech From Lance assignments upon retiring

MekHQ/src/mekhq/AtBGameThread.java

@@ -167,8 +167,8 @@ public void run() {
                 	entity.setOwner(client.getLocalPlayer()); 
                 	// Calculate deployment round
             		int speed = entity.getWalkMP();
-            		if (unit.getEntity().getJumpMP() > 0) {
-	            		if (unit.getEntity() instanceof megamek.common.Infantry) {
+            		if (entity.getJumpMP() > 0) {
+	            		if (entity instanceof megamek.common.Infantry) {
 	            			speed = entity.getJumpMP();
 	            		} else {
 	            			speed++;
@@ -195,6 +195,21 @@ public void run() {
                 		continue;
                 	}
                 	entity.setOwner(client.getLocalPlayer());
+            		int speed = entity.getWalkMP();
+            		if (entity.getJumpMP() > 0) {
+	            		if (entity instanceof megamek.common.Infantry) {
+	            			speed = entity.getJumpMP();
+	            		} else {
+	            			speed++;
+	            		}
+            		}
+                	int deploymentRound = Math.max(entity.getDeployRound(), scenario.getDeploymentDelay() - speed);
+                	if (scenario.getLanceRole() == Lance.ROLE_SCOUT
+                			&& scenario.getLance(campaign).getForceId() == scenario.getLanceForceId()
+                			&& !useDropship) {
+                		deploymentRound = Math.max(deploymentRound, 6 - speed);
+                	}
+                	entity.setDeployRound(Math.max(0, deploymentRound));
                 	client.sendAddEntity(entity);
                 	Thread.sleep(campaign.getCampaignOptions().getStartGameDelay());
                 }

MekHQ/src/mekhq/campaign/mission/AtBScenario.java

@@ -936,7 +936,7 @@ private void setStandardBattleForces(Campaign campaign) {
             botForces.add(botForce);
 
             break;
-        case CHASE:
+        case CHASE:        	
             start = Board.START_S;
             enemyStart = Board.START_S;
             playerHome = Board.START_N;
@@ -966,7 +966,32 @@ private void setStandardBattleForces(Campaign campaign) {
             }
             botForces.add(botForce);
 
-            break;
+        	/* All forces deploy in 12 - WP turns */
+        	deploymentDelay = 12;
+        	for (Entity en : allyBot) {
+        		int speed = en.getWalkMP();
+        		if (en.getJumpMP() > 0) {
+            		if (en instanceof megamek.common.Infantry) {
+            			speed = en.getJumpMP();
+            		} else {
+            			speed++;
+            		}
+        		}
+        		en.setDeployRound(Math.max(0, 12 - speed));
+        	}
+        	for (Entity en : enemy) {
+        		int speed = en.getWalkMP();
+        		if (en.getJumpMP() > 0) {
+            		if (en instanceof megamek.common.Infantry) {
+            			speed = en.getJumpMP();
+            		} else {
+            			speed++;
+            		}
+        		}
+        		en.setDeployRound(Math.max(0, 12 - speed));
+        	}
+
+        	break;
         case PROBE:
             start = playerHome = startPos[Compute.randomInt(4)];
             enemyStart = start + 4;