diff options
Diffstat (limited to 'ammo-10_ammo-order-fix.patch')
| -rw-r--r-- | ammo-10_ammo-order-fix.patch | 585 |
1 files changed, 585 insertions, 0 deletions
diff --git a/ammo-10_ammo-order-fix.patch b/ammo-10_ammo-order-fix.patch new file mode 100644 index 0000000..35c69e9 --- /dev/null +++ b/ammo-10_ammo-order-fix.patch @@ -0,0 +1,585 @@ +--- a/data/json/items/ammo/20x66mm.json ++++ b/data/json/items/ammo/20x66mm.json +@@ -30,14 +30,49 @@ + "recoil": 1000 + }, + { +- "id": "20x66_bootleg_flechette", +- "copy-from": "20x66_flechette", ++ "id": "20x66_shot", ++ "copy-from": "20x66_abstract", + "type": "AMMO", +- "name": { "str": "20x66mm flechette, handmade", "str_pl": "20x66mm flechettes, handmade" }, +- "description": "A handcrafted bootleg duplicate of the Rivtech 20x66mm caseless flechette round.", +- "proportional": { "price": 0.7, "shot_damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, +- "extend": { "effects": [ "RECYCLED" ], "flags": [ "CASELESS_ROUNDS" ] }, +- "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } ++ "name": { "str_sp": "20x66mm buckshot" }, ++ "//": "2.5x the Generic Rate of $1/shot", ++ "description": "A 20x66mm caseless shotgun round, buckshot type. Proprietary ammunition for Rivtech shotguns.", ++ "price": 1500, ++ "price_postapoc": 4000, ++ "range": 12, ++ "projectile_count": 10, ++ "shot_spread": 10, ++ "shot_damage": { "damage_type": "bullet", "amount": 16 }, ++ "damage": { "damage_type": "bullet", "amount": 50 }, ++ "recoil": 2500, ++ "extend": { "effects": [ "SHOT" ], "flags": [ "CASELESS_ROUNDS" ] } ++ }, ++ { ++ "id": "20x66_flechette", ++ "copy-from": "20x66_shot", ++ "type": "AMMO", ++ "name": { "str": "20x66mm flechette" }, ++ "description": "A 20x66mm caseless shotgun round, flechette type. Proprietary ammunition for Rivtech shotguns.", ++ "price": 4000, ++ "price_postapoc": 4000, ++ "count": 10, ++ "shot_spread": 5, ++ "shot_damage": { "damage_type": "bullet", "amount": 8, "armor_penetration": 12 }, ++ "damage": { "damage_type": "bullet", "amount": 50 }, ++ "extend": { "flags": [ "CASELESS_ROUNDS" ] } ++ }, ++ { ++ "id": "20x66_slug", ++ "copy-from": "20x66_abstract", ++ "type": "AMMO", ++ "name": { "str": "20x66mm slug" }, ++ "description": "A 20x66mm caseless shotgun round, solid projectile type. Proprietary ammunition for Rivtech shotguns.", ++ "price": 1500, ++ "price_postapoc": 4000, ++ "range": 24, ++ "damage": { "damage_type": "bullet", "amount": 39, "armor_penetration": 8 }, ++ "dispersion": 100, ++ "recoil": 2500, ++ "extend": { "flags": [ "CASELESS_ROUNDS" ] } + }, + { + "id": "20x66_bootleg_shot", +@@ -50,6 +85,16 @@ + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { ++ "id": "20x66_bootleg_flechette", ++ "copy-from": "20x66_flechette", ++ "type": "AMMO", ++ "name": { "str": "20x66mm flechette, handmade", "str_pl": "20x66mm flechettes, handmade" }, ++ "description": "A handcrafted bootleg duplicate of the Rivtech 20x66mm caseless flechette round.", ++ "proportional": { "price": 0.7, "shot_damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, ++ "extend": { "effects": [ "RECYCLED" ], "flags": [ "CASELESS_ROUNDS" ] }, ++ "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } ++ }, ++ { + "id": "20x66_bootleg_slug", + "copy-from": "20x66_slug", + "type": "AMMO", +@@ -90,20 +135,6 @@ + "extend": { "flags": [ "CASELESS_ROUNDS" ] } + }, + { +- "id": "20x66_flechette", +- "copy-from": "20x66_shot", +- "type": "AMMO", +- "name": { "str": "20x66mm flechette" }, +- "description": "A 20x66mm caseless shotgun round, flechette type. Proprietary ammunition for Rivtech shotguns.", +- "price": 4000, +- "price_postapoc": 4000, +- "count": 10, +- "shot_spread": 5, +- "shot_damage": { "damage_type": "bullet", "amount": 8, "armor_penetration": 12 }, +- "damage": { "damage_type": "bullet", "amount": 50 }, +- "extend": { "flags": [ "CASELESS_ROUNDS" ] } +- }, +- { + "id": "20x66_frag", + "copy-from": "20x66_slug", + "type": "AMMO", +@@ -125,36 +156,5 @@ + "price_postapoc": 5000, + "count": 10, + "extend": { "effects": [ "INCENDIARY" ], "flags": [ "CASELESS_ROUNDS" ] } +- }, +- { +- "id": "20x66_shot", +- "copy-from": "20x66_abstract", +- "type": "AMMO", +- "name": { "str_sp": "20x66mm buckshot" }, +- "//": "2.5x the Generic Rate of $1/shot", +- "description": "A 20x66mm caseless shotgun round, buckshot type. Proprietary ammunition for Rivtech shotguns.", +- "price": 1500, +- "price_postapoc": 4000, +- "range": 12, +- "projectile_count": 10, +- "shot_spread": 10, +- "shot_damage": { "damage_type": "bullet", "amount": 16 }, +- "damage": { "damage_type": "bullet", "amount": 50 }, +- "recoil": 2500, +- "extend": { "effects": [ "SHOT" ], "flags": [ "CASELESS_ROUNDS" ] } +- }, +- { +- "id": "20x66_slug", +- "copy-from": "20x66_abstract", +- "type": "AMMO", +- "name": { "str": "20x66mm slug" }, +- "description": "A 20x66mm caseless shotgun round, solid projectile type. Proprietary ammunition for Rivtech shotguns.", +- "price": 1500, +- "price_postapoc": 4000, +- "range": 24, +- "damage": { "damage_type": "bullet", "amount": 39, "armor_penetration": 8 }, +- "dispersion": 100, +- "recoil": 2500, +- "extend": { "flags": [ "CASELESS_ROUNDS" ] } + } + ] +--- a/data/json/items/ammo/22.json ++++ b/data/json/items/ammo/22.json +@@ -1,28 +1,5 @@ + [ + { +- "id": "22_cb", +- "copy-from": "22_lr", +- "type": "AMMO", +- "name": { "str_sp": ".22 CB" }, +- "description": ".22 Conical Ball, a variety of .22 ammunition that propels its bullet using a primer instead of gunpowder. The end result is a subsonic round that is so weak as to be nearly useless given your predicament.", +- "price": 100, +- "price_postapoc": 1000, +- "flags": [ "IRREPLACEABLE_CONSUMABLE" ], +- "count": 100, +- "stack_size": 150, +- "recoil": 39, +- "proportional": { "range": 0.6, "damage": { "damage_type": "bullet", "amount": 0.5 }, "dispersion": 1.2 }, +- "extend": { "effects": [ "NOGIB" ] } +- }, +- { +- "id": "22_fmj", +- "copy-from": "22_lr", +- "type": "AMMO", +- "name": { "str_sp": ".22 FMJ" }, +- "description": ".22 Long Rifle ammunition with a 30gr FMJ bullet. The .22LR round is extremely weak, with short range and negligible recoil. This type is marginally better at piercing through targets, but deals even less damage as a result.", +- "relative": { "damage": { "damage_type": "bullet", "amount": -1, "armor_penetration": 2 } } +- }, +- { + "id": "22_lr", + "type": "AMMO", + "name": { "str_sp": ".22 LR" }, +@@ -46,6 +23,29 @@ + "effects": [ "COOKOFF" ] + }, + { ++ "id": "22_cb", ++ "copy-from": "22_lr", ++ "type": "AMMO", ++ "name": { "str_sp": ".22 CB" }, ++ "description": ".22 Conical Ball, a variety of .22 ammunition that propels its bullet using a primer instead of gunpowder. The end result is a subsonic round that is so weak as to be nearly useless given your predicament.", ++ "price": 100, ++ "price_postapoc": 1000, ++ "flags": [ "IRREPLACEABLE_CONSUMABLE" ], ++ "count": 100, ++ "stack_size": 150, ++ "recoil": 39, ++ "proportional": { "range": 0.6, "damage": { "damage_type": "bullet", "amount": 0.5 }, "dispersion": 1.2 }, ++ "extend": { "effects": [ "NOGIB" ] } ++ }, ++ { ++ "id": "22_fmj", ++ "copy-from": "22_lr", ++ "type": "AMMO", ++ "name": { "str_sp": ".22 FMJ" }, ++ "description": ".22 Long Rifle ammunition with a 30gr FMJ bullet. The .22LR round is extremely weak, with short range and negligible recoil. This type is marginally better at piercing through targets, but deals even less damage as a result.", ++ "relative": { "damage": { "damage_type": "bullet", "amount": -1, "armor_penetration": 2 } } ++ }, ++ { + "id": "22_ratshot", + "copy-from": "22_lr", + "type": "AMMO", +--- a/data/json/items/ammo/38.json ++++ b/data/json/items/ammo/38.json +@@ -1,13 +1,5 @@ + [ + { +- "id": "38_fmj", +- "copy-from": "38_special", +- "type": "AMMO", +- "name": { "str_sp": ".38 FMJ" }, +- "description": ".38 Special ammunition with a brass jacketed 130gr bullet. From its inception, the .38 Special round has been known for its accuracy and low recoil.", +- "relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 4 } } +- }, +- { + "id": "38_special", + "type": "AMMO", + "name": { "str": ".38 Special" }, +@@ -31,6 +23,14 @@ + "effects": [ "COOKOFF" ] + }, + { ++ "id": "38_fmj", ++ "copy-from": "38_special", ++ "type": "AMMO", ++ "name": { "str_sp": ".38 FMJ" }, ++ "description": ".38 Special ammunition with a brass jacketed 130gr bullet. From its inception, the .38 Special round has been known for its accuracy and low recoil.", ++ "relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 4 } } ++ }, ++ { + "id": "38_super", + "copy-from": "38_special", + "type": "AMMO", +--- a/data/json/items/ammo/40.json ++++ b/data/json/items/ammo/40.json +@@ -1,13 +1,5 @@ + [ + { +- "id": "40fmj", +- "copy-from": "40sw", +- "type": "AMMO", +- "name": { "str_sp": ".40 S&W FMJ" }, +- "description": ".40 S&W ammunition with a 180gr FMJ bullet. 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.", +- "relative": { "damage": { "damage_type": "bullet", "amount": -3, "armor_penetration": 6 } } +- }, +- { + "id": "40sw", + "type": "AMMO", + "name": { "str_sp": ".40 S&W JHP" }, +@@ -31,6 +23,14 @@ + "effects": [ "COOKOFF" ] + }, + { ++ "id": "40fmj", ++ "copy-from": "40sw", ++ "type": "AMMO", ++ "name": { "str_sp": ".40 S&W FMJ" }, ++ "description": ".40 S&W ammunition with a 180gr FMJ bullet. 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.", ++ "relative": { "damage": { "damage_type": "bullet", "amount": -3, "armor_penetration": 6 } } ++ }, ++ { + "id": "bp_40fmj", + "copy-from": "40fmj", + "type": "AMMO", +--- a/data/json/items/ammo/44.json ++++ b/data/json/items/ammo/44.json +@@ -1,13 +1,5 @@ + [ + { +- "id": "44fmj", +- "copy-from": "44magnum", +- "type": "AMMO", +- "name": { "str_sp": ".44 Magnum FMJ" }, +- "description": "A brass-jacketed variant of the .44 Magnum round. This increases penetration slightly at the cost of reduced damage from expansion.", +- "relative": { "damage": { "damage_type": "bullet", "amount": -4, "armor_penetration": 8 } } +- }, +- { + "id": "44magnum", + "type": "AMMO", + "name": { "str": ".44 Magnum" }, +@@ -31,6 +23,14 @@ + "effects": [ "COOKOFF" ] + }, + { ++ "id": "44fmj", ++ "copy-from": "44magnum", ++ "type": "AMMO", ++ "name": { "str_sp": ".44 Magnum FMJ" }, ++ "description": "A brass-jacketed variant of the .44 Magnum round. This increases penetration slightly at the cost of reduced damage from expansion.", ++ "relative": { "damage": { "damage_type": "bullet", "amount": -4, "armor_penetration": 8 } } ++ }, ++ { + "id": "reloaded_44fmj", + "copy-from": "44fmj", + "type": "AMMO", +--- a/data/json/items/ammo/45.json ++++ b/data/json/items/ammo/45.json +@@ -1,13 +1,5 @@ + [ + { +- "id": "45_acp", +- "copy-from": "45_jhp", +- "type": "AMMO", +- "name": { "str_sp": ".45 ACP FMJ" }, +- "description": ".45 ACP ammunition with a 230gr FMJ bullet. Due to a reputation for effectiveness, the .45 ACP round has been common for over a century.", +- "relative": { "damage": { "damage_type": "bullet", "amount": -3, "armor_penetration": 6 } } +- }, +- { + "id": "45_jhp", + "type": "AMMO", + "name": { "str_sp": ".45 ACP JHP" }, +@@ -31,6 +23,14 @@ + "effects": [ "COOKOFF" ] + }, + { ++ "id": "45_acp", ++ "copy-from": "45_jhp", ++ "type": "AMMO", ++ "name": { "str_sp": ".45 ACP FMJ" }, ++ "description": ".45 ACP ammunition with a 230gr FMJ bullet. Due to a reputation for effectiveness, the .45 ACP round has been common for over a century.", ++ "relative": { "damage": { "damage_type": "bullet", "amount": -3, "armor_penetration": 6 } } ++ }, ++ { + "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_sp": ".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_sp": ".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_sp": ".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_sp": ".50 BMG M33 Ball" }, +@@ -33,6 +23,16 @@ + "effects": [ "COOKOFF", "NEVER_MISFIRES" ] + }, + { ++ "id": "50_incendiary", ++ "copy-from": "50bmg", ++ "type": "AMMO", ++ "name": { "str_sp": ".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,91 @@ + [ + { ++ "abstract": "shotshell_abstract", ++ "type": "AMMO", ++ "name": "base shotshell", ++ "weight": "32 g", ++ "volume": "439 ml", ++ "flags": [ "IRREPLACEABLE_CONSUMABLE" ], ++ "material": [ "plastic", "powder" ], ++ "symbol": "=", ++ "color": "red", ++ "count": 20, ++ "stack_size": 20, ++ "ammo_type": "shot", ++ "casing": "shot_hull" ++ }, ++ { ++ "id": "shot_00", ++ "copy-from": "shotshell_abstract", ++ "type": "AMMO", ++ "name": { "str_sp": "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.", ++ "price": 500, ++ "price_postapoc": 800, ++ "range": 18, ++ "damage": { "damage_type": "bullet", "amount": 60 }, ++ "shot_damage": { "damage_type": "bullet", "amount": 15 }, ++ "projectile_count": 9, ++ "shot_spread": 300, ++ "recoil": 2500, ++ "loudness": 160, ++ "effects": [ "COOKOFF", "SHOT" ] ++ }, ++ { ++ "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, ++ "relative": { "shot_damage": { "damage_type": "bullet", "amount": -3, "armor_penetration": 6 }, "shot_spread": -150, "range": 12 } ++ }, ++ { ++ "id": "shot_slug", ++ "copy-from": "shotshell_abstract", ++ "type": "AMMO", ++ "name": { "str": "shotgun slug" }, ++ "description": "A heavy metal slug used to give a shotgun the range capabilities of a rifle. Extremely damaging but rather inaccurate.", ++ "price": 400, ++ "price_postapoc": 400, ++ "range": 24, ++ "dispersion": 100, ++ "damage": { "damage_type": "bullet", "amount": 50, "armor_penetration": 6 }, ++ "recoil": 3500, ++ "effects": [ "COOKOFF" ] ++ }, ++ { ++ "id": "shot_bird", ++ "copy-from": "shotshell_abstract", ++ "type": "AMMO", ++ "name": { "str_sp": "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, ++ "projectile_count": 100, ++ "shot_spread": 300, ++ "range": 18, ++ "shot_damage": { "damage_type": "bullet", "amount": 0.2 }, ++ "damage": { "damage_type": "bullet", "amount": 50 }, ++ "recoil": 1500, ++ "loudness": 128, ++ "effects": [ "COOKOFF", "SHOT", "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, ++ "proportional": { "damage": { "damage_type": "bullet", "amount": 0.2 }, "recoil": 0.6, "loudness": 0.8, "range": 0.5 }, ++ "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] } ++ }, ++ { + "id": "reloaded_shot_bird", + "copy-from": "shot_bird", + "type": "AMMO", +@@ -100,38 +186,6 @@ + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { +- "abstract": "shotshell_abstract", +- "type": "AMMO", +- "name": "base shotshell", +- "weight": "32 g", +- "volume": "439 ml", +- "flags": [ "IRREPLACEABLE_CONSUMABLE" ], +- "material": [ "plastic", "powder" ], +- "symbol": "=", +- "color": "red", +- "count": 20, +- "stack_size": 20, +- "ammo_type": "shot", +- "casing": "shot_hull" +- }, +- { +- "id": "shot_00", +- "copy-from": "shotshell_abstract", +- "type": "AMMO", +- "name": { "str_sp": "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.", +- "price": 500, +- "price_postapoc": 800, +- "range": 18, +- "damage": { "damage_type": "bullet", "amount": 60 }, +- "shot_damage": { "damage_type": "bullet", "amount": 15 }, +- "projectile_count": 9, +- "shot_spread": 300, +- "recoil": 2500, +- "loudness": 160, +- "effects": [ "COOKOFF", "SHOT" ] +- }, +- { + "id": "shot_beanbag", + "copy-from": "shotshell_abstract", + "type": "AMMO", +@@ -147,46 +201,6 @@ + "effects": [ "BEANBAG", "COOKOFF", "NOGIB" ] + }, + { +- "id": "shot_bird", +- "copy-from": "shotshell_abstract", +- "type": "AMMO", +- "name": { "str_sp": "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, +- "projectile_count": 100, +- "shot_spread": 300, +- "range": 18, +- "shot_damage": { "damage_type": "bullet", "amount": 0.2 }, +- "damage": { "damage_type": "bullet", "amount": 50 }, +- "recoil": 1500, +- "loudness": 128, +- "effects": [ "COOKOFF", "SHOT", "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, +- "proportional": { "damage": { "damage_type": "bullet", "amount": 0.2 }, "recoil": 0.6, "loudness": 0.8, "range": 0.5 }, +- "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, +- "relative": { "shot_damage": { "damage_type": "bullet", "amount": -3, "armor_penetration": 6 }, "shot_spread": -150, "range": 12 } +- }, +- { + "id": "shot_he", + "copy-from": "shot_slug", + "type": "AMMO", +@@ -218,19 +232,5 @@ + "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 } }, + "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } +- }, +- { +- "id": "shot_slug", +- "copy-from": "shotshell_abstract", +- "type": "AMMO", +- "name": { "str": "shotgun slug" }, +- "description": "A heavy metal slug used to give a shotgun the range capabilities of a rifle. Extremely damaging but rather inaccurate.", +- "price": 400, +- "price_postapoc": 400, +- "range": 24, +- "dispersion": 100, +- "damage": { "damage_type": "bullet", "amount": 50, "armor_penetration": 6 }, +- "recoil": 3500, +- "effects": [ "COOKOFF" ] + } + ] |