Shows the VZ. 58 the Door (#74422)

* fixes merge errors. * removes the guns.
CleverRaven · Jun 13, 2024 · b421240 · b421240
1 parent 58b90c6
commit b421240
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 167 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json b/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json
@@ -155,13 +155,6 @@
     "subtype": "distribution",
     "entries": [ { "item": "m203", "prob": 40 }, { "item": "m320_mod", "prob": 60 } ]
   },
-  {
-    "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": "ak74_folding_mods",

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -436,8 +436,6 @@
       { "group": "nested_steyr_aug", "prob": 40 },
       { "group": "nested_win70_458", "prob": 60 },
       { "group": "nested_arx160", "prob": 40 },
-      { "group": "nested_vz58p", "prob": 35 },
-      { "group": "nested_vz58v", "prob": 25 },
       { "group": "nested_psl", "prob": 10 },
       { "group": "nested_iwi_tavor_x95_300blk", "prob": 10 },
       { "group": "nested_acr_300blk", "prob": 15 },
@@ -457,8 +455,6 @@
       { "item": "m249_semi", "prob": 5 },
       { "item": "bfg50", "prob": 1 },
       { "item": "win70_458", "prob": 5 },
-      { "item": "vz58_p", "variant": "vz58_p", "prob": 5 },
-      { "item": "vz58_p", "variant": "vz58_v", "prob": 5 },
       { "item": "type99", "variant": "type99", "contents-group": "type99_mods", "prob": 5, "charges": 0 },
       { "item": "type99_sniper", "contents-item": "arisaka_monopod", "prob": 2, "charges": 0 },
       { "item": "m60_semi", "prob": 5 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
@@ -415,8 +415,7 @@
     "items": [
       { "group": "nested_sks", "prob": 1 },
       { "group": "nested_aksemi", "prob": 2 },
-      { "group": "nested_bren2_762", "prob": 1 },
-      { "group": "nested_vz58ts", "prob": 1 }
+      { "group": "nested_bren2_762", "prob": 1 }
     ]
   },
   {
@@ -489,7 +488,6 @@
       { "item": "sks", "prob": 1, "charges": [ 0, 10 ] },
       { "item": "aksemi", "prob": 2, "charges": [ 0, 30 ] },
       { "item": "bren2_762", "prob": 1, "charges": [ 0, 30 ] },
-      { "item": "vz58ts", "prob": 1, "charges": [ 0, 30 ] },
       { "item": "mk47", "prob": 1, "charges": [ 0, 30 ] }
     ]
   },
@@ -567,8 +565,7 @@
       { "item": "sks", "prob": 20 },
       { "item": "aksemi", "prob": 15 },
       { "item": "mk47", "prob": 10 },
