Skip to content

Commit

Permalink
Gun volume & weight audit for blackpowder firearms(.36 & .44 paper + …
Browse files Browse the repository at this point in the history
…flintlock) (#39188)

* Audit Colt M1861 Navy
* Audit Colt M1860 Army
* Audit flintlock musket
* Audit flintlock carbine
* Audit flintlock rifle
* Audit doublebarrel flintlock
* Audit flintlock pistol
* Re-add price_postapoc
  • Loading branch information
LaVeyanFiend authored Apr 8, 2020
1 parent e1cee5b commit 3e8ab06
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 12 deletions.
4 changes: 2 additions & 2 deletions data/json/items/gun/36paper.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"type": "GUN",
"name": { "str": "Colt M1861 Navy", "str_pl": "Colt M1861 Navy" },
"description": "The Colt Model 1861 Navy cap & ball .36-caliber revolver was a six-shot, single-action percussion weapon produced by Colt's Manufacturing Company from 1861 until 1873.",
"weight": "1190 g",
"volume": "750 ml",
"weight": "1184 g",
"volume": "540 ml",
"price": 30000,
"price_postapoc": 3000,
"to_hit": -1,
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/gun/44paper.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"type": "GUN",
"name": { "str": "Colt M1860 Army", "str_pl": "Colt M1860 Army" },
"description": "The Colt Army Model 1860 is a cap & ball .44-caliber revolver. It was used during the American Civil War, and made by Colt's Manufacturing Company.",
"weight": "1200 g",
"volume": "750 ml",
"weight": "1188 g",
"volume": "486 ml",
"price": 43000,
"price_postapoc": 3000,
"to_hit": -1,
Expand All @@ -17,7 +17,7 @@
"dispersion": 400,
"durability": 7,
"blackpowder_tolerance": 96,
"clip_size": 5
"clip_size": 6
},
{
"id": "lemat_revolver",
Expand Down
18 changes: 11 additions & 7 deletions data/json/items/gun/flintlock.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
],
"relative": { "weight": -500, "volume": -4, "range": -2, "ranged_damage": -4 },
"volume": "2250 ml",
"weight": "3600 g",
"relative": { "range": -2, "ranged_damage": -4 },
"proportional": { "bashing": 0.6, "dispersion": 1.35, "reload": 0.6 }
},
{
Expand All @@ -27,8 +29,8 @@
"description": "This is a compact muzzle-loading rifle combining a pair of rudimentary flintlock actions and two barrels. Whereas an antique multiple-barrel flintlock is an intricate work of gunsmithing, this weapon is simpler yet still serviceable.",
"clip_size": 2,
"price_postapoc": 2750,
"relative": { "weight": 400, "range": -1, "ranged_damage": -2 },
"proportional": { "dispersion": 1.3 },
"relative": { "range": -1, "ranged_damage": -2 },
"proportional": { "dispersion": 1.3, "weight": 1.25, "volume": 1.25 },
"extend": { "flags": [ "RELOAD_ONE" ] }
},
{
Expand All @@ -38,8 +40,8 @@
"reload_noise_volume": 10,
"name": { "str": "flintlock pistol" },
"description": "A beautifully decorated flintlock pistol. If using this doesn't make you feel a pirate, nothing will.",
"weight": "753 g",
"volume": "750 ml",
"weight": "1 kg",
"volume": "390 ml",
"price": 35000,
"price_postapoc": 1750,
"to_hit": -1,
Expand Down Expand Up @@ -73,7 +75,7 @@
"reload_noise_volume": 10,
"name": { "str": "flintlock musket" },
"description": "For once, something *good* came back from the dead. This ancient design lacks the fire-rate of modern weapons, but packs as much punch as the best of 'em and rewards the skilled shooter with easily-crafted ammunition.",
"weight": "1950 g",
"weight": "4900 g",
"volume": "2500 ml",
"price": 41000,
"price_postapoc": 2250,
Expand Down Expand Up @@ -108,7 +110,9 @@
"type": "GUN",
"name": "flintlock rifle",
"description": "Also called a Pennsylvania rifle, this long barreled rifled flintlock gun has signficantly increased accuracy at the cost of taking even longer to reload.",
"relative": { "weight": 500, "range": 2 },
"weight": "3700 g",
"volume": "1700 ml",
"relative": { "range": 2 },
"proportional": { "dispersion": 0.5, "reload": 2.0 }
}
]

0 comments on commit 3e8ab06

Please sign in to comment.