Move 50bmg copy-from fix to after the ammo order fix.

2 files changed, 2 insertions, 73 deletions

diff --git a/ammo-01_inconsistent-ammo-names.patch b/ammo-01_inconsistent-ammo-names.patch
deleted file mode 100644
index 3c85a25..0000000
--- a/ammo-01_inconsistent-ammo-names.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- 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,
-@@ -27,8 +27,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.",
-     "damage": { "damage_type": "bullet", "amount": 42, "armor_penetration": 0 }
-   },
-   {
---- a/data/json/items/ammo/45.json
-+++ b/data/json/items/ammo/45.json
-@@ -76,7 +76,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": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-     "extend": { "effects": [ "RECYCLED" ] },
-     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
---- a/data/json/items/ammo/50.json
-+++ b/data/json/items/ammo/50.json
-@@ -70,7 +70,7 @@
-     "id": "reloaded_50_incendiary",
-     "copy-from": "50_incendiary",
-     "type": "AMMO",
--    "name": { "str": ".50 BMG tracer, reloaded" },
-+    "name": { "str": ".50 BMG M17 tracer, reloaded" },
-     "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.",
-     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-     "extend": { "effects": [ "RECYCLED" ] },
-@@ -90,7 +90,7 @@
-     "id": "reloaded_50ss",
-     "copy-from": "50ss",
-     "type": "AMMO",
--    "name": { "str": ".50 BMG AP, reloaded" },
-+    "name": { "str": ".50 BMG M2 AP, reloaded" },
-     "description": "Variant of the .50 BMG round that uses a core hardened steel.  Penetration is increased, but damage is reduced.",
-     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-     "extend": { "effects": [ "RECYCLED" ] },
---- a/data/json/items/ammo/762x25.json
-+++ b/data/json/items/ammo/762x25.json
-@@ -68,7 +68,8 @@
-     "id": "reloaded_762_25",
-     "copy-from": "762_25hot",
-     "type": "AMMO",
--    "name": { "str": "7.62x25mm, reloaded" },
--    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.9 }, "dispersion": 1.1 }
-+    "name": { "str": "7.62x25mm FMJ, reloaded" },
-+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.9 }, "dispersion": 1.1 },
-+    "extend": { "effects": [ "RECYCLED" ] }
-   }
- ]
diff --git a/ammo-03_fix-reloaded-50bmg.patch b/ammo-13_fix-reloaded-50bmg.patch
index ab618c9..5a47596 100644
--- a/ammo-03_fix-reloaded-50bmg.patch
+++ b/ammo-13_fix-reloaded-50bmg.patch
@@ -1,14 +1,11 @@
 --- a/data/json/items/ammo/50.json
 +++ b/data/json/items/ammo/50.json
-@@ -78,9 +78,9 @@
+@@ -78,7 +78,7 @@
    },
    {
      "id": "reloaded_50bmg",
 -    "copy-from": "50match",
 +    "copy-from": "50bmg",
      "type": "AMMO",
--    "name": { "str": ".50 BMG Match, reloaded" },
-+    "name": { "str": ".50 BMG M33 Ball, reloaded" },
+     "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.",
-     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-     "extend": { "effects": [ "RECYCLED" ] },