Fix Beta campaign research.

Missing some of the superhot flamer gel upgrades and being given too many ROF upgrades for rockets/flamer. - Cam2-b: Move the middle base cleanup west some more to catch a few tank traps in the base structure autoremoval.
Warzone2100 · Jan 5, 2018 · ebacfd2 · ebacfd2
1 parent e424c73
commit ebacfd2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/data/base/stats/research.json b/data/base/stats/research.json
@@ -5040,7 +5040,7 @@
         "name": "Superhot Flamer Gel",
         "requiredResearch": [
             "R-Wpn-Flame2",
-			"R-Wpn-Flamer-Damage03"
+            "R-Wpn-Flamer-Damage03"
         ],
         "researchPoints": 7200,
         "researchPower": 225,
@@ -5066,7 +5066,6 @@
     "R-Wpn-Flamer-Damage05": {
         "iconID": "IMAGE_RES_WEAPONTECH",
         "id": "R-Wpn-Flamer-Damage05",
-		"keyTopic": 1,
         "name": "Superhot Flamer Gel Mk2",
         "requiredResearch": [
             "R-Wpn-Flamer-Damage04"
@@ -5125,6 +5124,7 @@
     "R-Wpn-Flamer-ROF02": {
         "iconID": "IMAGE_RES_WEAPONTECH",
         "id": "R-Wpn-Flamer-ROF02",
+        "keyTopic": 1,
         "name": "Flamer Autoloader Mk2",
         "requiredResearch": [
             "R-Wpn-Flamer-Damage04"
@@ -5154,7 +5154,7 @@
     "R-Wpn-Flamer-ROF03": {
         "iconID": "IMAGE_RES_WEAPONTECH",
         "id": "R-Wpn-Flamer-ROF03",
-		"keyTopic": 1,
+        "keyTopic": 1,
         "name": "Flamer Autoloader Mk3",
         "requiredResearch": [
             "R-Wpn-Flamer-ROF02"
@@ -5935,7 +5935,7 @@
         "requiredResearch": [
             "R-Wpn-Rocket02-MRL",
             "R-Sys-CBSensor-Tower01",
-            "R-Wpn-RocketSlow-ROF02"
+            "R-Wpn-RocketSlow-ROF01"
         ],
         "researchPoints": 7200,
         "researchPower": 225,
@@ -6084,6 +6084,7 @@
     "R-Wpn-RocketSlow-ROF02": {
         "iconID": "IMAGE_RES_WEAPONTECH",
         "id": "R-Wpn-RocketSlow-ROF02",
+        "keyTopic": 1,
         "name": "Rocket Autoloader Mk2",
         "requiredResearch": [
             "R-Wpn-RocketSlow-Damage04",
@@ -7313,7 +7314,7 @@
     "R-Wpn-Bomb04": {
         "iconID": "IMAGE_RES_WEAPONTECH",
         "id": "R-Wpn-Bomb04",
-		"keyTopic": 1,
+        "keyTopic": 1,
         "imdName": "trmvtlin.PIE",
         "msgName": "RES_W_BMB4",
         "name": "Thermite Bomb Bay",

diff --git a/data/base/wrf/cam2/cam2b/labels.json b/data/base/wrf/cam2/cam2b/labels.json
@@ -117,7 +117,7 @@
 	},
 	"area_3": {
 		"label": "base4Cleanup",
-		"pos1": [11328, 5824],
+		"pos1": [10368, 5824],
 		"pos2": [13632, 7616]
 	},
 	"area_4": {