Some minor script improvements

Warzone2100 · Aug 22, 2023 · abe1a33 · abe1a33
1 parent b804a5e
commit abe1a33
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/data/base/script/campaign/cam1-1.js b/data/base/script/campaign/cam1-1.js
@@ -68,7 +68,8 @@ function eventAttacked(victim, attacker)
 		return;
 	}
 
-	if (victim.type === STRUCTURE && victim.id === 146)
+	const scavFactory = getObject("scavFactory1");
+	if (camDef(scavFactory) && scavFactory && victim.type === STRUCTURE && victim.id === scavFactory.id)
 	{
 		camCallOnce("westScavAction");
 	}

diff --git a/data/base/script/campaign/cam1-3.js b/data/base/script/campaign/cam1-3.js
@@ -223,11 +223,11 @@ function eventStartLevel()
 	camCompleteRequiredResearch(mis_scavengerRes, CAM_SCAV_7);
 	setAlliance(CAM_NEW_PARADIGM, CAM_SCAV_7, true);
 
-	camUpgradeOnMapTemplates(cTempl.bloke, cTempl.blokeheavy, 7);
-	camUpgradeOnMapTemplates(cTempl.trike, cTempl.trikeheavy, 7);
-	camUpgradeOnMapTemplates(cTempl.buggy, cTempl.buggyheavy, 7);
-	camUpgradeOnMapTemplates(cTempl.bjeep, cTempl.bjeepheavy, 7);
-	camUpgradeOnMapTemplates(cTempl.rbjeep, cTempl.rbjeep8, 7);
+	camUpgradeOnMapTemplates(cTempl.bloke, cTempl.blokeheavy, CAM_SCAV_7);
+	camUpgradeOnMapTemplates(cTempl.trike, cTempl.trikeheavy, CAM_SCAV_7);
+	camUpgradeOnMapTemplates(cTempl.buggy, cTempl.buggyheavy, CAM_SCAV_7);
+	camUpgradeOnMapTemplates(cTempl.bjeep, cTempl.bjeepheavy, CAM_SCAV_7);
+	camUpgradeOnMapTemplates(cTempl.rbjeep, cTempl.rbjeep8, CAM_SCAV_7);
 
 	camSetEnemyBases({
 		"ScavBaseGroup": {

diff --git a/data/base/script/campaign/cam1-7.js b/data/base/script/campaign/cam1-7.js
@@ -102,7 +102,7 @@ function eventGroupLoss(obj, group, newsize)
 			addLabel(acrate, "newArtiLabel");
 
 			camSetArtifacts({
-				"newArtiLabel": { tech: ["R-Wpn-Cannon3Mk1", "R-Wpn-RocketSlow-Damage03", "R-Wpn-Rocket-Damage03"] }
+				"newArtiLabel": { tech: ["R-Wpn-Cannon3Mk1", "R-Wpn-RocketSlow-Damage03"] }
 			});
 
 			droidWithArtiID = undefined;

diff --git a/data/base/script/campaign/cam1a.js b/data/base/script/campaign/cam1a.js
@@ -157,8 +157,8 @@ function eventStartLevel()
 
 	enableBaseStructures();
 	camCompleteRequiredResearch(mis_playerRes, CAM_HUMAN_PLAYER);
-	camCompleteRequiredResearch(mis_scavengerRes, 6);
-	camCompleteRequiredResearch(mis_scavengerRes, 7);
+	camCompleteRequiredResearch(mis_scavengerRes, CAM_SCAV_6);
+	camCompleteRequiredResearch(mis_scavengerRes, CAM_SCAV_7);
 	if (difficulty === INSANE)
 	{
 		completeResearch("R-Wpn-Flamer-Range01-ScavReduce-Undo", CAM_SCAV_6);

diff --git a/data/base/script/campaign/cam1b.js b/data/base/script/campaign/cam1b.js
@@ -83,8 +83,8 @@ function eventStartLevel()
 	setAlliance(CAM_NEW_PARADIGM, CAM_SCAV_7, true);
 	setAlliance(CAM_SCAV_6, CAM_SCAV_7, true);
 
-	camCompleteRequiredResearch(mis_scavengerRes, 6);
-	camCompleteRequiredResearch(mis_scavengerRes, 7);
+	camCompleteRequiredResearch(mis_scavengerRes, CAM_SCAV_6);
+	camCompleteRequiredResearch(mis_scavengerRes, CAM_SCAV_7);
 	if (difficulty === HARD)
 	{
 		completeResearch("R-Wpn-Flamer-Range01-ScavReduce-Undo", CAM_SCAV_6);

diff --git a/data/base/script/campaign/transitionTech.js b/data/base/script/campaign/transitionTech.js
@@ -175,7 +175,7 @@ const mis_gammaResearchNew = [
 	"R-Wpn-Missile-Damage01", "R-Vehicle-Armor-Heat05", "R-Wpn-Rail-Accuracy01", "R-Wpn-Missile-Accuracy01",
 	"R-Wpn-AAGun-Accuracy03", "R-Wpn-Howitzer-Accuracy03", "R-Wpn-Rail-ROF01", "R-Wpn-Missile2A-T",
 	"R-Cyborg-Wpn-ATMiss", "R-Defense-GuardTower-ATMiss", "R-Defense-WallTower-A-Tmiss", "R-Wpn-Missile-Damage02",
-	"R-Wpn-Missile-ROF01",
+	"R-Wpn-Missile-ROF01", "R-Cyborg-Metals08", "R-Cyborg-Armor-Heat05",
 
 	// 7
 	"R-Wpn-MdArtMissile", "R-Wpn-Laser02", "R-Wpn-RailGun02",