Award rank in Beta/Gamma 1 from main menu only.

For the first transporter load.
Warzone2100 · Dec 18, 2017 · bdea327 · bdea327
1 parent 5b0de61
commit bdea327
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/data/base/script/campaign/cam2-a.js b/data/base/script/campaign/cam2-a.js
@@ -4,6 +4,7 @@ include("script/campaign/templates.js");
 
 const TRANSPORT_LIMIT = 4;
 var index; //Number of transport loads sent into the level
+var startedFromMenu;
 
 
 camAreaEvent("vtolRemoveZone", function(droid)
@@ -239,7 +240,10 @@ function eventTransporterLanded(transport)
 {
 	if (transport.player === CAM_HUMAN_PLAYER)
 	{
-		camCallOnce("setUnitRank");
+		if (startedFromMenu)
+		{
+			camCallOnce("setUnitRank");
+		}
 
 		if (!camDef(index))
 		{
@@ -332,10 +336,12 @@ function eventStartLevel()
 	truckDefense();
 	setUnitRank(); //All pre-placed player droids are ranked.
 	camPlayVideos("MB2A_MSG");
+	startedFromMenu = false;
 
 	//Only if starting Beta directly rather than going through Alpha
 	if (enumDroid(CAM_HUMAN_PLAYER, DROID_TRANSPORTER).length === 0)
 	{
+		startedFromMenu = true;
 		sendPlayerTransporter();
 	}
 	else

diff --git a/data/base/script/campaign/cam3-a.js b/data/base/script/campaign/cam3-a.js
@@ -3,6 +3,7 @@ include("script/campaign/libcampaign.js");
 include("script/campaign/templates.js");
 
 var index; //Number of bonus transports that have flown in.
+var startedFromMenu;
 
 //Remove Nexus VTOL droids.
 camAreaEvent("vtolRemoveZone", function(droid)
@@ -59,7 +60,10 @@ function setHeroUnits()
 
 function eventTransporterLanded(transport)
 {
-	camCallOnce("setHeroUnits");
+	if (startedFromMenu)
+	{
+		camCallOnce("setHeroUnits");
+	}
 }
 
 //Enable all factories.
@@ -336,10 +340,12 @@ function eventStartLevel()
 	camManageTrucks(NEXUS);
 	truckDefense();
 	camPlayVideos(["MB3A_MSG", "MB3A_MSG2"]);
+	startedFromMenu = false;
 
 	//Only if starting Gamma directly rather than going through Beta
 	if (enumDroid(CAM_HUMAN_PLAYER, DROID_TRANSPORTER).length === 0)
 	{
+		startedFromMenu = true;
 		setReinforcementTime(LZ_COMPROMISED_TIME);
 		sendPlayerTransporter();
 	}