From ceb9f49045e4bed1a074752ca68d48a59a9d0a01 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Fri, 11 Sep 2020 13:29:33 -0700
Subject: Many rebuilds from mod updates New hotfixes

---
 0003-inconsistent-ammo-names.patch | 89 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 0003-inconsistent-ammo-names.patch

(limited to '0003-inconsistent-ammo-names.patch')

diff --git a/0003-inconsistent-ammo-names.patch b/0003-inconsistent-ammo-names.patch
new file mode 100644
index 0000000..a98c955
--- /dev/null
+++ b/0003-inconsistent-ammo-names.patch
@@ -0,0 +1,89 @@
+--- a/data/json/items/ammo/45.json
++++ b/data/json/items/ammo/45.json
+@@ -63,7 +63,7 @@
+     "id": "reloaded_45_acp",
+     "copy-from": "45_acp",
+     "type": "AMMO",
+-    "name": { "str": ".45 FMJ, reloaded" },
++    "name": { "str": ".45 ACP FMJ, reloaded" },
+     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+     "extend": { "effects": [ "RECYCLED" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ] }
+--- a/data/json/items/ammo/223.json
++++ b/data/json/items/ammo/223.json
+@@ -55,7 +55,7 @@
+     "id": "bp_556",
+     "copy-from": "556",
+     "type": "AMMO",
+-    "name": { "str": "5.56 NATO, black powder" },
++    "name": { "str": "5.56 NATO M855A1, black powder" },
+     "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
+     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ] }
+@@ -82,7 +82,7 @@
+     "id": "reloaded_556",
+     "copy-from": "556",
+     "type": "AMMO",
+-    "name": { "str": "5.56 NATO, reloaded" },
++    "name": { "str": "5.56 NATO M855A1, reloaded" },
+     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+     "extend": { "effects": [ "RECYCLED" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ] }
+--- a/data/json/items/ammo/308.json
++++ b/data/json/items/ammo/308.json
+@@ -26,7 +26,7 @@
+     "id": "762_51",
+     "copy-from": "308",
+     "type": "AMMO",
+-    "name": { "str": "7.62x51mm M80" },
++    "name": { "str": "7.62x51mm NATO M80" },
+     "casing": "762_51_casing",
+     "description": "A 7.62x51mm NATO round with a 147gr FMJ bullet.  It is a powerful rifle cartridge commonly used by hunters and military snipers because of its high accuracy and long range.",
+     "relative": { "damage": -2, "pierce": 4, "dispersion": -10 },
+@@ -54,7 +54,7 @@
+     "id": "bp_762_51",
+     "copy-from": "762_51",
+     "type": "AMMO",
+-    "name": { "str": "7.62x51mm, black powder" },
++    "name": { "str": "7.62x51mm NATO M80, black powder" },
+     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ] }
+@@ -63,7 +63,7 @@
+     "id": "bp_762_51_incendiary",
+     "copy-from": "762_51_incendiary",
+     "type": "AMMO",
+-    "name": { "str": "7.62x51mm tracer, black powder" },
++    "name": { "str": "7.62x51mm NATO tracer, black powder" },
+     "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+     "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ] }
+@@ -81,7 +81,7 @@
+     "id": "reloaded_762_51",
+     "copy-from": "762_51",
+     "type": "AMMO",
+-    "name": { "str": "7.62x51mm, reloaded" },
++    "name": { "str": "7.62x51mm NATO M80, reloaded" },
+     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+     "extend": { "effects": [ "RECYCLED" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ] }
+@@ -90,7 +90,7 @@
+     "id": "reloaded_762_51_incendiary",
+     "copy-from": "762_51_incendiary",
+     "type": "AMMO",
+-    "name": { "str": "7.62x51mm incendiary, reloaded" },
++    "name": { "str": "7.62x51mm NATO incendiary, reloaded" },
+     "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+     "extend": { "effects": [ "RECYCLED" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ] }
+--- a/data/json/items/ammo/5x50.json
++++ b/data/json/items/ammo/5x50.json
+@@ -38,7 +38,7 @@
+     "id": "reloaded_5x50dart",
+     "copy-from": "5x50dart",
+     "type": "AMMO",
+-    "name": { "str": "5x50mm flechette, reloaded" },
++    "name": { "str": "RA110 5x50mm flechette, reloaded" },
+     "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.",
+     "effects": [ "COOKOFF", "RECYCLED" ],
+     "relative": { "range": -15, "dispersion": 40 },
-- 
cgit v1.2.1