diff options
Diffstat (limited to 'ammo-10_ammo-order-fix.patch')
| -rw-r--r-- | ammo-10_ammo-order-fix.patch | 371 |
1 files changed, 194 insertions, 177 deletions
diff --git a/ammo-10_ammo-order-fix.patch b/ammo-10_ammo-order-fix.patch index fdface4..502c1bc 100644 --- a/ammo-10_ammo-order-fix.patch +++ b/ammo-10_ammo-order-fix.patch @@ -1,6 +1,6 @@ --- a/data/json/items/ammo/20x66mm.json +++ b/data/json/items/ammo/20x66mm.json -@@ -1,7 +1,38 @@ +@@ -1,5 +1,35 @@ [ { + "abstract": "20x66_shot_abstract", @@ -19,10 +19,9 @@ + "count": 20, + "stack_size": 20, + "ammo_type": "20x66mm", -+ "range": 12, -+ "damage": { "damage_type": "bullet", "amount": 60 }, ++ "range": 20, ++ "damage": { "damage_type": "bullet", "amount": 100 }, + "recoil": 2500, -+ "loudness": 160, + "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ] + }, + { @@ -35,12 +34,9 @@ + }, + { "id": "20x66_beanbag", -- "copy-from": "20x66_shot", -+ "copy-from": "20x66_shot_abstract", + "copy-from": "20x66_shot", "type": "AMMO", - "name": { "str": "20x66mm beanbag" }, - "description": "20x66mm caseless shotgun rounds, sublethal beanbag type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", -@@ -14,6 +46,18 @@ +@@ -14,6 +45,19 @@ "extend": { "effects": [ "LARGE_BEANBAG", "NOGIB" ] } }, { @@ -53,13 +49,14 @@ + "price_postapoc": 4000, + "flags": [ "IRREPLACEABLE_CONSUMABLE" ], + "count": 10, -+ "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 20 } } ++ "//": "Balanced as AP.", ++ "relative": { "damage": { "damage_type": "bullet", "amount": -18, "armor_penetration": 36 } } + }, + { - "id": "20x66_bootleg_flechette", + "id": "20x66_flechette_reloaded", "copy-from": "20x66_flechette", "type": "AMMO", -@@ -34,6 +78,20 @@ +@@ -34,6 +78,21 @@ "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } }, { @@ -71,16 +68,17 @@ + "price": 1500, + "price_postapoc": 4000, + "flags": [ "IRREPLACEABLE_CONSUMABLE" ], -+ "damage": { "damage_type": "bullet", "amount": 39, "armor_penetration": 8 }, -+ "relative": { "range": 12 }, ++ "//": "Balanced as FMJ", ++ "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 21 }, ++ "relative": { "range": 20 }, + "proportional": { "dispersion": 1.3 }, + "delete": { "effects": [ "SHOT" ] } + }, + { - "id": "20x66_bootleg_slug", + "id": "20x66_slug_reloaded", "copy-from": "20x66_slug", "type": "AMMO", -@@ -75,18 +133,6 @@ +@@ -75,19 +134,6 @@ "effects": [ "NO_EMBED" ] }, { @@ -93,13 +91,14 @@ - "price_postapoc": 4000, - "flags": [ "IRREPLACEABLE_CONSUMABLE" ], - "count": 10, -- "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 20 } } +- "//": "Balanced as AP.", +- "relative": { "damage": { "damage_type": "bullet", "amount": -18, "armor_penetration": 36 } } - }, - { "id": "20x66_frag", "copy-from": "20x66_slug", "type": "AMMO", -@@ -110,50 +156,5 @@ +@@ -111,50 +157,5 @@ "flags": [ "IRREPLACEABLE_CONSUMABLE" ], "count": 10, "extend": { "effects": [ "INCENDIARY" ] } @@ -121,10 +120,9 @@ - "count": 20, - "stack_size": 20, - "ammo_type": "20x66mm", -- "range": 12, -- "damage": { "damage_type": "bullet", "amount": 60 }, +- "range": 20, +- "damage": { "damage_type": "bullet", "amount": 100 }, - "recoil": 2500, -- "loudness": 160, - "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ] - }, - { @@ -144,8 +142,9 @@ - "price": 1500, - "price_postapoc": 4000, - "flags": [ "IRREPLACEABLE_CONSUMABLE" ], -- "damage": { "damage_type": "bullet", "amount": 39, "armor_penetration": 8 }, -- "relative": { "range": 12 }, +- "//": "Balanced as FMJ", +- "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 21 }, +- "relative": { "range": 20 }, - "proportional": { "dispersion": 1.3 }, - "delete": { "effects": [ "SHOT" ] } } @@ -395,129 +394,103 @@ --- a/data/json/items/ammo/shot.json +++ b/data/json/items/ammo/shot.json -@@ -1,49 +1,5 @@ +@@ -1,5 +1,50 @@ [ { -- "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": "heat", "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" ] } -- }, -- { - "abstract": "shot_abstract", - "type": "AMMO", - "name": { "str": "00 shot" }, -@@ -76,19 +32,5 @@ - }, - { -- "id": "shot_beanbag", -- "copy-from": "shot_00", -- "type": "AMMO", -- "name": { "str": "shotgun beanbag" }, -- "description": "A beanbag round for shotguns, not deadly but designed to disable.", -- "price": 500, -- "price_postapoc": 200, -- "flags": [ "IRREPLACEABLE_CONSUMABLE" ], -- "count": 10, -- "damage": { "damage_type": "bash", "amount": 5 }, -- "proportional": { "recoil": 0.4, "loudness": 0.6 }, -- "extend": { "effects": [ "BEANBAG", "NOGIB" ] } -- }, -- { - "id": "shot_bird", - "copy-from": "shot_00", - "type": "AMMO", -@@ -105,6 +47,15 @@ - "extend": { "effects": [ "NOGIB" ] } - }, - { -+ "id": "bp_shot_bird", -+ "copy-from": "shot_bird", ++ "abstract": "shot_abstract", + "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" ] } ++ "name": { "str": "00 shot" }, ++ "description": "A shell filled with metal pellets. Extremely damaging, plus the spread makes it very accurate at short range. Favored by SWAT forces.", ++ "weight": "32 g", ++ "volume": "250 ml", ++ "price": 500, ++ "price_postapoc": 800, ++ "flags": [ "IRREPLACEABLE_CONSUMABLE" ], ++ "material": [ "plastic", "powder" ], ++ "symbol": "=", ++ "color": "red", ++ "count": 20, ++ "stack_size": 20, ++ "ammo_type": "shot", ++ "casing": "shot_hull", ++ "range": 20, ++ "damage": { "damage_type": "bullet", "amount": 80, "armor_multiplier": 2.0 }, ++ "recoil": 2500, ++ "loudness": 160, ++ "effects": [ "COOKOFF", "SHOT" ] + }, + { - "id": "shot_dragon", - "copy-from": "shot_00", - "type": "AMMO", -@@ -120,6 +71,23 @@ - "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] } - }, - { -+ "id": "bp_shot_dragon", -+ "copy-from": "shot_dragon", ++ "id": "shot_00", ++ "copy-from": "shot_abstract", + "type": "AMMO", -+ "name": { "str": "dragon's breath shell, black powder" }, -+ "proportional": { "price": 0.6, "damage": { "damage_type": "heat", "amount": 0.8 }, "dispersion": 1.2 }, -+ "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, -+ "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } ++ "name": { "str": "00 shot" }, ++ "description": "A shell filled with metal pellets. Extremely damaging, plus the spread makes it very accurate at short range. Favored by SWAT forces." + }, + { -+ "id": "bp_shot_00", ++ "id": "shot_bird", + "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" ] } ++ "name": { "str": "birdshot" }, ++ "description": "Weak shotgun ammunition. Designed for hunting birds and other small game, its applications in combat are very limited.", ++ "price": 100, ++ "price_postapoc": 400, ++ "range": 0, ++ "damage": { "damage_type": "bullet", "amount": 50, "armor_multiplier": 3.0 }, ++ "dispersion": 1000, ++ "loudness": 80, ++ "shape": [ "cone", { "half_angle": 15, "length": 8 } ], ++ "extend": { "effects": [ "NOGIB" ] } + }, + { - "id": "shot_flechette", - "copy-from": "shot_00", + "id": "reloaded_shot_bird", + "copy-from": "shot_bird", + "type": "AMMO", +@@ -9,6 +54,21 @@ + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { ++ "id": "shot_dragon", ++ "copy-from": "shot_00", ++ "type": "AMMO", ++ "name": { "str": "dragon's breath shell" }, ++ "description": "A shotgun shell filled with magnesium pellets or shards, used mostly as a distress flare or pyrotechnics tool. When the round is fired, high temperature sparks and flames shoot out of the barrel, igniting everything in their path.", ++ "price": 1000, ++ "price_postapoc": 1600, ++ "flags": [ "IRREPLACEABLE_CONSUMABLE" ], ++ "damage": { "damage_type": "heat", "amount": 30 }, ++ "proportional": { "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2 }, ++ "range": 0, ++ "shape": [ "cone", { "half_angle": 15, "length": 8 } ], ++ "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] } ++ }, ++ { + "id": "reloaded_shot_dragon", + "copy-from": "shot_dragon", "type": "AMMO", -@@ -132,6 +100,52 @@ - "relative": { "damage": { "damage_type": "bullet", "amount": -6, "armor_penetration": 12 } } +@@ -27,6 +87,19 @@ + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } }, { -+ "id": "bp_shot_flechette", -+ "copy-from": "shot_flechette", ++ "id": "shot_flechette", ++ "copy-from": "shot_00", + "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" ] } ++ "name": { "str": "flechette shell" }, ++ "description": "A shotgun shell filled with tiny steel darts. Extremely damaging, plus the spread makes it very accurate at short range. Slices through most forms of armor with ease.", ++ "price": 2000, ++ "price_postapoc": 800, ++ "flags": [ "IRREPLACEABLE_CONSUMABLE" ], ++ "count": 10, ++ "//": "Balanced as standard AP.", ++ "relative": { "damage": { "damage_type": "bullet", "amount": -20, "armor_penetration": 30, "armor_multiplier": -1.0 } } + }, + { + "id": "reloaded_shot_flechette", + "copy-from": "shot_flechette", + "type": "AMMO", +@@ -36,6 +109,21 @@ + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "shot_slug", + "copy-from": "shot_abstract", + "type": "AMMO", @@ -526,77 +499,121 @@ + "price": 400, + "price_postapoc": 400, + "flags": [ "IRREPLACEABLE_CONSUMABLE" ], -+ "dispersion": 100, -+ "relative": { "range": 12, "damage": { "damage_type": "bullet", "armor_penetration": 6 } }, ++ "dispersion": 80, ++ "//": "Balanced as FMJ", ++ "relative": { "range": 12, "damage": { "damage_type": "bullet", "amount": -15, "armor_penetration": 18, "armor_multiplier": -0.5 } }, + "proportional": { "recoil": 1.4 }, + "delete": { "effects": [ "SHOT" ] } + }, + { -+ "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_beanbag", -+ "copy-from": "shot_00", -+ "type": "AMMO", -+ "name": { "str": "shotgun beanbag" }, -+ "description": "A beanbag round for shotguns, not deadly but designed to disable.", -+ "price": 500, -+ "price_postapoc": 200, -+ "flags": [ "IRREPLACEABLE_CONSUMABLE" ], -+ "count": 10, -+ "damage": { "damage_type": "bash", "amount": 5 }, -+ "proportional": { "recoil": 0.4, "loudness": 0.6 }, -+ "extend": { "effects": [ "BEANBAG", "NOGIB" ] } -+ }, -+ { - "id": "shot_he", + "id": "reloaded_shot_slug", "copy-from": "shot_slug", "type": "AMMO", -@@ -146,16 +160,6 @@ - "extend": { "effects": [ "EXPLOSIVE" ] } +@@ -89,36 +177,6 @@ + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } }, { -- "id": "shot_scrap", -- "copy-from": "shot_00", +- "abstract": "shot_abstract", - "type": "AMMO", -- "name": { "str": "00 shot, scrap loaded" }, -- "description": "A shotgun shell filled with whatever was lying around. They are more damaging than birdshot, but fairly inaccurate.", -- "proportional": { "price": 0.4, "damage": { "damage_type": "bullet", "amount": 0.6 }, "dispersion": 1.2 }, -- "extend": { "effects": [ "RECYCLED" ] }, -- "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } +- "name": { "str": "00 shot" }, +- "description": "A shell filled with metal pellets. Extremely damaging, plus the spread makes it very accurate at short range. Favored by SWAT forces.", +- "weight": "32 g", +- "volume": "250 ml", +- "price": 500, +- "price_postapoc": 800, +- "flags": [ "IRREPLACEABLE_CONSUMABLE" ], +- "material": [ "plastic", "powder" ], +- "symbol": "=", +- "color": "red", +- "count": 20, +- "stack_size": 20, +- "ammo_type": "shot", +- "casing": "shot_hull", +- "range": 20, +- "damage": { "damage_type": "bullet", "amount": 80, "armor_multiplier": 2.0 }, +- "recoil": 2500, +- "loudness": 160, +- "effects": [ "COOKOFF", "SHOT" ] - }, - { - "id": "bp_shot_scrap", - "copy-from": "shot_scrap", +- "id": "shot_00", +- "copy-from": "shot_abstract", +- "type": "AMMO", +- "name": { "str": "00 shot" }, +- "description": "A shell filled with metal pellets. Extremely damaging, plus the spread makes it very accurate at short range. Favored by SWAT forces." +- }, +- { + "id": "shot_beanbag", + "copy-from": "shot_00", "type": "AMMO", -@@ -165,17 +169,13 @@ - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } +@@ -133,49 +191,6 @@ + "extend": { "effects": [ "BEANBAG", "NOGIB" ] } }, { +- "id": "shot_bird", +- "copy-from": "shot_00", +- "type": "AMMO", +- "name": { "str": "birdshot" }, +- "description": "Weak shotgun ammunition. Designed for hunting birds and other small game, its applications in combat are very limited.", +- "price": 100, +- "price_postapoc": 400, +- "range": 0, +- "damage": { "damage_type": "bullet", "amount": 50, "armor_multiplier": 3.0 }, +- "dispersion": 1000, +- "loudness": 80, +- "shape": [ "cone", { "half_angle": 15, "length": 8 } ], +- "extend": { "effects": [ "NOGIB" ] } +- }, +- { +- "id": "shot_dragon", +- "copy-from": "shot_00", +- "type": "AMMO", +- "name": { "str": "dragon's breath shell" }, +- "description": "A shotgun shell filled with magnesium pellets or shards, used mostly as a distress flare or pyrotechnics tool. When the round is fired, high temperature sparks and flames shoot out of the barrel, igniting everything in their path.", +- "price": 1000, +- "price_postapoc": 1600, +- "flags": [ "IRREPLACEABLE_CONSUMABLE" ], +- "damage": { "damage_type": "heat", "amount": 30 }, +- "proportional": { "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2 }, +- "range": 0, +- "shape": [ "cone", { "half_angle": 15, "length": 8 } ], +- "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] } +- }, +- { +- "id": "shot_flechette", +- "copy-from": "shot_00", +- "type": "AMMO", +- "name": { "str": "flechette shell" }, +- "description": "A shotgun shell filled with tiny steel darts. Extremely damaging, plus the spread makes it very accurate at short range. Slices through most forms of armor with ease.", +- "price": 2000, +- "price_postapoc": 800, +- "flags": [ "IRREPLACEABLE_CONSUMABLE" ], +- "count": 10, +- "//": "Balanced as standard AP.", +- "relative": { "damage": { "damage_type": "bullet", "amount": -20, "armor_penetration": 30, "armor_multiplier": -1.0 } } +- }, +- { + "id": "shot_he", + "copy-from": "shot_slug", + "type": "AMMO", +@@ -207,20 +222,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_abstract", -+ "id": "shot_scrap", -+ "copy-from": "shot_00", - "type": "AMMO", +- "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 } }, +- "dispersion": 80, +- "//": "Balanced as FMJ", +- "relative": { "range": 12, "damage": { "damage_type": "bullet", "amount": -15, "armor_penetration": 18, "armor_multiplier": -0.5 } }, - "proportional": { "recoil": 1.4 }, - "delete": { "effects": [ "SHOT" ] } -+ "name": { "str": "00 shot, scrap loaded" }, -+ "description": "A shotgun shell filled with whatever was lying around. They are more damaging than birdshot, but fairly inaccurate.", -+ "proportional": { "price": 0.4, "damage": { "damage_type": "bullet", "amount": 0.6 }, "dispersion": 1.2 }, -+ "extend": { "effects": [ "RECYCLED" ] }, -+ "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } } ] |