diff --git a/data/mp/multiplay/script/functions/camTechEnabler.js b/data/mp/multiplay/script/functions/camTechEnabler.js index c39767b1298..d17bc3912ee 100644 --- a/data/mp/multiplay/script/functions/camTechEnabler.js +++ b/data/mp/multiplay/script/functions/camTechEnabler.js @@ -69,6 +69,7 @@ var allRes = { "R-Struc-RepairFacility": 472, "R-Sys-MobileRepairTurretHvy": 472, "R-Vehicle-Body04": 492, + "R-Wpn-MG-Accuracy01": 494, "R-Wpn-Rocket02-MRL": 509, "R-Vehicle-Engine03": 511, "R-Vehicle-Prop-Hover": 511, @@ -89,6 +90,7 @@ var allRes = { "R-Wpn-Mortar-Acc01": 585, "R-Wpn-Mortar-Damage02": 585, "R-Wpn-MG-ROF01": 602, + "R-Wpn-MG-Accuracy02": 605, "R-Wpn-Flamer-Damage04": 620, "R-Cyborg-Metals03": 620, "R-Vehicle-Body08": 636, @@ -175,7 +177,6 @@ var allRes = { "R-Vehicle-Armor-Heat02": 988, "R-Vehicle-Body06": 1001, "R-Cyborg-Metals05": 1004, - "R-Wpn-MG-ROF03": 1006, "R-Cyborg-Hvywpn-Acannon": 1013, "R-Cyborg-Hvywpn-HPV": 1013, "R-Wpn-RocketSlow-Accuracy01": 1017, @@ -202,18 +203,18 @@ var allRes = { "R-Wpn-Cannon-ROF03": 1108, "R-Defense-IDFRocket": 1112, "R-Defense-WallUpgrade05": 1116, + "R-Wpn-MG5": 1121, "R-Wpn-Rocket07-Tank-Killer": 1135, "R-Struc-VTOLPad-Upgrade02": 1137, "R-Wpn-MG-Damage07": 1144, + "R-Defense-WallTower-TwinAGun": 1145, "R-Wpn-RocketSlow-Accuracy02": 1159, "R-Defense-HvyA-Trocket": 1159, "R-Defense-WallTower-HvyA-Trocket": 1159, "R-Wpn-Cannon6TwinAslt": 1160, - "R-Wpn-MG5": 1163, "R-Vehicle-Armor-Heat03": 1168, "R-Wpn-Mortar-Damage05": 1170, "R-Defense-Cannon6": 1184, - "R-Defense-WallTower-TwinAGun": 1187, "R-Cyborg-Metals06": 1194, "R-Wpn-HowitzerMk1": 1211, "R-Cyborg-Hvywpn-TK": 1214, @@ -221,22 +222,22 @@ var allRes = { "R-Wpn-Rocket-Damage07": 1228, "R-Sys-VTOLCBS-Turret01": 1230, "R-Wpn-Cannon-Damage07": 1230, - "R-Wpn-AAGun04": 1232, "R-Wpn-Mortar-ROF04": 1236, "R-Wpn-Bomb02": 1243, "R-Wpn-PlasmaCannon": 1254, - "R-Defense-AASite-QuadRotMg": 1256, - "R-Defense-WallTower-QuadRotAA": 1256, "R-Comp-CommandTurret02": 1263, "R-Sys-VTOLCBS-Tower01": 1263, "R-Vehicle-Engine06": 1271, "R-Defense-Super-Cannon": 1275, "R-Defense-PlasmaCannon": 1277, "R-Wpn-Bomb04": 1278, + "R-Wpn-AAGun04": 1280, "R-Wpn-Bomb-Damage02": 1280, "R-Struc-VTOLPad-Upgrade03": 1288, "R-Defense-Howitzer": 1298, "R-Vehicle-Body09": 1301, + "R-Defense-AASite-QuadRotMg": 1303, + "R-Defense-WallTower-QuadRotAA": 1303, "R-Defense-WallUpgrade06": 1304, "R-Vehicle-Metals06": 1315, "R-Wpn-Howitzer-Damage01": 1319, @@ -258,6 +259,7 @@ var allRes = { "R-Defense-WallTower-DoubleAAgun02": 1420, "R-Wpn-Cannon-Damage08": 1423, "R-Struc-Research-Upgrade08": 1432, + "R-Wpn-MG-ROF03": 1441, "R-Wpn-Howitzer-Damage02": 1460, "R-Struc-VTOLPad-Upgrade04": 1464, "R-Wpn-Laser01": 1472, diff --git a/data/mp/stats/research.json b/data/mp/stats/research.json index 9afada9f5e7..5641fbfc3d8 100644 --- a/data/mp/stats/research.json +++ b/data/mp/stats/research.json @@ -4708,12 +4708,11 @@ "QuadMg1AAGun" ], "requiredResearch": [ - "R-Wpn-MG-ROF03", - "R-Wpn-AAGun03", - "R-Struc-Research-Upgrade06" + "R-Wpn-MG5", + "R-Wpn-AAGun03" ], - "researchPoints": 10800, - "researchPower": 337, + "researchPoints": 8400, + "researchPower": 262, "resultComponents": [ "QuadRotAAGun" ], @@ -6755,6 +6754,90 @@ ], "statID": "Laser2PULSEMk1" }, + "R-Wpn-MG-Accuracy01": { + "iconID": "IMAGE_RES_WEAPONTECH", + "id": "R-Wpn-MG-Accuracy01", + "name": "MG Laser Rangefinder", + "requiredResearch": [ + "R-Wpn-MG3Mk1" + ], + "researchPoints": 2400, + "researchPower": 75, + "results": [ + { + "class": "Weapon", + "filterParameter": "ImpactClass", + "filterValue": "MACHINE GUN", + "parameter": "HitChance", + "value": 10 + }, + { + "class": "Weapon", + "filterParameter": "ImpactClass", + "filterValue": "MACHINE GUN", + "parameter": "ShortHitChance", + "value": 10 + }, + { + "class": "Weapon", + "filterParameter": "ImpactClass", + "filterValue": "A-A GUN", + "parameter": "HitChance", + "value": 10 + }, + { + "class": "Weapon", + "filterParameter": "ImpactClass", + "filterValue": "A-A GUN", + "parameter": "ShortHitChance", + "value": 10 + } + ], + "statID": "MG1Mk1", + "subgroupIconID": "IMAGE_RES_GRPACC" + }, + "R-Wpn-MG-Accuracy02": { + "iconID": "IMAGE_RES_WEAPONTECH", + "id": "R-Wpn-MG-Accuracy02", + "name": "MG Laser Designator", + "requiredResearch": [ + "R-Wpn-MG-Accuracy01" + ], + "researchPoints": 3600, + "researchPower": 112, + "results": [ + { + "class": "Weapon", + "filterParameter": "ImpactClass", + "filterValue": "MACHINE GUN", + "parameter": "HitChance", + "value": 10 + }, + { + "class": "Weapon", + "filterParameter": "ImpactClass", + "filterValue": "MACHINE GUN", + "parameter": "ShortHitChance", + "value": 10 + }, + { + "class": "Weapon", + "filterParameter": "ImpactClass", + "filterValue": "A-A GUN", + "parameter": "HitChance", + "value": 10 + }, + { + "class": "Weapon", + "filterParameter": "ImpactClass", + "filterValue": "A-A GUN", + "parameter": "ShortHitChance", + "value": 10 + } + ], + "statID": "MG1Mk1", + "subgroupIconID": "IMAGE_RES_GRPACC" + }, "R-Wpn-MG-Damage01": { "iconID": "IMAGE_RES_WEAPONTECH", "id": "R-Wpn-MG-Damage01", @@ -7012,8 +7095,7 @@ "id": "R-Wpn-MG-Damage08", "name": "Depleted Uranium MG Bullets", "requiredResearch": [ - "R-Wpn-MG-Damage07", - "R-Struc-Research-Upgrade06" + "R-Wpn-MG-Damage07" ], "researchPoints": 9800, "researchPower": 450, @@ -7049,8 +7131,7 @@ "id": "R-Wpn-MG-Damage09", "name": "Depleted Uranium MG Bullets Mk2", "requiredResearch": [ - "R-Wpn-MG-Damage08", - "R-Struc-Research-Upgrade07" + "R-Wpn-MG-Damage08" ], "researchPoints": 10200, "researchPower": 450, @@ -7086,8 +7167,7 @@ "id": "R-Wpn-MG-Damage10", "name": "Depleted Uranium MG Bullets Mk3", "requiredResearch": [ - "R-Wpn-MG-Damage09", - "R-Struc-Research-Upgrade08" + "R-Wpn-MG-Damage09" ], "researchPoints": 11800, "researchPower": 450, @@ -7178,14 +7258,14 @@ "filterParameter": "ImpactClass", "filterValue": "MACHINE GUN", "parameter": "FirePause", - "value": -18 + "value": -26 }, { "class": "Weapon", "filterParameter": "ImpactClass", "filterValue": "MACHINE GUN", "parameter": "ReloadTime", - "value": -18 + "value": -26 }, { "class": "Weapon", @@ -7211,7 +7291,8 @@ "msgName": "RES_W_MG_ROF3", "name": "Hyper Fire Chaingun Upgrade", "requiredResearch": [ - "R-Wpn-MG4" + "R-Wpn-MG-Damage08", + "R-Wpn-MG-ROF02" ], "researchPoints": 6000, "researchPower": 187, @@ -7221,14 +7302,14 @@ "filterParameter": "ImpactClass", "filterValue": "MACHINE GUN", "parameter": "FirePause", - "value": -8 + "value": -10 }, { "class": "Weapon", "filterParameter": "ImpactClass", "filterValue": "MACHINE GUN", "parameter": "ReloadTime", - "value": -8 + "value": -10 }, { "class": "Weapon", @@ -7334,8 +7415,8 @@ "MG4ROTARYMk1" ], "requiredResearch": [ - "R-Struc-Research-Upgrade06", - "R-Wpn-MG4" + "R-Wpn-MG4", + "R-Wpn-MG-Damage06" ], "researchPoints": 7200, "researchPower": 225,