Update cam3-1(s) scripts.

Split timers again for this mission like before and new assemblies from alfred007. libcampaign: Do not let queued trucks go into anything but a regular factory. Thus stopping an assert.
Warzone2100 · Dec 28, 2017 · f00ca92 · f00ca92
1 parent 797966b
commit f00ca92
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/data/base/script/campaign/cam3-1.js b/data/base/script/campaign/cam3-1.js
@@ -154,11 +154,7 @@ function setupNextMission()
 		playSound(MISSLE_ABORT, CAM_HUMAN_PLAYER);
 
 		setScrollLimits(0, 0, 64, 64); //Reveal the whole map.
-
-		if (getMissionTime() > 3600)
-		{
-			setMissionTime(camChangeOnDiff(3600));
-		}
+		setMissionTime(camChangeOnDiff(1800)); // 30 min
 
 		hackRemoveMessage("CM31_TAR_UPLINK", PROX_MSG, CAM_HUMAN_PLAYER);
 		hackAddMessage("CM31_HIDE_LOC", PROX_MSG, CAM_HUMAN_PLAYER);
@@ -355,7 +351,7 @@ function eventStartLevel()
 	getCountdown();
 
 	queue("setupNextMission", 8000);
-	queue("enableReinforcements", 10000);
+	queue("enableReinforcements", 15000);
 	queue("hoverAttack", camChangeOnDiff(240000)); // 4 min
 	queue("vtolAttack", camChangeOnDiff(300000)); //5 min
 	queue("enableAllFactories", camChangeOnDiff(300000)); //5 min

diff --git a/data/base/script/campaign/cam3-1s.js b/data/base/script/campaign/cam3-1s.js
@@ -5,7 +5,7 @@ function eventStartLevel()
 	camSetupTransporter(56, 120, 25, 87);
 	centreView(57, 119);
 	setNoGoArea(55, 119, 57, 121, CAM_HUMAN_PLAYER);
-	setMissionTime(camChangeOnDiff(7200)); // 120 minutes
+	setMissionTime(camChangeOnDiff(4500)); // 75 minutes
 	camPlayVideos(["MB3_1A_MSG", "MB3_1A_MSG2"]);
 	camSetStandardWinLossConditions(CAM_VICTORY_PRE_OFFWORLD, "SUB_3_1");
 }
diff --git a/data/base/script/campaign/libcampaign.js b/data/base/script/campaign/libcampaign.js
@@ -2180,7 +2180,15 @@ function __camAddDroidToFactoryGroup(droid, structure)
 function __camBuildDroid(template, structure)
 {
 	if (!camDef(structure))
+	{
+		return false;
+	}
+	//if not a normal factory and the template is a constructor then keep it in the
+	//queue until a factory can deal with it.
+	if (template.weap === "Spade1Mk1" && structure.stattype !== FACTORY)
+	{
 		return false;
+	}
 	makeComponentAvailable(template.body, structure.player);
 	makeComponentAvailable(template.prop, structure.player);
 	makeComponentAvailable(template.weap, structure.player);
@@ -2267,7 +2275,9 @@ function __camContinueProduction(structure)
 	// loop through templates
 	++fi.state;
 	if (fi.state >= fi.templates.length)
+	{
 		fi.state = -1;
+	}
 	fi.lastprod = gameTime;
 }
 

diff --git a/data/base/wrf/cam3/sub3-1/labels.json b/data/base/wrf/cam3/sub3-1/labels.json
@@ -77,15 +77,15 @@
 	},
 	"position_19": {
 		"label": "NXCybFac1Assembly",
-		"pos": [1856, 6720]
+		"pos": [1856, 6848]
 	},
 	"position_20": {
 		"label": "NXCybFac2Assembly",
-		"pos": [1600, 6720]
+		"pos": [1600, 6848]
 	},
 	"position_21": {
 		"label": "NXMediumFacAssembly",
-		"pos": [1984, 7488]
+		"pos": [1600, 7488]
 	},
 
 	"area_0": {