feat(content): gatling gun for forts and museums

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -1060,6 +1060,8 @@
       [ "shot_paper_slug", 10 ],
       [ "36navy", 50 ],
       [ "44army", 50 ],
+      [ "gatlingdrum240", 10 ],
+      [ "4570_low", 10 ],
       [ "cannonball_explosive", 5 ],
       [ "cannonball_4lb", 20 ]
     ]
@@ -2597,15 +2599,20 @@
     "id": "fort_crate",
     "type": "item_group",
     "subtype": "collection",
-    "entries": [ { "item": "cannonball_4lb", "prob": 100, "count": [ 1, 10 ] }, { "item": "rag", "prob": 50, "count": [ 1, 25 ] } ]
+    "entries": [
+      { "item": "cannonball_4lb", "prob": 100, "count": [ 1, 10 ] },
+      { "item": "rag", "prob": 50, "count": [ 1, 25 ] },
+      { "item": "gatlingdrum240", "prob": 25 }
+    ]
   },
   {
     "id": "fort_powderbarrel",
     "type": "item_group",
     "subtype": "collection",
     "entries": [
       { "item": "chem_black_powder", "charges": [ 100, 2500 ], "container-item": "wooden_barrel_small" },
-      { "item": "chem_black_powder", "charges": [ 100, 2500 ], "container-item": "wooden_barrel_small", "prob": 50 }
+      { "item": "chem_black_powder", "charges": [ 100, 2500 ], "container-item": "wooden_barrel_small", "prob": 50 },
+      { "item": "4570_low", "charges": [ 1, 240 ], "prob": 50 }
     ]
   }
 ]

data/json/itemgroups/main.json

@@ -201,7 +201,8 @@
       { "item": "longrifle_flintlock", "prob": 75 },
       { "item": "shotgun_paper", "prob": 60 },
       { "item": "colt_army", "prob": 30 },
-      { "item": "colt_navy", "prob": 30 }
+      { "item": "colt_navy", "prob": 30 },
+      { "item": "m1874_gatling", "prob": 10 }
     ]
   },
   {
@@ -218,7 +219,8 @@
       { "item": "longrifle_flintlock", "prob": 75 },
       { "item": "shotgun_paper", "prob": 60 },
       { "item": "colt_army", "prob": 30 },
-      { "item": "colt_navy", "prob": 30 }
+      { "item": "colt_navy", "prob": 30 },
+      { "item": "m1874_gatling", "prob": 10 }
     ]
   },
   {
@@ -232,7 +234,8 @@
       { "item": "shot_paper_bird", "prob": 15 },
       { "item": "shot_paper_slug", "prob": 10 },
       { "item": "36navy", "prob": 50 },
-      { "item": "44army", "prob": 50 }
+      { "item": "44army", "prob": 50 },
+      { "item": "4570_low", "prob": 25 }
     ]
   },
   {

data/json/items/gun/4570.json

@@ -89,5 +89,28 @@
       [ "stock", 1 ],
       [ "underbarrel mount", 1 ]
     ]
+  },
+  {
+    "id": "m1874_gatling",
+    "copy-from": "gatling_base",
+    "looks_like": "m134",
+    "type": "GUN",
+    "name": { "str": "M1874 Gatling gun" },
+    "description": "A rotary firearm from the 19th Century driving multiple barrels with a hand crank for sustained fire.  This one is a reproduction of a five-barrel version using the .45-70 cartridge, and can fit Broadwell drums holding 240 rounds each.",
+    "weight": "61200 g",
+    "volume": "10 L",
+    "barrel_length": "1 L",
+    "price": "45000 USD",
+    "price_postapoc": "80 USD",
+    "material": [ "iron", "brass" ],
+    "color": "yellow",
+    "ammo": "4570",
+    "dispersion": 400,
+    "blackpowder_tolerance": 80,
+    "valid_mod_locations": [ [ "brass catcher", 1 ], [ "rail mount", 1 ], [ "sights", 1 ] ],
+    "modes": [ [ "DEFAULT", "single", 1 ], [ "AUTO", "burst", 3 ] ],
+    "//": "If speedloaders get fixed to allow topping off a partially-loaded gun, adding the more common Bruce feed (40 round feed tray topped off with 20-round blocks) would be an option.",
+    "magazines": [ [ "4570", [ "gatlingdrum240" ] ] ],
+    "extend": { "flags": [ "NEVER_JAMS", "FIRE_TWOHAND" ] }
   }
 ]

