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

Further consistency updates for shotshells #3335

Merged
merged 1 commit into from
Oct 1, 2023
+8 −4
Merged

Further consistency updates for shotshells #3335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 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 @@ -22,6 +22,7 @@
"copy-from": "shot_00",
"type": "AMMO",
"name": { "str": "00 shot, 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" ] }
},
Expand Down Expand Up @@ -56,6 +57,7 @@
"material": [ "plastic", "powder" ],
"symbol": "=",
"color": "red",
"dispersion": 10,
"count": 20,
"stack_size": 20,
"ammo_type": "shot",
Expand Down Expand Up @@ -97,7 +99,6 @@
"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" ] }
Expand Down Expand Up @@ -150,7 +151,8 @@
"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 },
"dispersion": 60,
"proportional": { "price": 0.4, "damage": { "damage_type": "bullet", "amount": 0.75, "armor_multiplier": 1.25 } },
"extend": { "effects": [ "RECYCLED" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
Expand Down
6 changes: 4 additions & 2 deletions data/json/items/ammo/shotpaper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"material": [ "paper", "powder", "lead" ],
"symbol": "=",
"color": "white",
"dispersion": 20,
"count": 20,
"stack_size": 20,
"ammo_type": "shotpaper",
Expand All @@ -33,7 +34,7 @@
"type": "AMMO",
"name": { "str": "20ga paper birdshot" },
"description": "A paper cartridge containing a premeasured amount of black powder and an equal volume of birdshot. Used mostly for hunting small game or fowl.",
"damage": { "damage_type": "bullet", "amount": 40 },
"damage": { "damage_type": "bullet", "amount": 40, "armor_multiplier": 3.0 },
"proportional": { "recoil": 0.6, "loudness": 0.8 },
"extend": { "effects": [ "NOGIB" ] }
},
Expand All @@ -43,7 +44,8 @@
"type": "AMMO",
"name": { "str": "20ga paper pyrotechnic cartridge" },
"description": "A paper cartridge containing a premeasured amount of black powder and an equal volume of flammable metals. When fired, burning chunks of metal and sparks will shoot out of the barrel, igniting everything in their path.",
"proportional": { "damage": { "damage_type": "bullet", "amount": 0.2 }, "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2 },
"damage": { "damage_type": "heat", "amount": 24 },
"proportional": { "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2 },
"range": 0,
"shape": [ "cone", { "half_angle": 15, "length": 8 } ],
"extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
Expand Down