Fix a few Alpha campaign regressions.

Emulate behavior closer to wzcam. -cam1-c: Fix an odd cleanup and base detection situation where essentially two bases (eastScavs) were on top of each other. Move the blip removal trigger father into the valley. Bring a wall corner of LZ1 into the cleanup region. -cam1-4a: Emulate some blip removal and appearance behavior. -libcampaign: Transporter blips stay instead of being removed as the transporter leaves the map. -cam1-d: Make the LZ into a base and use base reinforcements to bring in the transporter.
Warzone2100 · Sep 23, 2017 · 87be78b · 87be78b
1 parent 3c907bd
commit 87be78b
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 51 deletions.
diff --git a/data/base/script/campaign/cam1-4a.js b/data/base/script/campaign/cam1-4a.js
@@ -64,11 +64,21 @@ camAreaEvent("MediumNPFactoryTrigger", function()
 	camEnableFactory("MediumNPFactory");
 });
 
+camAreaEvent("removeRedObjectiveBlip", function()
+{
+	hackRemoveMessage("C1-4_OBJ1", PROX_MSG, CAM_HUMAN_PLAYER); //Remove mission objective.
+});
+
+camAreaEvent("triggerLZ2Blip", function()
+{
+	hackAddMessage("C1-4_LZ", PROX_MSG, CAM_HUMAN_PLAYER, false);
+});
+
 camAreaEvent("LandingZoneTrigger", function()
 {
 	var lz = getObject("LandingZone2"); // will override later
 	setNoGoArea(lz.x, lz.y, lz.x2, lz.y2, CAM_HUMAN_PLAYER);
-	hackRemoveMessage("C1-4_OBJ1", PROX_MSG, CAM_HUMAN_PLAYER); //Remove mission objective.
+	hackRemoveMessage("C1-4_LZ", PROX_MSG, CAM_HUMAN_PLAYER); //Remove LZ 2 blip.
 	playSound("pcv456.ogg");
 	// continue after 4 seconds
 	queue("moreLandingZoneTrigger", 4000);

diff --git a/data/base/script/campaign/cam1-d.js b/data/base/script/campaign/cam1-d.js
@@ -29,7 +29,14 @@ camAreaEvent("causeWayTrig", function()
 	camEnableFactory("NPFactoryNE");
 	camEnableFactory("NPCybFactoryNE");
 	cyborgGroupPatrol();
-	sendNPTransporter();
+
+	camDetectEnemyBase("NPLZGroup");
+	camSetBaseReinforcements("NPLZGroup", camChangeOnDiff(600000), "getDroidsForNPLZ",
+		CAM_REINFORCE_TRANSPORT, {
+			entry: { x: 0, y: 0 },
+			exit: { x: 0, y: 0 }
+		}
+	);
 });
 
 function getDroidsForNPLZ()
@@ -49,29 +56,6 @@ function getDroidsForNPLZ()
 	return droids;
 }
 
-function sendNPTransporter()
-{
-	//Check if the NP LZ is secure. If so, send a transport.
-	var tPos = getObject("NPTransportPos");
-	var nearbyDefense = enumRange(tPos.x, tPos.y, 8, NEW_PARADIGM, false).filter(function(obj) {
-		return (obj.type === STRUCTURE && obj.stattype !== WALL);
-	});
-
-	if (nearbyDefense.length)
-	{
-		var list = getDroidsForNPLZ();
-		camSendReinforcement(NEW_PARADIGM, camMakePos("NPTransportPos"), list,
-			CAM_REINFORCE_TRANSPORT, {
-				entry: { x: 0, y: 0 },
-				exit: { x: 0, y: 0 },
-				message: "C1D_LZ2"
-			}
-		);
-
-		queue("sendNPTransporter", camChangeOnDiff(600000)); //10 min
-	}
-}
-
 function HoverGroupPatrol()
 {
 	camManageGroup(camMakeGroup("hoversAttack"), CAM_ORDER_ATTACK, {
@@ -207,6 +191,12 @@ function eventStartLevel()
 			detectSnd: "pcv379.ogg",
 			eliminateSnd: "pcv394.ogg",
 		},
+		"NPLZGroup": {
+			cleanup: "NPLZ1",
+			detectMsg: "C1D_LZ2",
+			eliminateSnd: "pcv394.ogg",
+			player: NEW_PARADIGM // required for LZ-type bases
+		},
 	});
 
 	with (camTemplates) camSetFactories({

diff --git a/data/base/script/campaign/cam1c.js b/data/base/script/campaign/cam1c.js
@@ -211,7 +211,7 @@ function eventStartLevel()
 		},
 		"ScavSouthEastHighgroundGroup": {
 			cleanup: "ScavSouthEastHighground",
-			detectMsg: "C1C_BASE2",
+			detectMsg: "C1C_BASE6",
 			detectSnd: "pcv374.ogg",
 			eliminateSnd: "pcv391.ogg"
 		},
@@ -234,12 +234,6 @@ function eventStartLevel()
 			eliminateSnd: "pcv391.ogg",
 			player: 7 // hence discriminate by player filter
 		},
