From 4cd074662d7c14d663b7e4e528736db27b62a917 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sat, 10 Sep 2022 12:50:31 -0700 Subject: Update ammo order patch to fix 00 shot. --- PKGBUILD | 2 +- ammo-10_ammo-order-fix.patch | 234 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 235 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index d831689..3a40ad1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -141,7 +141,7 @@ b2sums=('b0f21654472cdbbdd6ef02e69044629b4b2c45ba80a3c9530af19a6e0fca6e0a9351350 '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19' '7fa3cc2cc13171aa395accc061a8582f0254a01377b3d60ded4c8d82c5a4f1af65b8e1b6c4fccf0b5fb9a6de1cd59121aae353e6d374726f058c3718bfb9743f' '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c' - '4ebc6160e28b7852b4ae689062a9b92f3ff3f2c7990bfe84ed62ce617d5589d53d375627cf544abb10b41e68b213af1507af39f5148fa4f119abcc15055033d8' + '373186c55545b4e747c08db497dae0f1446d2830c862a1b8a0d1bd03d237acc9a4fa8854537c0f485528fc0ef05ec6a2f5e43a42c21689dd85178fb07667b51b' '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4' 'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65' '172c611008cb8893a8a8cbf83ef929f5727fbf341f3303c6f38749e3742f96ba7352624112ac231a8df7be9031649e41d54cc52152776e52e3a7a620ea8f33e3' diff --git a/ammo-10_ammo-order-fix.patch b/ammo-10_ammo-order-fix.patch index 9fd6e55..7720600 100644 --- a/ammo-10_ammo-order-fix.patch +++ b/ammo-10_ammo-order-fix.patch @@ -379,3 +379,237 @@ "id": "50match", "copy-from": "50bmg", "type": "AMMO", +--- a/data/json/items/ammo/shot.json ++++ b/data/json/items/ammo/shot.json +@@ -1,94 +1,5 @@ + [ + { +- "id": "reloaded_shot_bird", +- "copy-from": "shot_bird", +- "type": "AMMO", +- "name": { "str": "birdshot, 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" ] } +- }, +- { +- "id": "reloaded_shot_dragon", +- "copy-from": "shot_dragon", +- "type": "AMMO", +- "name": { "str": "dragon's breath shell, 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" ] } +- }, +- { +- "id": "reloaded_shot_00", +- "copy-from": "shot_00", +- "type": "AMMO", +- "name": { "str": "00 shot, 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" ] } +- }, +- { +- "id": "reloaded_shot_flechette", +- "copy-from": "shot_flechette", +- "type": "AMMO", +- "name": { "str": "flechette shell, 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" ] } +- }, +- { +- "id": "reloaded_shot_slug", +- "copy-from": "shot_slug", +- "type": "AMMO", +- "name": { "str": "shotgun slug, 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" ] } +- }, +- { +- "id": "bp_shot_bird", +- "copy-from": "shot_bird", +- "type": "AMMO", +- "name": { "str": "birdshot, black powder" }, +- "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 }, +- "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, +- "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } +- }, +- { +- "id": "bp_shot_dragon", +- "copy-from": "shot_dragon", +- "type": "AMMO", +- "name": { "str": "dragon's breath shell, black powder" }, +- "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 }, +- "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, +- "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } +- }, +- { +- "id": "bp_shot_00", +- "copy-from": "shot_00", +- "type": "AMMO", +- "name": { "str": "00 shot, black powder" }, +- "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, +- "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } +- }, +- { +- "id": "bp_shot_flechette", +- "copy-from": "shot_flechette", +- "type": "AMMO", +- "name": { "str": "flechette shell, black powder" }, +- "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 }, +- "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, +- "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } +- }, +- { +- "id": "bp_shot_slug", +- "copy-from": "shot_slug", +- "type": "AMMO", +- "name": { "str": "shotgun slug, black powder" }, +- "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 }, +- "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, +- "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } +- }, +- { + "id": "shot_00", + "type": "AMMO", + "name": { "str": "00 shot" }, +@@ -171,6 +82,20 @@ + "relative": { "damage": { "damage_type": "bullet", "amount": -6, "armor_penetration": 12 } } + }, + { ++ "id": "shot_slug", ++ "copy-from": "shot_00", ++ "type": "AMMO", ++ "name": { "str": "shotgun slug" }, ++ "description": "A heavy metal slug used with shotguns to give them the range capabilities of a rifle. Extremely damaging but rather inaccurate.", ++ "price": 400, ++ "price_postapoc": 400, ++ "flags": [ "IRREPLACEABLE_CONSUMABLE" ], ++ "dispersion": 100, ++ "relative": { "range": 12, "damage": { "damage_type": "bullet", "armor_penetration": 6 } }, ++ "proportional": { "recoil": 1.4 }, ++ "delete": { "effects": [ "SHOT" ] } ++ }, ++ { + "id": "shot_he", + "copy-from": "shot_slug", + "type": "AMMO", +@@ -195,6 +120,95 @@ + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { ++ "id": "reloaded_shot_bird", ++ "copy-from": "shot_bird", ++ "type": "AMMO", ++ "name": { "str": "birdshot, 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" ] } ++ }, ++ { ++ "id": "reloaded_shot_dragon", ++ "copy-from": "shot_dragon", ++ "type": "AMMO", ++ "name": { "str": "dragon's breath shell, 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" ] } ++ }, ++ { ++ "id": "reloaded_shot_00", ++ "copy-from": "shot_00", ++ "type": "AMMO", ++ "name": { "str": "00 shot, 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" ] } ++ }, ++ { ++ "id": "reloaded_shot_flechette", ++ "copy-from": "shot_flechette", ++ "type": "AMMO", ++ "name": { "str": "flechette shell, 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" ] } ++ }, ++ { ++ "id": "reloaded_shot_slug", ++ "copy-from": "shot_slug", ++ "type": "AMMO", ++ "name": { "str": "shotgun slug, 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" ] } ++ }, ++ { ++ "id": "bp_shot_bird", ++ "copy-from": "shot_bird", ++ "type": "AMMO", ++ "name": { "str": "birdshot, black powder" }, ++ "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 }, ++ "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, ++ "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } ++ }, ++ { ++ "id": "bp_shot_dragon", ++ "copy-from": "shot_dragon", ++ "type": "AMMO", ++ "name": { "str": "dragon's breath shell, black powder" }, ++ "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 }, ++ "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, ++ "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } ++ }, ++ { ++ "id": "bp_shot_00", ++ "copy-from": "shot_00", ++ "type": "AMMO", ++ "name": { "str": "00 shot, black powder" }, ++ "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, ++ "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } ++ }, ++ { ++ "id": "bp_shot_flechette", ++ "copy-from": "shot_flechette", ++ "type": "AMMO", ++ "name": { "str": "flechette shell, black powder" }, ++ "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 }, ++ "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, ++ "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } ++ }, ++ { ++ "id": "bp_shot_slug", ++ "copy-from": "shot_slug", ++ "type": "AMMO", ++ "name": { "str": "shotgun slug, black powder" }, ++ "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 }, ++ "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, ++ "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } ++ }, ++ { + "id": "bp_shot_scrap", + "copy-from": "shot_scrap", + "type": "AMMO", +@@ -202,19 +216,5 @@ + "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 } }, + "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } +- }, +- { +- "id": "shot_slug", +- "copy-from": "shot_00", +- "type": "AMMO", +- "name": { "str": "shotgun slug" }, +- "description": "A heavy metal slug used with shotguns to give them the range capabilities of a rifle. Extremely damaging but rather inaccurate.", +- "price": 400, +- "price_postapoc": 400, +- "flags": [ "IRREPLACEABLE_CONSUMABLE" ], +- "dispersion": 100, +- "relative": { "range": 12, "damage": { "damage_type": "bullet", "armor_penetration": 6 } }, +- "proportional": { "recoil": 1.4 }, +- "delete": { "effects": [ "SHOT" ] } + } + ] -- cgit v1.2.1