data/json/items/magazine/4570.json

@@ -0,0 +1,20 @@
+[
+  {
+    "id": "gatlingdrum240",
+    "looks_like": "thompson_drum",
+    "type": "MAGAZINE",
+    "name": { "str": "Gatling 240-round drum magazine" },
+    "description": "A heavy Broadwell drum for .45-70 variants of the Gatling gun, holding a total of 240 rounds.",
+    "weight": "10 kg",
+    "volume": "3500 ml",
+    "price": "600 USD",
+    "price_postapoc": "10 USD",
+    "material": [ "iron", "brass" ],
+    "symbol": "#",
+    "color": "yellow",
+    "ammo_type": "4570",
+    "capacity": 240,
+    "reliability": 6,
+    "flags": [ "MAG_BULKY" ]
+  }
+]

data/json/mapgen/Bastion_Fort.json

@@ -196,20 +196,20 @@
       "palettes": [ "bastion_fort_palette" ],
       "terrain": { " ": "t_open_air", "#": "t_rock_wall_half", "^": "t_sidewalk_ramp_down_high", "v": "t_sidewalk_ramp_down_low" },
       "place_vehicles": [
-        { "vehicle": "cannon_3in", "x": 8, "y": 22, "chance": 25, "rotation": 180 },
-        { "vehicle": "cannon_3in", "x": 8, "y": 19, "chance": 25, "rotation": 180 },
-        { "vehicle": "cannon_3in", "x": 8, "y": 16, "chance": 25, "rotation": 180 },
-        { "vehicle": "cannon_3in", "x": 5, "y": 13, "chance": 25, "rotation": 90 },
-        { "vehicle": "cannon_3in", "x": 4, "y": 11, "chance": 25, "rotation": 180 },
-        { "vehicle": "cannon_3in", "x": 3, "y": 8, "chance": 25, "rotation": 180 },
-        { "vehicle": "cannon_3in", "x": 2, "y": 4, "chance": 25, "rotation": 180 },
-        { "vehicle": "cannon_3in", "x": 4, "y": 2, "chance": 25, "rotation": 270 },
-        { "vehicle": "cannon_3in", "x": 8, "y": 3, "chance": 25, "rotation": 270 },
-        { "vehicle": "cannon_3in", "x": 11, "y": 4, "chance": 25, "rotation": 270 },
-        { "vehicle": "cannon_3in", "x": 13, "y": 5, "chance": 25 },
-        { "vehicle": "cannon_3in", "x": 16, "y": 8, "chance": 25, "rotation": 270 },
-        { "vehicle": "cannon_3in", "x": 19, "y": 8, "chance": 25, "rotation": 270 },
-        { "vehicle": "cannon_3in", "x": 22, "y": 8, "chance": 25, "rotation": 270 }
+        { "vehicle": "bastion_fort_vehicles", "x": 8, "y": 22, "chance": 25, "rotation": 180 },
+        { "vehicle": "bastion_fort_vehicles", "x": 8, "y": 19, "chance": 25, "rotation": 180 },
+        { "vehicle": "bastion_fort_vehicles", "x": 8, "y": 16, "chance": 25, "rotation": 180 },
+        { "vehicle": "bastion_fort_vehicles", "x": 5, "y": 13, "chance": 25, "rotation": 90 },
+        { "vehicle": "bastion_fort_vehicles", "x": 4, "y": 11, "chance": 25, "rotation": 180 },
+        { "vehicle": "bastion_fort_vehicles", "x": 3, "y": 8, "chance": 25, "rotation": 180 },
+        { "vehicle": "bastion_fort_vehicles", "x": 2, "y": 4, "chance": 25, "rotation": 180 },
+        { "vehicle": "bastion_fort_vehicles", "x": 4, "y": 2, "chance": 25, "rotation": 270 },
+        { "vehicle": "bastion_fort_vehicles", "x": 8, "y": 3, "chance": 25, "rotation": 270 },
+        { "vehicle": "bastion_fort_vehicles", "x": 11, "y": 4, "chance": 25, "rotation": 270 },
+        { "vehicle": "bastion_fort_vehicles", "x": 13, "y": 5, "chance": 25 },
+        { "vehicle": "bastion_fort_vehicles", "x": 16, "y": 8, "chance": 25, "rotation": 270 },
+        { "vehicle": "bastion_fort_vehicles", "x": 19, "y": 8, "chance": 25, "rotation": 270 },
+        { "vehicle": "bastion_fort_vehicles", "x": 22, "y": 8, "chance": 25, "rotation": 270 }
       ],
       "//": "A small chance that some soldiers will have drifted here in desperation, as it's at least somewhat defensible.",
       "place_monster": [ { "group": "GROUP_MIL_WEAK", "x": [ 3, 13 ], "y": [ 4, 9 ], "chance": 50, "repeat": 2 } ]