-      { "item": "bren2_762", "prob": 6 },
-      { "item": "vz58ts", "prob": 10 }
+      { "item": "bren2_762", "prob": 6 }
     ]
   },
   {

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -420,8 +420,6 @@
       [ "akmag20", 40 ],
       [ "akmag40", 40 ],
       [ "akdrum75", 30 ],
-      [ "vz58mag30", 30 ],
-      [ "vz58mag10", 30 ],
       [ "clip303_5rd", 15 ],
       [ "clip_77mm_arisaka", 10 ],
       [ "enfield_303mag", 4 ],
@@ -568,8 +566,6 @@
       [ "762R_clip", 10 ],
       [ "clip9mm_10rd", 5 ],
       [ "af2011a1mag", 1 ],
-      [ "vz58mag30", 8 ],
-      [ "vz58mag10", 8 ],
       [ "ak74mag", 10 ],
       [ "makarovmag", 10 ],
       [ "mausermag_10rd", 3 ],

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -2318,42 +2318,6 @@
       { "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": [ 0, 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": [ 0, 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",

diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
@@ -234,79 +234,6 @@
     "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "akmag10", "akmag20", "akmag30", "akmag40", "akdrum75" ] } ],
     "melee_damage": { "bash": 12 }
   },
-  {
-    "id": "vz58_p",
-    "copy-from": "rifle_auto",
-    "looks_like": "modular_ar15",
-    "type": "GUN",
-    "name": { "str": "vz. 58 combat rifle" },
-    "description": "A Cold War-era Czechoslovak 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": "845 mm",
-    "barrel_length": "390 mm",
-    "price": "2 kUSD",
-    "//": "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": "40 USD",
-    "variant_type": "gun",
-    "variants": [
-      {
-        "id": "vz58_p",
-        "name": { "str": "Samopal vz. 58 P rifle" },
-        "description": "This lightweight and relatively svelte Cold War assault rifle was originally developed for use by the Czechoslovak army, in place of the various licensed Kalashnikov rifles which were then prevalent around eastern Europe.  Bearing 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 third 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."
-      },
-      {
-        "id": "vz58_v",
-        "name": { "str": "Samopal VZ 58 V rifle" },
-        "description": "This lightweight and relatively svelte Cold War assault rifle was originally developed for use by the Czechoslovak army, in place of the various licensed Kalashnikov rifles which were then prevalent around eastern Europe.  Bearing 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 third 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,
-    "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": [
-      [ "barrel", 1 ],
-      [ "bayonet lug", 1 ],
-      [ "brass catcher", 1 ],
-      [ "grip", 1 ],
-      [ "mechanism", 2 ],
-      [ "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" ] } ],
-    "melee_damage": { "bash": 12 }
-  },
-  {
-    "id": "vz58ts",
-    "copy-from": "vz58_p",
-    "looks_like": "modular_ar15",
-    "type": "GUN",
-    "name": { "str": "vz. 58 tactical rifle" },
-    "description": "Inspired and built primarily from older Czechoslovak 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 comply 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 rifle" },
-        "description": "A modern semi-automatic clone of the Czechoslovak-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."
-      }
-    ],
-    "price": "1 kUSD 700 USD",
-    "longest_side": "868 mm",
-    "barrel_length": "413 mm",
-    "modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
-    "default_mods": [ "folding_stock", "rail_mount", "offset_sight_rail", "muzzle_brake" ]
-  },
   {
     "id": "bren2_762",
     "copy-from": "rifle_semi",

diff --git a/data/json/items/magazine/762.json b/data/json/items/magazine/762.json
@@ -113,44 +113,6 @@
     "flags": [ "MAG_BULKY" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762": 75 } } ]
   },
-  {
-    "id": "vz58mag10",
-    "//": "Dimensions and weight are from previous PR, not sure of methods. Based on a pinned magazine.",
-    "looks_like": "stanag30",
-    "type": "MAGAZINE",
-    "name": { "str": "vz. 58 10-round magazine" },
-    "description": "A surplus Czechoslovak 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": "188 g",
-    "volume": "370 ml",
-    "longest_side": "235 mm",
-    "price": "40 USD",
-    "price_postapoc": "1 USD",
-    "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",
-    "//": "Dimensions and weight are from previous PR, not sure of methods.",
-    "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-pattern mag wells due to changes made in its follower assembly to facilitate a last-round-hold-open feature within the vz. 58.",
-    "weight": "188 g",
-    "volume": "370 ml",
-    "longest_side": "235 mm",
-    "price": "32 USD 99 cent",
-    "price_postapoc": "2 USD 50 cent",
-    "material": [ "aluminum" ],
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": [ "762" ],
-    "flags": [ "MAG_COMPACT" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762": 30 } } ]
-  },
   {
     "id": "bren2_762mag30",
     "//": "Audited with ImageJ.",

diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json
@@ -1404,6 +1404,26 @@
     "type": "MIGRATION",
     "replace": "ruger_lcr_22"
   },
+  {
+    "id": "vz58_p",
+    "type": "MIGRATION",
+    "replace": "ak47"
+  },
+  {
+    "id": "vz58ts",
+    "type": "MIGRATION",
+    "replace": "aksemi"
+  },
+  {
+    "id": "vz58mag10",
+    "type": "MIGRATION",
+    "replace": "akmag10"
+  },
+  {
+    "id": "vz58mag30",
+    "type": "MIGRATION",
+    "replace": "akmag30"
+  },
   {
     "id": "stowed_fridge",
     "type": "MIGRATION",