summaryrefslogtreecommitdiff
path: root/0003-inconsistent-ammo-names.patch
diff options
context:
space:
mode:
Diffstat (limited to '0003-inconsistent-ammo-names.patch')
-rw-r--r--0003-inconsistent-ammo-names.patch164
1 files changed, 0 insertions, 164 deletions
diff --git a/0003-inconsistent-ammo-names.patch b/0003-inconsistent-ammo-names.patch
deleted file mode 100644
index 4b6dcb0..0000000
--- a/0003-inconsistent-ammo-names.patch
+++ /dev/null
@@ -1,164 +0,0 @@
---- 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/300blk.json
-+++ b/data/json/items/ammo/300blk.json
-@@ -26,7 +26,7 @@
- "id": "300blk_ss",
- "copy-from": "300blk",
- "type": "AMMO",
-- "name": { "str": ".300 AAC Blackout" },
-+ "name": { "str": ".300 AAC Blackout SS" },
- "description": "A subsonic .300 AAC Blackout round with a 220gr open tip match bullet. 300 BLK is an intermediate cartridge necked up from 5.56x45mm, designed to achieve similar ballistics to 7.62x39mm. It is compatible with standard AR-15 lower receivers and will feed from STANAG magazines.",
- "weight": "21 g",
- "range": 40,
---- 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 },
---- 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",
- "name": { "str": ".357 Magnum FMJ, reloaded", "str_pl": ".357 Magnum FMJ, reloaded" },
-- "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 }
-+ "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 },
-+ "extend": { "effects": [ "RECYCLED" ] }
- },
- {
- "id": "reloaded_357mag_jhp",
- "copy-from": "357mag_jhp",
- "type": "AMMO",
- "name": { "str": ".357 Magnum JHP, reloaded", "str_pl": ".357 Magnum JHP, reloaded" },
-- "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 }
-+ "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 },
-+ "extend": { "effects": [ "RECYCLED" ] }
- }
- ]
---- a/data/json/items/ammo/762x25.json
-+++ b/data/json/items/ammo/762x25.json
-@@ -26,7 +26,7 @@
- "id": "762_25hot",
- "copy-from": "762_25",
- "type": "AMMO",
-- "name": { "str": "7.62x25mm FMJ hot load" },
-+ "name": { "str": "7.62x25mm FMJ" },
- "description": "A high-pressure commercial version of the 7.62x25mm cartridge, loaded with an 85 gr. FMJ bullet. It is more powerful than the original.",
- "relative": { "price": 500, "range": 2, "damage": 4, "pierce": 3 },
- "proportional": { "recoil": 1.4 }
-@@ -55,7 +55,8 @@
- "id": "reloaded_762_25",
- "copy-from": "762_25hot",
- "type": "AMMO",
-- "name": { "str": "7.62x25mm, reloaded" },
-- "proportional": { "price": 0.7, "damage": 0.9, "pierce": 0.9, "dispersion": 1.1 }
-+ "name": { "str": "7.62x25mm FMJ, reloaded" },
-+ "proportional": { "price": 0.7, "damage": 0.9, "pierce": 0.9, "dispersion": 1.1 },
-+ "extend": { "effects": [ "RECYCLED" ] }
- }
- ]
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-14 09:10:46 +0000