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

Fix 20ga percussion ammo inheritance and names #3195

Merged
merged 1 commit into from
Sep 23, 2023
Merged

Fix 20ga percussion ammo inheritance and names #3195

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
Fix 20ga percussion ammo inheritance and names
  • Loading branch information
@chaosvolt
chaosvolt committed Sep 21, 2023
commit 418a4a4d7753c35572566473dfe3f3247073ff17
65 changes: 32 additions & 33 deletions data/json/items/ammo/shotpaper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,37 @@
[
{
"abstract": "shot_paper_abstract",
"type": "AMMO",
"name": { "str": "buckshot paper cartridge" },
"description": "A paper cartridge containing a premeasured amount of black powder and an equal volume of 00 buckshot.",
"weight": "26 g",
"volume": "250 ml",
"price": 500,
"price_postapoc": 800,
"material": [ "paper", "powder", "lead" ],
"symbol": "=",
"color": "white",
"count": 20,
"stack_size": 20,
"ammo_type": "shotpaper",
"range": 20,
"damage": { "damage_type": "bullet", "amount": 64, "armor_multiplier": 2.0 },
"recoil": 2000,
"loudness": 128,
"effects": [ "COOKOFF", "SHOT", "MUZZLE_SMOKE", "BLACKPOWDER" ]
},
{
"id": "shot_paper_00",
"copy-from": "shot_paper_abstract",
"type": "AMMO",
"name": { "str": "20ga paper shot" },
"description": "A paper cartridge containing a premeasured amount of black powder and an equal volume of 00 buckshot."
},
{
"id": "shot_paper_bird",
"copy-from": "shot_paper_00",
"type": "AMMO",
"name": { "str": "birdshot paper cartridge" },
"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 },
"proportional": { "recoil": 0.6, "loudness": 0.8 },
Expand All @@ -13,49 +41,20 @@
"id": "shot_paper_dragon",
"copy-from": "shot_paper_00",
"type": "AMMO",
"name": { "str": "pyrotechnic paper cartridge" },
"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 },
"range": 0,
"shape": [ "cone", { "half_angle": 15, "length": 8 } ],
"extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] }
},
{
"abstract": "shot_paper_abstract",
"copy-from": "shot_abstract",
"type": "AMMO",
"name": { "str": "buckshot paper cartridge" },
"description": "A paper cartridge containing a premeasured amount of black powder and an equal volume of 00 buckshot.",
"weight": "26 g",
"volume": "250 ml",
"material": [ "paper", "powder", "lead" ],
"color": "white",
"ammo_type": "shotpaper",
"proportional": { "damage": { "damage_type": "bullet", "amount": 0.8 }, "recoil": 0.8, "loudness": 0.8 },
"extend": { "effects": [ "MUZZLE_SMOKE", "BLACKPOWDER" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ], "casing": "shot_hull" }
},
{
"id": "shot_paper_00",
"copy-from": "bp_shot_00",
"type": "AMMO",
"name": { "str": "buckshot paper cartridge" },
"description": "A paper cartridge containing a premeasured amount of black powder and an equal volume of 00 buckshot.",
"weight": "26 g",
"volume": "250 ml",
"material": [ "paper", "powder", "lead" ],
"color": "white",
"ammo_type": "shotpaper",
"proportional": { "damage": { "damage_type": "bullet", "amount": 0.8 }, "recoil": 0.8, "loudness": 0.8 },
"delete": { "effects": [ "RECYCLED" ], "casing": "shot_hull" }
},
{
"id": "shot_paper_slug",
"copy-from": "shot_paper_abstract",
"type": "AMMO",
"name": { "str": ".62 paper cartridge" },
"name": { "str": "20ga paper slug" },
"description": "A paper cartridge containing a premeasured amount of black powder and a .605 inch lead ball.",
"relative": { "range": 12, "damage": { "damage_type": "bullet", "amount": -8, "armor_penetration": 14 } },
"relative": { "range": 12, "damage": { "damage_type": "bullet", "amount": -8, "armor_penetration": 14, "armor_multiplier": -0.5 } },
"delete": { "effects": [ "SHOT" ] },
"dispersion": 100
}
Expand Down