qtscript: Fix bug in previous commit preventing weapon cyborg product…

…ion. Also make sure we set the correct droid types for campaign.
Warzone2100 · Jul 17, 2017 · a856dea · a856dea
1 parent 490b91d
commit a856dea
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/data/base/stats/brain.json b/data/base/stats/brain.json
@@ -1,6 +1,7 @@
 {
     "CommandBrain01": {
         "designable": 1,
+        "droidType": "DROID_COMMAND",
         "hitpoints": 500,
         "id": "CommandBrain01",
         "maxDroids": 6,

diff --git a/data/base/stats/construction.json b/data/base/stats/construction.json
@@ -4,6 +4,7 @@
         "buildPower": 17,
         "constructPoints": 10,
         "designable": 1,
+        "droidType": "DROID_CONSTRUCT",
         "hitpoints": 50,
         "id": "Spade1Mk1",
         "name": "Truck",

diff --git a/data/base/stats/repair.json b/data/base/stats/repair.json
@@ -3,6 +3,7 @@
         "buildPoints": 250,
         "buildPower": 50,
         "designable": 1,
+        "droidType": "DROID_REPAIR",
         "id": "LightRepair1",
         "location": "TURRET",
         "model": "GNMREPAR.PIE",

diff --git a/data/base/stats/sensor.json b/data/base/stats/sensor.json
@@ -73,6 +73,7 @@
         "buildPoints": 100,
         "buildPower": 20,
         "designable": 1,
+        "droidType": "DROID_SENSOR",
         "hitpoints": 200,
         "id": "SensorTurret1Mk1",
         "location": "TURRET",
@@ -102,6 +103,7 @@
         "buildPoints": 100,
         "buildPower": 20,
         "designable": 1,
+        "droidType": "DROID_SENSOR",
         "hitpoints": 200,
         "id": "Sys-CBTurret01",
         "location": "TURRET",
@@ -146,6 +148,7 @@
         "buildPoints": 100,
         "buildPower": 20,
         "designable": 1,
+        "droidType": "DROID_SENSOR",
         "hitpoints": 200,
         "id": "Sys-VTOLCBTurret01",
         "location": "TURRET",
@@ -175,6 +178,7 @@
         "buildPoints": 100,
         "buildPower": 20,
         "designable": 1,
+        "droidType": "DROID_SENSOR",
         "id": "Sys-VstrikeTurret01",
         "location": "TURRET",
         "mountModel": "TRLSNSR1.PIE",

diff --git a/src/stats.cpp b/src/stats.cpp
@@ -299,7 +299,7 @@ static void loadCompStats(WzConfig &json, COMPONENT_STATS *psStats, int index)
 	psStats->pBase->hitpointPct = json.value("hitpointPct", 100).toUInt();
 
 	QString dtype = json.value("droidType", "DROID").toString();
-	psStats->droidTypeOverride = DROID_DEFAULT;
+	psStats->droidTypeOverride = DROID_ANY;
 	if (dtype.compare("PERSON") == 0)
 	{
 		psStats->droidTypeOverride = DROID_PERSON;