Merge pull request #110 from AtomicFox556/CleverRaven-master

Add M242 Bushmaster autocannon

data/json/EraOfDecay/ammo_effects.json

@@ -0,0 +1,7 @@
+[
+  {
+    "id": "AMMO_25MM_HEI",
+    "type": "ammo_effect",
+    "explosion": { "power": 54, "shrapnel": { "casing_mass": 153, "fragment_mass": 0.08 } }
+  }
+]

data/json/EraOfDecay/ammo_types.json

@@ -4,5 +4,11 @@
     "id": "salt",
     "name": "salt",
     "default": "salt"
+  },
+  {
+    "type": "ammunition_type",
+    "id": "25mm",
+    "name": "25x137mm",
+    "default": "25mm_hei"
   }
 ]

data/json/EraOfDecay/itemgroups/guns.json

@@ -0,0 +1,21 @@
+[
+  {
+    "type": "item_group",
+    "id": "guns_launcher_heavy",
+    "items": [
+      [ "25mm_apds", 10 ],
+      [ "25mm_apfsds", 10 ],
+      [ "25mm_hei", 5 ],
+      { "item": "belt25mm", "contents-group": "25mm_ammo", "prob": 10 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "25mm_ammo",
+    "items": [
+      { "item": "25mm_apds", "prob": 25, "charges": [ 1, 100 ] },
+      { "item": "25mm_apfsds", "prob": 25, "charges": [ 1, 100 ] },
+      { "item": "25mm_hei", "prob": 50, "charges": [ 1, 100 ] }
+    ]
+  }
+]

data/json/EraOfDecay/items/abstract.json

@@ -75,5 +75,12 @@
     "name": { "str": "base large shield" },
     "longest_side": "120 cm",
     "techniques": [ "WBLOCK_3" ]
+  },
+  {
+    "abstract": "steel_casing",
+    "copy-from": "casing",
+    "type": "GENERIC",
+    "name": { "str": "steel casing from ammunition cartridge" },
+    "material": [ "steel" ]
   }
 ]

data/json/EraOfDecay/items/ammo/25mm.json

