Updated core military vehicles and motorcycles (#19254)

* Removed military seats and added camera controls * Added mufflers part 1 * Added mufflers to gas-powered motorbikes * Added seat_nocargo to deprecation savegame_json.cpp * Removed military seat from vehicle_parts.json * Added ammo, magazines and rare gun spawns to aapc-gl Some soldiers may lose their weapons/bullets/magazines in panic. The weapon station needs spent casing spawns to make it look lived-in. The APC drivers have a small survival kit stashed under their seat; since they most likely abandoned the vehicle with the kit, spawns will be rare. * Added same for aapc-mg * Added military gunmods to cargo truck * Added muffler to cargo truck * Removed nice spaces * Removed CARGO from Generic Guns turrets Turrets with CARGO cannot be installed on seats with CARGO.
CleverRaven · Nov 20, 2016 · 07556f4dcc4fa25227386a72f9051e2f05899214 · 07556f4
1 parent cf34d33
commit 07556f4dcc4fa25227386a72f9051e2f05899214
Unified Split

Showing with 67 additions and 27 deletions.

+0 −15 data/json/vehicle_parts.json

+5 −0 data/json/vehicles/bikes.json

+56 −7 data/json/vehicles/military.json

+5 −5 data/mods/Generic_Guns/gg_vehicle_override.json

+1 −0 src/savegame_json.cpp
diff --git a/data/json/vehicle_parts.json b/data/json/vehicle_parts.json
@@ -119,21 +119,6 @@
        "location" : "center",
        "flags" : ["BED", "SEAT", "BOARDABLE", "BELTABLE", "CARGO", "TOOL_WRENCH"],
        "breaks_into": "ig_vp_seat"
-  
-    },{
-  
-        "type" : "vehicle_part",
-  
-        "id" : "seat_nocargo",
-  
-        "name" : "military seat",
-  
-        "symbol" : "#",
-  
-        "color" : "red",
-  
-        "broken_symbol" : "*",
-  
-        "broken_color" : "red",
-  
-        "damage_modifier" : 60,
-  
-        "durability" : 250,
-  
-        "item" : "seat",
-  
-        "difficulty" : 1,
-  
-        "location" : "center",
-  
-        "flags" : ["SEAT", "BOARDABLE", "BELTABLE"],
-  
-        "breaks_into": "ig_vp_seat"
    },{
        "type" : "vehicle_part",
        "id" : "tracker",

diff --git a/data/json/vehicles/bikes.json b/data/json/vehicles/bikes.json
@@ -58,6 +58,7 @@
      { "x": 2, "y": 0, "part": "wheel_motorbike_steerable" },
      { "x": -1, "y": 0, "part": "frame_vertical" },
      { "x": -1, "y": 0, "part": "wheel_motorbike" },
+  
+      { "x": -1, "y": 0, "part": "muffler" },
      { "x": -1, "y": 0, "part": "box" }
    ]
  },
@@ -99,6 +100,7 @@
      { "x": 2, "y": 0, "part": "wheel_motorbike_steerable" },
      { "x": -1, "y": 0, "part": "frame_vertical" },
      { "x": -1, "y": 0, "part": "wheel_motorbike" },
+  
+      { "x": -1, "y": 0, "part": "muffler" },
      { "x": -1, "y": 0, "part": "box" },
      { "x": 0, "y": 1, "part": "frame_cross" },
      { "x": 0, "y": 1, "part": "wheel_motorbike" },
@@ -134,6 +136,7 @@
      { "x": 1, "y": 0, "part": "tank_small", "fuel": "gasoline" },
      { "x": 1, "y": 0, "part": "plating_steel" },
      { "x": -1, "y": 0, "part": "frame_horizontal" },
+  
+      { "x": -1, "y": 0, "part": "muffler" },
      { "x": -1, "y": 0, "part": "trunk" },
      { "x": 1, "y": -1, "part": "frame_horizontal" },
      { "x": 1, "y": -1, "part": "wheel_motorbike_steerable" },
