Skip to content

Commit

Permalink
rebalance pipe gun recipes (CleverRaven#40912)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dissociativity
dissociativity authored May 31, 2020
1 parent f15d695 commit 47c7f74
Show file tree
Hide file tree
Showing 13 changed files with 387 additions and 558 deletions.
100 changes: 0 additions & 100 deletions data/json/items/gun/223.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,46 +513,6 @@
}
]
},
{
"id": "rifle_223",
"copy-from": "gun_base",
"looks_like": "ar15",
"type": "GUN",
"name": { "str": "pipe rifle: .223", "str_pl": "pipe rifles: .223" },
"description": "A homemade rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.",
"weight": "4080 g",
"volume": "3 L",
"price": 110000,
"price_postapoc": 500,
"to_hit": -1,
"bashing": 12,
"material": [ "steel", "wood" ],
"symbol": "(",
"color": "brown",
"ammo": [ "223" ],
"skill": "rifle",
"ranged_damage": { "damage_type": "bullet", "amount": -2 },
"dispersion": 550,
"durability": 6,
"blackpowder_tolerance": 60,
"loudness": 25,
"clip_size": 1,
"reload": 200,
"barrel_length": "1000 ml",
"valid_mod_locations": [
[ "accessories", 2 ],
[ "muzzle", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"flags": [ "RELOAD_EJECT" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "223": 1 } } ]
},
{
"id": "ruger_mini",
"copy-from": "rifle_semi",
Expand Down Expand Up @@ -734,65 +694,5 @@
"item_restriction": [ "augmag_30rd", "augmag_10rd", "augmag_42rd", "augmag_100rd" ]
}
]
},
{
"id": "surv_carbine_223",
"copy-from": "rifle_manual",
"looks_like": "ar15",
"type": "GUN",
"name": { "str": "handmade carbine" },
"//": "It's smaller than an M4A1, plus it's a homemade firearm.",
"description": "A well-designed improvised lever-action carbine with a shortened barrel. Accepting crude detachable magazines or STANAG magazines, this is one of the better homemade weapons.",
"weight": "1950 g",
"volume": "1500 ml",
"price": 10000,
"price_postapoc": 2750,
"to_hit": -1,
"bashing": 6,
"material": [ "steel", "wood" ],
"symbol": "(",
"color": "brown",
"ammo": [ "223" ],
"ranged_damage": { "damage_type": "bullet", "amount": -4 },
"dispersion": 550,
"durability": 6,
"blackpowder_tolerance": 32,
"loudness": 25,
"reload": 200,
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
[ "brass catcher", 1 ],
[ "muzzle", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "underbarrel", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ]
],
"pocket_data": [
{
"pocket_type": "MAGAZINE_WELL",
"holster": true,
"max_contains_volume": "20 L",
"max_contains_weight": "20 kg",
"item_restriction": [
"survivor223mag",
"stanag30",
"stanag5",
"stanag10",
"stanag20",
"stanag40",
"stanag50",
"stanag60",
"stanag60drum",
"stanag90",
"stanag100",
"stanag100drum",
"stanag150"
]
}
]
}
]
41 changes: 0 additions & 41 deletions data/json/items/gun/3006.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,46 +210,5 @@
"barrel_length": "750 ml",
"flags": [ "RELOAD_ONE", "NEVER_JAMS" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "3006": 4 } } ]
},
{
"id": "rifle_3006",
"looks_like": "ar15",
"type": "GUN",
"reload_noise_volume": 10,
"name": { "str": "pipe rifle: .30-06", "str_pl": "pipe rifles: .30-06" },
"//": "It's the same size as the others, but it's still a scrap weapon.",
"description": "A homemade rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.",
"weight": "4080 g",
"volume": "3 L",
"price": 110000,
"price_postapoc": 500,
"to_hit": -1,
"bashing": 12,
"material": [ "steel", "wood" ],
"symbol": "(",
"color": "brown",
"ammo": [ "3006" ],
"skill": "rifle",
"ranged_damage": { "damage_type": "bullet", "amount": -2 },
"dispersion": 550,
"durability": 6,
"blackpowder_tolerance": 60,
"loudness": 25,
"clip_size": 1,
"reload": 200,
"barrel_length": "1000 ml",
"valid_mod_locations": [
[ "accessories", 2 ],
[ "muzzle", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"flags": [ "RELOAD_EJECT" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "3006": 1 } } ]
}
]
48 changes: 0 additions & 48 deletions data/json/items/gun/308.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,54 +275,6 @@
"description": "This is a semi-automatic civilian variant of the M60 machine gun, retaining the ability to be belt fed, an uncommon feature in civilian firearms.",
"modes": [ [ "DEFAULT", "semi-auto", 1 ] ]
},
{
"id": "rifle_308",
"copy-from": "rifle_manual",
"looks_like": "ar15",
"type": "GUN",
"name": { "str": "handmade heavy carbine" },
"//": "It's amongst the smallest of the .308 firearms, and a scrap weapon as well. This means a short handmade barrel, and considerable loss of energy.",
"description": "A homemade lever-action magazine-fed smoothbore rifle. While still a primitive pipe and 2x4 design, some minor improvements have been made, such as being able to accept G3 compatible magazines, and chambering the more powerful .308 rounds.",
"weight": "2311 g",
"volume": "2 L",
"price": 10000,
"price_postapoc": 2250,
"to_hit": -1,
"bashing": 10,
"material": [ "steel", "wood" ],
"symbol": "(",
"color": "brown",
"ammo": [ "308" ],
"ranged_damage": { "damage_type": "bullet", "amount": -5 },
"dispersion": 550,
"durability": 6,
"blackpowder_tolerance": 60,
"reload": 200,
"barrel_length": "500 ml",
"valid_mod_locations": [
[ "accessories", 4 ],
[ "barrel", 1 ],
[ "bore", 1 ],
[ "brass catcher", 1 ],
[ "muzzle", 1 ],
[ "stock", 1 ],
[ "mechanism", 4 ],
[ "sights", 1 ],
[ "sling", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "underbarrel mount", 1 ]
],
"pocket_data": [
{
"pocket_type": "MAGAZINE_WELL",
"holster": true,
"max_contains_volume": "20 L",
"max_contains_weight": "20 kg",
"item_restriction": [ "g3_makeshiftmag", "g3mag", "g3bigmag" ]
}
]
},
{
"id": "savage_111f",
"copy-from": "rifle_manual",
Expand Down
39 changes: 0 additions & 39 deletions data/json/items/gun/combination.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,44 +39,5 @@
[ "rail mount", 1 ]
],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "3006": 1 } } ]
},
{
"id": "pipe_combination_gun",
"looks_like": "ar15",
"type": "GUN",
"reload_noise_volume": 10,
"symbol": "(",
"color": "brown",
"name": { "str": "pipe combination gun" },
"description": "A home-made triple-barreled firearm, one barrel chambered in .30-06 and two other for shotgun shells. It is made from pipes and parts cannibalized from a double barrel shotgun.",
"price": 40000,
"//": "Attached mod will now have weight.",
"material": [ "steel", "wood" ],
"flags": [ "NEVER_JAMS", "RELOAD_EJECT" ],
"skill": "shotgun",
"ammo": [ "3006" ],
"weight": "2267 g",
"volume": "2 L",
"price_postapoc": 1250,
"bashing": 12,
"to_hit": -1,
"dispersion": 550,
"durability": 6,
"blackpowder_tolerance": 60,
"clip_size": 1,
"loudness": 25,
"barrel_length": "500 ml",
"built_in_mods": [ "combination_gun_shotgun_pipe" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"valid_mod_locations": [
[ "muzzle", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "3006": 1 } } ]
}
]
36 changes: 36 additions & 0 deletions data/json/items/gun/shot.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,42 @@
}
]
},
{
"id": "lever_shotgun",
"copy-from": "shotgun_base",
"looks_like": "remington_870",
"type": "GUN",
"name": { "str": "handmade lever shotgun" },
"description": "A short homemade lever-action shotgun with a small internal tube magazine. While still a primitive pipe and 2x4 design, it is a formiddable shotgun in it's own right with room for improvement.",
"weight": "2311 g",
"volume": "2 L",
"price": 10000,
"price_postapoc": 2250,
"to_hit": -1,
"bashing": 10,
"material": [ "steel", "wood" ],
"ranged_damage": { "damage_type": "bullet", "amount": -2 },
"dispersion": 550,
"durability": 6,
"barrel_length": "500 ml",
"valid_mod_locations": [
[ "accessories", 4 ],
[ "barrel", 1 ],
[ "bore", 1 ],
[ "brass catcher", 1 ],
[ "muzzle", 1 ],
[ "stock", 1 ],
[ "mechanism", 4 ],
[ "sights", 1 ],
[ "sling", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "underbarrel mount", 1 ]
],
"clip_size": 6,
"extend": { "flags": [ "RELOAD_ONE" ] },
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 6 } } ]
},
{
"id": "browning_a5",
"copy-from": "shotgun_base",
Expand Down
19 changes: 0 additions & 19 deletions data/json/items/gunmod/underbarrel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,6 @@
"flags": [ "IRREMOVABLE", "RELOAD_ONE", "RELOAD_EJECT" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 2 } } ]
},
{
"id": "combination_gun_shotgun_pipe",
"type": "GUNMOD",
"name": { "str": "pipe combination gun shotgun" },
"description": "The integrated underbarrel shotgun of a pipe combination gun which holds two shots. It's irremovable.",
"weight": "1134 g",
"volume": "1 L",
"price": 10000,
"price_postapoc": 500,
"to_hit": -1,
"material": [ "steel" ],
"symbol": ":",
"color": "light_red",
"location": "underbarrel",
"mod_targets": [ "rifle" ],
"gun_data": { "ammo": "shot", "skill": "shotgun", "dispersion": 480, "durability": 6, "clip_size": 2 },
"flags": [ "IRREMOVABLE", "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "shot": 2 } } ]
},
{
"id": "factory_handguard",
"type": "GUNMOD",
Expand Down
Loading

0 comments on commit 47c7f74

Please sign in to comment.