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.

Sign up for GitHub

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

feat(balance): second revert of shotgun ammo AoE #6027

Merged
merged 3 commits into from
Feb 1, 2025
Merged

feat(balance): second revert of shotgun ammo AoE #6027

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f73ee5
DOOFENSHMIRTZ EVIL INCORPORATED
RoyalFox2140 Feb 1, 2025
666d876
Revert "DOOFENSHMIRTZ EVIL INCORPORATED"
RoyalFox2140 Feb 1, 2025
2571329
A
RoyalFox2140 Feb 1, 2025
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
Next Next commit
DOOFENSHMIRTZ EVIL INCORPORATED
  • Loading branch information
@RoyalFox2140
RoyalFox2140 committed Feb 1, 2025
commit 8f73ee52e6996600dc1f8ae4a6f76e202e033636
1 change: 1 addition & 0 deletions data/json/items/ammo/20x66mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
"//": "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,
"damage": { "damage_type": "bullet", "amount": 50 },
"shape": [ "cone", { "half_angle": 5, "length": 24 } ]
},
{
Expand Down
1 change: 1 addition & 0 deletions data/json/items/ammo/22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"price_postapoc": "4 USD",
"dispersion": 0,
"range": 0,
"damage": { "damage_type": "bullet", "amount": 10, "armor_penetration": 0 },
"shape": [ "cone", { "half_angle": 15, "length": 8 } ],
"proportional": { "recoil": 0.334 },
"extend": { "effects": [ "SHOT", "NOGIB" ] }
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/ammo/40x46mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"weight": "120 g",
"range": 0,
"shape": [ "cone", { "half_angle": 15, "length": 12 } ],
"damage": { "damage_type": "bullet", "amount": 120 },
"damage": { "damage_type": "bullet", "amount": 60 },
"recoil": 1000,
"casing": "40x46mm_m199_casing",
"extend": { "effects": [ "SHOT" ] }
Expand All @@ -80,7 +80,7 @@
"weight": "120 g",
"range": 0,
"shape": [ "cone", { "half_angle": 15, "length": 12 } ],
"damage": { "damage_type": "bullet", "amount": 120 },
"damage": { "damage_type": "bullet", "amount": 60 },
"recoil": 1000,
"casing": "40x46mm_m118_casing",
"extend": { "effects": [ "SHOT" ] }
Expand Down Expand Up @@ -121,7 +121,7 @@
"range": 0,
"shape": [ "cone", { "half_angle": 15, "length": 12 } ],
"//": "Balanced as AP.",
"damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 72 },
"damage": { "damage_type": "bullet", "amount": 42, "armor_penetration": 36 },
"recoil": 1000,
"casing": "40x46mm_m118_casing",
"extend": { "effects": [ "SHOT" ] }
Expand All @@ -136,7 +136,7 @@
"range": 0,
"shape": [ "cone", { "half_angle": 15, "length": 12 } ],
"//": "Balanced as AP.",
"damage": { "damage_type": "bullet", "amount": 84, "armor_penetration": 72 },
"damage": { "damage_type": "bullet", "amount": 42, "armor_penetration": 36 },
"recoil": 1000,
"casing": "40x46mm_m199_casing",
"extend": { "effects": [ "SHOT" ] }
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/ammo/40x53mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"//": "Balanced as AP.",
"range": 0,
"shape": [ "cone", { "half_angle": 15, "length": 10 } ],
"damage": { "damage_type": "bullet", "amount": 91, "armor_penetration": 78 },
"damage": { "damage_type": "bullet", "amount": 45, "armor_penetration": 39 },
"recoil": 1000,
"casing": "40x53mm_m169_casing",
"extend": { "effects": [ "SHOT" ] }
Expand All @@ -55,7 +55,7 @@
"weight": "340 g",
"range": 0,
"shape": [ "cone", { "half_angle": 15, "length": 10 } ],
"damage": { "damage_type": "bullet", "amount": 130 },
"damage": { "damage_type": "bullet", "amount": 65 },
"recoil": 1200,
"casing": "40x53mm_m169_casing",
"extend": { "effects": [ "SHOT" ] }
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo/cannon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"weight": "5651 g",
"looks_like": "cannon_round_ball",
"//2": "balanced as hollowpoint, with buckshot level of armor multiplier.",
"damage": { "damage_type": "bullet", "amount": 250, "armor_multiplier": 2 },
"damage": { "damage_type": "bullet", "amount": 125, "armor_multiplier": 2 },
"range": 0,
"shape": [ "cone", { "half_angle": 10, "length": 30 } ],
"dispersion": 450,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo/flintlock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"ammo_type": "flintlockshot",
"range": 0,
"shape": [ "cone", { "half_angle": 10, "length": 12 } ],
"damage": { "damage_type": "bullet", "amount": 63 },
"damage": { "damage_type": "bullet", "amount": 30 },
"dispersion": 20,
"recoil": 1500,
"loudness": 90,
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/ammo/shot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"ammo_type": "shot",
"casing": "shot_hull",
"range": 20,
"damage": { "damage_type": "bullet", "amount": 80, "armor_multiplier": 2 },
"damage": { "damage_type": "bullet", "amount": 40, "armor_multiplier": 2 },
"recoil": 2500,
"loudness": 160,
"effects": [ "COOKOFF", "SHOT" ]
Expand Down Expand Up @@ -123,7 +123,7 @@
"price": "1 USD",
"price_postapoc": "4 USD",
"range": 0,
"damage": { "damage_type": "bullet", "amount": 50, "armor_multiplier": 3 },
"damage": { "damage_type": "bullet", "amount": 25, "armor_multiplier": 3 },
"loudness": 80,
"shape": [ "cone", { "half_angle": 15, "length": 10 } ],
"extend": { "effects": [ "NOGIB" ] }
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo/shotpaper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"stack_size": 20,
"ammo_type": "shotpaper",
"range": 20,
"damage": { "damage_type": "bullet", "amount": 65, "armor_multiplier": 2 },
"damage": { "damage_type": "bullet", "amount": 40, "armor_multiplier": 2 },
"recoil": 2000,
"loudness": 128,
"effects": [ "COOKOFF", "SHOT", "MUZZLE_SMOKE", "BLACKPOWDER" ]
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/handloaded_bullets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"weight": "2 g",
"bashing": 1,
"ammo_type": "blunderbuss",
"damage": { "damage_type": "bullet", "amount": 55, "armor_multiplier": 1.5 },
"damage": { "damage_type": "bullet", "amount": 27, "armor_multiplier": 1.5 },
"range": 0,
"shape": [ "cone", { "half_angle": 18, "length": 10 } ],
"dispersion": 1000,
Expand All @@ -56,7 +56,7 @@
"bashing": 1,
"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 },
"damage": { "damage_type": "bullet", "amount": 22, "armor_penetration": 24, "armor_multiplier": 1.5 },
"range": 0,
"shape": [ "cone", { "half_angle": 10, "length": 12 } ],
"dispersion": 1000,
Expand Down
Loading