Updated to 2023-05-02-0922

Remove obsolete v29 patch.
Fix ammo reverts due to shot cone effects.

1 files changed, 146 insertions, 154 deletions

diff --git a/ammo-10_ammo-order-fix.patch b/ammo-10_ammo-order-fix.patch
index 60ba09f..5ca1d91 100644
--- a/ammo-10_ammo-order-fix.patch
+++ b/ammo-10_ammo-order-fix.patch
@@ -1,9 +1,9 @@
 --- a/data/json/items/ammo/20x66mm.json
 +++ b/data/json/items/ammo/20x66mm.json
-@@ -1,5 +1,54 @@
+@@ -1,7 +1,40 @@
  [
    {
-+    "id": "20x66_shot",
++    "abstract": "20x66_shot_abstract",
 +    "type": "AMMO",
 +    "name": { "str": "20x66mm buckshot" },
 +    "//": "2.5x the Generic Rate of $1/shot",
@@ -26,6 +26,26 @@
 +    "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.",
++    "range": 0,
++    "shape": [ "cone", { "half_angle": 15, "length": 12 } ]
++  },
++  {
+     "id": "20x66_beanbag",
+-    "copy-from": "20x66_shot",
++    "copy-from": "20x66_shot_abstract",
+     "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.",
+@@ -14,6 +46,18 @@
+     "extend": { "effects": [ "LARGE_BEANBAG", "NOGIB" ] }
+   },
+   {
 +    "id": "20x66_flechette",
 +    "copy-from": "20x66_shot",
 +    "type": "AMMO",
@@ -38,8 +58,15 @@
 +    "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 20 } }
 +  },
 +  {
+     "id": "20x66_bootleg_flechette",
+     "copy-from": "20x66_flechette",
+     "type": "AMMO",
+@@ -34,6 +78,20 @@
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+   },
+   {
 +    "id": "20x66_slug",
-+    "copy-from": "20x66_shot",
++    "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.",
@@ -52,10 +79,10 @@
 +    "delete": { "effects": [ "SHOT" ] }
 +  },
 +  {
-     "id": "20x66_beanbag",
-     "copy-from": "20x66_shot",
+     "id": "20x66_bootleg_slug",
+     "copy-from": "20x66_slug",
      "type": "AMMO",
-@@ -74,18 +122,6 @@
+@@ -75,18 +133,6 @@
      "effects": [ "NO_EMBED" ]
    },
    {
@@ -74,13 +101,13 @@
      "id": "20x66_frag",
      "copy-from": "20x66_slug",
      "type": "AMMO",
-@@ -109,42 +145,5 @@
+@@ -110,52 +156,5 @@
      "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
      "count": 10,
      "extend": { "effects": [ "INCENDIARY" ] }
 -  },
 -  {
--    "id": "20x66_shot",
+-    "abstract": "20x66_shot_abstract",
 -    "type": "AMMO",
 -    "name": { "str": "20x66mm buckshot" },
 -    "//": "2.5x the Generic Rate of $1/shot",
@@ -103,8 +130,18 @@
 -    "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.",
+-    "range": 0,
+-    "shape": [ "cone", { "half_angle": 15, "length": 12 } ]
+-  },
+-  {
 -    "id": "20x66_slug",
--    "copy-from": "20x66_shot",
+-    "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.",
@@ -186,7 +223,7 @@
 +    "relative": { "damage": { "damage_type": "bullet", "amount": -6, "armor_penetration": 14 } }
 +  },
 +  {
-     "id": "reloaded_38_fmj",
+     "id": "bp_38_fmj",
      "copy-from": "38_fmj",
      "type": "AMMO",
 
@@ -241,42 +278,22 @@
      "id": "44magnum",
      "type": "AMMO",
      "name": { "str": ".44 Magnum" },
-@@ -33,13 +24,13 @@
+@@ -33,6 +24,15 @@
      "effects": [ "COOKOFF" ]
    },
    {
--    "id": "reloaded_44fmj",
--    "copy-from": "44fmj",
 +    "id": "44fmj",
 +    "copy-from": "44magnum",
-     "type": "AMMO",
--    "name": { "str": ".44 Magnum FMJ, 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" ] }
++    "type": "AMMO",
 +    "name": { "str": ".44 Magnum FMJ" },
 +    "description": "A brass-jacketed variant of the .44 Magnum round.  This increases penetration at the cost of reduced damage from expansion.",
 +    "//": "Base damage of 36, balance increase of one-nineth.",
 +    "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 23 } }
-   },
-   {
-     "id": "reloaded_44magnum",
-@@ -49,6 +40,15 @@
-     "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_44fmj",
-+    "copy-from": "44fmj",
-+    "type": "AMMO",
-+    "name": { "str": ".44 Magnum FMJ, 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_44magnum",
+     "copy-from": "44magnum",
+     "type": "AMMO",
 
 --- a/data/json/items/ammo/45.json
 +++ b/data/json/items/ammo/45.json
@@ -362,7 +379,7 @@
      "id": "50bmg",
      "type": "AMMO",
      "name": { "str": ".50 BMG M33 Ball" },
-@@ -33,6 +23,16 @@
+@@ -34,6 +24,16 @@
      "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
    },
    {
@@ -379,56 +396,12 @@
      "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 @@
+@@ -1,49 +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": "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": "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",
@@ -473,79 +446,34 @@
 -    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
 -  },
 -  {
-     "id": "shot_00",
+     "abstract": "shot_abstract",
      "type": "AMMO",
      "name": { "str": "00 shot" },
-@@ -171,6 +82,20 @@
-     "relative": { "damage": { "damage_type": "bullet", "amount": -6, "armor_penetration": 12 } }
+@@ -76,20 +32,6 @@
+     "shape": [ "cone", { "half_angle": 10, "length": 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",
+-    "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_bird",
+     "copy-from": "shot_00",
      "type": "AMMO",
-@@ -195,6 +120,95 @@
-     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+@@ -105,6 +47,15 @@
+     "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": "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": "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",
@@ -555,6 +483,13 @@
 +    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
 +  },
 +  {
+     "id": "shot_dragon",
+     "copy-from": "shot_00",
+     "type": "AMMO",
+@@ -120,6 +71,23 @@
+     "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
+   },
+   {
 +    "id": "bp_shot_dragon",
 +    "copy-from": "shot_dragon",
 +    "type": "AMMO",
@@ -572,6 +507,13 @@
 +    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
 +  },
 +  {
+     "id": "shot_flechette",
+     "copy-from": "shot_00",
+     "type": "AMMO",
+@@ -132,6 +100,52 @@
+     "relative": { "damage": { "damage_type": "bullet", "amount": -6, "armor_penetration": 12 } }
+   },
+   {
 +    "id": "bp_shot_flechette",
 +    "copy-from": "shot_flechette",
 +    "type": "AMMO",
@@ -581,6 +523,20 @@
 +    "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": 100,
++    "relative": { "range": 12, "damage": { "damage_type": "bullet", "armor_penetration": 6 } },
++    "proportional": { "recoil": 1.4 },
++    "delete": { "effects": [ "SHOT" ] }
++  },
++  {
 +    "id": "bp_shot_slug",
 +    "copy-from": "shot_slug",
 +    "type": "AMMO",
@@ -590,18 +546,49 @@
 +    "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",
+@@ -146,16 +160,6 @@
+     "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",
-@@ -202,19 +216,5 @@
-     "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 } },
-     "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] },
+@@ -165,17 +169,13 @@
      "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
--  },
--  {
+   },
+   {
 -    "id": "shot_slug",
--    "copy-from": "shot_00",
--    "type": "AMMO",
+-    "copy-from": "shot_abstract",
++    "id": "shot_scrap",
++    "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,
@@ -611,5 +598,10 @@
 -    "relative": { "range": 12, "damage": { "damage_type": "bullet", "armor_penetration": 6 } },
 -    "proportional": { "recoil": 1.4 },
 -    "delete": { "effects": [ "SHOT" ] }
++    "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" ] }
    }
  ]