@@ -257,20 +257,20 @@
       },
       "items": { "e": { "item": "office_breakroom", "chance": 50, "repeat": 3 } },
       "place_vehicles": [
-        { "vehicle": "cannon_3in", "x": 1, "y": 8, "chance": 25, "rotation": 270 },
-        { "vehicle": "cannon_3in", "x": 4, "y": 8, "chance": 25, "rotation": 270 },
-        { "vehicle": "cannon_3in", "x": 7, "y": 8, "chance": 25, "rotation": 270 },
-        { "vehicle": "cannon_3in", "x": 10, "y": 5, "chance": 25, "rotation": 180 },
-        { "vehicle": "cannon_3in", "x": 12, "y": 4, "chance": 25, "rotation": 270 },
-        { "vehicle": "cannon_3in", "x": 15, "y": 3, "chance": 25, "rotation": 270 },
-        { "vehicle": "cannon_3in", "x": 19, "y": 2, "chance": 25, "rotation": 270 },
-        { "vehicle": "cannon_3in", "x": 21, "y": 4, "chance": 25 },
-        { "vehicle": "cannon_3in", "x": 20, "y": 8, "chance": 25 },
-        { "vehicle": "cannon_3in", "x": 19, "y": 11, "chance": 25 },
-        { "vehicle": "cannon_3in", "x": 18, "y": 13, "chance": 25, "rotation": 90 },
-        { "vehicle": "cannon_3in", "x": 15, "y": 16, "chance": 25 },
-        { "vehicle": "cannon_3in", "x": 15, "y": 19, "chance": 25 },
-        { "vehicle": "cannon_3in", "x": 15, "y": 22, "chance": 25 }
+        { "vehicle": "bastion_fort_vehicles", "x": 1, "y": 8, "chance": 25, "rotation": 270 },
+        { "vehicle": "bastion_fort_vehicles", "x": 4, "y": 8, "chance": 25, "rotation": 270 },
+        { "vehicle": "bastion_fort_vehicles", "x": 7, "y": 8, "chance": 25, "rotation": 270 },
+        { "vehicle": "bastion_fort_vehicles", "x": 10, "y": 5, "chance": 25, "rotation": 180 },
+        { "vehicle": "bastion_fort_vehicles", "x": 12, "y": 4, "chance": 25, "rotation": 270 },
+        { "vehicle": "bastion_fort_vehicles", "x": 15, "y": 3, "chance": 25, "rotation": 270 },
+        { "vehicle": "bastion_fort_vehicles", "x": 19, "y": 2, "chance": 25, "rotation": 270 },
+        { "vehicle": "bastion_fort_vehicles", "x": 21, "y": 4, "chance": 25 },
+        { "vehicle": "bastion_fort_vehicles", "x": 20, "y": 8, "chance": 25 },
+        { "vehicle": "bastion_fort_vehicles", "x": 19, "y": 11, "chance": 25 },
+        { "vehicle": "bastion_fort_vehicles", "x": 18, "y": 13, "chance": 25, "rotation": 90 },
+        { "vehicle": "bastion_fort_vehicles", "x": 15, "y": 16, "chance": 25 },
+        { "vehicle": "bastion_fort_vehicles", "x": 15, "y": 19, "chance": 25 },
+        { "vehicle": "bastion_fort_vehicles", "x": 15, "y": 22, "chance": 25 }
       ],
       "place_monster": [ { "group": "GROUP_MIL_WEAK", "x": [ 10, 20 ], "y": [ 4, 9 ], "chance": 50, "repeat": 2 } ]
     }
