feat(content): add a makeshift blackpowder cannon, shot ammo for cann…

…on ammotype (#5398)

* feat(content): add a makeshift blackpowder cannon, shot ammo for cannon ammotype

* Update external_tileset.md

* style(autofix.ci): automated formatting

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

data/json/external_tileset/External_Tileset_DP_Normal.json

@@ -62,7 +62,15 @@
           { "id": "f_target_downed", "fg": 50 },
           { "id": [ "pirate_flag", "overlay_wielded_pirate_flag" ], "fg": 51 },
           { "id": "overlay_worn_pirate_flag", "fg": 52 },
-          { "id": "vp_sail", "fg": 53 }
+          { "id": "vp_sail", "fg": 53 },
+          { "id": "cannon_3in_makeshift", "fg": 54 },
+          { "id": "overlay_wielded_cannon_3in_makeshift", "fg": 55 },
+          { "id": "vp_mounted_makeshift_cannon", "fg": 56 },
+          { "id": [ "cannonball_explosive", "overlay_wielded_cannonball_explosive" ], "fg": 57 },
+          { "id": [ "cannon_scrap_shot", "overlay_wielded_cannon_scrap_shot" ], "fg": 58 },
+          { "id": [ "cannon_canister_shot", "overlay_wielded_cannon_canister_shot" ], "fg": 59 },
+          { "id": [ "cannon_round_ball", "overlay_wielded_cannon_round_ball" ], "fg": 60 },
+          { "id": [ "cannon_explosive_shell", "overlay_wielded_cannon_explosive_shell" ], "fg": 61 }
         ],
         "sprite_width": 32,
         "sprite_height": 32

data/json/items/ammo/cannon.json

@@ -41,5 +41,35 @@
     "recoil": 26250,
     "loudness": 900,
     "effects": [ "COOKOFF", "MUZZLE_SMOKE", "BLACKPOWDER" ]
+  },
+  {
+    "id": "cannon_canister_shot",
+    "copy-from": "cannon_round_ball",
+    "type": "AMMO",
+    "name": { "str": "cannon canister shot" },
+    "description": "A bundle of wadding, black gunpowder, and a good five pounds of round lead shot.  Used for hosing down formations of line infantry, and quite capable of absolutely ruining a zombie's day.",
+    "//": "Exact weight of component items.",
+    "weight": "5651 g",
+    "looks_like": "cannon_round_ball",
+    "//2": "balanced as hollowpoint, with buckshot level of armor multiplier.",
+    "damage": { "damage_type": "bullet", "amount": 250, "armor_multiplier": 2 },
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 10, "length": 30 } ],
+    "dispersion": 450,
+    "recoil": 55000,
+    "extend": { "effects": [ "SHOT" ] }
+  },
+  {
+    "id": "cannon_scrap_shot",
+    "copy-from": "cannon_canister_shot",
+    "type": "AMMO",
+    "name": { "str": "cannon scrap shot" },
+    "description": "A bundle of wadding, black gunpowder, and a load of improvised buckshot.  Certainly still quite dangerous to anything downrange.",
+    "weight": "3751 g",
+    "looks_like": "cannon_round_ball",
+    "proportional": { "price": 0.5, "price_postapoc": 0.5, "damage": { "damage_type": "bullet", "amount": 0.8, "armor_multiplier": 1.25 } },
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 10, "length": 25 } ],
+    "dispersion": 500
   }
 ]

data/json/items/gun/cannon.json

@@ -24,5 +24,20 @@
     "reload": 30000,
     "valid_mod_locations": [  ],
     "flags": [ "MOUNTED_GUN", "NEVER_JAMS" ]
+  },
+  {
+    "id": "cannon_3in_makeshift",
+    "copy-from": "cannon_3in_ordnance",
+    "type": "GUN",
+    "name": { "str": "makeshift 3-inch cannon" },
+    "description": "A muzzleloading blackpowder cannon made from logs bored for 3-inch shells, reinforced with iron bands.  While lighter and easier to produce, it's not as effective and less durable than the real deal.",
+    "weight": "85 kg",
+    "volume": "100 L",
+    "material": [ "wood", "iron" ],
+    "color": "brown",
+    "ranged_damage": { "damage_type": "bullet", "damage_multiplier": 0.9 },
+    "relative": { "durability": -2 },
+    "proportional": { "bashing": 0.5, "dispersion": 1.25 },
+    "extend": { "flag": [ "NO_REPAIR" ] }
   }
 ]

data/json/recipes/ammo/launcher.json