-		"ScavSouthEastBaseGroup": {
-			cleanup: "ScavSouthEastBase",
-			detectMsg: "C1C_BASE6",
-			detectSnd: "pcv374.ogg",
-			eliminateSnd: "pcv391.ogg",
-		},
 		"NPEastBaseGroup": {
 			cleanup: "NPEastBase",
 			detectMsg: "C1C_BASE7",

diff --git a/data/base/script/campaign/libcampaign.js b/data/base/script/campaign/libcampaign.js
@@ -1076,6 +1076,13 @@ function __camDispatchTransporterUnsafe()
 
 	setNoGoArea(pos.x - 2, pos.y - 2, pos.x + 2, pos.y + 2, player);
 
+	//Delete previous enemy reinforcement transport blip
+	if (player !== CAM_HUMAN_PLAYER && camDef(__camTransporterMessage))
+	{
+		hackRemoveMessage(__camTransporterMessage, PROX_MSG, 0);
+		__camTransporterMessage = undefined;
+	}
+
 	if(player !== CAM_HUMAN_PLAYER)
 	{
 		playSound("pcv381.ogg"); //Enemy transport detected.
@@ -3085,13 +3092,6 @@ function cam_eventTransporterExit(transport)
 		|| (__camWinLossCallback === "__camVictoryStandard"
 		&& transport.player === CAM_HUMAN_PLAYER))
 	{
-		//Delete any enemy reinforcement transport blips once it exits map.
-		if (transport.player !== CAM_HUMAN_PLAYER && camDef(__camTransporterMessage))
-		{
-			hackRemoveMessage(__camTransporterMessage, PROX_MSG, 0);
-			__camTransporterMessage = undefined;
-		}
-
 		// allow the next transport to enter
 		if (camDef(__camIncomingTransports[transport.player]))
 			delete __camIncomingTransports[transport.player];

diff --git a/data/base/wrf/cam1/cam1c/labels.json b/data/base/wrf/cam1/cam1c/labels.json
@@ -39,21 +39,20 @@
 	"object_8": { "label": "AmbushForceCommander", "id": 3276, "player": 1, "type": 0 },
 
 	"area_13": {"label": "ScavSouthDerrick", "pos1": [ 9920, 14848 ], "pos2": [ 11072, 16192 ]},
-	"area_14": {"label": "ScavSouthEastHighground", "pos1": [ 11200, 11968 ], "pos2": [ 14912, 14784 ]},
+	"area_14": {"label": "ScavSouthEastHighground", "pos1": [ 10624, 11968 ], "pos2": [ 14912, 14784 ]},
 	"area_15": {"label": "ScavNorthBase", "pos1": [ 8000, 192 ], "pos2": [ 9664, 1600 ]},
 	"area_16": {"label": "ScavSouthPodPits", "pos1": [ 8384, 2624 ], "pos2": [ 10048, 4672 ]},
 	"area_17": {"label": "MixedCentralBase", "pos1": [ 8256, 4928 ], "pos2": [ 10048, 8640 ]},
-	"area_18": {"label": "ScavSouthEastBase", "pos1": [ 10176, 12992 ], "pos2": [ 14528, 14784 ]},
-	"area_19": {"label": "NPEastBase", "pos1": [ 9408, 8640 ], "pos2": [ 13760, 11328 ]},
-	"area_20": {"label": "NPNorthEastGenerator", "pos1": [ 12992, 1088 ], "pos2": [ 15040, 3776 ]},
-	"area_21": {"label": "NPNorthEastBase", "pos1": [ 10176, 1216 ], "pos2": [ 12352, 4544 ]},
+	"area_18": {"label": "NPEastBase", "pos1": [ 9408, 8640 ], "pos2": [ 13760, 11328 ]},
+	"area_19": {"label": "NPNorthEastGenerator", "pos1": [ 12992, 1088 ], "pos2": [ 15040, 3776 ]},
+	"area_20": {"label": "NPNorthEastBase", "pos1": [ 10176, 1216 ], "pos2": [ 12352, 4544 ]},
 
-	"radius_3": { "label": "RemoveBeacon", "subscriber": 0, "pos" : [ 6848, 13888 ], "radius": 640 },
-	"area_22": { "label": "AmbushTrigger", "subscriber": 0, "pos1": [ 8896, 13760 ], "pos2": [ 10048, 14656 ]},
+	"radius_3": { "label": "RemoveBeacon", "subscriber": 0, "pos" : [ 7168, 13888 ], "radius": 540 },
+	"area_21": { "label": "AmbushTrigger", "subscriber": 0, "pos1": [ 8896, 13760 ], "pos2": [ 10048, 14656 ]},
 	"position_5": { "label": "AmbushTarget", "pos": [ 8352, 13880 ]},
 
-	"area_23": { "label": "NPLZ1", "pos1": [ 12992, 3904 ], "pos2": [ 14272, 5568 ]},
-	"area_24": { "label": "NPLZ1Trigger", "subscriber": 0, "pos1": [ 10560, 6400 ], "pos2": [ 16448, 8256 ]},
-	"area_25": { "label": "NPLZ2", "pos1": [ 8512, 9792 ], "pos2": [ 9664, 10944 ]},
-	"area_26": { "label": "NPLZ2Trigger", "subscriber": 0, "pos1": [ 7616, 4800 ], "pos2": [ 9408, 5696 ]}
+	"area_22": { "label": "NPLZ1", "pos1": [ 12892, 3704 ], "pos2": [ 14472, 5668 ]},
+	"area_23": { "label": "NPLZ1Trigger", "subscriber": 0, "pos1": [ 10560, 6400 ], "pos2": [ 16448, 8256 ]},
+	"area_24": { "label": "NPLZ2", "pos1": [ 8512, 9792 ], "pos2": [ 9664, 10944 ]},
+	"area_25": { "label": "NPLZ2Trigger", "subscriber": 0, "pos1": [ 7616, 4800 ], "pos2": [ 9408, 5696 ]}
 }
diff --git a/data/base/wrf/cam1/sub1-4/labels.json b/data/base/wrf/cam1/sub1-4/labels.json
@@ -37,5 +37,8 @@
 
 	"area_6": { "label": "LandingZoneTrigger", "subscriber": 0, "pos1": [ 7232, 4416 ], "pos2": [ 7744, 4928 ] },
 	"area_7": { "label": "AttackGroupMedium", "pos1": [ 3264, 3008 ], "pos2": [ 3648, 3264 ] },
-	"area_8": { "label": "AttackGroupLight", "pos1": [ 3392, 2112 ], "pos2": [ 3776, 2624 ] }
+	"area_8": { "label": "AttackGroupLight", "pos1": [ 3392, 2112 ], "pos2": [ 3776, 2624 ] },
+
+	"radius_3": { "label": "removeRedObjectiveBlip", "subscriber": 0, "pos" : [ 4096, 3640 ], "radius": 700 },
+	"radius_4": { "label": "triggerLZ2Blip", "subscriber": 0, "pos" : [ 6160, 3840 ], "radius": 800 }
 }
diff --git a/data/base/wrf/cam1/sub1-d/labels.json b/data/base/wrf/cam1/sub1-d/labels.json
@@ -29,6 +29,7 @@
 	"area_11": { "label": "NPSouthEast",   "pos1": [ 3072, 12800 ], "pos2": [ 6272, 16000 ] },
 	"area_12": { "label": "NPMiddle",      "pos1": [ 3392, 1984 ],   "pos2": [ 6080, 5184 ] },
 	"area_13": { "label": "NPNorthEast",   "pos1": [ 6016, 128 ],   "pos2": [ 9984, 3968 ] },
+	"area_14": { "label": "NPLZ1",		"pos1": [ 6912, 5376 ],   "pos2": [ 7808, 6400 ] },
 
 	"object_0": { "label": "artifact1",      "id": 555, "player": 0, "type": 2 },
 	"object_1": { "label": "NPFactoryW",     "id": 670, "player": 1, "type": 1 },