From 36b21fe65e609953e684a2b97c71ed57044791fc Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 4 May 2021 20:08:12 -0700
Subject: Fix more inconsistent ammo names

---
 0003-inconsistent-ammo-names.patch | 22 ++++++++++++++++++++++
 PKGBUILD                           |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/0003-inconsistent-ammo-names.patch b/0003-inconsistent-ammo-names.patch
index b9bf3e8..4b6dcb0 100644
--- a/0003-inconsistent-ammo-names.patch
+++ b/0003-inconsistent-ammo-names.patch
@@ -100,6 +100,28 @@
      "relative": { "range": -15, "dispersion": 40 },
 --- a/data/json/items/ammo/357mag.json
 +++ b/data/json/items/ammo/357mag.json
+@@ -2,8 +2,8 @@
+   {
+     "id": "357mag_fmj",
+     "type": "AMMO",
+-    "name": { "str": ".357 magnum FMJ" },
+-    "description": "Jacketed .357 magnum ammunition.  The .357 magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.",
++    "name": { "str": ".357 Magnum FMJ" },
++    "description": "Jacketed .357 Magnum ammunition.  The .357 Magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.",
+     "weight": "8 g",
+     "volume": "250 ml",
+     "price": 140,
+@@ -26,8 +26,8 @@
+     "id": "357mag_jhp",
+     "copy-from": "357mag_fmj",
+     "type": "AMMO",
+-    "name": { "str": ".357 magnum JHP" },
+-    "description": "Jacketed hollow point .357 magnum ammunition.  The .357 magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.",
++    "name": { "str": ".357 Magnum JHP" },
++    "description": "Jacketed hollow point .357 Magnum ammunition.  The .357 Magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.",
+     "relative": { "damage": 4, "pierce": -2 }
+   },
+   {
 @@ -53,13 +53,15 @@
      "copy-from": "357mag_fmj",
      "type": "AMMO",
diff --git a/PKGBUILD b/PKGBUILD
index 148b728..b7ecadc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=(cataclysm-dda cataclysm-dda-tiles)
 pkgname=cataclysm-dda
 pkgver=0.E.3
 _pkgver=0.E-3
-pkgrel=2.9
+pkgrel=2.10
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -72,7 +72,7 @@ b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0d
         'd429bdf583ba6a69814f3a33a983650bcaa61b8edaed6560491972478515adb996482af248b10df8b4435bfad487ecba6c2ca0a249a4daee54994117a2742055'
         '8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa'
         '025213998583972e7551bd7bd7376ab65857e28d4338fab60ae792a6b3bd48983aec77e5143baaa63d4f3feb7cd590c4bded529c410e4d18f2b8c5813f25daa3'
-        '3c180b3b8fed46a1f4bfd357fee3b8b541f1c86b073bbc6215ed0e4298a8d9c7527fda028227d0695c045d2198839d7042544a3467d6f8733e9ddabe884e3c2b'
+        '33a6f33ca9066ea7e190f017e0d57bd23b0ffb458944bd2a6f20f04ec7e1db43c34b64e606f2c0207ce500957230325116e9e00d92c51be280bda899c34d5580'
         'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
         '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8'
         '58a94409205f7b670ab5745b8cbc234a38efd6a6217cef4efb7e397f091092e3e0c7790706b0a42accaa83d7509b8e244a98b9f0ba78349ee85f3164745c3501'
-- 
cgit v1.2.1