@@ -413,6 +413,56 @@
     "qualities": [ { "id": "CUT", "level": 1 } ],
     "components": [ [ [ "cannonball_4lb", 1 ] ], [ [ "rag", 4 ] ], [ [ "chem_black_powder", 225 ] ], [ [ "fuse", 1 ] ] ]
   },
+  {
+    "result": "cannon_canister_shot",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_LAUNCHER",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "skills_required": [ "gun", 1 ],
+    "time": "10 m",
+    "batch_time_factors": [ 60, 5 ],
+    "autolearn": true,
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "ammo_bullet", 800 ] ],
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "rag", 4 ] ], [ [ "chem_black_powder", 225 ] ], [ [ "fuse", 1 ] ] ]
+  },
+  {
+    "result": "cannon_scrap_shot",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_LAUNCHER",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "skills_required": [ "gun", 1 ],
+    "time": "10 m",
+    "batch_time_factors": [ 60, 5 ],
+    "autolearn": true,
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "ammo_bullet", 800 ] ],
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [
+      [
+        [ "scrap", 5 ],
+        [ "scrap_copper", 5 ],
+        [ "nail", 125 ],
+        [ "bb", 500 ],
+        [ "material_limestone", 40 ],
+        [ "pebble", 100 ],
+        [ "pebble_clay", 175 ],
+        [ "marble", 175 ],
+        [ "bearing", 50 ],
+        [ "glass_shard", 7 ]
+      ],
+      [ [ "rag", 4 ] ],
+      [ [ "chem_black_powder", 225 ] ],
+      [ [ "fuse", 1 ] ]
+    ]
+  },
   {
     "type": "recipe",
     "result": "mininuke_mod",

data/json/recipes/weapon/ranged.json

@@ -1245,6 +1245,20 @@
     "tools": [ [ [ "soldering_standard", 10, "LIST" ], [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ],
     "components": [ [ [ "pipe", 1 ] ], [ [ "power_supply", 1 ] ], [ [ "amplifier", 1 ] ], [ [ "scrap", 6 ] ], [ [ "cable", 20 ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "cannon_3in_makeshift",
+    "byproducts": [ [ "splinter", 10 ] ],
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_RANGED",
+    "skill_used": "fabrication",
+    "difficulty": 6,
+    "time": "3 h",
+    "autolearn": true,
+    "using": [ [ "blacksmithing_intermediate", 40 ], [ "steel_standard", 10 ], [ "wood_structural", 5 ] ],
+    "qualities": [ { "id": "SAW_W", "level": 1 }, { "id": "DRILL", "level": 1 } ],
+    "components": [ [ [ "log", 2 ] ] ]
+  },
   {
     "result": "carbon_pistol",
     "type": "recipe",

data/json/vehicleparts/turret.json

@@ -450,6 +450,24 @@
     "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_makeshift_cannon",
+    "copy-from": "turret",
+    "type": "vehicle_part",
+    "name": { "str": "mounted makeshift 3-inch cannon" },
+    "item": "cannon_3in_makeshift",
+    "color": "brown",
+    "broken_color": "dark_gray",
+    "looks_like": "mounted_3in_ordnance_rifle",
+    "breaks_into": [
+      { "item": "steel_chunk", "count": [ 1, 5 ] },
+      { "item": "scrap", "count": [ 5, 10 ] },
+      { "item": "log", "count": [ 0, 1 ] },
+      { "item": "splinter", "count": [ 25, 50 ] }
+    ],
+    "requirements": { "install": { "skills": [ [ "mechanics", 3 ], [ "launcher", 1 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } },
+    "description": "A muzzleloading cannon improvised from logs reinforced with iron bands, less effective than a proper artillery piece."
+  },
   {
     "id": "mounted_m1874_gatling",
     "copy-from": "turret",

doc/src/content/docs/en/mod/json/reference/graphics/external_tileset.md

@@ -46,6 +46,8 @@ Links to relevant pull requests, for content covered below:
 - Flagpoles: [#5363](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/5363)
 - Vehicle-mounted Flags: [#5372](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/5372)
 - Pirate Flag: [#5375](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/5375)
+- Makeshift cannons and canister shot:
+  [#5398](https://github.com/cataclysmbnteam/Cataclysm-BN/pull/5398)
 
 ## Undead People
 
@@ -90,6 +92,8 @@ Ultica are planned for the future.
 - Furniture version of utility light. Furniture specific to BN.
 - Knocked-down steel target. Furniture specific to BN.
 - Jolly Roger, item and worn sprite. Item specific to BN.
+- Makeshift cannon, item and vehiclepart sprite. Item specific to BN.
+- Explosive cannonshells and sprites for readied cannon ammo. Items specific to BN.
 
 ### External_Tileset_DP_Tall.png