@@ -310,20 +310,20 @@
       "palettes": [ "bastion_fort_palette" ],
       "terrain": { " ": "t_open_air", "#": "t_rock_wall_half", "^": "t_sidewalk_ramp_down_high", "v": "t_sidewalk_ramp_down_low" },
       "place_vehicles": [
-        { "vehicle": "cannon_3in", "x": 22, "y": 15, "chance": 25, "rotation": 90 },
-        { "vehicle": "cannon_3in", "x": 19, "y": 15, "chance": 25, "rotation": 90 },
-        { "vehicle": "cannon_3in", "x": 16, "y": 15, "chance": 25, "rotation": 90 },
-        { "vehicle": "cannon_3in", "x": 13, "y": 18, "chance": 25 },
-        { "vehicle": "cannon_3in", "x": 11, "y": 19, "chance": 25, "rotation": 90 },
-        { "vehicle": "cannon_3in", "x": 8, "y": 20, "chance": 25, "rotation": 90 },
-        { "vehicle": "cannon_3in", "x": 4, "y": 21, "chance": 25, "rotation": 90 },
-        { "vehicle": "cannon_3in", "x": 2, "y": 19, "chance": 25, "rotation": 180 },
-        { "vehicle": "cannon_3in", "x": 3, "y": 15, "chance": 25, "rotation": 180 },
-        { "vehicle": "cannon_3in", "x": 4, "y": 12, "chance": 25, "rotation": 180 },
-        { "vehicle": "cannon_3in", "x": 5, "y": 10, "chance": 25, "rotation": 270 },
-        { "vehicle": "cannon_3in", "x": 8, "y": 7, "chance": 25, "rotation": 180 },
-        { "vehicle": "cannon_3in", "x": 8, "y": 4, "chance": 25, "rotation": 180 },
-        { "vehicle": "cannon_3in", "x": 8, "y": 1, "chance": 25, "rotation": 180 }
+        { "vehicle": "bastion_fort_vehicles", "x": 22, "y": 15, "chance": 25, "rotation": 90 },
+        { "vehicle": "bastion_fort_vehicles", "x": 19, "y": 15, "chance": 25, "rotation": 90 },
+        { "vehicle": "bastion_fort_vehicles", "x": 16, "y": 15, "chance": 25, "rotation": 90 },
+        { "vehicle": "bastion_fort_vehicles", "x": 13, "y": 18, "chance": 25 },
+        { "vehicle": "bastion_fort_vehicles", "x": 11, "y": 19, "chance": 25, "rotation": 90 },
+        { "vehicle": "bastion_fort_vehicles", "x": 8, "y": 20, "chance": 25, "rotation": 90 },
+        { "vehicle": "bastion_fort_vehicles", "x": 4, "y": 21, "chance": 25, "rotation": 90 },
+        { "vehicle": "bastion_fort_vehicles", "x": 2, "y": 19, "chance": 25, "rotation": 180 },
+        { "vehicle": "bastion_fort_vehicles", "x": 3, "y": 15, "chance": 25, "rotation": 180 },
+        { "vehicle": "bastion_fort_vehicles", "x": 4, "y": 12, "chance": 25, "rotation": 180 },
+        { "vehicle": "bastion_fort_vehicles", "x": 5, "y": 10, "chance": 25, "rotation": 270 },
+        { "vehicle": "bastion_fort_vehicles", "x": 8, "y": 7, "chance": 25, "rotation": 180 },
+        { "vehicle": "bastion_fort_vehicles", "x": 8, "y": 4, "chance": 25, "rotation": 180 },
+        { "vehicle": "bastion_fort_vehicles", "x": 8, "y": 1, "chance": 25, "rotation": 180 }
       ],
       "place_monster": [ { "group": "GROUP_MIL_WEAK", "x": [ 4, 13 ], "y": [ 13, 19 ], "chance": 50, "repeat": 2 } ]
     }
