Port in entire 20xx6mm and 00shot overrides.

2 files changed, 384 insertions, 0 deletions

diff --git a/json/items/ammo/20x66mm.json b/json/items/ammo/20x66mm.json
new file mode 100644
index 0000000..4fcd995
--- /dev/null
+++ b/json/items/ammo/20x66mm.json
@@ -0,0 +1,159 @@
+[
+  {
+    "abstract": "20x66_shot_abstract",
+    "type": "AMMO",
+    "name": { "str": "20x66mm buckshot" },
+    "//": "2.5x the Generic Rate of $1/shot",
+    "description": "20x66mm caseless shotgun rounds, buckshot type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "weight": "56 g",
+    "volume": "250 ml",
+    "price": 1500,
+    "price_postapoc": 4000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "material": [ "steel", "powder" ],
+    "symbol": "=",
+    "color": "pink",
+    "count": 20,
+    "stack_size": 20,
+    "ammo_type": "20x66mm",
+    "range": 20,
+    "damage": { "damage_type": "bullet", "amount": 100 },
+    "recoil": 2500,
+    "loudness": 160,
+    "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ]
+  },
+  {
+    "id": "20x66_shot",
+    "copy-from": "20x66_shot_abstract",
+    "type": "AMMO",
+    "name": { "str": "20x66mm buckshot" },
+    "//": "2.5x the Generic Rate of $1/shot",
+    "description": "20x66mm caseless shotgun rounds, buckshot type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded."
+  },
+  {
+    "id": "20x66_beanbag",
+    "copy-from": "20x66_shot",
+    "type": "AMMO",
+    "name": { "str": "20x66mm beanbag" },
+    "description": "20x66mm caseless shotgun rounds, sublethal beanbag type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "price": 8000,
+    "price_postapoc": 1000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "count": 10,
+    "damage": { "damage_type": "bash", "amount": 6 },
+    "proportional": { "recoil": 0.4, "loudness": 0.6 },
+    "extend": { "effects": [ "LARGE_BEANBAG", "NOGIB" ] }
+  },
+  {
+    "id": "20x66_flechette",
+    "copy-from": "20x66_shot",
+    "type": "AMMO",
+    "name": { "str": "20x66mm flechette" },
+    "description": "20x66mm caseless shotgun rounds, flechette type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "price": 4000,
+    "price_postapoc": 4000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "count": 10,
+    "relative": { "damage": { "damage_type": "bullet", "amount": -18, "armor_penetration": 20 } }
+  },
+  {
+    "id": "20x66_flechette_reloaded",
+    "copy-from": "20x66_flechette",
+    "type": "AMMO",
+    "name": { "str": "20x66mm flechette, handmade", "str_pl": "20x66mm flechettes, handmade" },
+    "description": "Handmade duplicates of Rivtech 20x66mm caseless flechette rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "20x66_shot_reloaded",
+    "copy-from": "20x66_shot",
+    "type": "AMMO",
+    "name": { "str": "20x66mm buckshot, handmade" },
+    "description": "Handmade duplicates of Rivtech 20x66mm caseless buckshot rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "20x66_slug",
+    "copy-from": "20x66_shot_abstract",
+    "type": "AMMO",
+    "name": { "str": "20x66mm slug" },
+    "description": "20x66mm caseless shotgun rounds, solid projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "price": 1500,
+    "price_postapoc": 4000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 8 },
+    "relative": { "range": 20 },
+    "proportional": { "dispersion": 1.3 },
+    "delete": { "effects": [ "SHOT" ] }
+  },
+  {
+    "id": "20x66_slug_reloaded",
+    "copy-from": "20x66_slug",
+    "type": "AMMO",
+    "name": { "str": "20x66mm slug, handmade", "str_pl": "20x66mm slugs, handmade" },
+    "description": "Handmade duplicates of Rivtech 20x66mm caseless solid projectile rounds.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "20x66_exp",
+    "copy-from": "20x66_shot_abstract",
+    "type": "AMMO",
+    "name": { "str": "20x66mm explosive" },
+    "description": "20x66mm caseless shotgun rounds, explosive projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "price": 10000,
+    "price_postapoc": 8000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "range": 20,
+    "damage": { "damage_type": "bullet", "amount": 16, "armor_penetration": 4 },
+    "dispersion": 120,
+    "effects": [ "COOKOFF", "EXPLOSIVE_TINY", "NEVER_MISFIRES" ]
+  },
+  {
+    "id": "20x66_flare",
+    "copy-from": "20x66_shot_abstract",
+    "type": "AMMO",
+    "name": { "str": "20x66mm flare" },
+    "description": "20x66mm caseless shotgun rounds, signal flare type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "price": 5000,
+    "price_postapoc": 4000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "count": 10,
+    "range": 28,
+    "damage": { "damage_type": "heat", "amount": 16 },
+    "dispersion": 200,
+    "recoil": 100,
+    "drop": "handflare_lit",
+    "effects": [ "NO_EMBED" ]
+  },
+  {
+    "id": "20x66_frag",
+    "copy-from": "20x66_slug",
+    "type": "AMMO",
+    "name": { "str": "20x66mm frag" },
+    "description": "20x66mm caseless shotgun rounds, explosive fragmentation type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "price": 7800,
+    "price_postapoc": 5000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "count": 5,
+    "proportional": { "damage": { "damage_type": "bullet", "amount": 0.25, "armor_penetration": 0.25 } },
+    "extend": { "effects": [ "FRAG_SMALL" ] }
+  },
+  {
+    "id": "20x66_inc",
+    "copy-from": "20x66_shot",
+    "type": "AMMO",
+    "name": { "str": "20x66mm incendiary", "str_pl": "20x66mm incendiaries" },
+    "description": "20x66mm caseless shotgun rounds, incendiary type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "price": 10500,
+    "price_postapoc": 5000,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "count": 10,
+    "extend": { "effects": [ "INCENDIARY" ] }
+  }
+]
diff --git a/json/items/ammo/shot.json b/json/items/ammo/shot.json
new file mode 100644
index 0000000..2a4b718
--- /dev/null
+++ b/json/items/ammo/shot.json
@@ -0,0 +1,225 @@
+[
+  {
+    "abstract": "shot_abstract",
+    "type": "AMMO",
+    "name": { "str": "00 shot" },
+    "description": "A shell filled with metal pellets.  Extremely damaging, plus the spread makes it very accurate at short range.  Favored by SWAT forces.",
+    "weight": "32 g",
+    "volume": "250 ml",
+    "price": 500,
+    "price_postapoc": 800,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "material": [ "plastic", "powder" ],
+    "symbol": "=",
+    "color": "red",
+    "count": 20,
+    "stack_size": 20,
+    "ammo_type": "shot",
+    "casing": "shot_hull",
+    "range": 20,
+    "damage": { "damage_type": "bullet", "amount": 80, "armor_multiplier": 2.0 },
+    "recoil": 2500,
+    "loudness": 160,
+    "effects": [ "COOKOFF", "SHOT" ]
+  },
+  {
+    "id": "shot_00",
+    "copy-from": "shot_abstract",
+    "type": "AMMO",
+    "name": { "str": "00 shot" },
+    "description": "A shell filled with metal pellets.  Extremely damaging, plus the spread makes it very accurate at short range.  Favored by SWAT forces."
+  },
+  {
+    "id": "shot_bird",
+    "copy-from": "shot_00",
+    "type": "AMMO",
+    "name": { "str": "birdshot" },
+    "description": "Weak shotgun ammunition.  Designed for hunting birds and other small game, its applications in combat are very limited.",
+    "price": 100,
+    "price_postapoc": 400,
+    "range": 0,
+    "damage": { "damage_type": "bullet", "amount": 50, "armor_multiplier": 3.0 },
+    "dispersion": 1000,
+    "loudness": 80,
+    "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
+    "extend": { "effects": [ "NOGIB" ] }
+  },
+  {
+    "id": "reloaded_shot_bird",
+    "copy-from": "shot_bird",
+    "type": "AMMO",
+    "name": { "str": "birdshot, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "shot_dragon",
+    "copy-from": "shot_00",
+    "type": "AMMO",
+    "name": { "str": "dragon's breath shell" },
+    "description": "A shotgun shell filled with magnesium pellets or shards, used mostly as a distress flare or pyrotechnics tool.  When the round is fired, high temperature sparks and flames shoot out of the barrel, igniting everything in their path.",
+    "price": 1000,
+    "price_postapoc": 1600,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "damage": { "damage_type": "heat", "amount": 30 },
+    "proportional": { "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2 },
+    "range": 0,
+    "shape": [ "cone", { "half_angle": 15, "length": 8 } ],
+    "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
+  },
+  {
+    "id": "reloaded_shot_dragon",
+    "copy-from": "shot_dragon",
+    "type": "AMMO",
+    "name": { "str": "dragon's breath shell, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "heat", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "reloaded_shot_00",
+    "copy-from": "shot_00",
+    "type": "AMMO",
+    "name": { "str": "00 shot, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "shot_flechette",
+    "copy-from": "shot_00",
+    "type": "AMMO",
+    "name": { "str": "flechette shell" },
+    "description": "A shotgun shell filled with tiny steel darts.  Extremely damaging, plus the spread makes it very accurate at short range.  Slices through most forms of armor with ease.",
+    "price": 2000,
+    "price_postapoc": 800,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "count": 10,
+    "//": "Balanced as standard AP.",
+    "relative": { "damage": { "damage_type": "bullet", "amount": -20, "armor_penetration": 12, "armor_multiplier": -1.0 } }
+  },
+  {
+    "id": "reloaded_shot_flechette",
+    "copy-from": "shot_flechette",
+    "type": "AMMO",
+    "name": { "str": "flechette shell, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "shot_slug",
+    "copy-from": "shot_abstract",
+    "type": "AMMO",
+    "name": { "str": "shotgun slug" },
+    "description": "A heavy metal slug used with shotguns to give them the range capabilities of a rifle.  Extremely damaging but rather inaccurate.",
+    "price": 400,
+    "price_postapoc": 400,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "dispersion": 80,
+    "relative": { "range": 12, "damage": { "damage_type": "bullet", "amount": -15, "armor_penetration": 6, "armor_multiplier": -0.5 } },
+    "proportional": { "recoil": 1.4 },
+    "delete": { "effects": [ "SHOT" ] }
+  },
+  {
+    "id": "reloaded_shot_slug",
+    "copy-from": "shot_slug",
+    "type": "AMMO",
+    "name": { "str": "shotgun slug, reloaded" },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_shot_bird",
+    "copy-from": "shot_bird",
+    "type": "AMMO",
+    "name": { "str": "birdshot, black powder" },
+    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_shot_dragon",
+    "copy-from": "shot_dragon",
+    "type": "AMMO",
+    "name": { "str": "dragon's breath shell, black powder" },
+    "proportional": { "price": 0.6, "damage": { "damage_type": "heat", "amount": 0.8 }, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_shot_00",
+    "copy-from": "shot_00",
+    "type": "AMMO",
+    "name": { "str": "00 shot, black powder" },
+    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_shot_flechette",
+    "copy-from": "shot_flechette",
+    "type": "AMMO",
+    "name": { "str": "flechette shell, black powder" },
+    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.8 }, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_shot_slug",
+    "copy-from": "shot_slug",
+    "type": "AMMO",
+    "name": { "str": "shotgun slug, black powder" },
+    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8, "armor_penetration": 0.8 }, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "shot_beanbag",
+    "copy-from": "shot_00",
+    "type": "AMMO",
+    "name": { "str": "shotgun beanbag" },
+    "description": "A beanbag round for shotguns, not deadly but designed to disable.",
+    "price": 500,
+    "price_postapoc": 200,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "count": 10,
+    "damage": { "damage_type": "bash", "amount": 5 },
+    "proportional": { "recoil": 0.4, "loudness": 0.6 },
+    "extend": { "effects": [ "BEANBAG", "NOGIB" ] }
+  },
+  {
+    "id": "shot_he",
+    "copy-from": "shot_slug",
+    "type": "AMMO",
+    "name": { "str": "explosive slug" },
+    "//": "$30/shot thanks to tight regulation, one way or another.",
+    "description": "A shotgun shell shooting a small explosive.  Damaging, but rather inaccurate and short ranged.  Banned in several states.",
+    "price": 3000,
+    "price_postapoc": 1600,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "count": 5,
+    "damage": { "damage_type": "bullet", "amount": 30, "armor_penetration": 0 },
+    "extend": { "effects": [ "EXPLOSIVE" ] }
+  },
+  {
+    "id": "shot_scrap",
+    "copy-from": "shot_00",
+    "type": "AMMO",
+    "name": { "str": "00 shot, scrap loaded" },
+    "description": "A shotgun shell filled with whatever was lying around.  They are more damaging than birdshot, but fairly inaccurate.",
+    "proportional": { "price": 0.4, "damage": { "damage_type": "bullet", "amount": 0.6 }, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  },
+  {
+    "id": "bp_shot_scrap",
+    "copy-from": "shot_scrap",
+    "type": "AMMO",
+    "name": { "str": "00 shot, black powder, scrap loaded" },
+    "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 } },
+    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+  }
+]