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.

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 magazines to 9mm weapons #15003

Closed
wants to merge 18 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
88 changes: 76 additions & 12 deletions data/json/item_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -2737,7 +2737,15 @@
["improve_sights", 20],
["survnote", 1],
["shoulder_strap", 24],
["powered_earmuffs",40]
["powered_earmuffs",40],
["stanag10", 10],
["stanag30", 5],
["stanag10", 10],
["glockmag", 20],
["glockbigmag", 3],
["m9mag", 10],
["m9bigmag", 1],
["usp9mag", 10]
]
},{
"type" : "item_group",
Expand Down Expand Up @@ -3676,7 +3684,12 @@
["shot_beanbag", 14],
["223", 10],
["3006", 10],
["survnote", 1]
["survnote", 1],
["stanag10", 6],
["lw223mag", 2],
["glockmag", 10],
["mp5mag", 5],
["lw21mag", 2]
]
},{
"type" : "item_group",
Expand Down Expand Up @@ -3757,7 +3770,9 @@
["fn_p90", 3],
["l_mp_9mm", 2],
["tazer", 15],
["l-stick", 1]
["l-stick", 1],
["stanag10", 6],
["lw223mag", 2]
]
},{
"type" : "item_group",
Expand Down Expand Up @@ -3887,7 +3902,18 @@
["tac_helmet", 20],
["helmet_lobster", 10],
["goggles_nv", 5],
["UPS_off", 10]
["UPS_off", 10],
["stanag30", 10],
["stanag10", 5],
["lw223mag", 5],
["lw21mag", 5],
["glockmag", 5],
["glockbigmag", 5],
["m9mag", 5],
["m9bigmag", 5],
["usp9mag", 5],
["mp5mag", 15],
["mp5bigmag", 5]
]
},{
"type" : "item_group",
Expand Down Expand Up @@ -4739,7 +4765,8 @@
["rail_laser_sight", 10],
["rifle_scope", 17],
["pistol_scope", 14],
["improve_sights", 20]
["improve_sights", 20],
["survivor223mag", 20]
]
},{
"type" : "item_group",
Expand Down Expand Up @@ -5211,7 +5238,9 @@
["eboshi", 1],
["kariginu", 2],
["kimono", 3],
["l-stick", 1]
["l-stick", 1],
["stanag10", 2],
["glockmag", 2]
]
},{
"type" : "item_group",
Expand Down Expand Up @@ -5292,7 +5321,14 @@
["bfipowder", 20],
["sheath", 10],
["bootsheath", 10],
["survnote", 1]
["survnote", 1],
["stanag10", 8],
["stanag30", 6],
["lw223mag", 6],
["lw21mag", 6],
["m9mag", 20],
["m9bigmag", 5],
["usp9mag", 20]
]
},{
"type" : "item_group",
Expand Down Expand Up @@ -6273,7 +6309,12 @@
["20x66_exp", 2],
["20x66_frag", 2],
["20x66_flare", 4],
["20x66_inc", 2]
["20x66_inc", 2],
["lw223mag", 20],
["lw223bigmag", 10],
["lw21mag", 10],
["mp5mag", 5],
["mp5bigmag", 3]
]
},{
"type" : "item_group",
Expand Down Expand Up @@ -6337,7 +6378,9 @@
["20x66_flechette", 3],
["waterproof_gunmod", 2],
["improve_sights", 5],
["rm11b_sniper_rifle", 1]
["rm11b_sniper_rifle", 1],
["lw223mag", 8],
["lw223bigmag", 4]
]
},{
"type" : "item_group",
Expand Down Expand Up @@ -7628,7 +7671,12 @@
["grapnel", 1],
["briefcase", 5],
["survnote", 2],
["robot_controls", 3]
["robot_controls", 3],
["stanag30", 10],
["lw223mag", 5],
["lw21mag", 5],
["m9mag", 5],
["usp9mag", 5]
]
},{
"type" : "item_group",
Expand Down Expand Up @@ -7859,7 +7907,15 @@
["shoulder_strap", 16],
["bot_manhack", 1],
["bot_grenade_hack", 1],
["l-stick", 1]
["l-stick", 1],
["stanag30", 20],
["stanag50", 10],
["lw223mag", 20],
["lw223bigmag", 10],
["lw21mag", 20],
["m9mag", 20],
["m9bigmag", 5],
["usp9mag", 10]
]
},{
"type" : "item_group",
Expand Down Expand Up @@ -8053,7 +8109,15 @@
["scrap_copper", 5],
["signal_flare", 5],
["8mm_inc", 2],
["survnote", 1]
["survnote", 1],
["stanag10", 4],
["stanag30", 2],
["lw223mag", 1],
["lw21mag", 1],
["usp9mag", 2],
["m9mag", 2],
["glockmag", 6],
["glockbigmag",1]
]
},{
"type" : "item_group",
Expand Down
25 changes: 14 additions & 11 deletions data/json/items/ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,8 @@
"dispersion" : 150,
"recoil" : 195,
"count" : 50,
"effects" : ["COOKOFF"]
"effects" : ["COOKOFF"],
"stack_size" : 50
},
{ "type" : "AMMO",
"id" : "9mmP",
Expand Down Expand Up @@ -827,7 +828,8 @@
"dispersion" : 155,
"recoil" : 195,
"count" : 50,
"effects" : ["COOKOFF"]
"effects" : ["COOKOFF"],
"stack_size" : 50
},
{ "type" : "AMMO",
"id" : "9x18mm",
Expand Down Expand Up @@ -1353,7 +1355,7 @@
"description" : ".223 Remington ammunition with 36gr JHP bullets. The .223 round has been very popular with civilian shooters for almost a century, finding use in a wide variety of weapons. It generates lower pressure than 5.56 NATO leading to slightly decreased accuracy and recoil.",
"material" : ["steel", "powder"],
"volume" : 1,
"weight" : 4,
"weight" : 12,
"bashing" : 1,
"to_hit" : 0,
"ammo_type" : "223",
Expand All @@ -1377,7 +1379,7 @@
"description" : "5.56x45mm ammunition with a 62gr FMJ bullet containing a steel penetrator. Its light weight, high accuracy, and managable recoil lead to widespread use in the 20th century and it remains popular among militaries and civilians.",
"material" : ["steel", "powder"],
"volume" : 1,
"weight" : 4,
"weight" : 12,
"bashing" : 1,
"to_hit" : 0,
"ammo_type" : "223",
Expand All @@ -1387,8 +1389,9 @@
"range" : 38,
"dispersion" : 60,
"recoil" : 480,
"count" : 40,
"effects" : ["COOKOFF", "NEVER_MISFIRES"]
"count" : 30,
"effects" : ["COOKOFF", "NEVER_MISFIRES"],
"stack_size": 20
},
{ "type" : "AMMO",
"id" : "556_incendiary",
Expand All @@ -1397,10 +1400,10 @@
"name_plural" : "5.56 NATO tracer",
"symbol" : "=",
"color" : "yellow",
"description" : "A belt of 5.56 NATO rounds. The ammunition is a one-in-five mix of M855A1 and M856 tracer rounds to help keep the weapon they are fired from on target.",
"description" : "This ammunition is a one-in-five mix of M855A1 and M856 tracer rounds to help keep the weapon they are fired from on target.",
"material" : ["steel", "powder"],
"volume" : 3,
"weight" : 5,
"volume" : 1,
"weight" : 12,
"bashing" : 1,
"to_hit" : 0,
"ammo_type" : "223",
Expand All @@ -1411,8 +1414,8 @@
"dispersion" : 45,
"recoil" : 480,
"count" : 30,
"stack_size": 100,
"effects" : ["COOKOFF", "INCENDIARY", "NEVER_MISFIRES"]
"effects" : ["COOKOFF", "INCENDIARY", "NEVER_MISFIRES"],
"stack_size": 20
},
{ "type" : "AMMO",
"id" : "270",
Expand Down
20 changes: 11 additions & 9 deletions data/json/items/handloaded_bullets.json
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,7 @@
"description" : "The .223 rifle round is a civilian variant of the 5.56 NATO round. It is designed to tumble or fragment inside a target, dealing devastating damage. The lower pressure of the .223 compared to the 5.56 results in lower accuracy. This one has been hand-reloaded.",
"material" : ["steel", "powder"],
"volume" : 1,
"weight" : 4,
"weight" : 12,
"bashing" : 1,
"ammo_type" : "223",
"casing" : "223_casing",
Expand All @@ -868,8 +868,9 @@
"range" : 36,
"dispersion" : 90,
"recoil" : 450,
"count" : 40,
"effects" : ["COOKOFF", "RECYCLED"]
"count" : 30,
"effects" : ["COOKOFF", "RECYCLED"],
"stack_size": 20
},
{
"type" : "AMMO",
Expand All @@ -882,7 +883,7 @@
"description" : "This rifle round has enjoyed widespread use in NATO countries, thanks to its very light weight and high damage. It is designed to shatter inside a target, inflicting massive damage. This one has been hand-reloaded.",
"material" : ["steel", "powder"],
"volume" : 1,
"weight" : 4,
"weight" : 12,
"bashing" : 1,
"ammo_type" : "223",
"casing" : "223_casing",
Expand All @@ -891,8 +892,9 @@
"range" : 38,
"dispersion" : 70,
"recoil" : 480,
"count" : 40,
"effects" : ["COOKOFF", "RECYCLED"]
"count" : 30,
"effects" : ["COOKOFF", "RECYCLED"],
"stack_size" : 20
},
{
"type" : "AMMO",
Expand All @@ -902,10 +904,10 @@
"name_plural" : "reloaded 5.56 NATO tracer",
"symbol" : "=",
"color" : "yellow",
"description" : "A belt of hand-reloaded 5.56 NATO rounds. A hand-made variant of the widely-used 5.56 NATO round, the ammunition is a one-in-five mix of hand-loaded 5.56 FMJ and 5.56 incendiary rounds designed to burn hotly when fired.",
"description" : "A hand-made variant of the widely-used 5.56 NATO round, the ammunition is a one-in-five mix of hand-loaded 5.56 FMJ and 5.56 incendiary rounds designed to burn hotly when fired.",
"material" : ["steel", "powder"],
"volume" : 1,
"weight" : 5,
"weight" : 12,
"bashing" : 1,
"ammo_type" : "223",
"casing" : "223_casing",
Expand All @@ -915,7 +917,7 @@
"dispersion" : 75,
"recoil" : 495,
"count" : 30,
"stack_size": 40,
"stack_size": 20,
"effects" : ["COOKOFF", "INCENDIARY", "RECYCLED"]
},
{
Expand Down
Loading