Merge pull request cataclysmbnteam#2432 from metalheimer/upload

Humvee headlight reduction, and GL ammo change to 40x53mm
KheirFerrum · Mar 18, 2023 · 201367c · 201367c
2 parents 6f61158 + ed27164
commit 201367c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/data/json/vehicles/military.json b/data/json/vehicles/military.json
@@ -347,7 +347,7 @@
       { "y": 3, "x": 1, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
       { "y": 2, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
       { "y": 1, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
-      { "y": 0, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield", "headlight_reinforced" ] },
+      { "y": 0, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
       { "y": -1, "x": 1, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
       { "y": 3, "x": 0, "parts": [ "hdframe_vertical", "hddoor_right" ] },
       { "y": 2, "x": 0, "parts": [ "hdframe_vertical_2", "hdroof", { "fuel": "jp8", "part": "tank" } ] },
@@ -421,7 +421,7 @@
       { "y": 3, "x": 1, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
       { "y": 2, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
       { "y": 1, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
-      { "y": 0, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield", "headlight_reinforced" ] },
+      { "y": 0, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
       { "y": -1, "x": 1, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
       { "y": 3, "x": 0, "parts": [ "hdframe_vertical", "hddoor_right" ] },
       { "y": 2, "x": 0, "parts": [ "hdframe_vertical_2", "hdroof", { "fuel": "jp8", "part": "tank" } ] },
@@ -495,7 +495,7 @@
       { "y": 3, "x": 1, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
       { "y": 2, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
       { "y": 1, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
-      { "y": 0, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield", "headlight_reinforced" ] },
+      { "y": 0, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
       { "y": -1, "x": 1, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
       { "y": 3, "x": 0, "parts": [ "hdframe_vertical", "hddoor_right" ] },
       { "y": 2, "x": 0, "parts": [ "hdframe_vertical_2", "hdroof", { "fuel": "diesel", "part": "tank" } ] },

diff --git a/data/mods/Aftershock/vehicles/vehicles.json b/data/mods/Aftershock/vehicles/vehicles.json
@@ -731,7 +731,6 @@
       { "x": 1, "y": 3, "part": "reinforced_windshield" },
       { "x": 1, "y": 0, "part": "hdframe_horizontal" },
       { "x": 1, "y": 0, "part": "reinforced_windshield" },
-      { "x": 1, "y": 0, "part": "headlight_reinforced" },
       { "x": 1, "y": -1, "part": "hdframe_vertical" },
       { "x": 1, "y": -1, "part": "reinforced_windshield" },
       { "x": 2, "y": 1, "part": "hdframe_horizontal" },
@@ -775,7 +774,7 @@
         "y": 1,
         "part": "mounted_mk19",
         "ammo": 60,
-        "ammo_types": [ "40x46mm_m433", "40mm_emp" ],
+        "ammo_types": [ "40x53mm_m430a1" ],
         "ammo_qty": [ 1, 25 ]
       },
       { "x": -1, "y": 2, "part": "hdframe_horizontal_2" },

diff --git a/data/mods/No_Hope/vehicles.json b/data/mods/No_Hope/vehicles.json
@@ -327,7 +327,7 @@
       { "y": 3, "x": 1, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
       { "y": 2, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
       { "y": 1, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
-      { "y": 0, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield", "headlight_reinforced" ] },
+      { "y": 0, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
       { "y": -1, "x": 1, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
       { "y": 3, "x": 0, "parts": [ "hdframe_vertical", "hddoor" ] },
       { "y": 2, "x": 0, "parts": [ "hdframe_vertical_2", "hdroof", { "fuel": "diesel", "part": "tank" } ] },
@@ -396,7 +396,7 @@
       { "y": 3, "x": 1, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
       { "y": 2, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
       { "y": 1, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
-      { "y": 0, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield", "headlight_reinforced" ] },
+      { "y": 0, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
       { "y": -1, "x": 1, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
       { "y": 3, "x": 0, "parts": [ "hdframe_vertical", "hddoor" ] },
       { "y": 2, "x": 0, "parts": [ "hdframe_vertical_2", "hdroof", { "fuel": "diesel", "part": "tank" } ] },
@@ -465,7 +465,7 @@
       { "y": 3, "x": 1, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
       { "y": 2, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
       { "y": 1, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
-      { "y": 0, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield", "headlight_reinforced" ] },
+      { "y": 0, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
       { "y": -1, "x": 1, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
       { "y": 3, "x": 0, "parts": [ "hdframe_vertical", "hddoor" ] },
       { "y": 2, "x": 0, "parts": [ "hdframe_vertical_2", "hdroof", { "fuel": "diesel", "part": "tank" } ] },

diff --git a/data/mods/Salvaged_Robots/robot_additions/vehicles.json b/data/mods/Salvaged_Robots/robot_additions/vehicles.json
@@ -282,7 +282,6 @@
       { "x": 1, "y": 3, "part": "reinforced_windshield" },
       { "x": 1, "y": 0, "part": "hdframe_horizontal" },
       { "x": 1, "y": 0, "part": "reinforced_windshield" },
-      { "x": 1, "y": 0, "part": "headlight_reinforced" },
       { "x": 1, "y": -1, "part": "hdframe_vertical" },
       { "x": 1, "y": -1, "part": "reinforced_windshield" },
       { "x": 2, "y": 1, "part": "hdframe_horizontal" },
@@ -326,7 +325,7 @@
         "y": 1,
         "part": "mounted_mk19",
         "ammo": 60,
-        "ammo_types": [ "40x46mm_m433", "40mm_emp" ],
+        "ammo_types": [ "40x53mm_m430a1" ],
         "ammo_qty": [ 1, 25 ]
       },
       { "x": -1, "y": 2, "part": "hdframe_horizontal_2" },

diff --git a/tests/vehicle_efficiency_test.cpp b/tests/vehicle_efficiency_test.cpp
@@ -448,7 +448,7 @@ TEST_CASE( "vehicle_efficiency", "[vehicle] [engine]" )
     test_vehicle( "truck_swat", 5959334, 682900, 131700, 29610, 7604 );
     test_vehicle( "tractor_plow", 723658, 681200, 681200, 132400, 132400 );
     test_vehicle( "apc", 5801619, 1626000, 1119000, 130800, 85590 );
-    test_vehicle( "humvee", 5503245, 767900, 306900, 25620, 9171 );
+    test_vehicle( "humvee", 5502045, 767900, 306900, 25620, 9171 );
     test_vehicle( "road_roller", 8829220, 602500, 147100, 22760, 6925 );
     test_vehicle( "golf_cart", 444630, 37180, 27560, 14100, 5681 );
 
@@ -468,7 +468,7 @@ TEST_CASE( "vehicle_efficiency", "[vehicle] [engine]" )
     test_vehicle( "truck_swat", 5959334, 129300, 130100, 29350, 7668, 0, 0, true );
     test_vehicle( "tractor_plow", 723658, 72240, 72240, 53610, 53610, 0, 0, true );
     test_vehicle( "apc", 5801619, 381500, 382100, 123600, 82000, 0, 0, true );
-    test_vehicle( "humvee", 5503245, 89940, 89940, 25780, 9086, 0, 0, true );
+    test_vehicle( "humvee", 5502045, 89940, 89940, 25780, 9086, 0, 0, true );
     test_vehicle( "road_roller", 8829220, 97490, 97690, 22880, 6606, 0, 0, true );
     test_vehicle( "golf_cart", 444630, 37140, 11510, 14110, 4450, 0, 0, true );
 }