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

VZ. 58 7.62x39mm rifles #58933

Merged
merged 22 commits into from Jul 11, 2022
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8d81eb6
starting implementation, adds the VZ. 58 P, pluss 30 and 10 round mag…
DoctorBoomstick Jun 25, 2022
35d403e
Merge branch 'master' into VZ58
DoctorBoomstick Jun 26, 2022
a73f5b1
Adds all the variations of the VZ. 58 and its magazines, pluss the ne…
DoctorBoomstick Jun 28, 2022
8cd1506
adds VZ. 58 rifle spawns.
DoctorBoomstick Jun 28, 2022
b9e194f
Merge branch 'master' into VZ58
DoctorBoomstick Jun 28, 2022
9a49d35
Merge branch 'master' into VZ58
DoctorBoomstick Jul 3, 2022
9dd4643
fixes the spawn rates for the VZ rifles, and steps down on how common…
DoctorBoomstick Jul 3, 2022
bc02625
Update data/json/items/gun/762.json
DoctorBoomstick Jul 3, 2022
6f9f3ee
Update data/json/items/gun/762.json
DoctorBoomstick Jul 4, 2022
b551be1
Update data/json/items/magazine/762.json
DoctorBoomstick Jul 4, 2022
644aa9d
Fixes non-capitalised/ mistakenly capitalised letters, makes the vz. …
DoctorBoomstick Jul 4, 2022
45dbce1
Merge branch 'master' into VZ58
DoctorBoomstick Jul 4, 2022
fed9ee1
Fixes, “parts interchangeability,” to, “interchangeable parts,” in de…
DoctorBoomstick Jul 4, 2022
c9868e9
Update data/json/items/gun/762.json
DoctorBoomstick Jul 4, 2022
37967e3
Changes the variant’s name to the, “vz. 58 combat rifle,” as, “vz,” b…
DoctorBoomstick Jul 5, 2022
881ace2
Merge branch 'VZ58' of https://github.com/DoctorBoomstick/Cataclysm-D…
DoctorBoomstick Jul 5, 2022
d71fa31
Merge branch 'master' into VZ58
DoctorBoomstick Jul 5, 2022
43a0df8
adds the, "looks like," and, "type," fields back to the two magazines…
DoctorBoomstick Jul 5, 2022
56d50b9
Changes the name of the, “Czechpoint tactical rifle,” to the, “vz. 58…
DoctorBoomstick Jul 5, 2022
dc8b8a5
Merge branch 'master' into VZ58
DoctorBoomstick Jul 6, 2022
14c52e6
Merge branch 'master' into VZ58
DoctorBoomstick Jul 7, 2022
d8282e6
Merge branch 'master' into VZ58
DoctorBoomstick Jul 10, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json
Expand Up @@ -136,6 +136,13 @@
"subtype": "collection",
"entries": [ { "item": "suppressor" }, { "item": "rifle_scope" }, { "item": "bipod" } ]
},
{
"type": "item_group",
"id": "vz58v_mods",
"//": "Default mods for the vz. 58 V variant of the VZ combat rifle",
"subtype": "collection",
"entries": [ { "item": "folding_stock" } ]
},
{
"type": "item_group",
"id": "sights_shotgun_readied",
Expand Down
7 changes: 7 additions & 0 deletions data/json/itemgroups/Weapons_Mods_Ammo/guns.json
Expand Up @@ -396,6 +396,7 @@
{ "group": "nested_sks", "prob": 1 },
{ "group": "nested_win70", "prob": 2 },
{ "group": "nested_1895sbl", "prob": 1 },
{ "group": "nested_vz58ts", "prob": 1 },
{ "group": "nested_fn_ps90", "prob": 1 },
{ "group": "nested_aksemi", "prob": 2 },
{ "group": "nested_m1carbine", "prob": 1 }
Expand Down Expand Up @@ -424,6 +425,7 @@
{ "item": "ruger_mini", "prob": 1, "charges-min": 0, "charges-max": 5 },
{ "item": "sks", "prob": 1, "charges-min": 0, "charges-max": 10 },
{ "item": "win70", "prob": 2, "charges-min": 0, "charges-max": 3 },
{ "item": "vz58ts", "prob": 1, "charges-min": 0, "charges-max": 30 },
{ "item": "fn_ps90", "prob": 1, "charges-min": 0, "charges-max": 50 },
{ "item": "1895sbl", "prob": 1, "charges-min": 0, "charges-max": 6 },
{ "item": "aksemi", "prob": 2, "charges-min": 0, "charges-max": 30 },
Expand Down Expand Up @@ -451,6 +453,7 @@
{ "item": "sharps", "prob": 10, "charges-min": 0, "charges-max": 0 },
{ "item": "sks", "prob": 20, "charges-min": 0, "charges-max": 0 },
{ "item": "m1a", "prob": 30, "charges-min": 0, "charges-max": 0 },
{ "item": "vz58ts", "prob": 10, "charges-min": 0, "charges-max": 0 },
{ "item": "fn_ps90", "prob": 5, "charges-min": 0, "charges-max": 0 },
{ "item": "aksemi", "prob": 15, "charges-min": 0, "charges-max": 0 },
{ "item": "mk47", "prob": 10, "charges-min": 0, "charges-max": 0 }
Expand Down Expand Up @@ -573,6 +576,8 @@
{ "group": "nested_steyr_aug", "prob": 40 },
{ "group": "nested_trex_gun", "prob": 60 },
{ "group": "nested_arx160", "prob": 40 },
{ "group": "nested_vz58p", "prob": 35 },
{ "group": "nested_vz58v", "prob": 25 },
{ "group": "nested_iwi_tavor_x95_300blk", "prob": 10 },
{ "group": "nested_acr_300blk", "prob": 15 }
]
Expand All @@ -588,6 +593,8 @@
{ "item": "bfg50", "prob": 5, "charges-min": 0, "charges-max": 0 },
{ "item": "trex_gun", "prob": 5, "charges-min": 0, "charges-max": 0 },
{ "item": "ak74", "prob": 5, "charges-min": 0, "charges-max": 0 },
{ "item": "vz58_p", "variant": "vz58_p", "prob": 5, "charges-min": 0, "charges-max": 0 },
{ "item": "vz58_p", "variant": "vz58_v", "prob": 5, "charges-min": 0, "charges-max": 0 },
{ "item": "famas", "prob": 5, "charges-min": 0, "charges-max": 0 },
{ "item": "m60_semi", "prob": 5, "charges-min": 0, "charges-max": 0 },
{ "item": "oa93", "prob": 3, "charges-min": 0, "charges-max": 0 },
Expand Down
6 changes: 6 additions & 0 deletions data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
Expand Up @@ -377,6 +377,8 @@
[ "akmag20", 40 ],
[ "akmag40", 40 ],
[ "akdrum75", 30 ],
[ "vz58mag30", 30 ],
[ "vz58mag10", 30 ],
[ "fnp90mag", 15 ],
[ "falmag", 100 ],
[ "falbigmag", 50 ],
Expand Down Expand Up @@ -490,6 +492,8 @@
[ "762R_clip", 10 ],
[ "clip9mm_10rd", 5 ],
[ "af2011a1mag", 1 ],
[ "vz58mag30", 8 ],
[ "vz58mag10", 8 ],
[ "ak74mag", 10 ],
[ "makarovmag", 10 ],
[ "mausermag_10rd", 3 ],
Expand All @@ -513,6 +517,8 @@
[ "762x39_clip", 10 ],
[ "762R_clip", 10 ],
[ "clip9mm_10rd", 5 ],
[ "vz58mag30", 8 ],
[ "vz58mag10", 8 ],
[ "makarovmag", 10 ],
[ "mausermag_10rd", 3 ],
[ "mausermag_20rd", 2 ],
Expand Down
36 changes: 36 additions & 0 deletions data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
Expand Up @@ -2082,6 +2082,42 @@
{ "group": "on_hand_9mm" }
]
},
{
"id": "nested_vz58ts",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"subtype": "collection",
"entries": [
{ "item": "vz58ts", "charges-min": 0, "charges-max": 30 },
{ "item": "vz58mag30" },
{ "item": "vz58mag30", "prob": 50 },
{ "group": "on_hand_762" }
]
},
{
"id": "nested_vz58p",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"subtype": "collection",
"entries": [
{ "item": "vz58_p", "variant": "vz58_p", "charges-min": 0, "charges-max": 30 },
{ "item": "vz58mag30" },
{ "item": "vz58mag30", "prob": 50 },
{ "group": "on_hand_762" }
]
},
{
"id": "nested_vz58v",
"type": "item_group",
"//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
"subtype": "collection",
"entries": [
{ "item": "vz58_p", "variant": "vz58_v", "contents-group": "vz58v_mods", "prob": 1, "charges": [ 0, 30 ] },
{ "item": "vz58mag30" },
{ "item": "vz58mag30", "prob": 50 },
{ "group": "on_hand_762" }
]
},
{
"id": "nested_m1carbine",
"type": "item_group",
Expand Down
73 changes: 73 additions & 0 deletions data/json/items/gun/762.json
Expand Up @@ -236,5 +236,78 @@
[ "underbarrel", 1 ]
],
"pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "akmag10", "akmag20", "akmag30", "akmag40", "akdrum75" ] } ]
},
{
"id": "vz58_p",
"copy-from": "rifle_auto",
"looks_like": "ar15",
"type": "GUN",
"name": { "str": "vz. 58 combat rifle" },
"description": "A Cold War era Czechoslovakian assault rifle, likely constructed stateside from a pre-1986 imported parts kit or brought back from a third world war zone. Externally similar to the AK family of rifles, this weapon nevertheless only shares the former’s 7.62x39mm chambering. Featuring no interchangeable parts with its Russian doppelganger, this firearm makes use of a completely different internal operating system, is far more svelte than its other Warsaw Pact counterparts, and feeds from proprietary box magazines.",
"weight": "2900 g",
"volume": "2000 ml",
"longest_side": "84 cm",
"price": 200000,
"//": "Couldn’t find exact price information on original VZ assault rifles, so did some guestimation based off of prices for similar Russian automatic weapon’s's parts kits.",
"price_postapoc": 4000,
"variant_type": "gun",
"variants": [
{
"id": "vz58_p",
"name": { "str": "Samopal vz. 58 P" },
"description": "This lightweight and relatively svelte Cold War assault rifle was originally developed for use by the Czechoslovakian army, in place of the various licenced Kalashnikov rifles which were then prevalent around eastern Europe. Baring more than a passing resemblance to the AK-47, this weapon nevertheless features a completely different array of internals and possesses no interchangeable parts with its Russian counterpart. Making use of proprietary magazines and a 15.4 inch barrel, the vz. 58 was regarded by some to be the Kalashnikov’s lesser known superior. Likely reconstructed from a pre-1986 imported parts kit, or brought back from a 3rd world war zone, this particular weapon features a removable wood impregnated plastic buttstock and a 'P' suffixed designation, which both mark it as an original infantry model.",
"weight": 1
},
{
"id": "vz58_v",
"name": { "str": "Samopal VZ 58 V" },
"description": "This lightweight and relatively svelte cold war assault rifle was originally developed for use by the Czechoslovak army, in place of the various licenced Kalashnikov rifles which were then prevalent around eastern Europe. Baring more than a passing resemblance to the AK-47, this weapon nevertheless features a completely different array of internals and possesses no interchangeable parts with its Russian counterpart. Making use of proprietary magazines and a 15.4 inch barrel, the VZ. 58 is regarded by some to be the Kalashnikov’s lesser known superior. Likely reconstructed from a pre-1986 imported parts kit, or brought back from a 3rd world war zone, this particular weapon features a removable side-folding buttstock and a 'V' suffixed designation, which both mark it as an original airborne or crew issued model."
}
],
"to_hit": -1,
"bashing": 12,
"material": [ "steel", "plastic", "wood" ],
"color": "brown",
"ammo": [ "762" ],
"dispersion": 150,
"durability": 10,
"min_cycle_recoil": 1950,
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
"valid_mod_locations": [
[ "accessories", 4 ],
[ "barrel", 1 ],
[ "bore", 1 ],
[ "brass catcher", 1 ],
[ "grip", 1 ],
[ "mechanism", 4 ],
[ "muzzle", 1 ],
[ "rail mount", 1 ],
[ "sights mount", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "stock accessory", 2 ],
[ "underbarrel mount", 1 ]
],
"pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "vz58mag30", "vz58mag10" ] } ]
},
{
"id": "vz58ts",
"copy-from": "vz58_p",
"looks_like": "ar15",
"type": "GUN",
"name": { "str": "Czechpoint tactical rifle" },
DoctorBoomstick marked this conversation as resolved.
Show resolved Hide resolved
"description": "Inspired and built primarily from older Czechoslovakian military combat rifles, this weapon bears an uncanny resemblance to the Kalashnikov despite sharing no components with it, including magazines. Chambering the Soviet 7.62x39mm cartridge and featuring an American produced folding buttstock, receiver and barrel in order to have complied with US importation laws, the weapon is equipped with a side mounted rail assembly as well as a detachable muzzle brake. Despite the firearm’s Cold War design being nearly 80 years old, this modern iteration makes for a relatively portable and serviceable cataclysmic problem solver.",
"variant_type": "gun",
"variants": [
{
"id": "vz58ts",
"name": { "str": "vz. 58 Tactical Sporter" },
"description": "A modern semi-automatic clone of the Czechoslovakian produced vz. 58 assault rifle, chambered in the Soviet 7.62x39mm cartridge. Built off of surplus vz. 58 parts, the rifle makes use of additional American made components such as the receiver, barrel and buttstock to comply with US importation laws. Featuring an extended 16 inch barrel, an M4 style stock adapter and tube, and an integrated side rail for optics mounting, this Cold War rifle makes for a relatively handy post-apocalyptic companion.",
"weight": 1
}
],
"price": 170000,
"modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
"default_mods": [ "folding_stock", "rail_mount", "offset_sight_rail", "muzzle_brake" ]
}
]
34 changes: 34 additions & 0 deletions data/json/items/magazine/762.json
Expand Up @@ -102,5 +102,39 @@
"ammo_type": [ "762" ],
"flags": [ "MAG_BULKY" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762": 75 } } ]
},
{
"id": "vz58mag10",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": { "str": "vz. 58 10-round magazine" },
"description": "A surplus Czech military magazine for the vz. 58 assault rifle, which has been modified to only be capable of holding 10 rounds in place of its standard capacity of 30 cartridges.",
"weight": "190 g",
"volume": "370 ml",
"price": 4000,
"price_postapoc": 100,
"material": [ "aluminum" ],
"symbol": "#",
"color": "light_gray",
"ammo_type": [ "762" ],
"flags": [ "MAG_COMPACT" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762": 10 } } ]
},
{
"id": "vz58mag30",
"looks_like": "stanag30",
"type": "MAGAZINE",
"name": { "str": "vz. 58 30-round magazine" },
"description": "An original surplus Czechoslovak magazine, constructed out of lightweight aluminum and made for use within vz. 58 pattern rifles and modern derivatives. Despite strongly resembling standard Kalashnikov magazines, this curved box magazine is unsuitable for insertion into AK patten mag wells due to changes made in its follower assembly to facilitate a last-round-hold-open feature within the vz. 58.",
"weight": "190 g",
"volume": "370 ml",
"price": 3299,
"price_postapoc": 250,
"material": [ "aluminum" ],
"symbol": "#",
"color": "light_gray",
"ammo_type": [ "762" ],
"flags": [ "MAG_COMPACT" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762": 30 } } ]
}
]
3 changes: 3 additions & 0 deletions data/mods/Generic_Guns/firearms/gg_firearms_migration.json
Expand Up @@ -215,6 +215,8 @@
"sig_mcx_rattler_sbr",
"rm51_assault_rifle",
"an94",
"vz58_p",
"vz58_v",
"rm88_battle_rifle"
],
"type": "MIGRATION",
Expand Down Expand Up @@ -271,6 +273,7 @@
"ar10",
"1895sbl",
"ak74",
"vz58ts",
"kord",
"ak47",
"arx160",
Expand Down
2 changes: 2 additions & 0 deletions data/mods/Generic_Guns/magazines/gg_magazines_migration.json
Expand Up @@ -275,6 +275,8 @@
"akmag30",
"akmag40",
"akdrum75",
"vz58mag30",
"vz58mag10",
"8x40_100_mag",
"8x40_250_mag",
"8x40_25_mag",
Expand Down