@@ -0,0 +1,93 @@
+[
+  {
+    "type": "AMMO",
+    "id": "25mm_apds",
+    "price": "49 USD",
+    "price_postapoc": "10 USD",
+    "name": { "str_sp": "25x137mm APDS-T" },
+    "symbol": "=",
+    "color": "yellow",
+    "description": "A 25x137mm M791 tracer round with an armor-piercing discarding sabot projectile with a tungsten alloy penetrator.  Used by autocannons primarily against light armored vehicles and slow-moving aerial targets.",
+    "material": [ "steel" ],
+    "volume": "2700 ml",
+    "weight": "458 g",
+    "longest_side": "223 mm",
+    "ammo_type": "25mm",
+    "casing": "25mm_casing",
+    "damage": { "damage_type": "bullet", "amount": 285, "armor_penetration": 102 },
+    "range": 60,
+    "dispersion": 125,
+    "recoil": 56250,
+    "count": 15,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "effects": [ "COOKOFF", "INCENDIARY" ]
+  },
+  {
+    "type": "AMMO",
+    "id": "25mm_apfsds",
+    "copy-from": "25mm_apds",
+    "price": "98 USD",
+    "price_postapoc": "15 USD",
+    "name": { "str_sp": "25x137mm APFSDS-T" },
+    "description": "A 25x137mm M919 tracer round with an armor-piercing fin-stabilized discarding sabot projectile with a depleted uranium penetrator.  Used by autocannons primarily against light armored vehicles and slow-moving aerial targets.",
+    "weight": "454 g",
+    "damage": { "damage_type": "bullet", "amount": 304, "armor_penetration": 163 }
+  },
+  {
+    "type": "AMMO",
+    "id": "25mm_hei",
+    "copy-from": "25mm_apds",
+    "price": "49 USD",
+    "price_postapoc": "10 USD",
+    "name": { "str_sp": "25x137mm HEI-T" },
+    "description": "A 25x137mm M792 tracer round with an high explosive incendiary projectile, which explodes on impact, scattering fragments.  Used by autocannons against unarmored vehicles and to suppress infantry.",
+    "weight": "501 g",
+    "damage": { "damage_type": "bullet", "amount": 285 },
+    "explode_in_fire": true,
+    "extend": { "effects": [ "AMMO_25MM_HEI" ] },
+    "delete": { "effects": [ "COOKOFF" ] }
+  },
+  {
+    "type": "AMMO",
+    "id": "25mm_slug_t",
+    "copy-from": "25mm_apds",
+    "name": { "str_sp": "25x137mm tracer slug, reloaded" },
+    "description": "A 25x137mm autocannon round with its primer replaced, and loaded with a machined steel projectile with a tracer compound.  Not as effective as the real thing, but still fairly potent.",
+    "weight": "501 g",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.5 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "type": "AMMO",
+    "id": "25mm_slug",
+    "copy-from": "25mm_slug_t",
+    "name": { "str_sp": "25x137mm slug, reloaded" },
+    "description": "A 25x137mm autocannon round with its primer replaced, and loaded with a machined steel projectile.  Not as effective as the real thing, but still fairly potent.",
+    "delete": { "effects": [ "INCENDIARY" ] }
+  },
+  {
+    "type": "AMMO",
+    "id": "bp_25mm_slug_t",
+    "copy-from": "25mm_apds",
+    "name": { "str_sp": "25x137mm tracer slug, black powder" },
+    "description": "A 25x137mm autocannon round with its primer replaced, and loaded with a machined steel projectile with a tracer compound.  Not as effective as the real thing, but still fairly potent.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "weight": "501 g",
+    "proportional": {
+      "price": 0.3,
+      "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.25 },
+      "recoil": 0.76,
+      "dispersion": 1.2
+    },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "type": "AMMO",
+    "id": "bp_25mm_slug",
+    "copy-from": "bp_25mm_slug_t",
+    "name": { "str_sp": "25x137mm slug, black powder" },
+    "description": "A 25x137mm autocannon round with its primer replaced, and loaded with a machined steel projectile.  Not as effective as the real thing, but still fairly potent.  Someone was down on their luck when they hand-reloaded this one - it's filled with black powder instead of smokeless powder.  Expect lower velocity, muzzle smoke, and a dirtier barrel if you shoot it.",
+    "delete": { "effects": [ "INCENDIARY" ] }
+  }
+]

data/json/EraOfDecay/items/books/launcher.json

@@ -0,0 +1,22 @@
+[
+  {
+    "type": "BOOK",
+    "id": "textbook_launcher",
+    "category": "manuals",
+    "name": { "str": "Artillery and Field Gunnery", "str_pl": "copies of Artillery and Field Gunnery" },
+    "max_level": 6,
+    "description": "A textbook on the history of modern artillery, with a number of illustrations and excerpts from various field manuals.  A competent handloader or mechanic might find additional uses for the more technical parts of the text.",
+    "weight": "1120 g",
+    "color": "green",
+    "intelligence": 8,
+    "symbol": "?",
+    "material": [ "paper" ],
+    "volume": "1 L",
+    "time": "30 m",
+    "fun": 0,
+    "skill": "launcher",
+    "price": "60 USD",
+    "price_postapoc": "25 USD",
+    "required_level": 3
+  }
+]

data/json/EraOfDecay/items/generic/ammolink.json

@@ -5,5 +5,16 @@
     "type": "GENERIC",
     "name": { "str": ".30-06 ammo belt linkage" },
     "use_action": { "type": "ammobelt", "belt": "belt3006" }
+  },
+  {
+    "id": "ammolink25mm",
+    "copy-from": "ammolink",
+    "type": "GENERIC",
+    "name": { "str": "25x137mm ammo belt linkage" },
+    "description": "An M28 steel linkage from a disintegrating 25x137mm ammo belt.",
+    "weight": "76 g",
+    "volume": "20 ml",
+    "longest_side": "3 cm",
+    "use_action": { "type": "ammobelt", "belt": "belt25mm" }
   }
 ]

data/json/EraOfDecay/items/generic/casing.json

@@ -0,0 +1,12 @@
+[
+  {
+    "type": "GENERIC",
+    "id": "25mm_casing",
+    "copy-from": "steel_casing",
+    "name": { "str": "25x137mm casing" },
+    "description": "An empty steel casing from a 25x137mm cartridge.",
+    "volume": "150 ml",
+    "weight": "80 g",
+    "longest_side": "137 mm"
+  }
+]

