Improvements to cam1-5 mission.

Changes from alfred007 for assemeblies, factory triggers, and timers.
Warzone2100 · Jan 30, 2018 · de3a9b0 · de3a9b0
1 parent c89320c
commit de3a9b0
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 14 deletions.
diff --git a/data/base/script/campaign/cam1-5.js b/data/base/script/campaign/cam1-5.js
@@ -17,7 +17,6 @@ const SCAVENGER_RES = [
 	"R-Wpn-MG-Damage03", "R-Wpn-Rocket-Damage02", "R-Wpn-Cannon-Damage02",
 ];
 
-
 //Get some droids for the New Paradigm transport
 function getDroidsForNPLZ(args)
 {
@@ -46,22 +45,39 @@ function getDroidsForNPLZ(args)
 	return list;
 }
 
-//These enable scav factories when close enough
-camAreaEvent("NorthScavFactoryTrigger", function()
+//These enable Scav and NP factories when close enough
+camAreaEvent("NorthScavFactoryTrigger", function(droid)
 {
 	camEnableFactory("ScavNorthFactory");
+	camEnableFactory("NPCyborgFactory");
+	camEnableFactory("NPLeftFactory");
+	camEnableFactory("NPRightFactory");
 });
 
-camAreaEvent("SouthWestScavFactoryTrigger", function()
+camAreaEvent("SouthWestScavFactoryTrigger", function(droid)
 {
 	camEnableFactory("ScavSouthWestFactory");
 });
 
-camAreaEvent("SouthEastScavFactoryTrigger", function()
+camAreaEvent("SouthEastScavFactoryTrigger", function(droid)
 {
 	camEnableFactory("ScavSouthEastFactory");
 });
 
+camAreaEvent("NPFactoryTrigger", function(droid)
+{
+	if (camIsTransporter(droid) === false)
+	{
+		camEnableFactory("NPCyborgFactory");
+		camEnableFactory("NPLeftFactory");
+		camEnableFactory("NPRightFactory");
+	}
+	else
+	{
+		resetLabel("NPFactoryTrigger", CAM_HUMAN_PLAYER);
+	}
+});
+
 //Land New Paradigm transport in the LZ area (protected by four hardpoints in the New Paradigm base)
 camAreaEvent("NPLZTrigger", function()
 {
@@ -199,7 +215,7 @@ function eventStartLevel()
 			assembly: "NPLeftAssembly",
 			order: CAM_ORDER_ATTACK,
 			groupSize: 4,
-			throttle: camChangeOnDiff(50000),
+			throttle: camChangeOnDiff(40000),
 			templates: [ npmrl, npmmct, npsbb, nphmg ],
 			data: {
 				regroup: false,
@@ -211,7 +227,7 @@ function eventStartLevel()
 			assembly: "NPRightAssembly",
 			order: CAM_ORDER_ATTACK,
 			groupSize: 4,
-			throttle: camChangeOnDiff(60000),
+			throttle: camChangeOnDiff(50000),
 			templates: [ npmor, npsens, npsbb, nphmg ],
 			data: {
 				regroup: false,
@@ -223,7 +239,7 @@ function eventStartLevel()
 			assembly: "NPCyborgAssembly",
 			order: CAM_ORDER_ATTACK,
 			groupSize: 4,
-			throttle: camChangeOnDiff(40000),
+			throttle: camChangeOnDiff(30000),
 			templates: [ npcybc, npcybf, npcybm ],
 			data: {
 				regroup: false,

diff --git a/data/base/wrf/cam1/sub1-5/labels.json b/data/base/wrf/cam1/sub1-5/labels.json
@@ -9,23 +9,23 @@
 	},
 	"position_2": {
 		"label": "NPLeftAssembly",
-		"pos": [4800, 3008]
+		"pos": [4928, 3136]
 	},
 	"position_3": {
 		"label": "NPRightAssembly",
-		"pos": [5184, 3008]
+		"pos": [5440, 3008]
 	},
 	"position_4": {
 		"label": "NPCyborgAssembly",
 		"pos": [4160, 3648]
 	},
 	"position_5": {
 		"label": "ScavSouthWestAssembly",
-		"pos": [4928, 7488]
+		"pos": [4672, 6976]
 	},
 	"position_6": {
 		"label": "ScavSouthEastAssembly",
-		"pos": [6336, 7616]
+		"pos": [5184, 6976]
 	},
 	"position_7": {
 		"label": "ScavNorthAssembly",
@@ -71,6 +71,12 @@
 		"pos1": [3520, 1728],
 		"pos2": [6976, 5056]
 	},
+	"area_7": {
+		"label": "NPFactoryTrigger",
+		"subscriber": 0,
+		"pos1": [3776, 5568],
+		"pos2": [4800, 6080]
+	},
 
 	"object_0": {
 		"label": "NPLeftFactory",
@@ -143,13 +149,13 @@
 		"label": "SouthWestScavFactoryTrigger",
 		"subscriber": 0,
 		"pos": [4200, 7500],
-		"radius": 800
+		"radius": 1024
 	},
 	"radius_2": {
 		"label": "SouthEastScavFactoryTrigger",
 		"subscriber": 0,
 		"pos": [5600, 7500],
-		"radius": 800
+		"radius": 1024
 	},
 	"radius_3": {
 		"label": "NPLZTrigger",