@@ -363,20 +363,20 @@
       "palettes": [ "bastion_fort_palette" ],
       "terrain": { " ": "t_open_air", "#": "t_rock_wall_half", "^": "t_sidewalk_ramp_down_high", "v": "t_sidewalk_ramp_down_low" },
       "place_vehicles": [
-        { "vehicle": "cannon_3in", "x": 15, "y": 1, "chance": 25 },
-        { "vehicle": "cannon_3in", "x": 15, "y": 4, "chance": 25 },
-        { "vehicle": "cannon_3in", "x": 15, "y": 7, "chance": 25 },
-        { "vehicle": "cannon_3in", "x": 18, "y": 10, "chance": 25, "rotation": 270 },
-        { "vehicle": "cannon_3in", "x": 19, "y": 12, "chance": 25 },
-        { "vehicle": "cannon_3in", "x": 20, "y": 15, "chance": 25 },
-        { "vehicle": "cannon_3in", "x": 21, "y": 19, "chance": 25 },
-        { "vehicle": "cannon_3in", "x": 19, "y": 21, "chance": 25, "rotation": 90 },
-        { "vehicle": "cannon_3in", "x": 15, "y": 20, "chance": 25, "rotation": 90 },
-        { "vehicle": "cannon_3in", "x": 12, "y": 19, "chance": 25, "rotation": 90 },
-        { "vehicle": "cannon_3in", "x": 10, "y": 18, "chance": 25, "rotation": 180 },
-        { "vehicle": "cannon_3in", "x": 7, "y": 15, "chance": 25, "rotation": 90 },
-        { "vehicle": "cannon_3in", "x": 4, "y": 15, "chance": 25, "rotation": 90 },
-        { "vehicle": "cannon_3in", "x": 1, "y": 15, "chance": 25, "rotation": 90 }
+        { "vehicle": "bastion_fort_vehicles", "x": 15, "y": 1, "chance": 25 },
+        { "vehicle": "bastion_fort_vehicles", "x": 15, "y": 4, "chance": 25 },
+        { "vehicle": "bastion_fort_vehicles", "x": 15, "y": 7, "chance": 25 },
+        { "vehicle": "bastion_fort_vehicles", "x": 18, "y": 10, "chance": 25, "rotation": 270 },
+        { "vehicle": "bastion_fort_vehicles", "x": 19, "y": 12, "chance": 25 },
+        { "vehicle": "bastion_fort_vehicles", "x": 20, "y": 15, "chance": 25 },
+        { "vehicle": "bastion_fort_vehicles", "x": 21, "y": 19, "chance": 25 },
+        { "vehicle": "bastion_fort_vehicles", "x": 19, "y": 21, "chance": 25, "rotation": 90 },
+        { "vehicle": "bastion_fort_vehicles", "x": 15, "y": 20, "chance": 25, "rotation": 90 },
+        { "vehicle": "bastion_fort_vehicles", "x": 12, "y": 19, "chance": 25, "rotation": 90 },
+        { "vehicle": "bastion_fort_vehicles", "x": 10, "y": 18, "chance": 25, "rotation": 180 },
+        { "vehicle": "bastion_fort_vehicles", "x": 7, "y": 15, "chance": 25, "rotation": 90 },
+        { "vehicle": "bastion_fort_vehicles", "x": 4, "y": 15, "chance": 25, "rotation": 90 },
+        { "vehicle": "bastion_fort_vehicles", "x": 1, "y": 15, "chance": 25, "rotation": 90 }
       ],
       "place_monster": [ { "group": "GROUP_MIL_WEAK", "x": [ 10, 19 ], "y": [ 13, 19 ], "chance": 50, "repeat": 2 } ]
     }

data/json/mapgen/mansion.json

@@ -2562,7 +2562,7 @@
         "t": { "item": "dining", "chance": 40 }
       },
       "place_monsters": [ { "monster": "GROUP_MANSION", "x": [ 2, 21 ], "y": [ 2, 21 ], "density": 0.1 } ],
