From ced0e8ead599a872a18a9b425d97ff8be306c1b5 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Wed, 4 Oct 2023 20:34:23 -0700
Subject: Clear out more clutter from the ammo reverts.

---
 ammo-01_inconsistent-ammo-names.patch | 103 ----------------------------------
 1 file changed, 103 deletions(-)

(limited to 'ammo-01_inconsistent-ammo-names.patch')

diff --git a/ammo-01_inconsistent-ammo-names.patch b/ammo-01_inconsistent-ammo-names.patch
index 584b613..3c85a25 100644
--- a/ammo-01_inconsistent-ammo-names.patch
+++ b/ammo-01_inconsistent-ammo-names.patch
@@ -1,106 +1,3 @@
---- a/data/json/items/ammo/223.json
-+++ b/data/json/items/ammo/223.json
-@@ -39,7 +39,7 @@
-     "id": "556_incendiary",
-     "copy-from": "556",
-     "type": "AMMO",
--    "name": { "str": "5.56 NATO tracer" },
-+    "name": { "str": "5.56 NATO M856 tracer" },
-     "description": "This ammunition is a one-in-five mix of M855A1 and M856 tracer rounds to help keep the weapon they are fired from on target.",
-     "extend": { "effects": [ "INCENDIARY" ] }
-   },
-@@ -61,7 +61,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": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
-@@ -75,7 +75,7 @@
-     "id": "bp_556_incendiary",
-     "copy-from": "556_incendiary",
-     "type": "AMMO",
--    "name": { "str": "5.56 NATO tracer, black powder" },
-+    "name": { "str": "5.56 NATO M856 tracer, black powder" },
-     "proportional": {
-       "price": 0.3,
-       "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
-@@ -98,7 +98,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": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-     "extend": { "effects": [ "RECYCLED" ] },
-     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-@@ -107,7 +107,7 @@
-     "id": "reloaded_556_incendiary",
-     "copy-from": "556_incendiary",
-     "type": "AMMO",
--    "name": { "str": "5.56 NATO tracer, reloaded" },
-+    "name": { "str": "5.56 NATO M856 tracer, 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" ] }
---- 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": { "damage_type": "bullet", "amount": -2, "armor_penetration": 4 }, "dispersion": -10 },
-@@ -37,7 +37,7 @@
-     "id": "762_51_incendiary",
-     "copy-from": "762_51",
-     "type": "AMMO",
--    "name": { "str": "7.62x51mm NATO tracer" },
-+    "name": { "str": "7.62x51mm NATO M62 tracer" },
-     "description": "This ammunition is a one-in-five mix of M80 and M62 tracer rounds to help keep the weapon they are fired from on target.",
-     "extend": { "effects": [ "INCENDIARY" ] }
-   },
-@@ -59,7 +59,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": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
-@@ -73,7 +73,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 M62 tracer, black powder" },
-     "proportional": {
-       "price": 0.3,
-       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
-@@ -96,7 +96,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": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-     "extend": { "effects": [ "RECYCLED" ] },
-     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-@@ -105,7 +105,7 @@
-     "id": "reloaded_762_51_incendiary",
-     "copy-from": "762_51_incendiary",
-     "type": "AMMO",
--    "name": { "str": "7.62x51mm incendiary, reloaded" },
-+    "name": { "str": "7.62x51mm NATO M62 tracer, 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" ] }
 --- a/data/json/items/ammo/357mag.json
 +++ b/data/json/items/ammo/357mag.json
 @@ -2,8 +2,8 @@
-- 
cgit v1.2.1