@@ -186,6 +189,7 @@
      { "x": 1, "y": 0, "part": "xlframe_vertical" },
      { "x": 1, "y": 0, "part": "wheel_small_steerable" },
      { "x": -1, "y": 0, "part": "xlframe_vertical" },
+  
+      { "x": -1, "y": 0, "part": "muffler" },
      { "x": -1, "y": 0, "part": "wheel_small" }
    ]
  },
@@ -227,6 +231,7 @@
      { "x": 2, "y": 0, "part": "frame_vertical" },
      { "x": 2, "y": 0, "part": "wheel_motorbike_steerable" },
      { "x": -1, "y": 0, "part": "frame_vertical" },
+  
+      { "x": -1, "y": 0, "part": "muffler" },
      { "x": -1, "y": 0, "part": "wheel_motorbike" }
    ]
  },

diff --git a/data/json/vehicles/military.json b/data/json/vehicles/military.json
@@ -10,6 +10,7 @@
      { "x": -2, "y": -1, "part": "plating_military" },
      { "x": -2, "y": -2, "part": "hdframe_sw" },
      { "x": -2, "y": -2, "part": "hdboard_sw" },
+  
+      { "x": -2, "y": -2, "part": "muffler" },
      { "x": -2, "y": -2, "part": "plating_military" },
      { "x": -2, "y": 0, "part": "hdframe_horizontal" },
      { "x": -2, "y": 0, "part": "door_opaque" },
@@ -20,6 +21,7 @@
      { "x": -2, "y": 1, "part": "plating_military" },
      { "x": -2, "y": 2, "part": "hdframe_se" },
      { "x": -2, "y": 2, "part": "hdboard_se" },
+  
+      { "x": -2, "y": 2, "part": "muffler" },
      { "x": -2, "y": 2, "part": "plating_military" },
      { "x": -1, "y": -1, "part": "hdframe_vertical_2" },
      { "x": -1, "y": -1, "part": "box" },
@@ -96,6 +98,7 @@
      { "x": 3, "y": -1, "part": "hdframe_vertical_2" },
      { "x": 3, "y": -1, "part": "seat" },
      { "x": 3, "y": -1, "part": "controls" },
+  
+      { "x": 3, "y": -1, "part": "cam_control" },
      { "x": 3, "y": -1, "part": "vehicle_clock" },
      { "x": 3, "y": -1, "part": "seatbelt_heavyduty" },
      { "x": 3, "y": -1, "part": "hdroof" },
@@ -116,7 +119,7 @@
      { "x": 3, "y": 1, "part": "cam_control" },
      { "x": 3, "y": 1, "part": "plating_military" },
      { "x": 3, "y": 1, "part": "mounted_mk19", "ammo": 60, "ammo_types": [ "40mm_frag", "40mm_concussive" ] },
-  
-      { "x": 3, "y": 1, "part": "seat_nocargo" },
+  
+      { "x": 3, "y": 1, "part": "seat" },
      { "x": 3, "y": 1, "part": "seatbelt_heavyduty" },
      { "x": 3, "y": 2, "part": "hdframe_vertical" },
      { "x": 3, "y": 2, "part": "wheel_armor_steerable" },
@@ -157,7 +160,23 @@
      { "x": 5, "y": 2, "part": "hdhalfboard_ne" },
      { "x": 5, "y": 2, "part": "plating_military" }
    ],
