Fix .50bmg ammo ordering

Fix reloaded_50bmg being incorrectly based on .50 match
Add missing military base overmap patch

4 files changed, 151 insertions, 2 deletions

diff --git a/0024-ammo-order-fix.patch b/0024-ammo-order-fix.patch
index 01c91fb..96032ec 100644
--- a/0024-ammo-order-fix.patch
+++ b/0024-ammo-order-fix.patch
@@ -165,3 +165,39 @@
      "id": "bp_460_fmj",
      "copy-from": "460_fmj",
      "type": "AMMO",
+
+--- a/data/json/items/ammo/50.json
++++ b/data/json/items/ammo/50.json
+@@ -1,15 +1,5 @@
+ [
+   {
+-    "id": "50_incendiary",
+-    "copy-from": "50bmg",
+-    "type": "AMMO",
+-    "name": { "str": ".50 BMG M17 tracer" },
+-    "description": "A tracer variant of the powerful .50 BMG round.  Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances.",
+-    "count": 10,
+-    "effects": [ "INCENDIARY" ],
+-    "dispersion": 310
+-  },
+-  {
+     "id": "50bmg",
+     "type": "AMMO",
+     "name": { "str": ".50 BMG M33 Ball" },
+@@ -33,6 +23,16 @@
+     "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
+   },
+   {
++    "id": "50_incendiary",
++    "copy-from": "50bmg",
++    "type": "AMMO",
++    "name": { "str": ".50 BMG M17 tracer" },
++    "description": "A tracer variant of the powerful .50 BMG round.  Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances.",
++    "count": 10,
++    "effects": [ "INCENDIARY" ],
++    "dispersion": 310
++  },
++  {
+     "id": "50match",
+     "copy-from": "50bmg",
+     "type": "AMMO",
diff --git a/0034-fix-reloaded-50bmg.patch b/0034-fix-reloaded-50bmg.patch
new file mode 100644
index 0000000..cbab4e1
--- /dev/null
+++ b/0034-fix-reloaded-50bmg.patch
@@ -0,0 +1,15 @@
+--- a/data/json/items/ammo/50.json
++++ b/data/json/items/ammo/50.json
+@@ -78,10 +78,10 @@
+   },
+   {
+     "id": "reloaded_50bmg",
+-    "copy-from": "50match",
++    "copy-from": "50bmg",
+     "type": "AMMO",
+     "name": { "str": ".50 BMG Match, reloaded" },
+-    "description": ".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very powerful rifle round designed for anti-aircraft use, later adapted to anti-vehicular and anti-personnel roles.  Its stupendous energy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.",
++    "description": ".50 BMG ammunition with lead-cored FMJ bullets.  The .50 BMG is a very powerful rifle round designed for anti-aircraft use, later adapted to anti-vehicular and anti-personnel roles.  Its stupendous energy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.  This one has been hand-reloaded.",
+     "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 },
+     "extend": { "effects": [ "RECYCLED" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
diff --git a/PKGBUILD b/PKGBUILD
index 1911f24..f70d245 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
 pkgver=202110161440
 _pkgver=2021-10-16-1440
-pkgrel=1
+pkgrel=2
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -64,6 +64,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "0031-vacutainer-is-not-a-weapon.patch"
         "0032-shears-use-light-battery.patch"
         "0033-add-missing-price-postapoc.patch"
+        "0034-fix-reloaded-50bmg.patch"
 
         "jc_ammo-loudness-ap-times-2.patch"
         "jc_allow-bio-firestarter-on-smoker.patch"
@@ -110,7 +111,7 @@ b2sums=('28d01fe9a265419ad941d4ad2ca4cd1a5aafdc2e46dc1d734b718a60e3039e303f8c6b4
         '7cae5e42b6e16f3c4bf64dca3c7573c1b552424ff70bb6da0a21f121b53b2546b239c87953a090cd90f46a1c3c124e2fe19c560b1830b11334f8e64c92fb614d'
         'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768'
         'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
-        'c47d002dc55af6c74a830205626eab57922f3f79143a5e1ddbc9ac8dc75c1ef4f2adf6a1816f8abe0b43e9a81a9021d1c9c7f62d76fdf67fa5fe00bbeca73962'
+        '846066151ff156ed18594748d965afa8d0f566c843ed3988055022408580bfb4e995b48048dc244be16d9f516b135937d8acda9e3334a63f3072df49208a0613'
         '8eef73575981d10a6a8734afc0e284ec7125db24bf666ff943938a4df87dedbd9ac622ea51bb71b5aaff7b1cc75627258bcfdc8659b915c09c82d3561fde1f62'
         '040363cea9b3492f8a0f8daba44c179c871ba691dea688c15f3ad6994f78d530b4f74b283b9c64e4f5a2b1268805e60d4ea154d3dc8246200c50907054f5b5ef'
         '43937dd83705b5ab62ae02cf1d043426c82f37e600afe06a287706e8450b596b84cc23138fbda31d67b9a2206ebfdc69754e329e7621075cbf480691f7d61871'
@@ -118,6 +119,7 @@ b2sums=('28d01fe9a265419ad941d4ad2ca4cd1a5aafdc2e46dc1d734b718a60e3039e303f8c6b4
         'a45b2a53b6725dfd4780049a7522befe49c2a0c4efa4fb1dcb5cf53c7af18d329d2ba02aa6ac150342a3e66a46fd17f5e6e76a8db15c677a237edbb5cf4f5af7'
         '653930e35eac5dc7bd9fa3bfe0cbe89a36284431dc53cab95697da6b45d4c63af854d884f6b63fd45fde9c53a334a7e4f5600378c57b3b2ae2f881ef5d8fd0e3'
         '5a5a61ccb7e2e343fb6de2e3426688485a2f4ad65d4b001d8bd542907fd8ceb9315da7fd9e5f89a5aa6210edcd5f334c73657fc16349000d6f6a394303e22000'
+        '5efa0a93e889efa022370a334b20aefb1103e8f9f700494207b7def18d55578be89955a117863b8342159eb1371a21aa55747fd83cc6aa5f424d0c024d157aef'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
         'dede4f0774159243f87121e4d53107bb9de31f9658823fc7ab02124974b87defecf3ab0f2edf6779f2fe1ca437f16f83bf193cf3143fd5eb3a686b731319c11f'
         'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600'
@@ -256,6 +258,9 @@ prepare() {
   # Add price_postapoc to a number of items that did not have one set.
   patch -Np1 -i "$srcdir"/0033-add-missing-price-postapoc.patch
 
+  # The id and description make it pretty clear that reloaded_50bmg is not supposed to be based on Match rounds.
+  patch -Np1 -i "$srcdir"/0034-fix-reloaded-50bmg.patch
+
 
   # Various other fixes for bugs I came across that modify src
   # Fix ammo loudness mulitplying by six instead of two.
diff --git a/jc_more-military-base-overmap.patch b/jc_more-military-base-overmap.patch
new file mode 100644
index 0000000..4e575c5
--- /dev/null
+++ b/jc_more-military-base-overmap.patch
@@ -0,0 +1,93 @@
+--- a/data/json/overmap/overmap_terrain/overmap_terrain_military.json
++++ b/data/json/overmap/overmap_terrain/overmap_terrain_military.json
+@@ -168,7 +168,7 @@
+   {
+     "type": "overmap_terrain",
+     "abstract": "generic_mil_helipad",
+-    "name": "military helipad",
++    "name": "military base - helipad",
+     "sym": "H",
+     "color": "red",
+     "see_cost": 5,
+@@ -328,31 +328,39 @@
+       "mil_base_7c"
+     ],
+     "copy-from": "generic_military_base",
+-    "name": "military base - barracks"
++    "name": "military base - barracks",
++    "color": "light_green"
+   },
+   {
+     "type": "overmap_terrain",
+     "id": [ "mil_base_2f1", "mil_base_2f", "mil_base_3f1", "mil_base_3f" ],
+     "copy-from": "generic_military_base",
+-    "name": "military base - mess hall"
++    "name": "military base - mess hall",
++    "sym": ">",
++    "color": "pink"
+   },
+   {
+     "type": "overmap_terrain",
+     "id": [ "mil_base_2g1", "mil_base_2g", "mil_base_3g1", "mil_base_3g" ],
+     "copy-from": "generic_military_base",
+-    "name": "military base - warehouse"
++    "name": "military base - warehouse",
++    "sym": "w",
++    "color": "light_blue"
+   },
+   {
+     "type": "overmap_terrain",
+     "id": [ "mil_base_3h1", "mil_base_3h" ],
+     "copy-from": "generic_military_base",
+-    "name": "military base - communications center"
++    "name": "military base - communications center",
++    "sym": "L",
++    "color": "light_gray"
+   },
+   {
+     "type": "overmap_terrain",
+     "id": [ "mil_base_5e1", "mil_base_5e" ],
+     "copy-from": "generic_military_base",
+-    "name": "military base - armory"
++    "name": "military base - armory",
++    "sym": "v"
+   },
+   {
+     "type": "overmap_terrain",
+@@ -367,25 +375,32 @@
+       "mil_base_7f"
+     ],
+     "copy-from": "generic_military_base",
+-    "name": "military base - motor pool"
++    "name": "military base - motor pool",
++    "sym": "O",
++    "color": "white"
+   },
+   {
+     "type": "overmap_terrain",
+     "id": [ "mil_base_5g1", "mil_base_5g" ],
+     "copy-from": "generic_military_base",
+-    "name": "military base - command center"
++    "name": "military base - command center",
++    "sym": "<",
++    "color": "light_gray"
+   },
+   {
+     "type": "overmap_terrain",
+     "id": [ "mil_base_5h1", "mil_base_5h", "mil_base_5i1", "mil_base_5i", "mil_base_6i1", "mil_base_6i" ],
+     "copy-from": "generic_military_base",
+-    "name": "military base - infirmary"
++    "name": "military base - infirmary",
++    "sym": "+"
+   },
+   {
+     "type": "overmap_terrain",
+     "id": "mil_base_8i",
+     "copy-from": "generic_military_base",
+-    "name": "military base - fuel depot"
++    "name": "military base - fuel depot",
++    "sym": "<",
++    "color": "light_blue"
+   },
+   {
+     "type": "overmap_terrain",