Update ammo order patch to fix 00 shot.

1 files changed, 234 insertions, 0 deletions

diff --git a/ammo-10_ammo-order-fix.patch b/ammo-10_ammo-order-fix.patch
index 9fd6e55..7720600 100644
--- a/ammo-10_ammo-order-fix.patch
+++ b/ammo-10_ammo-order-fix.patch
@@ -379,3 +379,237 @@
      "id": "50match",
      "copy-from": "50bmg",
      "type": "AMMO",
+--- a/data/json/items/ammo/shot.json
++++ b/data/json/items/ammo/shot.json
+@@ -1,94 +1,5 @@
+ [
+   {
+-    "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": "reloaded_shot_dragon",
+-    "copy-from": "shot_dragon",
+-    "type": "AMMO",
+-    "name": { "str": "dragon's breath 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": "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": "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": "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": "bullet", "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 }, "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 }, "dispersion": 1.2 },
+-    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
+-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+-  },
+-  {
+     "id": "shot_00",
+     "type": "AMMO",
+     "name": { "str": "00 shot" },
+@@ -171,6 +82,20 @@
+     "relative": { "damage": { "damage_type": "bullet", "amount": -6, "armor_penetration": 12 } }
+   },
+   {
++    "id": "shot_slug",
++    "copy-from": "shot_00",
++    "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": 100,
++    "relative": { "range": 12, "damage": { "damage_type": "bullet", "armor_penetration": 6 } },
++    "proportional": { "recoil": 1.4 },
++    "delete": { "effects": [ "SHOT" ] }
++  },
++  {
+     "id": "shot_he",
+     "copy-from": "shot_slug",
+     "type": "AMMO",
+@@ -195,6 +120,95 @@
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+   },
+   {
++    "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": "reloaded_shot_dragon",
++    "copy-from": "shot_dragon",
++    "type": "AMMO",
++    "name": { "str": "dragon's breath 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": "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": "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": "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": "bullet", "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 }, "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 }, "dispersion": 1.2 },
++    "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] },
++    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
++  },
++  {
+     "id": "bp_shot_scrap",
+     "copy-from": "shot_scrap",
+     "type": "AMMO",
+@@ -202,19 +216,5 @@
+     "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 } },
+     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+-  },
+-  {
+-    "id": "shot_slug",
+-    "copy-from": "shot_00",
+-    "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": 100,
+-    "relative": { "range": 12, "damage": { "damage_type": "bullet", "armor_penetration": 6 } },
+-    "proportional": { "recoil": 1.4 },
+-    "delete": { "effects": [ "SHOT" ] }
+   }
+ ]