(MP)Laser research fix (#3878)

Hi-Energy Laser Emitter "requiredResearch": Improved Laser Focusing -> Flashlight Heavy Laser "requiredResearch": Hi-Energy Laser Emitter -> Pulse Laser
Warzone2100 · Jun 13, 2024 · 832eb27 · 832eb27
1 parent 83c7f85
commit 832eb27
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/data/mp/multiplay/script/functions/camTechEnabler.js b/data/mp/multiplay/script/functions/camTechEnabler.js
@@ -299,6 +299,7 @@ var allRes = {
 	"R-Wpn-MG-Damage10": 1693,
 	"R-Wpn-HvyHowitzer": 1693,
 	"R-Wpn-Energy-Accuracy01": 1705,
+	"R-Wpn-Energy-Damage01": 1705,
 	"R-Cyborg-Armor-Heat06": 1705,
 	"R-Vehicle-Armor-Heat05": 1715,
 	"R-Wpn-Rail-Damage01": 1715,
@@ -323,7 +324,7 @@ var allRes = {
 	"R-Wpn-Howitzer-ROF01": 1912,
 	"R-Cyborg-Armor-Heat07": 1917,
 	"R-Wpn-Laser02": 1923,
-	"R-Wpn-Energy-Damage01": 1923,
+	"R-Wpn-Energy-ROF01": 1923,
 	"R-Wpn-Rail-Accuracy01": 1934,
 	"R-Sys-Resistance-Circuits": 1935,
 	"R-Defense-EMPMortar": 1935,
@@ -342,7 +343,7 @@ var allRes = {
 	"R-Wpn-Flamer-Damage09": 2069,
 	"R-Defense-MdArtMissile": 2069,
 	"R-Struc-Factory-Upgrade09": 2117,
-	"R-Wpn-Energy-ROF01": 2141,
+	"R-Wpn-Energy-Damage02": 2141,
 	"R-Wpn-Rail-Damage02": 2152,
 	"R-Wpn-Rail-ROF01": 2152,
 	"R-Cyborg-Armor-Heat08": 2160,
@@ -354,37 +355,36 @@ var allRes = {
 	"R-Wpn-HeavyPlasmaLauncher": 2244,
 	"R-Wpn-Howitzer-ROF02": 2348,
 	"R-Wpn-Howitzer-Damage05": 2354,
-	"R-Wpn-Energy-Damage02": 2360,
+	"R-Wpn-Energy-ROF02": 2360,
+	"R-Wpn-AALaser": 2360,
 	"R-Wpn-Missile-Damage02": 2393,
 	"R-Cyborg-Armor-Heat09": 2433,
 	"R-Wpn-HvyLaser": 2469,
 	"R-Vehicle-Armor-Heat08": 2488,
 	"R-Vehicle-Body10": 2497,
 	"R-Defense-WallUpgrade10": 2506,
-	"R-Wpn-AALaser": 2578,
-	"R-Wpn-Energy-ROF02": 2578,
 	"R-Wpn-Rail-ROF02": 2589,
 	"R-Wpn-RailGun02": 2596,
 	"R-Wpn-Missile-Accuracy02": 2611,
+	"R-Defense-AA-Laser": 2611,
 	"R-Defense-HeavyLas": 2624,
 	"R-Defense-Rail2": 2672,
 	"R-Cyborg-Hvywpn-RailGunner": 2680,
 	"R-Defense-HeavyPlasmaLauncher": 2681,
 	"R-Defense-WallTower-Rail2": 2706,
 	"R-Vehicle-Engine09": 2755,
+	"R-Wpn-Energy-Damage03": 2796,
 	"R-Vehicle-Armor-Heat09": 2806,
-	"R-Defense-AA-Laser": 2807,
 	"R-Wpn-Missile-ROF03": 2829,
 	"R-Wpn-HvArtMissile": 2830,
 	"R-Defense-WallUpgrade11": 2839,
 	"R-Wpn-LasSat": 2890,
 	"R-Wpn-Howitzer-ROF03": 3003,
 	"R-Wpn-Howitzer-Damage06": 3009,
-	"R-Wpn-Energy-Damage03": 3014,
+	"R-Wpn-Energy-ROF03": 3014,
 	"R-Wpn-Missile-Damage03": 3048,
 	"R-Vehicle-Body13": 3191,
 	"R-Defense-WallUpgrade12": 3203,
-	"R-Wpn-Energy-ROF03": 3233,
 	"R-Wpn-Rail-ROF03": 3243,
 	"R-Wpn-Rail-Damage03": 3251,
 	"R-Wpn-RailGun03": 3251,

diff --git a/data/mp/stats/research.json b/data/mp/stats/research.json
@@ -5635,7 +5635,7 @@
 		"msgName": "RES_LASD1",
 		"name": "Hi-Energy Laser Emitter",
 		"requiredResearch": [
-			"R-Wpn-Energy-Accuracy01"
+			"R-Wpn-Laser01"
 		],
 		"researchPoints": 14400,
 		"researchPower": 450,
@@ -6719,7 +6719,7 @@
 		"msgName": "RES_W_HLAS",
 		"name": "Heavy Laser",
 		"requiredResearch": [
-			"R-Wpn-Energy-Damage01"
+			"R-Wpn-Laser02"
 		],
 		"researchPoints": 36000,
 		"researchPower": 450,