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

Add 40mm blackpowder loads #45740

Merged
merged 4 commits into from
Dec 5, 2020
Merged

Add 40mm blackpowder loads #45740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85c8352
Add 40mm blackpowder loads
Rail-Runner Nov 30, 2020
e1c162c
Add RELOAD_EJECT to tube launcher
Rail-Runner Nov 30, 2020
1dc8d26
Linting
Rail-Runner Nov 30, 2020
c2aa562
Fix descriptions
Rail-Runner Dec 1, 2020
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
63 changes: 62 additions & 1 deletion data/json/items/ammo/40x46mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"copy-from": "40x46mm_slug_m118",
"type": "AMMO",
"name": { "str": "40x46mm-M199 slug, reloaded" },
"description": "An improvised 40x46mm load resembling an oversized shotgun slug, loaded into a M199 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
"description": "An improvised 40x46mm load resembling a shotgun slug, loaded into a M199 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
"casing": "40x46mm_m199_casing"
},
{
Expand All @@ -118,5 +118,66 @@
"name": { "str": "40x46mm-M199 flechette, reloaded" },
"description": "An improvised 40x46mm flechette load containing 10 steel darts, loaded into a M199 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
"casing": "40x46mm_m199_casing"
},
{
"id": "bp_40x46mm_buckshot_m118",
"copy-from": "bp_40x46mm_buckshot_m199",
"type": "AMMO",
"name": { "str": "40x46mm-M118 buckshot, black powder" },
"description": "An improvised 40x46mm buckshot load somewhat resembling M576, loaded into a M118 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
"casing": "40x46mm_m118_casing"
},
{
"id": "bp_40x46mm_buckshot_m199",
"copy-from": "40x46mm_m576",
"type": "AMMO",
"name": { "str": "40x46mm-M199 buckshot, black powder" },
"description": "An improvised 40x46mm buckshot load somewhat resembling M576, loaded into a M199 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
"proportional": {
"price": 0.3,
"damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
"recoil": 0.76,
"dispersion": 1.2
},
"extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
{
"id": "bp_40x46mm_slug_m118",
"copy-from": "40x46mm_grenade",
"type": "AMMO",
"name": { "str": "40x46mm-M118 slug, black powder" },
"description": "An improvised 40x46mm load resembling a shotgun slug, loaded into a M118 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
"damage": { "damage_type": "bullet", "amount": 21, "armor_penetration": 1 },
"weight": "120 g",
"proportional": { "price": 0.3, "recoil": 0.76, "dispersion": 1.2 },
"casing": "40x46mm_m118_casing",
"extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
{
"id": "bp_40x46mm_slug_m199",
"copy-from": "bp_40x46mm_slug_m118",
"type": "AMMO",
"name": { "str": "40x46mm-M199 slug, black powder" },
"description": "An improvised 40x46mm load resembling an oversized shotgun slug, loaded into a M199 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
"casing": "40x46mm_m199_casing"
},
{
"id": "bp_40x46mm_flechette_m118",
"copy-from": "bp_40x46mm_buckshot_m118",
"type": "AMMO",
"name": { "str": "40x46mm-M118 flechette, black powder" },
"description": "An improvised 40x46mm flechette load containing 10 steel darts, loaded into a M118 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
"damage": { "damage_type": "bullet", "amount": 19, "armor_penetration": 3 },
"delete": { "effects": [ "NOGIB" ] }
},
{
"id": "bp_40x46mm_flechette_m199",
"copy-from": "bp_40x46mm_flechette_m118",
"type": "AMMO",
"name": { "str": "40x46mm-M199 flechette, black powder" },
"description": "An improvised 40x46mm flechette load containing 10 steel darts, loaded into a M199 canister. Due to the limitations of weapons built to fire 40x46mm grenades, it's much less powerful than most people would expect.",
"casing": "40x46mm_m199_casing"
}
]
34 changes: 31 additions & 3 deletions data/json/items/ammo/40x53mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@
"type": "AMMO",
"name": { "str": "40x53mm buckshot, reloaded" },
"description": "An improvised 40x53mm buckshot load somewhat resembling M576.",
"damage": { "damage_type": "bullet", "amount": 141 },
"proportional": { "price": 0.7, "dispersion": 1.1 }
"damage": { "damage_type": "bullet", "amount": 141 }
},
{
"id": "40x53mm_slug_m169",
Expand All @@ -58,7 +57,36 @@
"type": "AMMO",
"name": { "str": "40x53mm flechette, reloaded" },
"description": "An improvised 40x53mm flechette load containing 115 steel darts, similar to M1001 flechette load.",
"range": 14,
"proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }
},
{
"id": "bp_40x53mm_buckshot_m169",
"copy-from": "bp_40x53mm_flechette_m169",
"type": "AMMO",
"name": { "str": "40x53mm buckshot, black powder" },
"description": "An improvised 40x53mm buckshot load somewhat resembling M576.",
"damage": { "damage_type": "bullet", "amount": 119 }
},
{
"id": "bp_40x53mm_slug_m169",
"copy-from": "40x53mm_grenade",
"type": "AMMO",
"name": { "str": "40x53mm slug, black powder" },
"description": "An improvised 40x53mm load resembling an oversized shotgun slug.",
"damage": { "damage_type": "bullet", "amount": 119, "armor_penetration": 3 },
"proportional": { "price": 0.3, "recoil": 0.76, "dispersion": 1.2 },
"extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
},
{
"id": "bp_40x53mm_flechette_m169",
"copy-from": "40x53mm_m1001",
"type": "AMMO",
"name": { "str": "40x53mm flechette, black powder" },
"description": "An improvised 40x53mm flechette load containing 115 steel darts, similar to M1001 flechette load.",
"damage": { "damage_type": "bullet", "amount": 114, "armor_penetration": 6 },
"proportional": { "price": 0.3, "recoil": 0.76, "dispersion": 1.2 },
"extend": { "effects": [ "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
}
]
6 changes: 6 additions & 0 deletions data/json/items/gun/40x46mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"ammo": [ "40x46mm" ],
"dispersion": 550,
"durability": 6,
"blackpowder_tolerance": 60,
"clip_size": 1,
"reload": 350,
"valid_mod_locations": [
Expand Down Expand Up @@ -50,6 +51,7 @@
"ammo": [ "40x46mm" ],
"dispersion": 270,
"durability": 9,
"blackpowder_tolerance": 60,
"clip_size": 1,
"reload": 150,
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "40x46mm": 1 } } ]
Expand All @@ -73,6 +75,7 @@
"ranged_damage": { "damage_type": "bullet", "amount": 3 },
"dispersion": 150,
"durability": 8,
"blackpowder_tolerance": 60,
"clip_size": 1,
"reload": 250,
"valid_mod_locations": [
Expand Down Expand Up @@ -105,6 +108,7 @@
"ammo": [ "40x46mm" ],
"dispersion": 270,
"durability": 8,
"blackpowder_tolerance": 60,
"clip_size": 6,
"reload": 300,
"valid_mod_locations": [
Expand Down Expand Up @@ -138,6 +142,7 @@
"ammo": [ "40x46mm" ],
"dispersion": 140,
"durability": 9,
"blackpowder_tolerance": 60,
"clip_size": 4,
"valid_mod_locations": [
[ "accessories", 4 ],
Expand Down Expand Up @@ -185,6 +190,7 @@
"ranged_damage": { "damage_type": "bullet", "amount": 1 },
"dispersion": 300,
"durability": 10,
"blackpowder_tolerance": 60,
"reload": 400,
"modes": [ [ "DEFAULT", "semi-auto", 1, "NPC_AVOID" ] ],
"clip_size": 6,
Expand Down
2 changes: 2 additions & 0 deletions data/json/items/gun/40x53mm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"ranged_damage": { "damage_type": "bullet", "amount": 1 },
"dispersion": 180,
"durability": 8,
"min_cycle_recoil": 16875,
"reload": 400,
"valid_mod_locations": [
[ "accessories", 2 ],
Expand All @@ -31,6 +32,7 @@
],
"modes": [ [ "DEFAULT", "semi-auto", 1, "NPC_AVOID" ], [ "AUTO", "auto", 2, "NPC_AVOID" ] ],
"flags": [ "MOUNTED_GUN" ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"pocket_data": [
{
"pocket_type": "MAGAZINE_WELL",
Expand Down
37 changes: 31 additions & 6 deletions data/json/items/gunmod/underbarrel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,18 @@
"color": "light_red",
"location": "underbarrel",
"mod_targets": [ "rifle", "crossbow" ],
"gun_data": { "ammo": "40x46mm", "skill": "launcher", "dispersion": 300, "durability": 10, "clip_size": 1 },
"gun_data": {
"ammo": "40x46mm",
"skill": "launcher",
"dispersion": 300,
"durability": 10,
"blackpowder_tolerance": 60,
"clip_size": 1
},
"min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ],
"flags": [ "NEVER_JAMS", "RELOAD_EJECT" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ]
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ]
},
{
"id": "m203_mod",
Expand All @@ -317,10 +325,18 @@
"color": "dark_gray",
"location": "underbarrel",
"mod_targets": [ "rifle", "crossbow" ],
"gun_data": { "ammo": "40x46mm", "skill": "launcher", "dispersion": 270, "durability": 10, "clip_size": 1 },
"gun_data": {
"ammo": "40x46mm",
"skill": "launcher",
"dispersion": 270,
"durability": 10,
"blackpowder_tolerance": 60,
"clip_size": 1
},
"min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ],
"flags": [ "NEVER_JAMS", "RELOAD_EJECT" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ]
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ]
},
{
"id": "m320_mod_mod",
Expand Down Expand Up @@ -405,9 +421,18 @@
"color": "light_gray",
"location": "underbarrel",
"mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ],
"gun_data": { "ammo": "40x46mm", "skill": "launcher", "dispersion": 450, "durability": 10, "clip_size": 1 },
"gun_data": {
"ammo": "40x46mm",
"skill": "launcher",
"dispersion": 450,
"durability": 10,
"blackpowder_tolerance": 60,
"clip_size": 1
},
"min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ]
"flags": [ "RELOAD_EJECT" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "40x46mm": 1 } } ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ]
},
{
"id": "pistol_bayonet",
Expand Down
Loading