Skip to content

Commit

Permalink
Merge pull request #35865 from ymber/40mm
Browse files Browse the repository at this point in the history
Split 40mm grenade types
  • Loading branch information
kevingranade authored Dec 15, 2019
2 parents 0ad5ea7 + b6c04be commit 4be222a
Show file tree
Hide file tree
Showing 26 changed files with 686 additions and 294 deletions.
17 changes: 7 additions & 10 deletions data/json/itemgroups/ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -276,12 +276,11 @@
"id": "ammo_launcher_grenade",
"//": "Factory specification grenade launcher ammo intended for military use",
"items": [
[ "40mm_flare", 40 ],
[ "40mm_flechette", 10 ],
[ "40mm_frag", 120 ],
[ "40mm_incendiary", 25 ],
[ "40mm_shot", 15 ],
[ "40mm_smoke", 60 ]
[ "40x53mm_m1001", 10 ],
[ "40x46mm_m433", 120 ],
[ "40x53mm_m430a1", 75 ],
[ "40x46mm_m576", 15 ],
[ "40x46mm_m651", 20 ]
]
},
{
Expand Down Expand Up @@ -382,10 +381,8 @@
"items": [
{ "group": "ammo_cop", "prob": 100 },
[ "300_winmag", 5 ],
[ "40mm_concussive", 5 ],
[ "40mm_flashbang", 20 ],
[ "40mm_smoke", 5 ],
[ "40mm_teargas", 20 ],
[ "40x46mm_m433", 5 ],
[ "40x46mm_m651", 20 ],
[ "556", 10 ],
[ "shot_slug", 20 ]
]
Expand Down
6 changes: 2 additions & 4 deletions data/json/itemgroups/gear.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,8 @@
"subtype": "distribution",
"items": [
{ "group": "cop_gear", "prob": 100 },
[ "40mm_concussive", 5 ],
[ "40mm_flashbang", 15 ],
[ "40mm_smoke", 5 ],
[ "40mm_teargas", 10 ],
[ "40x46mm_m433", 5 ],
[ "40x46mm_m651", 10 ],
[ "ammo_satchel", 5 ],
[ "bootstrap", 5 ],
[ "chestpouch", 5 ],
Expand Down
1 change: 0 additions & 1 deletion data/json/itemgroups/item_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -5102,7 +5102,6 @@
[ "223_casing", 85 ],
[ "3006_casing", 40 ],
[ "308_casing", 50 ],
[ "40mm_casing", 10 ],
[ "50_casing", 30 ],
[ "700nx_casing", 10 ],
[ "300_casing", 60 ],
Expand Down
5 changes: 2 additions & 3 deletions data/json/itemgroups/locations.json
Original file line number Diff line number Diff line change
Expand Up @@ -2445,9 +2445,8 @@
[ "rm20", 1 ],
[ "20x66_beanbag", 10 ],
[ "m79", 8 ],
[ "40mm_teargas", 20 ],
[ "40mm_flashbang", 8 ],
[ "40mm_beanbag", 10 ]
[ "40x46mm_m651", 20 ],
[ "40x46mm_m1006", 10 ]
]
},
{
Expand Down
22 changes: 9 additions & 13 deletions data/json/itemgroups/military.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,11 @@
[ "556_incendiary", 2 ],
[ "762_51", 6 ],
[ "762_51_incendiary", 6 ],
[ "40mm_concussive", 10 ],
[ "40mm_frag", 8 ],
[ "40mm_incendiary", 6 ],
[ "40mm_teargas", 5 ],
[ "40mm_smoke", 4 ],
[ "40mm_flare", 4 ],
[ "40mm_flashbang", 8 ],
[ "40mm_shot", 12 ],
[ "40mm_flechette", 6 ],
[ "40x46mm_m433", 10 ],
[ "40x46mm_m433", 8 ],
[ "40x46mm_m651", 5 ],
[ "40x46mm_m576", 12 ],
[ "40x53mm_m1001", 6 ],
[ "20x66_shot", 4 ],
[ "20x66_exp", 1 ],
[ "20x66_inc", 1 ],
Expand Down Expand Up @@ -262,13 +258,13 @@
[ "m2browning", 15 ],
[ "mark19", 15 ],
[ "556", 30 ],
[ "40mm_frag", 10 ],
[ "40mm_shot", 6 ],
[ "40x46mm_m433", 10 ],
[ "40x46mm_m576", 6 ],
[ "8mm_hvp", 4 ],
[ "556_incendiary", 10 ],
[ "rm802", 5 ],
[ "40mm_concussive", 7 ],
[ "40mm_flechette", 6 ],
[ "40x46mm_m433", 7 ],
[ "40x53mm_m1001", 6 ],
[ "m3_carlgustav", 10 ],
[ "84x246mm_he", 8 ],
[ "84x246mm_hedp", 8 ],
Expand Down
122 changes: 0 additions & 122 deletions data/json/items/ammo/40mm.json

This file was deleted.

151 changes: 151 additions & 0 deletions data/json/items/ammo/40x46mm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
[
{
"abstract": "40x46mm_grenade",
"type": "AMMO",
"name": "40x46mm grenade",
"price": 10000,
"price_postapoc": 40000,
"material": [ "steel", "powder" ],
"symbol": "=",
"color": "yellow",
"count": 6,
"stack_size": 1,
"ammo_type": "40x46mm",
"range": 40,
"damage": 80,
"dispersion": 30,
"recoil": 225,
"effects": [ "COOKOFF", "NEVER_MISFIRES" ]
},
{
"id": "40x46mm_m1006",
"copy-from": "40x46mm_grenade",
"type": "AMMO",
"name": "40x46mm M1006",
"description": "A low velocity less-lethal 40x46mm round with a foam and plastic projectile intended to cause pain and disorientation to the target. May still injure or kill.",
"weight": "68 g",
"damage": 20,
"casing": "40x46mm_m212_casing",
"extend": { "effects": [ "LARGE_BEANBAG" ] }
},
{
"id": "40x46mm_m433",
"copy-from": "40x46mm_grenade",
"type": "AMMO",
"name": "40x46mm M433",
"description": "A low velocity 40x46mm HEDP grenade. It can penetrate 2 inches of steel armor and fragmentation of the projectile body also makes it suitable for use against infantry.",
"weight": "230 g",
"damage": 200,
"pierce": 30,
"casing": "40x46mm_m118_casing",
"extend": { "effects": [ "EXPLOSIVE", "FRAG" ] }
},
{
"id": "40x46mm_m576",
"copy-from": "40x46mm_grenade",
"type": "AMMO",
"name": "40x46mm M576",
"description": "A 40x46mm buckshot load, designed for use in thick vegetation or room clearing.",
"weight": "120 g",
"range": 12,
"damage": 120,
"pierce": 4,
"recoil": 1000,
"casing": "40x46mm_m199_casing",
"extend": { "effects": [ "SHOT" ] }
},
{
"id": "40x46mm_m651",
"copy-from": "40x46mm_grenade",
"type": "AMMO",
"name": "40x46mm M651",
"description": "A low velocity 40mm tear gas canister. It is effective for riot control and driving infantry from entrenched positions",
"weight": "290 g",
"damage": 15,
"drop": "gasbomb_act",
"casing": "40x46mm_m195_casing",
"extend": { "effects": [ "NO_EMBED" ] }
},
{
"id": "40x46mm_buckshot_m118",
"copy-from": "40x46mm_grenade",
"type": "AMMO",
"name": "40x46mm buckshot",
"description": "An improvised 40x46mm buckshot load somewhat resembling M576.",
"weight": "120 g",
"range": 10,
"damage": 90,
"pierce": 4,
"recoil": 1000,
"casing": "40x46mm_m118_casing",
"extend": { "effects": [ "SHOT" ] }
},
{
"id": "40x46mm_buckshot_m199",
"copy-from": "40x46mm_grenade",
"type": "AMMO",
"name": "40x46mm buckshot",
"description": "An improvised 40x46mm buckshot load somewhat resembling M576.",
"weight": "120 g",
"range": 10,
"damage": 90,
"pierce": 4,
"recoil": 1000,
"casing": "40x46mm_m199_casing",
"extend": { "effects": [ "SHOT" ] }
},
{
"id": "40x46mm_slug_m118",
"copy-from": "40x46mm_grenade",
"type": "AMMO",
"name": "40x46mm slug",
"description": "An improvised 40x46mm load resembling an oversized shotgun slug.",
"weight": "120 g",
"range": 10,
"damage": 120,
"pierce": 6,
"recoil": 1000,
"casing": "40x46mm_m118_casing"
},
{
"id": "40x46mm_slug_m199",
"copy-from": "40x46mm_grenade",
"type": "AMMO",
"name": "40x46mm slug",
"description": "An improvised 40x46mm load resembling an oversized shotgun slug.",
"weight": "120 g",
"range": 10,
"damage": 120,
"pierce": 6,
"recoil": 1000,
"casing": "40x46mm_m199_casing"
},
{
"id": "40x46mm_flechette_m118",
"copy-from": "40x46mm_grenade",
"type": "AMMO",
"name": "40x46mm flechette",
"description": "An improvised 40x46mm flechette load containing 70 steel darts.",
"weight": "120 g",
"range": 10,
"damage": 75,
"pierce": 6,
"recoil": 1000,
"casing": "40x46mm_m118_casing",
"extend": { "effects": [ "SHOT" ] }
},
{
"id": "40x46mm_flechette_m199",
"copy-from": "40x46mm_grenade",
"type": "AMMO",
"name": "40x46mm flechette",
"description": "An improvised 40x46mm flechette load containing 70 steel darts.",
"weight": "120 g",
"range": 10,
"damage": 75,
"pierce": 6,
"recoil": 1000,
"casing": "40x46mm_m199_casing",
"extend": { "effects": [ "SHOT" ] }
}
]
Loading

0 comments on commit 4be222a

Please sign in to comment.