-  
-    "items": [ { "x": 3, "y": -1, "chance": 2, "items": [ "id_military" ] } ]
+  
+    "items": [
+  
+      { "x": 3, "y": -1, "chance": 2, "items": [ "id_military" ] },
+  
+      { "x": 3, "y": -1, "chance": 20, "item_groups": [ "tools_survival" ] },
+  
+      { "x": 3, "y": 1, "chance": 50, "items": [ "ear_plugs" ] },
+  
+      { "x": -1, "y": -1, "chance": 20, "item_groups": [ "ammo_milspec" ] },
+  
+      { "x": -1, "y": 1, "chance": 20, "item_groups": [ "ammo_milspec" ] },
+  
+      { "x": 1, "y": -1, "chance": 20, "item_groups": [ "ammo_milspec" ] },
+  
+      { "x": 1, "y": 1, "chance": 20, "item_groups": [ "ammo_milspec" ] },
+  
+      { "x": -1, "y": -1, "chance": 10, "item_groups": [ "mags_milspec" ] },
+  
+      { "x": -1, "y": 1, "chance": 10, "item_groups": [ "mags_milspec" ] },
+  
+      { "x": 1, "y": -1, "chance": 10, "item_groups": [ "mags_milspec" ] },
+  
+      { "x": 1, "y": 1, "chance": 10, "item_groups": [ "mags_milspec" ] },
+  
+      { "x": -1, "y": -1, "chance": 5, "item_groups": [ "guns_milspec" ] },
+  
+      { "x": -1, "y": 1, "chance": 5, "item_groups": [ "guns_milspec" ] },
+  
+      { "x": 1, "y": -1, "chance": 5, "item_groups": [ "guns_milspec" ] },
+  
+      { "x": 1, "y": 1, "chance": 5, "item_groups": [ "guns_milspec" ] }
+  
+    ]
  },
  {
    "id": "aapc-mg",
@@ -169,6 +188,7 @@
      { "x": -2, "y": -1, "part": "plating_military" },
      { "x": -2, "y": -2, "part": "hdframe_sw" },
      { "x": -2, "y": -2, "part": "hdboard_sw" },
+  
+      { "x": -2, "y": -2, "part": "muffler" },
      { "x": -2, "y": -2, "part": "plating_military" },
      { "x": -2, "y": 0, "part": "hdframe_horizontal" },
      { "x": -2, "y": 0, "part": "door_opaque" },
@@ -179,6 +199,7 @@
      { "x": -2, "y": 1, "part": "plating_military" },
      { "x": -2, "y": 2, "part": "hdframe_se" },
      { "x": -2, "y": 2, "part": "hdboard_se" },
+  
+      { "x": -2, "y": 2, "part": "muffler" },
      { "x": -2, "y": 2, "part": "plating_military" },
      { "x": -1, "y": -1, "part": "hdframe_vertical_2" },
      { "x": -1, "y": -1, "part": "box" },
@@ -255,6 +276,7 @@
      { "x": 3, "y": -1, "part": "hdframe_vertical_2" },
      { "x": 3, "y": -1, "part": "seat" },
      { "x": 3, "y": -1, "part": "controls" },
+  
+      { "x": 3, "y": -1, "part": "cam_control" },
      { "x": 3, "y": -1, "part": "vehicle_clock" },
      { "x": 3, "y": -1, "part": "seatbelt_heavyduty" },
      { "x": 3, "y": -1, "part": "hdroof" },
@@ -275,7 +297,7 @@
      { "x": 3, "y": 1, "part": "cam_control" },
      { "x": 3, "y": 1, "part": "plating_military" },
      { "x": 3, "y": 1, "part": "mounted_browning", "ammo": 60 },
-  
-      { "x": 3, "y": 1, "part": "seat_nocargo" },
+  
+      { "x": 3, "y": 1, "part": "seat" },
      { "x": 3, "y": 1, "part": "seatbelt_heavyduty" },
      { "x": 3, "y": 2, "part": "hdframe_vertical" },
      { "x": 3, "y": 2, "part": "wheel_armor_steerable" },
@@ -316,7 +338,23 @@
      { "x": 5, "y": 2, "part": "hdhalfboard_ne" },
      { "x": 5, "y": 2, "part": "plating_military" }
    ],
