Skip to content

Commit

Permalink
Add more 9x19mm guns (#43015)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rail-Runner
Rail-Runner authored Oct 17, 2020
1 parent 2cbbd3d commit a44ff87
Show file tree
Hide file tree
Showing 7 changed files with 388 additions and 4 deletions.
22 changes: 20 additions & 2 deletions data/json/itemgroups/Weapons_Mods_Ammo/guns.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,15 +162,24 @@
{ "item": "m1911-460", "prob": 3, "charges-min": 0, "charges-max": 7 },
{ "item": "lemat_revolver", "prob": 150, "charges-min": 0, "charges-max": 9 },
{ "item": "makarov", "prob": 100, "charges-min": 0, "charges-max": 8 },
{ "item": "mauser_c96", "prob": 39, "charges-min": 0, "charges-max": 10 },
{ "item": "moss_brownie", "prob": 100, "charges-min": 0, "charges-max": 4 },
{ "item": "p08", "prob": 121, "charges-min": 0, "charges-max": 8 },
{ "item": "pistol_flintlock", "prob": 150 },
{ "item": "raging_bull", "prob": 100, "charges-min": 0, "charges-max": 5 },
{ "item": "raging_judge", "prob": 20, "charges-min": 0, "charges-max": 5 },
{ "item": "tokarev", "prob": 100, "charges-min": 0, "charges-max": 8 },
{ "item": "walther_ppk", "prob": 100, "charges-min": 0, "charges-max": 8 },
{ "item": "colt_saa", "prob": 150, "charges-min": 0, "charges-max": 6 }
{ "item": "colt_saa", "prob": 150, "charges-min": 0, "charges-max": 6 },
{ "group": "guns_pistol_collectible", "prob": 1 }
]
},
{
"type": "item_group",
"id": "guns_pistol_collectible",
"//": "Extremely rare factory-made pistols that are possible for civilians to own; only likely to show up in gun collections, museums or similar. Always unloaded.",
"items": [ { "item": "mauser_m714", "prob": 60, "charges-min": 0, "charges-max": 0 } ]
},
{
"type": "item_group",
"id": "guns_pistol_improvised",
Expand All @@ -186,6 +195,8 @@
"id": "guns_smg_common",
"//": "SMGs commonly owned by citizens and found in many locations.",
"items": [
{ "item": "mp40semi", "prob": 200, "charges-min": 0, "charges-max": 32 },
{ "item": "mp40", "prob": 185, "charges-min": 0, "charges-max": 32 },
{ "item": "tommygun", "prob": 70, "charges-min": 0, "charges-max": 20 },
{ "item": "hk_mp5_semi_pistol", "prob": 70, "charges-min": 0, "charges-max": 30 },
{ "item": "sten", "prob": 100, "charges-min": 0, "charges-max": 32 },
Expand Down Expand Up @@ -260,9 +271,16 @@
{ "item": "ppsh", "prob": 150, "charges-min": 0, "charges-max": 35 },
{ "item": "hk_mp5_10_semi", "prob": 1, "charges-min": 0, "charges-max": 30 },
{ "item": "skorpion_61", "prob": 100, "charges-min": 0, "charges-max": 20 },
{ "item": "skorpion_82", "prob": 100, "charges-min": 0, "charges-max": 20 }
{ "item": "skorpion_82", "prob": 100, "charges-min": 0, "charges-max": 20 },
{ "group": "guns_smg_collectible", "prob": 1 }
]
},
{
"type": "item_group",
"id": "guns_smg_collectible",
"//": "Extremely rare factory-made submachine guns that are possible for civilians to own; only likely to show up in gun collections, museums or similar. Always unloaded.",
"items": [ { "item": "mp18", "prob": 3, "charges-min": 0, "charges-max": 0 } ]
},
{
"type": "item_group",
"id": "guns_smg_improvised",
Expand Down
6 changes: 6 additions & 0 deletions data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,9 +383,15 @@
"items": [
[ "762x39_clip", 10 ],
[ "762R_clip", 10 ],
[ "clip9mm_10rd", 5 ],
[ "af2011a1mag", 1 ],
[ "ak74mag", 10 ],
[ "makarovmag", 10 ],
[ "mausermag_10rd", 3 ],
[ "mausermag_20rd", 2 ],
[ "mp40mag_32rd", 5 ],
[ "p08mag_32rd", 1 ],
[ "p08mag_8rd", 10 ],
[ "ppshmag", 10 ],
[ "ppshdrum", 10 ],
[ "rpk74mag", 10 ],
Expand Down
226 changes: 226 additions & 0 deletions data/json/items/gun/9mm.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,232 @@
}
]
},
{
"id": "p08",
"copy-from": "pistol_base",
"looks_like": "glock_17",
"type": "GUN",
"name": { "str": "Luger P08" },
"description": "A semi-automatic 9x19mm pistol with an unusual toggle-lock action, well-known for its use by Germans during both World Wars. Notably accurate even by modern standards.",
"weight": "871 g",
"volume": "465 ml",
"longest_side": "248 mm",
"price": 100000,
"price_postapoc": 2500,
"to_hit": -2,
"bashing": 8,
"material": "steel",
"symbol": "(",
"color": "dark_gray",
"ammo": [ "9mm" ],
"ranged_damage": { "damage_type": "bullet", "amount": -1 },
"dispersion": 420,
"durability": 8,
"min_cycle_recoil": 450,
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
[ "bore", 1 ],
[ "brass catcher", 1 ],
[ "grip", 1 ],
[ "mechanism", 4 ],
[ "magazine", 1 ],
[ "muzzle", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
],
"pocket_data": [
{
"magazine_well": "55 ml",
"pocket_type": "MAGAZINE_WELL",
"holster": true,
"max_contains_volume": "20 L",
"max_contains_weight": "20 kg",
"item_restriction": [ "p08mag_8rd", "p08mag_32rd" ]
}
]
},
{
"id": "mp18",
"copy-from": "smg_base",
"looks_like": "hk_mp5",
"type": "GUN",
"name": { "str": "MP 18" },
"description": "An early German submachine gun with wooden stock chambered for 9x19mm, introduced near the end of First World War.",
"weight": "4180 g",
"volume": "2630 ml",
"longest_side": "832 mm",
"price": 2000000,
"price_postapoc": 1500,
"bashing": 10,
"material": [ "steel", "wood" ],
"symbol": "(",
"color": "dark_gray",
"ammo": [ "9mm" ],
"ranged_damage": { "damage_type": "bullet", "amount": 1 },
"dispersion": 360,
"durability": 6,
"min_cycle_recoil": 450,
"modes": [ [ "DEFAULT", "burst", 4 ] ],
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
[ "bore", 1 ],
[ "brass catcher", 1 ],
[ "mechanism", 4 ],
[ "magazine", 1 ],
[ "muzzle", 1 ],
[ "sling", 1 ],
[ "stock mount", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"pocket_data": [
{
"magazine_well": "30 ml",
"pocket_type": "MAGAZINE_WELL",
"holster": true,
"max_contains_volume": "20 L",
"max_contains_weight": "20 kg",
"item_restriction": [ "p08mag_32rd", "p08mag_8rd" ]
}
]
},
{
"id": "mauser_c96",
"copy-from": "pistol_base",
"looks_like": "glock_17",
"type": "GUN",
"name": { "str": "Broomhandle Mauser" },
"description": "A semi-automatic pistol with an integral magazine loaded from the top. Red '9' number burned and painted into the grip marks it as a variant chambered for 9x19mm.",
"weight": "1134 g",
"volume": "640 ml",
"longest_side": "333 mm",
"price": 130000,
"price_postapoc": 2500,
"to_hit": -2,
"bashing": 8,
"material": "steel",
"symbol": "(",
"color": "dark_gray",
"ammo": [ "9mm" ],
"dispersion": 450,
"durability": 7,
"min_cycle_recoil": 450,
"modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
[ "bore", 1 ],
[ "brass catcher", 1 ],
[ "grip", 1 ],
[ "mechanism", 4 ],
[ "muzzle", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "stock", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "RELOAD_ONE" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "9mm": 10 }, "allowed_speedloaders": [ "clip9mm_10rd" ] } ]
},
{
"id": "mauser_m714",
"copy-from": "mauser_c96",
"type": "GUN",
"name": { "str": "detachable-magazine Mauser" },
"description": "This is a variant of the Mauser C96 pistol chambered for 9x19mm, which uses a detachable magazine rather than an integral one.",
"weight": "1070 g",
"volume": "615 ml",
"price": 90000,
"pocket_data": [
{
"magazine_well": "60 ml",
"pocket_type": "MAGAZINE_WELL",
"holster": true,
"max_contains_volume": "20 L",
"max_contains_weight": "20 kg",
"item_restriction": [ "mausermag_20rd", "mausermag_10rd" ]
}
]
},
{
"id": "mp40",
"copy-from": "smg_base",
"looks_like": "hk_mp5",
"type": "GUN",
"name": { "str": "MP 40" },
"description": "This is a 9x19mm submachine gun with a folding stock, which was used extensively during Second World War.",
"weight": "3969 g",
"volume": "2320 ml",
"longest_side": "648 mm",
"price": 1500000,
"price_postapoc": 1500,
"bashing": 10,
"material": [ "steel" ],
"symbol": "[",
"color": "dark_gray",
"ammo": [ "9mm" ],
"ranged_damage": { "damage_type": "bullet", "amount": 1 },
"dispersion": 360,
"durability": 6,
"min_cycle_recoil": 450,
"modes": [ [ "DEFAULT", "burst", 4 ] ],
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
[ "bore", 1 ],
[ "mechanism", 4 ],
[ "magazine", 1 ],
[ "brass catcher", 1 ],
[ "muzzle", 1 ],
[ "sling", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "SLOW_WIELD" ],
"pocket_data": [
{
"magazine_well": "40 ml",
"pocket_type": "MAGAZINE_WELL",
"holster": true,
"max_contains_volume": "20 L",
"max_contains_weight": "20 kg",
"item_restriction": [ "mp40mag_32rd" ]
}
]
},
{
"id": "mp40semi",
"copy-from": "mp40",
"type": "GUN",
"name": { "str": "MP 40 Semi Auto" },
"description": "This is a modern semi-automatic replica of MP 40 SMG, without a stock, to make it legally be considered a pistol. It actually bears only a visual resemblance to the original, differing substantially from originally manufactured MP 40s in internal operations.",
"weight": "3722 g",
"volume": "2020 ml",
"price": 90000,
"modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
[ "bore", 1 ],
[ "brass catcher", 1 ],
[ "muzzle", 1 ],
[ "sling", 1 ],
[ "stock mount", 1 ],
[ "grip mount", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"delete": { "flags": [ "SLOW_WIELD" ] }
},
{
"id": "ksub2000",
"looks_like": "hk_mp5",
Expand Down
Loading

0 comments on commit a44ff87

Please sign in to comment.