From 2ebd2bd7bab432be7817fb9ef1ea1c32cbb9595d Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Sun, 15 Aug 2021 01:02:12 -0700 Subject: [PATCH] Overhaul muzzle loaders --- data/json/items/ammo/flintlock.json | 4 +-- data/json/items/gun/blunderbuss.json | 5 ++-- data/json/items/gun/flintlock.json | 9 ++++--- data/json/items/handloaded_bullets.json | 35 +++++++++++++++++++------ data/json/recipes/recipe_ammo.json | 30 +++++++-------------- data/json/recipes/recipe_obsolete.json | 5 ++++ doc/GAME_BALANCE.md | 1 + 7 files changed, 52 insertions(+), 37 deletions(-) diff --git a/data/json/items/ammo/flintlock.json b/data/json/items/ammo/flintlock.json index 11e39af83f301..ecb3b8d8952a5 100644 --- a/data/json/items/ammo/flintlock.json +++ b/data/json/items/ammo/flintlock.json @@ -15,7 +15,7 @@ "stack_size": 10, "ammo_type": "flintlock", "range": 6, - "damage": { "damage_type": "bullet", "amount": 50 }, + "damage": { "damage_type": "bullet", "amount": 30 }, "dispersion": 90, "recoil": 1500, "loudness": 70, @@ -37,7 +37,7 @@ "stack_size": 10, "ammo_type": "flintlock", "range": 4, - "damage": { "damage_type": "bullet", "amount": 45 }, + "damage": { "damage_type": "bullet", "amount": 25 }, "dispersion": 20, "recoil": 1500, "loudness": 90, diff --git a/data/json/items/gun/blunderbuss.json b/data/json/items/gun/blunderbuss.json index 3e8bb0c77a443..e2d97f2b27195 100644 --- a/data/json/items/gun/blunderbuss.json +++ b/data/json/items/gun/blunderbuss.json @@ -5,7 +5,7 @@ "type": "GUN", "reload_noise_volume": 10, "name": { "str": "blunderbuss", "str_pl": "blunderbusses" }, - "description": "A homemade version of a crude precursor to the shotgun. Able to fire just about anything you put down the barrel, but it will degrade pretty quick.", + "description": "A homemade version of a crude precursor to the shotgun.", "ascii_picture": "blunderbuss", "weight": "8267 g", "volume": "3 L", @@ -23,7 +23,8 @@ "durability": 3, "loudness": 200, "clip_size": 1, - "reload": 300, + "//": "Similar reload process to a musket, which sources place at up to 4 / minute for elite professionals. Nominal 30s will be cut down to 15s at skill 10.", + "reload": 3000, "valid_mod_locations": [ [ "sling", 1 ], [ "stock", 1 ], diff --git a/data/json/items/gun/flintlock.json b/data/json/items/gun/flintlock.json index c971757fd9515..fa06c85f786e9 100644 --- a/data/json/items/gun/flintlock.json +++ b/data/json/items/gun/flintlock.json @@ -21,7 +21,7 @@ "weight": "3600 g", "longest_side": "1202 mm", "relative": { "range": -2, "ranged_damage": { "damage_type": "bullet", "amount": -4 } }, - "proportional": { "bashing": 0.6, "dispersion": 1.35, "reload": 0.6 }, + "proportional": { "bashing": 0.6, "dispersion": 1.35, "reload": 0.9 }, "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "flintlock": 1 } } ] }, { @@ -63,7 +63,7 @@ "durability": 6, "blackpowder_tolerance": 96, "clip_size": 1, - "reload": 600, + "reload": 2500, "valid_mod_locations": [ [ "accessories", 1 ], [ "grip mount", 1 ], @@ -100,7 +100,8 @@ "durability": 6, "blackpowder_tolerance": 96, "clip_size": 1, - "reload": 1200, + "//": "Sources place muzzle loader firing rate at at up to 4 / minute for elite professionals. Nominal 30s will be cut down to 15s at skill 10.", + "reload": 3000, "valid_mod_locations": [ [ "accessories", 1 ], [ "sling", 1 ], @@ -125,6 +126,6 @@ "price": 42000, "price_postapoc": 2500, "relative": { "range": 2 }, - "proportional": { "dispersion": 0.5, "reload": 2.0 } + "proportional": { "dispersion": 0.5, "reload": 1.1 } } ] diff --git a/data/json/items/handloaded_bullets.json b/data/json/items/handloaded_bullets.json index 26aa4ed024a19..19a0744cf6d36 100644 --- a/data/json/items/handloaded_bullets.json +++ b/data/json/items/handloaded_bullets.json @@ -10,10 +10,10 @@ "description": "A prepared blunderbuss shot of a large hunk of metal. Better for distance.", "material": [ "paper", "powder" ], "volume": "100 ml", - "weight": "3 g", + "weight": "26 g", "bashing": 1, "ammo_type": "blunderbuss", - "damage": { "damage_type": "stab", "amount": 60, "armor_penetration": 8 }, + "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, "range": 12, "dispersion": 60, "recoil": 840, @@ -24,16 +24,35 @@ "id": "blun_shot", "price": 4500, "price_postapoc": 50, + "name": { "str": "blunderbuss scrap shot" }, + "symbol": "=", + "color": "red", + "description": "A prepared blunderbuss shot of miscellaneous metal bits.", + "material": [ "paper", "powder" ], + "volume": "100 ml", + "weight": "28 g", + "bashing": 1, + "ammo_type": "blunderbuss", + "damage": { "damage_type": "bullet", "amount": 35 }, + "range": 6, + "recoil": 780, + "effects": [ "COOKOFF", "SHOT", "RECYCLED" ] + }, + { + "type": "AMMO", + "id": "blun_lead_shot", + "price": 4500, + "price_postapoc": 50, "name": { "str": "blunderbuss shot" }, "symbol": "=", "color": "red", - "description": "A prepared blunderbuss shot of marbles, pebbles, bearings, basically whatever is at hand. The homemade pellet spread and number makes up for the shoddy quality.", + "description": "A prepared blunderbuss shot of lead pellets.", "material": [ "paper", "powder" ], "volume": "100 ml", - "weight": "2 g", + "weight": "26 g", "bashing": 1, "ammo_type": "blunderbuss", - "damage": { "damage_type": "stab", "amount": 60 }, + "damage": { "damage_type": "bullet", "amount": 41 }, "range": 6, "recoil": 780, "effects": [ "COOKOFF", "SHOT", "RECYCLED" ] @@ -46,13 +65,13 @@ "name": { "str": "blunderbuss flechette" }, "symbol": "=", "color": "red", - "description": "A prepared blunderbuss shot of homemade flechette made out of nails. Shreds armor.", + "description": "A prepared blunderbuss shot of homemade flechette made out of nails.", "material": [ "plastic", "powder" ], "volume": "100 ml", - "weight": "3 g", + "weight": "18 g", "bashing": 1, "ammo_type": "blunderbuss", - "damage": { "damage_type": "stab", "amount": 53, "armor_penetration": 12 }, + "damage": { "damage_type": "bullet", "amount": 35, "armor_penetration": 10 }, "range": 10, "recoil": 840, "effects": [ "COOKOFF", "SHOT", "RECYCLED" ] diff --git a/data/json/recipes/recipe_ammo.json b/data/json/recipes/recipe_ammo.json index b7e57a82f2db0..5efac64d70a89 100644 --- a/data/json/recipes/recipe_ammo.json +++ b/data/json/recipes/recipe_ammo.json @@ -539,7 +539,7 @@ { "type": "recipe", "activity_level": "LIGHT_EXERCISE", - "result": "blun_shot", + "result": "blun_lead_shot", "category": "CC_AMMO", "subcategory": "CSC_AMMO_SHOT", "skill_used": "fabrication", @@ -550,45 +550,33 @@ "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ - [ [ "gunpowder", 20 ], [ "chem_black_powder", 20 ] ], - [ - [ "bb", 24 ], - [ "clockworks", 1 ], - [ "pebble", 16 ], - [ "pebble_clay", 16 ], - [ "marble", 16 ], - [ "bearing", 16 ], - [ "glass_shard", 1 ] - ], - [ [ "paper", 1 ], [ "aluminum_foil", 1 ] ] - ] + "components": [ [ [ "gunpowder", 20 ], [ "chem_black_powder", 20 ] ], [ [ "lead", 24 ] ], [ [ "paper", 1 ], [ "aluminum_foil", 1 ] ] ] }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", "result": "blun_shot", - "id_suffix": "using_big_scrap", "category": "CC_AMMO", "subcategory": "CSC_AMMO_SHOT", "skill_used": "fabrication", "skills_required": [ "gun", 1 ], "difficulty": 3, - "time": "50 s", + "time": "30 s", "autolearn": true, "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ], - "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "qualities": [ { "id": "CUT", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 20 ], [ "chem_black_powder", 20 ] ], - [ [ "scrap", 1 ], [ "nail", 8 ], [ "copper", 16 ], [ "lead", 16 ] ], + [ [ "bb", 24 ], [ "clockworks", 1 ], [ "pebble", 16 ], [ "bearing", 16 ] ], [ [ "paper", 1 ], [ "aluminum_foil", 1 ] ] ] }, { "type": "recipe", - "activity_level": "MODERATE_EXERCISE", - "result": "blun_slug", + "activity_level": "LIGHT_EXERCISE", + "result": "blun_shot", + "id_suffix": "using_big_scrap", "category": "CC_AMMO", "subcategory": "CSC_AMMO_SHOT", "skill_used": "fabrication", @@ -601,7 +589,7 @@ "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 20 ], [ "chem_black_powder", 20 ] ], - [ [ "rebar", 1 ], [ "spear_rebar", 1 ], [ "rebar_rail", 1 ], [ "steel_rail", 1 ], [ "scrap", 1 ] ], + [ [ "scrap", 1 ], [ "nail", 8 ], [ "copper", 16 ] ], [ [ "paper", 1 ], [ "aluminum_foil", 1 ] ] ] }, diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json index b23c9564f72dc..a80120c5f9789 100644 --- a/data/json/recipes/recipe_obsolete.json +++ b/data/json/recipes/recipe_obsolete.json @@ -2947,5 +2947,10 @@ "type": "recipe", "result": "rope_makeshift_30", "obsolete": true + }, + { + "type": "recipe", + "result": "blun_slug", + "obsolete": true } ] diff --git a/doc/GAME_BALANCE.md b/doc/GAME_BALANCE.md index 7b139a6c8bd7e..7b68d8d51b08f 100644 --- a/doc/GAME_BALANCE.md +++ b/doc/GAME_BALANCE.md @@ -261,6 +261,7 @@ Ammo ID | Description | Energy, J | Dmg | Base Brl | .50 BMG M33 Ball | 706.7gr bullet | 18013 | 134 | 45in | | .50 BMG M903 SLAP | 355gr tungsten AP bullet | 17083 | 131 | 45in | Can't be used with M107A1 | .410 000 shot | 5 000 pellets | 1530 | 39 | 18in | | +.70 blunderbuss shot | 400gr lead ball | 1200 | 41 | 16in | Very generous FPS | # LIQUIDS: Multi-charge items are weighed by the charge/use. If you have an item that contains 40 uses, it'll weigh 40x as much (when found in-game) as you entered in the JSON. Liquids are priced by the 250mL unit, but handled in containers. This can cause problems if you create something that comes in (say) a gallon jug (15 charges) and price it at the cost of a jug's worth: it'll be 15x as expensive as intended.