From ced0e8ead599a872a18a9b425d97ff8be306c1b5 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 4 Oct 2023 20:34:23 -0700 Subject: Clear out more clutter from the ammo reverts. --- PKGBUILD | 12 +-- ammo-01_inconsistent-ammo-names.patch | 103 --------------------- ..._Remove-handload-quality-distinction-1481.patch | 2 - revert-08_undo-rifle-balance-pass.patch | 64 ------------- revert-10_still-another-ammo-patch-to-undo.patch | 39 -------- ...tric-bullets-part-2-rename-.308-7.62x51mm.patch | 27 ------ 6 files changed, 6 insertions(+), 241 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index c028cbe..83f2a18 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -19,7 +19,7 @@ pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental pkgver=202310040030 _pkgver=2023-10-04-0030 -pkgrel=4 +pkgrel=5 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -171,21 +171,21 @@ b2sums=('57b0a71622ac7d363d90d57afc184425db5ba31ded1440b69e760ad55597b9d9e4d75cc 'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe' '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a' '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac' - '23f1d086c6faf35bf139d0ec490f9e14a2155fb04425112a54118ea645b446216e897f313de3bfc8e754152eb4c505fae345b2c8a7008629473f5439959eb4c9' + '17eca53b168574006ad517949cda3a7268be06488a83696ecd8c8fba31ae04edd141c86e7114a8796fdb3e8aa865f56df02a166dbdc76bcb1082905a7c5556c1' 'e6f0c25863074990ac54ec0a8fd05a3458c05bf41b7ebf9ec8e7ca302694b5a2fc89289d1a8818c44f0b879c61c2ecbd9d1defc9fc4a5a5fa0c98910859c8543' - 'cebd24bd72ace004972900eac56fc2b4d43d22d0fb7dbac014b55848f80067ba9c09e721543784bb9db19f28af3803288bd2be5821cbb97ebfac7a94868191a5' + 'fedcde7b8993f810e529e492c73c61d7acc4dd1965ac0d1abcb3bb1bdd23a689988d66fe9012c0cf9c4f524999aff42224ee3ccb850b8d9256ee596db3d9ffd8' 'e1eafcb481c11104e682e4cafd81f7d70261a7397c38bb4acf85f8999a16446c1fe508802d362b1a30e4c659966b635dc4cae75ef99416bacd866cb5aa9ed545' - '7311e7cfaf4c47ac2cc62ec2590c7f5b09b86615400f87f47bc62418d0028dc78ef88380022a70cbdb5e542becee9ad443cbf03e2793443d0e11656e91c0abc5' + '7c06a4bea4da71f00645c12fe1d244a5010480acec48cf0a98c9f6030f2c6ad7bcf4c8959ce9cfc2db4412cf5ce8dfdea60993bafb7fcda765f9b7030b20a226' '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7' 'd78d2bb16e19d1bcd9b3a46182048f41705cf8ddba89e051aef7f0e28aea52536467fa4a1e39db9f64d7cb53d19882e7e12a77613369a51d8fd937192609d0ff' - '909df4e1b7182e7d18e76b22c2ed0dc5d20ba4ca7df8ac03ada87ea03c623645ffe598161800c84f74aeb1d5d80923cbdf946eb9a88677216de3a13d81092455' + '63d334661bfe5270910de1c9689892aadfabbc5ee1a14508caccfd0639404f337900906fe91dab453ee5036290e485231d9072b977970d438c938ce55f8d2bf3' '3999499f63c50ab9fb38edab7592bcba4f8ab9a51b63d96445a9a6af843d5c5a36f36838735528fc42e5eec5c9e375e704fab1aa55df03f5a804e54d247edaa5' '2de96509a572c1eca36d63f1a049a27583cd0f2df53605b927c9b5112d4e2385bccc82ba1a37af06fe756f96cc1e8c9d4b6cd081ad70651ec09ac57b93cee84f' '664d6d2d4427040b25d9971fa07b32d3c1343dd60a9702835568ba1e287422ab2659a4a4e324e422755b6c655e324ca203933b6815c7b2e512beb4f15c4a27d8' 'ee3722ba1367d993605c0cee12e67b8e10dcda0401c4480d8915bd3ac587c8a3b84379ef6f98d6e93cf433b1dae7a0db35937271787bc6b893b373dc1d44ae7d' 'dcb8a004230da09e73a340c1acaf3c0071a8c26e3bce9a707b8e1624854aadc9e45f6f3f0d99549ccef5c11a6396dc082691895c437d50188e1b292cb8c10751' '19a91d07aff74b5718c239c50a559e17295cbca4b472bb75fd37b3569930c0454928e7f14f7e387eddf9d29a4e50d1fbed319e9e00338c50d40849ea0e2ee545' - 'ab128ffcdfed701761c927ea7a8a355b6a10991d124f1d4ee309b030f9825ad8631eee19dfc89f49b9e8af7892fb4cf68066f90498c39084aad067f9a0a953a6' + '61236054eedd254a6e53c19d74b6b686e257644bd3d52120187e3c01131686b71c007addd8d999978e351769e44cd7a589f32178f9d7870201621669d41369e3' '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d' 'eed0a3489e58a497c5941c182a83fb16d92c708a702da6365b39c81428b6cec1bff8fe78749f9f510cb880166a6851d61195e3066b8c19e2d3d763dd6ef38cfa' '5dd5cb90aab682dfad9c46b1fcbe93294b4d9e40f4c3f30a917b25081f7cfc66baa60adbb81584d622f099761eba0eda8f46d6e49df1f82ec3c50a2da61836b3' 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 @@ diff --git a/revert-07_Remove-handload-quality-distinction-1481.patch b/revert-07_Remove-handload-quality-distinction-1481.patch index 28791d8..2ffb29c 100644 --- a/revert-07_Remove-handload-quality-distinction-1481.patch +++ b/revert-07_Remove-handload-quality-distinction-1481.patch @@ -75,11 +75,9 @@ Added back into the game and made it reversible because I don't really understan data/json/recipes/ammo/pistol.json | 173 +++-- data/json/recipes/ammo/rifle.json | 111 ++-- data/json/recipes/ammo/shot.json | 17 +- - data/json/uncraft/ammo/223.json | 2 +- data/json/uncraft/ammo/30-06.json | 19 +- data/json/uncraft/ammo/300.json | 2 +- data/json/uncraft/ammo/300blk.json | 2 +- - data/json/uncraft/ammo/308.json | 8 +- data/json/uncraft/ammo/357mag.json | 8 +- data/json/uncraft/ammo/357sig.json | 10 +- data/json/uncraft/ammo/38.json | 10 +- diff --git a/revert-08_undo-rifle-balance-pass.patch b/revert-08_undo-rifle-balance-pass.patch index c93e339..2d7295e 100644 --- a/revert-08_undo-rifle-balance-pass.patch +++ b/revert-08_undo-rifle-balance-pass.patch @@ -3,28 +3,11 @@ From: Chaosvolt Date: Sun, 30 Oct 2022 11:00:10 -0500 Subject: [PATCH 074/177] Ammo rebalance project, part 6 (#1851) -* [WIP] Ammo rebalance project, part 6 - -* Continue work on the thing - -* Fix an oops - -* I knew I forgot one - -* Revert shotshell changes for now - -* Slight nudge to .233 and .308 per feedback - -* Update 308.json - -* Update 270win.json --- - data/json/items/ammo/223.json | 6 ++++-- data/json/items/ammo/270win.json | 2 +- data/json/items/ammo/300.json | 2 +- data/json/items/ammo/3006.json | 4 ++-- data/json/items/ammo/300blk.json | 2 +- - data/json/items/ammo/308.json | 5 +++-- data/json/items/ammo/36paper.json | 4 ++-- data/json/items/ammo/44paper.json | 4 ++-- data/json/items/ammo/4570.json | 8 +++++--- @@ -35,30 +18,6 @@ Subject: [PATCH 074/177] Ammo rebalance project, part 6 (#1851) data/json/items/ammo/762R.json | 2 +- 14 files changed, 32 insertions(+), 23 deletions(-) -diff --git a/data/json/items/ammo/223.json b/data/json/items/ammo/223.json -index 22c55429c5a..5b747112341 100644 ---- a/data/json/items/ammo/223.json -+++ b/data/json/items/ammo/223.json -@@ -17,7 +17,8 @@ - "ammo_type": "223", - "casing": "223_casing", - "range": 36, -- "damage": { "damage_type": "bullet", "amount": 44, "armor_penetration": 2 }, -+ "//": "Balanced as FMJ rather than JHP, as M855A1 is steel core and would fit better as AP.", -+ "damage": { "damage_type": "bullet", "amount": 42, "armor_penetration": 24 }, - "dispersion": 30, - "recoil": 1500, - "effects": [ "COOKOFF" ] -@@ -31,7 +32,8 @@ - "price": 290, - "price_postapoc": 900, - "flags": [ "IRREPLACEABLE_CONSUMABLE" ], -- "relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 4 }, "dispersion": -10 }, -+ "//": "Balanced as AP, 7/8 damage, arpen matches damage.", -+ "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 13 }, "dispersion": -10 }, - "proportional": { "recoil": 1.1 }, - "extend": { "effects": [ "NEVER_MISFIRES" ] } - }, diff --git a/data/json/items/ammo/270win.json b/data/json/items/ammo/270win.json index bc2f5e826e9..6ca0814d2e2 100644 --- a/data/json/items/ammo/270win.json @@ -120,29 +79,6 @@ index bdff5be36f5..815d1a1702d 100644 "dispersion": 30, "recoil": 2000, "effects": [ "COOKOFF" ] -diff --git a/data/json/items/ammo/308.json b/data/json/items/ammo/308.json -index 8d25222a916..bbf6d3701ec 100644 ---- a/data/json/items/ammo/308.json -+++ b/data/json/items/ammo/308.json -@@ -17,7 +17,8 @@ - "ammo_type": "308", - "casing": "308_casing", - "range": 65, -- "damage": { "damage_type": "bullet", "amount": 60, "armor_penetration": 2 }, -+ "//": "Balanced as FMJ rather than JHP.", -+ "damage": { "damage_type": "bullet", "amount": 55, "armor_penetration": 31 }, - "dispersion": 15, - "recoil": 3000, - "effects": [ "COOKOFF" ] -@@ -29,7 +30,7 @@ - "name": { "str": "7.62x51mm 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 }, -+ "relative": { "damage": { "damage_type": "bullet", "amount": -7, "armor_penetration": 17 }, "dispersion": -10 }, - "proportional": { "recoil": 1.1 }, - "extend": { "effects": [ "NEVER_MISFIRES" ] } - }, diff --git a/data/json/items/ammo/36paper.json b/data/json/items/ammo/36paper.json index 40556f4e1c8..4b170321d4f 100644 --- a/data/json/items/ammo/36paper.json diff --git a/revert-10_still-another-ammo-patch-to-undo.patch b/revert-10_still-another-ammo-patch-to-undo.patch index 59177b6..d880c5f 100644 --- a/revert-10_still-another-ammo-patch-to-undo.patch +++ b/revert-10_still-another-ammo-patch-to-undo.patch @@ -7,12 +7,10 @@ Subject: [PATCH 01/13] Ammo Rebalance, Part 8 (#2258) * Doi I forgot .50 at first --- - data/json/items/ammo/223.json | 6 +++--- data/json/items/ammo/270win.json | 2 +- data/json/items/ammo/300.json | 2 +- data/json/items/ammo/3006.json | 2 +- data/json/items/ammo/300blk.json | 2 +- - data/json/items/ammo/308.json | 2 +- data/json/items/ammo/4570.json | 10 +++++----- data/json/items/ammo/50.json | 4 ++-- data/json/items/ammo/545x39.json | 4 ++-- @@ -21,30 +19,6 @@ Subject: [PATCH 01/13] Ammo Rebalance, Part 8 (#2258) data/json/items/ammo/762R.json | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) -diff --git a/data/json/items/ammo/223.json b/data/json/items/ammo/223.json -index 5b747112341..beaea0d4e9f 100644 ---- a/data/json/items/ammo/223.json -+++ b/data/json/items/ammo/223.json -@@ -18,7 +18,7 @@ - "casing": "223_casing", - "range": 36, - "//": "Balanced as FMJ rather than JHP, as M855A1 is steel core and would fit better as AP.", -- "damage": { "damage_type": "bullet", "amount": 42, "armor_penetration": 24 }, -+ "damage": { "damage_type": "bullet", "amount": 42, "armor_penetration": 18 }, - "dispersion": 30, - "recoil": 1500, - "effects": [ "COOKOFF" ] -@@ -32,8 +32,8 @@ - "price": 290, - "price_postapoc": 900, - "flags": [ "IRREPLACEABLE_CONSUMABLE" ], -- "//": "Balanced as AP, 7/8 damage, arpen matches damage.", -- "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 13 }, "dispersion": -10 }, -+ "//": "Balanced as AP, 7/8 damage, arpen 6/7 of that value.", -+ "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 14 }, "dispersion": -10 }, - "proportional": { "recoil": 1.1 }, - "extend": { "effects": [ "NEVER_MISFIRES" ] } - }, diff --git a/data/json/items/ammo/270win.json b/data/json/items/ammo/270win.json index 6ca0814d2e2..8a9139df52c 100644 --- a/data/json/items/ammo/270win.json @@ -97,19 +71,6 @@ index 815d1a1702d..4e9b193b5e7 100644 "dispersion": 30, "recoil": 2000, "effects": [ "COOKOFF" ] -diff --git a/data/json/items/ammo/308.json b/data/json/items/ammo/308.json -index bbf6d3701ec..52e9c588eda 100644 ---- a/data/json/items/ammo/308.json -+++ b/data/json/items/ammo/308.json -@@ -18,7 +18,7 @@ - "casing": "308_casing", - "range": 65, - "//": "Balanced as FMJ rather than JHP.", -- "damage": { "damage_type": "bullet", "amount": 55, "armor_penetration": 31 }, -+ "damage": { "damage_type": "bullet", "amount": 55, "armor_penetration": 24 }, - "dispersion": 15, - "recoil": 3000, - "effects": [ "COOKOFF" ] diff --git a/data/json/items/ammo/4570.json b/data/json/items/ammo/4570.json index bc4f6de6ecb..048d32d35c7 100644 --- a/data/json/items/ammo/4570.json diff --git a/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch b/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch index 177994a..02e1dd2 100644 --- a/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch +++ b/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch @@ -50,15 +50,6 @@ index 52e9c588eda..c8832a73794 100644 "description": ".308 Winchester ammunition with 168gr hollow point bullets. The .308 round is one of the most popular hunting cartridges in the world due to its accuracy and power.", "weight": "18 g", "volume": "250 ml", -@@ -27,7 +27,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": -7, "armor_penetration": 17 }, "dispersion": -10 }, @@ -46,7 +46,7 @@ "id": "bp_308", "copy-from": "308", @@ -68,24 +59,6 @@ index 52e9c588eda..c8832a73794 100644 "proportional": { "price": 0.3, "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 }, -@@ -60,7 +60,7 @@ - "id": "bp_762_51", - "copy-from": "762_51", - "type": "AMMO", -- "name": { "str": "7.62x51mm, black powder" }, -+ "name": { "str": "7.62x51mm NATO, black powder" }, - "proportional": { - "price": 0.3, - "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 }, -@@ -74,7 +74,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": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 }, diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json index 06cbf7f7e8a..19c14a9397d 100644 --- a/data/json/items/ammo_types.json -- cgit v1.2.1