Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove AoE from buckshot and flechette ammo until it's fixed #2792

Merged
merged 1 commit into from
May 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions data/json/items/ammo/20x66mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,7 @@
"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.",
"range": 0,
"shape": [ "cone", { "half_angle": 15, "length": 12 } ]
"description": "20x66mm caseless shotgun rounds, buckshot type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded."
},
{
"id": "20x66_slug",
Expand Down
12 changes: 4 additions & 8 deletions data/json/items/ammo/40x46mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
"name": { "str": "40x46mm M576 buckshot" },
"description": "A 40x46mm buckshot load, designed for use in thick vegetation or room clearing.",
"weight": "120 g",
"range": 0,
"shape": [ "cone", { "half_angle": 15, "length": 12 } ],
"range": 12,
"damage": { "damage_type": "bullet", "amount": 120 },
"recoil": 1000,
"casing": "40x46mm_m199_casing",
Expand All @@ -74,8 +73,7 @@
"name": { "str": "improvised 40x46mm buckshot" },
"description": "An improvised 40x46mm buckshot load somewhat resembling M576. Aside from using the M118 casing normally used by HEDP shells, it performs as well as buckshot loads using the intended M199 casing.",
"weight": "120 g",
"range": 0,
"shape": [ "cone", { "half_angle": 15, "length": 12 } ],
"range": 10,
"damage": { "damage_type": "bullet", "amount": 120 },
"recoil": 1000,
"casing": "40x46mm_m118_casing",
Expand Down Expand Up @@ -114,8 +112,7 @@
"name": { "str": "improvised 40x46mm flechette" },
"description": "An improvised 40x46mm flechette load containing 70 steel darts. Aside from using the M118 casing normally used by HEDP shells, it performs as well as flechette shells using the M199 casing.",
"weight": "120 g",
"range": 0,
"shape": [ "cone", { "half_angle": 15, "length": 12 } ],
"range": 10,
"//": "Balanced as AP.",
"damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 72 },
"recoil": 1000,
Expand All @@ -129,8 +126,7 @@
"name": { "str": "improvised 40x46mm flechette" },
"description": "An improvised 40x46mm flechette load containing 70 steel darts, loaded into the M199 casing used by M576 buckshot shells.",
"weight": "120 g",
"range": 0,
"shape": [ "cone", { "half_angle": 15, "length": 12 } ],
"range": 10,
"//": "Balanced as AP.",
"damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 72 },
"recoil": 1000,
Expand Down
6 changes: 2 additions & 4 deletions data/json/items/ammo/40x53mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
"description": "40x53mm canister shot loaded with 17 grain flechettes.",
"weight": "340 g",
"//": "Balanced as AP.",
"range": 0,
"shape": [ "cone", { "half_angle": 15, "length": 10 } ],
"range": 10,
"damage": { "damage_type": "bullet", "amount": 91, "armor_penetration": 78 },
"recoil": 1000,
"casing": "40x53mm_m169_casing",
Expand All @@ -52,8 +51,7 @@
"name": { "str": "improvised 40x53mm buckshot" },
"description": "An improvised 40x53mm buckshot load somewhat resembling M576.",
"weight": "340 g",
"range": 0,
"shape": [ "cone", { "half_angle": 15, "length": 10 } ],
"range": 10,
"damage": { "damage_type": "bullet", "amount": 130 },
"recoil": 1200,
"casing": "40x53mm_m169_casing",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/ammo/410shot.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
"stack_size": 20,
"ammo_type": "410shot",
"casing": "410shot_hull",
"range": 0,
"shape": [ "cone", { "half_angle": 10, "length": 12 } ],
"range": 12,
"damage": { "damage_type": "bullet", "amount": 30 },
"recoil": 1350,
"loudness": 90,
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/ammo/flintlock.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
"count": 30,
"stack_size": 10,
"ammo_type": "flintlock",
"range": 0,
"shape": [ "cone", { "half_angle": 10, "length": 12 } ],
"range": 4,
"damage": { "damage_type": "bullet", "amount": 63 },
"dispersion": 20,
"recoil": 1500,
Expand Down
4 changes: 1 addition & 3 deletions data/json/items/ammo/shot.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@
"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.",
"range": 0,
"shape": [ "cone", { "half_angle": 10, "length": 12 } ]
"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",
Expand Down
6 changes: 2 additions & 4 deletions data/json/items/handloaded_bullets.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
"bashing": 1,
"ammo_type": "blunderbuss",
"damage": { "damage_type": "bullet", "amount": 55, "armor_multiplier": 1.5 },
"range": 0,
"shape": [ "cone", { "half_angle": 18, "length": 10 } ],
"range": 6,
"dispersion": 1000,
"recoil": 780,
"effects": [ "COOKOFF", "SHOT", "RECYCLED" ]
Expand All @@ -57,8 +56,7 @@
"ammo_type": "blunderbuss",
"//": "Balanced as standard FMJ to allow lower damage but more penetration over shot.",
"damage": { "damage_type": "bullet", "amount": 44, "armor_penetration": 24, "armor_multiplier": 1.5 },
"range": 0,
"shape": [ "cone", { "half_angle": 10, "length": 12 } ],
"range": 10,
"dispersion": 1000,
"recoil": 840,
"effects": [ "COOKOFF", "SHOT", "RECYCLED" ]
Expand Down