diff --git a/data/base/script/campaign/cam3-ad2.js b/data/base/script/campaign/cam3-ad2.js index bf3ed249cf4..2cc5766f4f6 100644 --- a/data/base/script/campaign/cam3-ad2.js +++ b/data/base/script/campaign/cam3-ad2.js @@ -205,11 +205,22 @@ function vaporizeTarget() } if (Math.floor(mapLimit) < mapHeight) { - //Need to travel about 119 tiles in ~1 hour so: - //119 tiles / 60 minutes = 1.983 tiles per minute - //1.983 tile per minute / 60 seconds = 0.03305 tiles per second - //0.03305 * 10 sec = ~0.33 tiles per blast at 10 second intervals. - mapLimit += 0.33; //sector clear; move closer + if (camClassicMode() && tweakOptions.camClassic_balance32) + { + //Need to travel about 119 tiles in 80 minutes so: + //119 tiles / 80 minutes = 1.4875 tiles per minute + //1.4875 tile per minute / 60 seconds = 0.02479 tiles per second + //0.02479 * 10 sec = ~0.24 tiles per blast at 10 second intervals. + mapLimit += 0.24; //sector clear; move closer + } + else + { + //Need to travel about 119 tiles in ~1 hour so: + //119 tiles / 60 minutes = 1.9833 tiles per minute + //1.9833 tile per minute / 60 seconds = 0.03305 tiles per second + //0.03305 * 10 sec = ~0.33 tiles per blast at 10 second intervals. + mapLimit += 0.33; //sector clear; move closer + } } laserSatFuzzyStrike(target); } @@ -301,7 +312,14 @@ function checkTime() if (getMissionTime() <= 2) { camPlayVideos({video: "MB3_AD2_MSG2", type: CAMP_MSG}); - setMissionTime(camHoursToSeconds(1)); + if (camClassicMode() && tweakOptions.camClassic_balance32) + { + setMissionTime(camMinutesToSeconds(80)); // To accommodate the research bug of 3.2 balance. + } + else + { + setMissionTime(camHoursToSeconds(1)); + } phantomFactorySpawn(); queue("vaporizeTarget", camSecondsToMilliseconds(2)); diff --git a/data/base/wrf/cam2/sub2-8/labels.json b/data/base/wrf/cam2/sub2-8/labels.json index 338603031a6..45106b05937 100644 --- a/data/base/wrf/cam2/sub2-8/labels.json +++ b/data/base/wrf/cam2/sub2-8/labels.json @@ -66,8 +66,8 @@ "area_0": { "label": "landingZone", - "pos1": [6800, 7120], - "pos2": [7024, 7412] + "pos1": [6784, 7168], + "pos2": [7040, 7424] }, "area_1": { "label": "RTLZ", diff --git a/data/base/wrf/cam3/cam3ad/labels.json b/data/base/wrf/cam3/cam3ad/labels.json index f9eabf1fb6b..ef132f75485 100644 --- a/data/base/wrf/cam3/cam3ad/labels.json +++ b/data/base/wrf/cam3/cam3ad/labels.json @@ -38,8 +38,8 @@ "area_0": { "label": "landingZone", - "pos1": [6200, 31160], - "pos2": [6600, 31560] + "pos1": [6272, 31232], + "pos2": [6528, 31488] }, "area_1": { "label": "NXlandingZone", diff --git a/data/base/wrf/cam3/cam3d/labels.json b/data/base/wrf/cam3/cam3d/labels.json index 3e158e0dd92..b781830d7e3 100644 --- a/data/base/wrf/cam3/cam3d/labels.json +++ b/data/base/wrf/cam3/cam3d/labels.json @@ -67,8 +67,8 @@ }, "area_1": { "label": "landingZone2", - "pos1": [6200, 31160], - "pos2": [6600, 31560] + "pos1": [6272, 31232], + "pos2": [6528, 31488] }, "area_2": { "label": "mainBaseCleanup", diff --git a/data/base/wrf/cam3/sub3-2/dinit.bjo b/data/base/wrf/cam3/sub3-2/dinit.bjo index bc8a6c8d579..faffc49dbd4 100644 Binary files a/data/base/wrf/cam3/sub3-2/dinit.bjo and b/data/base/wrf/cam3/sub3-2/dinit.bjo differ diff --git a/data/base/wrf/cam3/sub3-2/struct.bjo b/data/base/wrf/cam3/sub3-2/struct.bjo index 11ce03c0bc9..16194b687e2 100644 Binary files a/data/base/wrf/cam3/sub3-2/struct.bjo and b/data/base/wrf/cam3/sub3-2/struct.bjo differ