-  
-    "items": [ { "x": 3, "y": -1, "chance": 2, "items": [ "id_military" ] } ]
+  
+    "items": [
+  
+      { "x": 3, "y": -1, "chance": 2, "items": [ "id_military" ] },
+  
+      { "x": 3, "y": -1, "chance": 20, "item_groups": [ "tools_survival" ] },
+  
+      { "x": 3, "y": 1, "chance": 50, "items": [ "ear_plugs" ] },
+  
+      { "x": -1, "y": -1, "chance": 20, "item_groups": [ "ammo_milspec" ] },
+  
+      { "x": -1, "y": 1, "chance": 20, "item_groups": [ "ammo_milspec" ] },
+  
+      { "x": 1, "y": -1, "chance": 20, "item_groups": [ "ammo_milspec" ] },
+  
+      { "x": 1, "y": 1, "chance": 20, "item_groups": [ "ammo_milspec" ] },
+  
+      { "x": -1, "y": -1, "chance": 10, "item_groups": [ "mags_milspec" ] },
+  
+      { "x": -1, "y": 1, "chance": 10, "item_groups": [ "mags_milspec" ] },
+  
+      { "x": 1, "y": -1, "chance": 10, "item_groups": [ "mags_milspec" ] },
+  
+      { "x": 1, "y": 1, "chance": 10, "item_groups": [ "mags_milspec" ] },
+  
+      { "x": -1, "y": -1, "chance": 5, "item_groups": [ "guns_milspec" ] },
+  
+      { "x": -1, "y": 1, "chance": 5, "item_groups": [ "guns_milspec" ] },
+  
+      { "x": 1, "y": -1, "chance": 5, "item_groups": [ "guns_milspec" ] },
+  
+      { "x": 1, "y": 1, "chance": 5, "item_groups": [ "guns_milspec" ] }
+  
+    ]
  },
  {
    "id": "apc",
@@ -328,6 +366,7 @@
      { "x": -2, "y": -1, "part": "plating_military" },
      { "x": -2, "y": -2, "part": "hdframe_sw" },
      { "x": -2, "y": -2, "part": "hdboard_sw" },
+  
+      { "x": -2, "y": -2, "part": "muffler" },
      { "x": -2, "y": -2, "part": "plating_military" },
      { "x": -2, "y": 0, "part": "hdframe_horizontal" },
      { "x": -2, "y": 0, "part": "door_opaque" },
@@ -338,6 +377,7 @@
      { "x": -2, "y": 1, "part": "plating_military" },
      { "x": -2, "y": 2, "part": "hdframe_se" },
      { "x": -2, "y": 2, "part": "hdboard_se" },
+  
+      { "x": -2, "y": 2, "part": "muffler" },
      { "x": -2, "y": 2, "part": "plating_military" },
      { "x": -1, "y": -1, "part": "hdframe_vertical_2" },
      { "x": -1, "y": -1, "part": "seat" },
@@ -410,6 +450,7 @@
      { "x": 3, "y": -1, "part": "hdframe_vertical_2" },
      { "x": 3, "y": -1, "part": "seat" },
      { "x": 3, "y": -1, "part": "controls" },
+  
+      { "x": 3, "y": -1, "part": "cam_control" },
      { "x": 3, "y": -1, "part": "vehicle_clock" },
      { "x": 3, "y": -1, "part": "seatbelt_heavyduty" },
      { "x": 3, "y": -1, "part": "hdroof" },
@@ -429,7 +470,7 @@
      { "x": 3, "y": 1, "part": "cam_control" },
      { "x": 3, "y": 1, "part": "plating_military" },
      { "x": 3, "y": 1, "part": "tank_small", "fuel": "diesel" },
-  
-      { "x": 3, "y": 1, "part": "seat_nocargo" },
+  
+      { "x": 3, "y": 1, "part": "seat" },
      { "x": 3, "y": 1, "part": "seatbelt_heavyduty" },
      { "x": 3, "y": 1, "part": "mounted_browning", "ammo": 60 },
      { "x": 3, "y": 2, "part": "hdframe_vertical" },
@@ -483,6 +524,7 @@
      { "x": -2, "y": -1, "part": "plating_military" },
      { "x": -2, "y": -2, "part": "hdframe_sw" },
      { "x": -2, "y": -2, "part": "hdboard_sw" },
+  
+      { "x": -2, "y": -2, "part": "muffler" },
      { "x": -2, "y": -2, "part": "plating_military" },
      { "x": -2, "y": 0, "part": "hdframe_horizontal" },
      { "x": -2, "y": 0, "part": "door_opaque" },
@@ -493,6 +535,7 @@
      { "x": -2, "y": 1, "part": "plating_military" },
      { "x": -2, "y": 2, "part": "hdframe_se" },
      { "x": -2, "y": 2, "part": "hdboard_se" },
+  
+      { "x": -2, "y": 2, "part": "muffler" },
      { "x": -2, "y": 2, "part": "plating_military" },
      { "x": -1, "y": -1, "part": "hdframe_vertical_2" },
      { "x": -1, "y": -1, "part": "seat" },
@@ -565,6 +608,7 @@
      { "x": 3, "y": -1, "part": "hdframe_vertical_2" },
      { "x": 3, "y": -1, "part": "seat" },
      { "x": 3, "y": -1, "part": "controls" },
+  
+      { "x": 3, "y": -1, "part": "cam_control" },
      { "x": 3, "y": -1, "part": "vehicle_clock" },
      { "x": 3, "y": -1, "part": "seatbelt_heavyduty" },
      { "x": 3, "y": -1, "part": "hdroof" },
@@ -585,7 +629,7 @@
      { "x": 3, "y": 1, "part": "tank_small", "fuel": "diesel" },
      { "x": 3, "y": 1, "part": "plating_military" },
      { "x": 3, "y": 1, "part": "mounted_mk19", "ammo": 60, "ammo_types": [ "40mm_frag", "40mm_concussive" ] },
-  
-      { "x": 3, "y": 1, "part": "seat_nocargo" },
+  
+      { "x": 3, "y": 1, "part": "seat" },
      { "x": 3, "y": 1, "part": "seatbelt_heavyduty" },
      { "x": 3, "y": 2, "part": "hdframe_vertical" },
      { "x": 3, "y": 2, "part": "wheel_armor_steerable" },
@@ -747,6 +791,7 @@
      { "x": -3, "y": 3, "part": "wheel_armor" },
      { "x": -3, "y": 0, "part": "hdframe_horizontal" },
      { "x": -3, "y": 0, "part": "door_trunk" },
+  
+      { "x": -3, "y": 0, "part": "muffler" },
      { "x": -3, "y": 0, "part": "plating_military" },
      { "x": -3, "y": -1, "part": "hdframe_sw" },
      { "x": -3, "y": -1, "part": "hdboard_sw" },
@@ -877,6 +922,7 @@
      { "x": -3, "y": 3, "part": "wheel_armor" },
      { "x": -3, "y": 0, "part": "hdframe_horizontal" },
      { "x": -3, "y": 0, "part": "door_trunk" },
+  
+      { "x": -3, "y": 0, "part": "muffler" },
      { "x": -3, "y": 0, "part": "plating_military" },
      { "x": -3, "y": -1, "part": "hdframe_sw" },
      { "x": -3, "y": -1, "part": "hdboard_sw" },
@@ -908,9 +954,11 @@
      { "x": -1, "y": 2, "part": "reinforced_windshield" },
      { "x": -1, "y": -1, "part": "hdframe_vertical" },
      { "x": -1, "y": -1, "part": "hdhalfboard_sw" },
+  
+      { "x": -1, "y": -1, "part": "muffler" },
      { "x": -1, "y": -1, "part": "plating_military" },
      { "x": -1, "y": 3, "part": "hdframe_vertical" },
      { "x": -1, "y": 3, "part": "hdhalfboard_se" },
+  
+      { "x": -1, "y": 3, "part": "muffler" },
      { "x": -1, "y": 3, "part": "plating_military" },
      { "x": 0, "y": 1, "part": "hdframe_vertical_2" },
      { "x": 0, "y": 1, "part": "seat" },
@@ -1037,7 +1085,8 @@
      { "x": 0, "y": 0, "chance": 6, "items": [ "id_military" ] },
      { "x": 0, "y": 1, "chance": 3, "item_groups": [ "mil_food_nodrugs" ] },
      { "x": 0, "y": 1, "chance": 2, "item_groups": [ "mil_accessories" ] },
-  
-      { "x": 0, "y": 2, "chance": 2, "item_groups": [ "mil_accessories" ] }
+  
+      { "x": 0, "y": 2, "chance": 2, "item_groups": [ "mil_accessories" ] },
+  
+      { "x": 0, "y": 2, "chance": 2, "item_groups": [ "gunmod_milspec" ] }
    ]
  }
 ]
