Allow tweaking factory production times for Classic

To match 3.2+ production times if they want. Also, fix naming capitalizations for classic tweaks options.
Warzone2100 · Apr 20, 2024 · 2568be6 · 2568be6
1 parent d538340
commit 2568be6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/data/base/script/campaign/cam2-a.js b/data/base/script/campaign/cam2-a.js
@@ -264,15 +264,15 @@ function cam2Setup()
 		camCompleteRequiredResearch(mis_alphaResearchNewClassic, CAM_HUMAN_PLAYER);
 		camCompleteRequiredResearch(mis_playerResBetaClassic, CAM_HUMAN_PLAYER);
 
-		if (tweakOptions.camclassic_Balance32)
+		if (tweakOptions.camClassic_balance32)
 		{
 			camClassicResearch(mis_betaStartingResearchClassic, CAM_HUMAN_PLAYER);
 			completeResearch("CAM2RESEARCH-UNDO", CAM_HUMAN_PLAYER);
 			//The Collective have no research in 3.2
 		}
 		else
 		{
-			completeResearch("CAM2RESEARCH-UNDO-Rockets", CAM_HUMAN_PLAYER); 
+			completeResearch("CAM2RESEARCH-UNDO-Rockets", CAM_HUMAN_PLAYER);
 			camCompleteRequiredResearch(mis_betaStartingResearchClassic, CAM_HUMAN_PLAYER);
 			camCompleteRequiredResearch(mis_alphaResearchNewClassic, CAM_THE_COLLECTIVE);
 			camCompleteRequiredResearch(collectiveResClassic, CAM_THE_COLLECTIVE);

diff --git a/data/base/script/campaign/cam3-a.js b/data/base/script/campaign/cam3-a.js
@@ -293,7 +293,7 @@ function cam3Setup()
 		camCompleteRequiredResearch(mis_playerResBetaClassic, CAM_HUMAN_PLAYER);
 		camCompleteRequiredResearch(mis_playerResGammaClassic, CAM_HUMAN_PLAYER);
 
-		if (tweakOptions.camclassic_Balance32)
+		if (tweakOptions.camClassic_balance32)
 		{
 			camClassicResearch(mis_gammaStartingResearchClassic, CAM_HUMAN_PLAYER);
 			completeResearch("CAM2RESEARCH-UNDO", CAM_HUMAN_PLAYER);

diff --git a/data/base/script/campaign/libcampaign_includes/production.js b/data/base/script/campaign/libcampaign_includes/production.js
@@ -256,7 +256,7 @@ function camUpgradeOnMapTemplates(template1, template2, playerId, excluded)
 // Boosts the throttle on factories if classic balance is active.
 function __camFactoryThrottleMultiplier()
 {
-	return ((camClassicMode()) ? 2 : 1);
+	return ((camClassicMode() && tweakOptions.camClassic_slowProduction) ? 2 : 1);
 }
 
 function __camFactoryUpdateTactics(flabel)

diff --git a/data/base/script/campaign/libcampaign_includes/research.js b/data/base/script/campaign/libcampaign_includes/research.js
@@ -74,7 +74,7 @@ function camClassicResearch(researchIds, playerId)
 	{
 		return;
 	}
-	if (tweakOptions.camclassic_Balance32)
+	if (tweakOptions.camClassic_balance32)
 	{
 		camEnableRes(researchIds, playerId);
 	}

diff --git a/data/mods/campaign/wz2100_camclassic/mod-info.json.in b/data/mods/campaign/wz2100_camclassic/mod-info.json.in
@@ -34,14 +34,25 @@
     ],
     "customTweakOptions": [
         {
-            "id": "camclassic_Balance32",
+            "id": "camClassic_balance32",
             "type": "bool",
             "default": false,
             "displayName": {
                 "en": "3.2.x Balance"
             },
             "description": {
-                "en": "3.2.x series balance by emulating research bugs"
+                "en": "3.2.x series balance by emulating research bugs."
+            }
+        },
+        {
+            "id": "camClassic_slowProduction",
+            "type": "bool",
+            "default": true,
+            "displayName": {
+                "en": "Slow Factory Production"
+            },
+            "description": {
+                "en": "Slower AI factory production times."
             }
         }
     ]