data/json/EraOfDecay/items/generic/parts.json

@@ -86,5 +86,23 @@
     "color": "brown",
     "symbol": ",",
     "material": [ "leather" ]
+  },
+  {
+    "type": "AMMO",
+    "id": "25mm_primer",
+    "category": "spare_parts",
+    "price": "50 USD",
+    "price_postapoc": "10 USD",
+    "name": { "str": "25x137mm primer" },
+    "symbol": "=",
+    "color": "dark_gray",
+    "description": "An M115 percussion primer from a 25x137mm round.",
+    "material": [ "steel", "powder" ],
+    "volume": "100 ml",
+    "weight": "5 g",
+    "longest_side": "6 mm",
+    "ammo_type": "components",
+    "count": 50,
+    "effects": [ "COOKOFF" ]
   }
 ]

data/json/EraOfDecay/items/guns/25mm.json

@@ -0,0 +1,34 @@
+[
+  {
+    "id": "25mm_autocannon",
+    "looks_like": "cannon_3in_ordnance",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "handling": 10,
+    "symbol": "(",
+    "color": "dark_gray",
+    "name": { "str": "M242 Bushmaster autocannon" },
+    "description": "An autocannon chambered in 25x137mm and driven by an electric motor, designed for the Bradley IFV and other ground vehicles, with some naval use as well.  It needs to be mounted on a vehicle to fire.",
+    "//": "Should have dual-feed capability (able to load two magazines at once and fire from either), but this isn't currently supported for vehicle-mounted weapons.  Gun is full-auto, but rate of fire is too slow to qualify for 2-round burst.",
+    "price": "28000 USD",
+    "price_postapoc": "75 USD",
+    "material": [ "qt_steel" ],
+    "flags": [ "VEHICLE_GUN_ONLY", "NEVER_JAMS", "USE_UPS" ],
+    "skill": "launcher",
+    "ammo": "25mm",
+    "weight": "110 kg",
+    "volume": "60 L",
+    "longest_side": "2743 mm",
+    "barrel_length": "2032 mm",
+    "melee_damage": { "bash": 30 },
+    "to_hit": -4,
+    "dispersion": 15,
+    "durability": 9,
+    "range": 110,
+    "modes": [ [ "DEFAULT", "auto", 1 ] ],
+    "min_veh_mass": "2500 kg",
+    "reload": 400,
+    "energy_drain": "1 kJ",
+    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "belt25mm" ] } ]
+  }
+]

data/json/EraOfDecay/items/magazines/25mm.json

@@ -0,0 +1,14 @@
+[
+  {
+    "id": "belt25mm",
+    "copy-from": "magazine_belt",
+    "type": "MAGAZINE",
+    "name": { "str": "25x137mm ammo belt" },
+    "description": "A disintegrating ammo belt consisting of M28 steel linkages holding 25x137mm cartidges together.",
+    "ammo_type": "25mm",
+    "default_ammo": "25mm_hei",
+    "capacity": 100,
+    "linkage": "ammolink25mm",
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "25mm": 100 } } ]
+  }
+]

data/json/EraOfDecay/recipes/ammo/components.json

@@ -68,5 +68,24 @@
       [ [ "chem_camphor", 40 ] ],
       [ [ "chem_nitroglycerin", 142 ] ]
     ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "25mm_primer",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "skill_used": "fabrication",
+    "skills_required": [ "gun", 3 ],
+    "difficulty": 4,
+    "time": "45 m",
+    "book_learn": [ [ "textbook_launcher", 4 ] ],
+    "proficiencies": [ { "proficiency": "prof_intro_chemistry" } ],
+    "qualities": [ { "id": "HAMMER", "level": 3 } ],
+    "tools": [ [ [ "swage", -1 ] ] ],
+    "components": [
+      [ [ "can_drink", 2 ], [ "can_food", 2 ], [ "canister_empty", 2 ], [ "scrap", 4 ] ],
+      [ [ "chem_mercury_fulminate", 3 ] ]
+    ]
   }
 ]