--- a/data/json/items/ammo/20x66mm.json +++ b/data/json/items/ammo/20x66mm.json @@ -1,5 +1,35 @@ [ { + "abstract": "20x66_shot_abstract", + "type": "AMMO", + "name": { "str": "20x66mm buckshot" }, + "//": "2.5x the Generic Rate of $1/shot", + "description": "20x66mm caseless shotgun rounds, buckshot type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", + "weight": "56 g", + "volume": "250 ml", + "price": 1500, + "price_postapoc": 4000, + "flags": [ "IRREPLACEABLE_CONSUMABLE" ], + "material": [ "steel", "powder" ], + "symbol": "=", + "color": "pink", + "count": 20, + "stack_size": 20, + "ammo_type": "20x66mm", + "range": 20, + "damage": { "damage_type": "bullet", "amount": 100 }, + "recoil": 2500, + "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ] + }, + { + "id": "20x66_shot", + "copy-from": "20x66_shot_abstract", + "type": "AMMO", + "name": { "str": "20x66mm buckshot" }, + "//": "2.5x the Generic Rate of $1/shot", + "description": "20x66mm caseless shotgun rounds, buckshot type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded." + }, + { "id": "20x66_beanbag", "copy-from": "20x66_shot", "type": "AMMO", @@ -14,6 +45,19 @@ "extend": { "effects": [ "LARGE_BEANBAG", "NOGIB" ] } }, { + "id": "20x66_flechette", + "copy-from": "20x66_shot", + "type": "AMMO", + "name": { "str": "20x66mm flechette" }, + "description": "20x66mm caseless shotgun rounds, flechette type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", + "price": 4000, + "price_postapoc": 4000, + "flags": [ "IRREPLACEABLE_CONSUMABLE" ], + "count": 10, + "//": "Balanced as AP.", + "relative": { "damage": { "damage_type": "bullet", "amount": -18, "armor_penetration": 36 } } + }, + { "id": "20x66_flechette_reloaded", "copy-from": "20x66_flechette", "type": "AMMO", @@ -34,6 +78,21 @@ "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } }, { + "id": "20x66_slug", + "copy-from": "20x66_shot_abstract", + "type": "AMMO", + "name": { "str": "20x66mm slug" }, + "description": "20x66mm caseless shotgun rounds, solid projectile type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", + "price": 1500, + "price_postapoc": 4000, + "flags": [ "IRREPLACEABLE_CONSUMABLE" ], + "//": "Balanced as FMJ", + "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 21 }, + "relative": { "range": 20 }, + "proportional": { "dispersion": 1.3 }, + "delete": { "effects": [ "SHOT" ] } + }, + { "id": "20x66_slug_reloaded", "copy-from": "20x66_slug", "type": "AMMO", @@ -75,19 +134,6 @@ "effects": [ "NO_EMBED" ] }, { - "id": "20x66_flechette", - "copy-from": "20x66_shot", - "type": "AMMO", - "name": { "str": "20x66mm flechette" }, - "description": "20x66mm caseless shotgun rounds, flechette type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", - "price": 4000, - "price_postapoc": 4000, - "flags": [ "IRREPLACEABLE_CONSUMABLE" ], - "count": 10, - "//": "Balanced as AP.", - "relative": { "damage": { "damage_type": "bullet", "amount": -18, "armor_penetration": 36 } } - }, - { "id": "20x66_frag", "copy-from": "20x66_slug", "type": "AMMO", @@ -111,50 +157,5 @@ "flags": [ "IRREPLACEABLE_CONSUMABLE" ], "count": 10, "extend": { "effects": [ "INCENDIARY" ] } - }, - { - "abstract": "20x66_shot_abstract", - "type": "AMMO", - "name": { "str": "20x66mm buckshot" }, - "//": "2.5x the Generic Rate of $1/shot", - "description": "20x66mm caseless shotgun rounds, buckshot type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", - "weight": "56 g", - "volume": "250 ml", - "price": 1500, - "price_postapoc": 4000, - "flags": [ "IRREPLACEABLE_CONSUMABLE" ], - "material": [ "steel", "powder" ], - "symbol": "=", - "color": "pink", - "count": 20, - "stack_size": 20, - "ammo_type": "20x66mm", - "range": 20, - "damage": { "damage_type": "bullet", "amount": 100 }, - "recoil": 2500, - "effects": [ "COOKOFF", "SHOT", "NEVER_MISFIRES" ] - }, - { - "id": "20x66_shot", - "copy-from": "20x66_shot_abstract", - "type": "AMMO", - "name": { "str": "20x66mm buckshot" }, - "//": "2.5x the Generic Rate of $1/shot", - "description": "20x66mm caseless shotgun rounds, buckshot type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded." - }, - { - "id": "20x66_slug", - "copy-from": "20x66_shot_abstract", - "type": "AMMO", - "name": { "str": "20x66mm slug" }, - "description": "20x66mm caseless shotgun rounds, solid projectile type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", - "price": 1500, - "price_postapoc": 4000, - "flags": [ "IRREPLACEABLE_CONSUMABLE" ], - "//": "Balanced as FMJ", - "damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 21 }, - "relative": { "range": 20 }, - "proportional": { "dispersion": 1.3 }, - "delete": { "effects": [ "SHOT" ] } } ] --- a/data/json/items/ammo/22.json +++ b/data/json/items/ammo/22.json @@ -1,16 +1,5 @@ [ { - "id": "22_cphp", - "copy-from": "22_lr", - "type": "AMMO", - "name": { "str": ".22 CPHP" }, - "description": ".22 Long Rifle ammunition with 30gr copper-plated, hollow-point bullets. Has a higher velocity and slightly more stopping power than lead round-nose ammunition, but armor will have a magnified effect on its already-low penetration.", - "//": "Hollowpoint damage increase of 25%", - "damage": { "damage_type": "bullet", "amount": 20, "armor_penetration": 0 }, - "relative": { "range": 3 }, - "proportional": { "recoil": 1.5 } - }, - { "id": "22_lr", "type": "AMMO", "name": { "str": ".22 LR" }, @@ -35,6 +24,17 @@ "effects": [ "COOKOFF" ] }, { + "id": "22_cphp", + "copy-from": "22_lr", + "type": "AMMO", + "name": { "str": ".22 CPHP" }, + "description": ".22 Long Rifle ammunition with 30gr copper-plated, hollow-point bullets. Has a higher velocity and slightly more stopping power than lead round-nose ammunition, but armor will have a magnified effect on its already-low penetration.", + "//": "Hollowpoint damage increase of 25%", + "damage": { "damage_type": "bullet", "amount": 20, "armor_penetration": 0 }, + "relative": { "range": 3 }, + "proportional": { "recoil": 1.5 } + }, + { "id": "22_ratshot", "copy-from": "22_cphp", "type": "AMMO", --- a/data/json/items/ammo/38.json +++ b/data/json/items/ammo/38.json @@ -1,14 +1,5 @@ [ { - "id": "38_fmj", - "copy-from": "38_special", - "type": "AMMO", - "name": { "str": ".38 FMJ" }, - "description": ".38 Special ammunition with brass jacketed 130gr bullets. The .38 Special round has been known from its inception for its accuracy and low recoil.", - "//": "Base damage of 20, balance increase of two-nineths.", - "relative": { "damage": { "damage_type": "bullet", "amount": -6, "armor_penetration": 14 } } - }, - { "id": "38_special", "type": "AMMO", "name": { "str": ".38 Special" }, @@ -33,6 +24,15 @@ "effects": [ "COOKOFF" ] }, { + "id": "38_fmj", + "copy-from": "38_special", + "type": "AMMO", + "name": { "str": ".38 FMJ" }, + "description": ".38 Special ammunition with brass jacketed 130gr bullets. The .38 Special round has been known from its inception for its accuracy and low recoil.", + "//": "Base damage of 20, balance increase of two-nineths.", + "relative": { "damage": { "damage_type": "bullet", "amount": -6, "armor_penetration": 14 } } + }, + { "id": "bp_38_fmj", "copy-from": "38_fmj", "type": "AMMO", --- a/data/json/items/ammo/40.json +++ b/data/json/items/ammo/40.json @@ -1,14 +1,5 @@ [ { - "id": "40fmj", - "copy-from": "40sw", - "type": "AMMO", - "name": { "str": ".40 S&W FMJ" }, - "description": ".40 S&W ammunition with 180gr FMJ bullets. Designed to retain the 10mm Auto cartridge's power with lower recoil, the .40 S&W round became popular for law enforcement and personal defense.", - "//": "Base damage of 23, balance increase of two-nineths.", - "relative": { "damage": { "damage_type": "bullet", "amount": -7, "armor_penetration": 16 } } - }, - { "id": "40sw", "type": "AMMO", "name": { "str": ".40 S&W JHP" }, @@ -33,6 +24,15 @@ "effects": [ "COOKOFF" ] }, { + "id": "40fmj", + "copy-from": "40sw", + "type": "AMMO", + "name": { "str": ".40 S&W FMJ" }, + "description": ".40 S&W ammunition with 180gr FMJ bullets. Designed to retain the 10mm Auto cartridge's power with lower recoil, the .40 S&W round became popular for law enforcement and personal defense.", + "//": "Base damage of 23, balance increase of two-nineths.", + "relative": { "damage": { "damage_type": "bullet", "amount": -7, "armor_penetration": 16 } } + }, + { "id": "bp_40fmj", "copy-from": "40fmj", "type": "AMMO", --- a/data/json/items/ammo/44.json +++ b/data/json/items/ammo/44.json @@ -1,14 +1,5 @@ [ { - "id": "44fmj", - "copy-from": "44magnum", - "type": "AMMO", - "name": { "str": ".44 Magnum FMJ" }, - "description": "A brass-jacketed variant of the .44 Magnum round. This increases penetration at the cost of reduced damage from expansion.", - "//": "Base damage of 36, balance increase of one-nineth.", - "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 23 } } - }, - { "id": "44magnum", "type": "AMMO", "name": { "str": ".44 Magnum" }, @@ -33,6 +24,15 @@ "effects": [ "COOKOFF" ] }, { + "id": "44fmj", + "copy-from": "44magnum", + "type": "AMMO", + "name": { "str": ".44 Magnum FMJ" }, + "description": "A brass-jacketed variant of the .44 Magnum round. This increases penetration at the cost of reduced damage from expansion.", + "//": "Base damage of 36, balance increase of one-nineth.", + "relative": { "damage": { "damage_type": "bullet", "amount": -10, "armor_penetration": 23 } } + }, + { "id": "bp_44magnum", "copy-from": "44magnum", "type": "AMMO", --- a/data/json/items/ammo/45.json +++ b/data/json/items/ammo/45.json @@ -1,14 +1,5 @@ [ { - "id": "45_acp", - "copy-from": "45_jhp", - "type": "AMMO", - "name": { "str": ".45 ACP FMJ" }, - "description": ".45 ACP ammunition with 230gr FMJ bullets. Noted for its stopping power, the .45 ACP round has been common for almost 150 years.", - "//": "Base damage of 27, balance increase of two-nineths.", - "relative": { "damage": { "damage_type": "bullet", "amount": -8, "armor_penetration": 18 } } - }, - { "id": "45_jhp", "type": "AMMO", "name": { "str": ".45 ACP JHP" }, @@ -32,6 +23,15 @@ "effects": [ "COOKOFF" ] }, { + "id": "45_acp", + "copy-from": "45_jhp", + "type": "AMMO", + "name": { "str": ".45 ACP FMJ" }, + "description": ".45 ACP ammunition with 230gr FMJ bullets. Noted for its stopping power, the .45 ACP round has been common for almost 150 years.", + "//": "Base damage of 27, balance increase of two-nineths.", + "relative": { "damage": { "damage_type": "bullet", "amount": -8, "armor_penetration": 18 } } + }, + { "id": "45_super", "copy-from": "45_jhp", "type": "AMMO", --- a/data/json/items/ammo/460.json +++ b/data/json/items/ammo/460.json @@ -1,13 +1,5 @@ [ { - "id": "460_fmj", - "copy-from": "460_rowland", - "type": "AMMO", - "name": { "str": ".460 Rowland HCFN" }, - "description": "A plated, hard cast flat nosed variant of the .460 Rowland round. This increases penetration slightly at the cost of reduced damage from expansion.", - "relative": { "damage": { "damage_type": "bullet", "amount": -4, "armor_penetration": 8 } } - }, - { "id": "460_rowland", "copy-from": "44magnum", "type": "AMMO", @@ -18,6 +10,14 @@ "proportional": { "range": 0.95, "damage": { "damage_type": "bullet", "amount": 0.95, "armor_penetration": 0.95 }, "recoil": 0.95 } }, { + "id": "460_fmj", + "copy-from": "460_rowland", + "type": "AMMO", + "name": { "str": ".460 Rowland HCFN" }, + "description": "A plated, hard cast flat nosed variant of the .460 Rowland round. This increases penetration slightly at the cost of reduced damage from expansion.", + "relative": { "damage": { "damage_type": "bullet", "amount": -4, "armor_penetration": 8 } } + }, + { "id": "bp_460_fmj", "copy-from": "460_fmj", "type": "AMMO", --- a/data/json/items/ammo/50.json +++ b/data/json/items/ammo/50.json @@ -1,15 +1,5 @@ [ { - "id": "50_incendiary", - "copy-from": "50bmg", - "type": "AMMO", - "name": { "str": ".50 BMG M17 tracer" }, - "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.", - "count": 10, - "effects": [ "INCENDIARY" ], - "dispersion": 310 - }, - { "id": "50bmg", "type": "AMMO", "name": { "str": ".50 BMG M33 Ball" }, @@ -34,6 +24,16 @@ "effects": [ "COOKOFF", "NEVER_MISFIRES" ] }, { + "id": "50_incendiary", + "copy-from": "50bmg", + "type": "AMMO", + "name": { "str": ".50 BMG M17 tracer" }, + "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.", + "count": 10, + "effects": [ "INCENDIARY" ], + "dispersion": 310 + }, + { "id": "50match", "copy-from": "50bmg", "type": "AMMO", --- a/data/json/items/ammo/shot.json +++ b/data/json/items/ammo/shot.json @@ -1,5 +1,50 @@ [ { + "abstract": "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.", + "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_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_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": "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", @@ -27,6 +87,19 @@ "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } }, { + "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": "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", + "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": 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": "reloaded_shot_slug", "copy-from": "shot_slug", "type": "AMMO", @@ -89,36 +177,6 @@ "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } }, { - "abstract": "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.", - "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_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", @@ -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", - "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": 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" ] } } ]