-      "place_vehicles": [ { "vehicle": "cannon_3in", "x": 18, "y": 3, "chance": 25, "rotation": 270 } ]
+      "place_vehicles": [ { "vehicle": "museum_vehicles", "x": 18, "y": 3, "chance": 25, "rotation": 270 } ]
     }
   },
   {

data/json/mapgen/museum.json

@@ -94,7 +94,7 @@
         { "item": "museum_guns", "x": [ 4, 7 ], "y": [ 20, 21 ], "chance": 70 },
         { "item": "museum_misc", "x": [ 4, 7 ], "y": [ 20, 21 ], "chance": 80 }
       ],
-      "place_vehicles": [ { "vehicle": "cannon_3in", "x": 11, "y": 7, "chance": 75, "rotation": 180 } ]
+      "place_vehicles": [ { "vehicle": "museum_vehicles", "x": 11, "y": 7, "chance": 75, "rotation": 180 } ]
     }
   },
   {

data/json/vehicle_groups.json

@@ -802,5 +802,15 @@
     "id": "park_playground_vehicles",
     "type": "vehicle_group",
     "vehicles": [ [ "ice_cream_cart", 100 ], [ "food_cart", 200 ], [ "bicycle", 150 ], [ "bicycle_dirt", 125 ], [ "tricycle", 5 ] ]
+  },
+  {
+    "id": "bastion_fort_vehicles",
+    "type": "vehicle_group",
+    "vehicles": [ [ "cannon_3in", 90 ], [ "gatling_carriage", 10 ] ]
+  },
+  {
+    "id": "museum_vehicles",
+    "type": "vehicle_group",
+    "vehicles": [ [ "cannon_3in", 50 ], [ "gatling_carriage", 50 ] ]
   }
 ]

data/json/vehicleparts/turret.json

@@ -434,5 +434,17 @@
     "breaks_into": [ { "item": "scrap", "count": 72 }, { "item": "steel_chunk", "count": 30 }, { "item": "steel_lump", "count": 10 } ],
     "requirements": { "install": { "skills": [ [ "mechanics", 3 ], [ "launcher", 1 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } },
     "description": "A light (by artillery standards) rifled cannon widely used in the American Civil War, noted for its reliability."
+  },
+  {
+    "id": "mounted_m1874_gatling",
+    "copy-from": "turret",
+    "type": "vehicle_part",
+    "name": { "str": "mounted M1874 Gatling gun" },
+    "item": "m1874_gatling",
+    "color": "dark_gray",
+    "broken_color": "dark_gray",
+    "breaks_into": [ { "item": "scrap", "count": 28 }, { "item": "steel_chunk", "count": 20 }, { "item": "steel_lump", "count": 12 } ],
+    "requirements": { "install": { "skills": [ [ "mechanics", 4 ], [ "rifle", 2 ] ] }, "removal": { "skills": [ [ "mechanics", 3 ] ] } },
+    "description": "A rotary firearm from the 19th Century driving multiple barrels with a hand crank for sustained fire."
   }
 ]

data/json/vehicles/military.json

@@ -636,5 +636,21 @@
       { "x": 0, "y": 1, "parts": [ "frame_horizontal", "wheel_wood_b" ] },
       { "x": -1, "y": 0, "parts": [ "frame_wood_handle" ] }
     ]
+  },
+  {
+    "id": "gatling_carriage",
+    "type": "vehicle",
+    "name": "Gatling carriage",
+    "blueprint": [
+      [ " H" ],
+      [ "-U" ],
+      [ " H" ]
+    ],
+    "parts": [
+      { "x": 0, "y": 0, "parts": [ "frame_wood_cross", "turret_mount", "mounted_m1874_gatling" ] },
+      { "x": 0, "y": -1, "parts": [ "frame_wood_horizontal", "wheel_wood_b" ] },
+      { "x": 0, "y": 1, "parts": [ "frame_wood_horizontal", "wheel_wood_b" ] },
+      { "x": -1, "y": 0, "parts": [ "frame_wood_handle" ] }
+    ]
   }
 ]