diff --git a/data/base/script/campaign/cam2-6.js b/data/base/script/campaign/cam2-6.js index f5edc21e5ab..f17c02e52b3 100644 --- a/data/base/script/campaign/cam2-6.js +++ b/data/base/script/campaign/cam2-6.js @@ -3,7 +3,7 @@ include("script/campaign/templates.js"); const mis_collectiveRes = [ "R-Defense-WallUpgrade06", "R-Struc-Materials06", "R-Sys-Engineering02", - "R-Vehicle-Engine04", "R-Vehicle-Metals05", "R-Cyborg-Metals05", + "R-Vehicle-Engine05", "R-Vehicle-Metals05", "R-Cyborg-Metals05", "R-Wpn-Cannon-Accuracy02", "R-Wpn-Cannon-Damage05", "R-Wpn-Cannon-ROF02", "R-Wpn-Flamer-Damage06", "R-Wpn-Flamer-ROF03", "R-Wpn-MG-Damage07", "R-Wpn-MG-ROF03", "R-Wpn-Mortar-Acc02", "R-Wpn-Mortar-Damage06", diff --git a/data/base/script/campaign/cam2-d.js b/data/base/script/campaign/cam2-d.js index 65c1fbc44ec..2e51d8def85 100644 --- a/data/base/script/campaign/cam2-d.js +++ b/data/base/script/campaign/cam2-d.js @@ -4,7 +4,7 @@ include("script/campaign/templates.js"); const MIS_UPLINK_PLAYER = 1; //The satellite uplink player number. const mis_collectiveRes = [ "R-Defense-WallUpgrade05", "R-Struc-Materials05", "R-Sys-Engineering02", - "R-Vehicle-Engine04", "R-Vehicle-Metals05", "R-Cyborg-Metals05", + "R-Vehicle-Engine05", "R-Vehicle-Metals05", "R-Cyborg-Metals05", "R-Wpn-Cannon-Accuracy02", "R-Wpn-Cannon-Damage05", "R-Wpn-Cannon-ROF02", "R-Wpn-Flamer-Damage06", "R-Wpn-Flamer-ROF03", "R-Wpn-MG-Damage07", "R-Wpn-MG-ROF03", "R-Wpn-Mortar-Acc02", "R-Wpn-Mortar-Damage05", diff --git a/data/base/script/campaign/transitionTech.js b/data/base/script/campaign/transitionTech.js index 64cb4f0d2a4..dd4bfabdab4 100644 --- a/data/base/script/campaign/transitionTech.js +++ b/data/base/script/campaign/transitionTech.js @@ -117,7 +117,7 @@ const mis_betaResearchNew = [ "R-Wpn-Bomb02", "R-Wpn-Howitzer-Accuracy01", "R-Wpn-Howitzer-Damage02", "R-Wpn-AAGun-Accuracy02", "R-Wpn-Howitzer-ROF02", "R-Struc-Research-Upgrade06", "R-Struc-VTOLPad-Upgrade03", "R-Wpn-Bomb-Damage02", "R-Wpn-Bomb04", - "R-Defense-WallUpgrade06", + "R-Defense-WallUpgrade06", "R-Vehicle-Engine05", // 8 "R-Sys-VTOLCBS-Tower01", "R-Wpn-Cannon4AMk1", "R-Wpn-Mortar3", "R-Wpn-Rocket07-Tank-Killer", diff --git a/data/base/stats/research.json b/data/base/stats/research.json index eb8e5804b04..967c1d27c68 100644 --- a/data/base/stats/research.json +++ b/data/base/stats/research.json @@ -4641,7 +4641,7 @@ "imdName": "iceng.pie", "name": "Turbo-Charged Engine Mk2", "requiredResearch": [ - "R-Vehicle-Body09", + "R-Struc-Research-Upgrade04", "R-Vehicle-Engine04" ], "researchPoints": 9000, @@ -4664,6 +4664,7 @@ "imdName": "iceng.pie", "name": "Turbo-Charged Engine Mk3", "requiredResearch": [ + "R-Vehicle-Body09", "R-Vehicle-Engine05" ], "researchPoints": 11000, @@ -8751,7 +8752,7 @@ "filterParameter": "ImpactClass", "filterValue": "MACHINE GUN", "parameter": "Damage", - "value": 5 + "value": 15 } ], "statID": "MG1Mk1", diff --git a/data/base/stats/structuremodifier.json b/data/base/stats/structuremodifier.json index 5b1aa61f9c5..28754b505db 100644 --- a/data/base/stats/structuremodifier.json +++ b/data/base/stats/structuremodifier.json @@ -24,7 +24,7 @@ "SOFT": 200 }, "BUNKER BUSTER": { - "BUNKER": 500, + "BUNKER": 1000, "HARD": 350, "MEDIUM": 200, "SOFT": 100 diff --git a/data/base/stats/weapons.json b/data/base/stats/weapons.json index 859324b261f..da27cf10b92 100644 --- a/data/base/stats/weapons.json +++ b/data/base/stats/weapons.json @@ -1627,7 +1627,7 @@ "CyborgRocket": { "buildPoints": 400, "buildPower": 110, - "damage": 123, + "damage": 124, "effectSize": 25, "explosionWav": "lrgexpl.ogg", "faceInFlight": 1, @@ -1667,7 +1667,7 @@ "CyborgRocket02": { "buildPoints": 700, "buildPower": 160, - "damage": 188, + "damage": 191, "effectSize": 75, "explosionWav": "lrgexpl.ogg", "faceInFlight": 1, @@ -1832,7 +1832,7 @@ "flightGfx": "FXLProj.PIE", "flightSpeed": 800, "hitGfx": "FXMNExp.PIE", - "hitpoints": 75, + "hitpoints": 100, "id": "Flame2", "lightWorld": 1, "longHit": 50, @@ -2162,7 +2162,7 @@ "flightGfx": "FXLFLSH.PIE", "flightSpeed": 1600, "hitGfx": "FXFLSHL.PIE", - "hitpoints": 100, + "hitpoints": 125, "id": "Laser3BEAMMk1", "lightWorld": 1, "longHit": 65, diff --git a/data/base/wrf/cam2/cam2start/dinit.bjo b/data/base/wrf/cam2/cam2start/dinit.bjo index da5fa72d03f..564b26e5efb 100644 Binary files a/data/base/wrf/cam2/cam2start/dinit.bjo and b/data/base/wrf/cam2/cam2start/dinit.bjo differ diff --git a/data/base/wrf/cam2/cam2start/struct.bjo b/data/base/wrf/cam2/cam2start/struct.bjo index 4024e6717a2..4b1d439388c 100644 Binary files a/data/base/wrf/cam2/cam2start/struct.bjo and b/data/base/wrf/cam2/cam2start/struct.bjo differ diff --git a/data/base/wrf/cam3/cam3a/dinit.bjo b/data/base/wrf/cam3/cam3a/dinit.bjo index 7f9a2814095..d0e1f99bcda 100644 Binary files a/data/base/wrf/cam3/cam3a/dinit.bjo and b/data/base/wrf/cam3/cam3a/dinit.bjo differ diff --git a/data/base/wrf/cam3/cam3a/feat.bjo b/data/base/wrf/cam3/cam3a/feat.bjo index 9a55a27470a..6a87d10a4ec 100644 Binary files a/data/base/wrf/cam3/cam3a/feat.bjo and b/data/base/wrf/cam3/cam3a/feat.bjo differ diff --git a/data/base/wrf/cam3/cam3a/game.map b/data/base/wrf/cam3/cam3a/game.map index b5c94b469d3..f41bb687914 100644 Binary files a/data/base/wrf/cam3/cam3a/game.map and b/data/base/wrf/cam3/cam3a/game.map differ diff --git a/data/base/wrf/cam3/cam3a/struct.bjo b/data/base/wrf/cam3/cam3a/struct.bjo index 378007a0848..4241116da80 100644 Binary files a/data/base/wrf/cam3/cam3a/struct.bjo and b/data/base/wrf/cam3/cam3a/struct.bjo differ diff --git a/data/base/wrf/cam3/cam3a/ttypes.ttp b/data/base/wrf/cam3/cam3a/ttypes.ttp index 7bfabc1f0e2..b35b0480df5 100644 Binary files a/data/base/wrf/cam3/cam3a/ttypes.ttp and b/data/base/wrf/cam3/cam3a/ttypes.ttp differ diff --git a/data/base/wrf/cam3/cam3b/dinit.bjo b/data/base/wrf/cam3/cam3b/dinit.bjo index f6441555209..df66063090f 100644 Binary files a/data/base/wrf/cam3/cam3b/dinit.bjo and b/data/base/wrf/cam3/cam3b/dinit.bjo differ diff --git a/data/base/wrf/cam3/cam3b/feat.bjo b/data/base/wrf/cam3/cam3b/feat.bjo index cf9d9de9dcf..d0b4b6fb7f1 100644 Binary files a/data/base/wrf/cam3/cam3b/feat.bjo and b/data/base/wrf/cam3/cam3b/feat.bjo differ diff --git a/data/base/wrf/cam3/cam3b/game.map b/data/base/wrf/cam3/cam3b/game.map index 0759c6c76de..05b7434e6c5 100644 Binary files a/data/base/wrf/cam3/cam3b/game.map and b/data/base/wrf/cam3/cam3b/game.map differ diff --git a/data/base/wrf/cam3/cam3b/struct.bjo b/data/base/wrf/cam3/cam3b/struct.bjo index 40bd186c1b2..c8462fbc8c0 100644 Binary files a/data/base/wrf/cam3/cam3b/struct.bjo and b/data/base/wrf/cam3/cam3b/struct.bjo differ diff --git a/data/base/wrf/cam3/cam3b/ttypes.ttp b/data/base/wrf/cam3/cam3b/ttypes.ttp index 7bfabc1f0e2..b35b0480df5 100644 Binary files a/data/base/wrf/cam3/cam3b/ttypes.ttp and b/data/base/wrf/cam3/cam3b/ttypes.ttp differ diff --git a/data/base/wrf/cam3/cam3c/dinit.bjo b/data/base/wrf/cam3/cam3c/dinit.bjo index 46f981ca861..72f7e3f2dcc 100644 Binary files a/data/base/wrf/cam3/cam3c/dinit.bjo and b/data/base/wrf/cam3/cam3c/dinit.bjo differ diff --git a/data/base/wrf/cam3/cam3c/feat.bjo b/data/base/wrf/cam3/cam3c/feat.bjo index fe58d21d5df..c8af8c8bf9d 100644 Binary files a/data/base/wrf/cam3/cam3c/feat.bjo and b/data/base/wrf/cam3/cam3c/feat.bjo differ diff --git a/data/base/wrf/cam3/cam3c/labels.json b/data/base/wrf/cam3/cam3c/labels.json index 23f4235d4b9..4e38d79818a 100644 --- a/data/base/wrf/cam3/cam3c/labels.json +++ b/data/base/wrf/cam3/cam3c/labels.json @@ -125,7 +125,7 @@ "object_0": { "label": "NXbase1HeavyFacArti", - "id": 1309, + "id": 524, "player": 3, "type": 1 }, @@ -137,7 +137,7 @@ }, "object_2": { "label": "NXvtolFacArti", - "id": 544, + "id": 542, "player": 3, "type": 1 }, diff --git a/data/base/wrf/cam3/cam3c/struct.bjo b/data/base/wrf/cam3/cam3c/struct.bjo index 1d7f4701b58..80739494d7b 100644 Binary files a/data/base/wrf/cam3/cam3c/struct.bjo and b/data/base/wrf/cam3/cam3c/struct.bjo differ