diff --git a/data/mods/Generic_Guns/gg_vehicle_override.json b/data/mods/Generic_Guns/gg_vehicle_override.json
@@ -15,7 +15,7 @@
    "damage_modifier": 80,
    "folded_volume": 20,
    "breaks_into": [ { "item": "m240", "prob": 50 } ],
-  
-    "flags": [ "TURRET", "CARGO", "TOOL_NONE", "MANUAL", "UNMOUNT_ON_DAMAGE", "FOLDABLE" ]
+  
+    "flags": [ "TURRET", "TOOL_NONE", "MANUAL", "UNMOUNT_ON_DAMAGE", "FOLDABLE" ]
  },
  {
    "id": "m60",
@@ -33,7 +33,7 @@
    "damage_modifier": 80,
    "folded_volume": 20,
    "breaks_into": [ { "item": "m60", "prob": 50 } ],
-  
-    "flags": [ "TURRET", "CARGO", "TOOL_NONE", "MANUAL", "UNMOUNT_ON_DAMAGE", "FOLDABLE" ]
+  
+    "flags": [ "TURRET", "TOOL_NONE", "MANUAL", "UNMOUNT_ON_DAMAGE", "FOLDABLE" ]
  },
  {
    "id": "m249",
@@ -51,7 +51,7 @@
    "damage_modifier": 80,
    "folded_volume": 14,
    "breaks_into": [ { "item": "m249", "prob": 50 } ],
-  
-    "flags": [ "TURRET", "CARGO", "TOOL_NONE", "MANUAL", "UNMOUNT_ON_DAMAGE", "FOLDABLE" ]
+  
+    "flags": [ "TURRET", "TOOL_NONE", "MANUAL", "UNMOUNT_ON_DAMAGE", "FOLDABLE" ]
  },
  {
    "id": "mounted_browning",
@@ -69,7 +69,7 @@
    "damage_modifier": 80,
    "folded_volume": 20,
    "breaks_into": [ { "item": "m2browning", "prob": 50 } ],
-  
-    "flags": [ "TURRET", "CARGO", "TOOL_NONE", "MANUAL", "UNMOUNT_ON_DAMAGE", "FOLDABLE" ]
+  
+    "flags": [ "TURRET", "TOOL_NONE", "MANUAL", "UNMOUNT_ON_DAMAGE", "FOLDABLE" ]
  },
  {
    "id": "mounted_m134",
@@ -87,6 +87,6 @@
    "range": 12,
    "damage_modifier": 80,
    "breaks_into": [ { "item": "m134", "prob": 50 } ],
-  
-    "flags": [ "TURRET", "CARGO" ]
+  
+    "flags": [ "TURRET" ]
  }
 ]
diff --git a/src/savegame_json.cpp b/src/savegame_json.cpp
@@ -1633,6 +1633,7 @@ void vehicle_part::deserialize(JsonIn &jsin)
    std::map<std::string, std::pair<std::string,itype_id>> deprecated = {
        { "laser_gun", { "laser_rifle", "none" } },
+  
+        { "seat_nocargo", { "seat", "none" } },
        { "engine_plasma", { "minireactor", "none" } },
        { "battery_truck", { "battery_car", "battery" } },