3 files changed, 335 insertions, 0 deletions
diff --git a/json/items/ammo/20x66mm.json b/json/items/ammo/20x66mm.json
index e5849cd..58f82c3 100644
--- a/json/items/ammo/20x66mm.json
+++ b/json/items/ammo/20x66mm.json
@@ -1,5 +1,165 @@
 [
   {
+    "abstract": "20x66_shot_abstract",
+    "type": "AMMO",
+    "name": { "str": "20x66mm buckshot" },
+    "//": "2.5x the Generic Rate of $1/shot",
+    "description": "A 20x66mm caseless shotgun round, buckshot type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "weight": "56 g",
+    "volume": "415 ml",
+    "price": "15 USD",
+    "price_postapoc": "40 USD",
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "material": [ "steel", "powder" ],
+    "symbol": "=",
+    "color": "pink",
+    "count": 20,
+    "stack_size": 20,
+    "ammo_type": "20x66mm",
+    "range": 12,
+    "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": "A 20x66mm caseless shotgun round, 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": "A 20x66mm caseless shotgun round, sublethal beanbag type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "price": "80 USD",
+    "price_postapoc": "10 USD",
+    "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": "A 20x66mm caseless shotgun round, flechette type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "price": "40 USD",
+    "price_postapoc": "40 USD",
+    "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": "Handcrafted bootleg duplicates of of Rivtech 20x66mm flechette caseless 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": "Handcrafted bootleg duplicates of Rivtech 20x66mm buckshot caseless 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": "A 20x66mm caseless shotgun round, solid projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "price": "15 USD",
+    "price_postapoc": "40 USD",
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 8 },
+    "relative": { "range": 12 },
+    "proportional": {
+      "dispersion": 1.3,
+      "recoil": 1.4
+    },
+    "delete": { "effects": [ "SHOT" ] }
+  },
+  {
+    "id": "20x66_slug_reloaded",
+    "copy-from": "20x66_slug",
+    "type": "AMMO",
+    "name": { "str": "20x66mm slug, handmade", "str_pl": "20x66mm slugs, handmade" },
+    "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm solid projectile caseless 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": "A 20x66mm caseless shotgun round, explosive projectile type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "price": "100 USD",
+    "price_postapoc": "80 USD",
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "range": 12,
+    "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": "A 20x66mm caseless shotgun round, signal flare type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "price": "50 USD",
+    "price_postapoc": "40 USD",
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "count": 10,
+    "range": 24,
+    "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": "A 20x66mm caseless shotgun round, explosive fragmentation type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "price": "78 USD",
+    "price_postapoc": "50 USD",
+    "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": "A 20x66mm caseless shotgun round, incendiary type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "price": "105 USD",
+    "price_postapoc": "50 USD",
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "count": 10,
+    "extend": { "effects": [ "INCENDIARY" ] }
+  },
+  {
     "id": "20x66_inc_reloaded",
     "copy-from": "20x66_inc",
     "type": "AMMO",
diff --git a/json/items/ammo/5x50.json b/json/items/ammo/5x50.json
new file mode 100644
index 0000000..7ff3c14
--- /dev/null
+++ b/json/items/ammo/5x50.json
@@ -0,0 +1,48 @@
+[
+  {
+    "id": "5x50dart",
+    "type": "AMMO",
+    "name": { "str": "RA110 5x50mm flechette" },
+    "description": "Designed to defeat modern body armor, the Rivtech 5x50mm flechette round features a biodegradable sabot and a single, fin-stabilized penetrator.",
+    "weight": "8 g",
+    "volume": "144 ml",
+    "price": "1125 cent",
+    "material": [ "plastic", "powder", "steel" ],
+    "symbol": "=",
+    "color": "green",
+    "count": 100,
+    "stack_size": 50,
+    "ammo_type": "5x50",
+    "casing": "5x50_hull",
+    "range": 60,
+    "damage": { "damage_type": "bullet", "amount": 20, "armor_penetration": 30 },
+    "dispersion": 60,
+    "recoil": 400,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "price_postapoc": "18 USD",
+    "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
+  },
+  {
+    "id": "5x50heavy",
+    "copy-from": "5x50dart",
+    "type": "AMMO",
+    "name": { "str": "RA119 5x50mm penetrator" },
+    "description": "Designed to defeat modern body armor, the Rivtech 5x50mm RA119 penetrator round features a biodegradable sabot and a single, fin-stabilized tungsten alloy projectile.",
+    "weight": "9 g",
+    "price": "1688 cent",
+    "price_postapoc": "25 USD",
+    "relative": { "range": -10, "damage": { "damage_type": "bullet", "amount": 5, "armor_penetration": 20 }, "dispersion": 20 },
+    "proportional": { "recoil": 1.1 }
+  },
+  {
+    "id": "reloaded_5x50dart",
+    "copy-from": "5x50dart",
+    "type": "AMMO",
+    "name": { "str": "RA110 5x50mm flechette, reloaded", "str_pl": "RA110 5x50mm flechettes, reloaded" },
+    "price_postapoc": "12 USD",
+    "description": "Designed to defeat modern body armor, the Rivtech 5x50mm flechette round features a biodegradable sabot and a single, fin-stabilized penetrator.  This one has been hand-reloaded by a lucky survivor or perhaps a pre-Cataclysm corporate spy, leading to slightly inferior performance compared to factory-produced ammo.",
+    "effects": [ "COOKOFF", "RECYCLED" ],
+    "relative": { "range": -15, "dispersion": 40 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.7 }, "recoil": 0.9 }
+  }
+]
diff --git a/json/items/ammo/8x40mm.json b/json/items/ammo/8x40mm.json
new file mode 100644
index 0000000..3cd2ef5
--- /dev/null
+++ b/json/items/ammo/8x40mm.json
@@ -0,0 +1,127 @@
+[
+  {
+    "id": "8mm_caseless",
+    "type": "AMMO",
+    "name": { "str_sp": "8x40mm caseless" },
+    "//": "Cased ammo tends to be roughly $1/shot, more or less.  Rivtech ammo, being New and Proprietary and Expensive, $2-2.50 or so.",
+    "description": "An 8x40mm caseless round.  Proprietary ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "weight": "12 g",
+    "volume": "230 ml",
+    "price": "225 cent",
+    "price_postapoc": "80 USD",
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "material": [ "plastic", "powder" ],
+    "symbol": "=",
+    "color": "pink",
+    "count": 40,
+    "stack_size": 40,
+    "ammo_type": "8x40mm",
+    "range": 42,
+    "damage": { "damage_type": "bullet", "amount": 42, "armor_penetration": 18 },
+    "dispersion": 75,
+    "recoil": 2200,
+    "effects": [ "NEVER_MISFIRES" ]
+  },
+  {
+    "id": "8mm_civilian",
+    "copy-from": "8mm_caseless",
+    "type": "AMMO",
+    "name": { "str_sp": "8x40mm sporting" },
+    "description": "An 8x40mm caseless round, light sporting load sold for civilian use.  Proprietary ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] },
+    "proportional": {
+      "price": 0.8,
+      "damage": { "damage_type": "bullet", "amount": 0.5, "armor_penetration": 0.5 },
+      "dispersion": 1.2,
+      "recoil": 0.5
+    }
+  },
+  {
+    "id": "8mm_fmj",
+    "copy-from": "8mm_caseless",
+    "type": "AMMO",
+    "name": { "str_sp": "8x40mm FMJ" },
+    "description": "An 8x40mm caseless round, full metal jacket.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 10 } }
+  },
+  {
+    "id": "8mm_hvp",
+    "copy-from": "8mm_caseless",
+    "type": "AMMO",
+    "name": { "str_sp": "8x40mm HVP" },
+    "description": "An 8x40mm caseless round, saboted high-velocity penetrator type.  Advanced military grade, armor-piercing ammunition that fires a single depleted uranium flechette.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "price": "25 USD",
+    "price_postapoc": "500 USD",
+    "count": 20,
+    "relative": { "damage": { "damage_type": "bullet", "amount": 5, "armor_penetration": 20 } },
+    "proportional": { "dispersion": 1.5, "recoil": 1.5 }
+  },
+  {
+    "id": "8mm_inc",
+    "copy-from": "8mm_caseless",
+    "type": "AMMO",
+    "name": { "str_sp": "8x40mm tracer" },
+    "description": "An 8x40mm caseless ammunition mixed with tracers to help keep the weapon they are fired from on target at the risk of igniting flammable substances.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "count": 20,
+    "proportional": { "dispersion": 0.8 },
+    "extend": { "effects": [ "INCENDIARY" ] }
+  },
+  {
+    "id": "8mm_jhp",
+    "copy-from": "8mm_caseless",
+    "type": "AMMO",
+    "name": { "str_sp": "8x40mm JHP" },
+    "description": "An 8x40mm caseless round, jacketed hollowpoint.  Military grade ammunition for Rivtech firearms.  Being caseless rounds, these cannot be disassembled or reloaded.",
+    "relative": { "damage": { "damage_type": "bullet", "amount": 5, "armor_penetration": -10 } }
+  },
+  {
+    "id": "8mm_caseless_reloaded",
+    "copy-from": "8mm_caseless",
+    "type": "AMMO",
+    "name": { "str_sp": "8x40mm caseless, handmade" },
+    "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm standard caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than factory made 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": "8mm_jhp_reloaded",
+    "copy-from": "8mm_jhp",
+    "type": "AMMO",
+    "name": { "str_sp": "8x40mm JHP, handmade" },
+    "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm JHP caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than factory made 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": "8mm_hvp_reloaded",
+    "copy-from": "8mm_hvp",
+    "type": "AMMO",
+    "name": { "str_sp": "8x40mm HVP, handmade" },
+    "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm HVP caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than factory made 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": "8mm_inc_reloaded",
+    "copy-from": "8mm_inc",
+    "type": "AMMO",
+    "name": { "str_sp": "8x40mm tracer, handmade" },
+    "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm tracer caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than factory made 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": "8mm_fmj_reloaded",
+    "copy-from": "8mm_fmj",
+    "type": "AMMO",
+    "name": { "str_sp": "8x40mm FMJ, handmade" },
+    "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm FMJ caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than factory made 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" ] }
+  }
+]