From dc34ce6e1002146619e3c4d2490abc2493fa3ea5 Mon Sep 17 00:00:00 2001 From: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Sat, 14 Oct 2023 18:11:25 +0200 Subject: [PATCH] starts working on the light machinegun. --- .../itemgroups/Weapons_Mods_Ammo/guns.json | 7 +-- .../Weapons_Mods_Ammo/nested_guns.json | 8 +-- data/json/items/gun/8x40mm.json | 22 ++++---- data/json/items/magazine/8x40mm.json | 54 ++++++++----------- data/json/obsoletion/migration_items.json | 7 ++- 5 files changed, 46 insertions(+), 52 deletions(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index bcf8f3dca6263..12190913caf10 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -702,7 +702,6 @@ { "group": "nested_m60", "prob": 15 }, { "group": "nested_rm11b_sniper_rifle", "prob": 15 }, { "group": "nested_rm298", "prob": 10 }, - { "group": "nested_rm614_lmg", "prob": 10 }, { "group": "nested_rm88_battle_rifle", "prob": 25 }, { "group": "nested_sig_assault_rifle", "prob": 50 }, { "group": "nested_scar_l", "prob": 50 }, @@ -748,7 +747,8 @@ { "group": "nested_iwi_tavor_x95_300blk", "prob": 10 }, { "group": "nested_acr_300blk", "prob": 15 }, { "group": "nested_ak308", "prob": 25 }, - { "group": "nested_papm77", "prob": 15 } + { "group": "nested_papm77", "prob": 15 }, + { "group": "nested_rcmg840", "prob": 10 } ] }, { @@ -781,7 +781,8 @@ { "item": "hk417_13", "prob": 40 }, { "item": "m2carbine", "prob": 5 }, { "item": "ak308", "prob": 10 }, - { "item": "ak308", "variant": "papm77", "prob": 5 } + { "item": "ak308", "variant": "papm77", "prob": 5 }, + { "item": "rcmg-840", "prob": 10 } ] }, { diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json index 64f66af94763c..4c099addaed0a 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -1870,15 +1870,15 @@ ] }, { - "id": "nested_rm614_lmg", + "id": "nested_rcmg840", "type": "item_group", "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", "subtype": "collection", "ammo": 100, "entries": [ - { "item": "rm614_lmg", "charges-min": 0, "charges-max": 100 }, - { "item": "8x40_250_mag" }, - { "item": "8x40_250_mag", "prob": 50 }, + { "item": "rcmg-840", "charges-min": 0, "charges-max": 100 }, + { "item": "8x40_96_mag" }, + { "item": "8x40_96_mag", "prob": 50 }, { "group": "on_hand_8x40" } ] }, diff --git a/data/json/items/gun/8x40mm.json b/data/json/items/gun/8x40mm.json index 5aa031c0bdfd9..dacd3218bd2dc 100644 --- a/data/json/items/gun/8x40mm.json +++ b/data/json/items/gun/8x40mm.json @@ -86,19 +86,18 @@ "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_42_mag", "8x40_24_mag", "8x40_54_mag" ] } ] }, { - "id": "xm614", - "//": "Based heavily on the LMG G11 design concept with some creative liberties: fundamentally a bulkier H&K G11 with a rear-loading packet system.", + "id": "rcmg840", "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "experimental 8x40mm SAW" }, - "description": "Utilizing caseless munitions and submitted by Rivtech into US Army trials, this squad automatic weapon (SAW) is largely an upsized version of its smaller infantry brother. Designed to provide suppressive firepower, the original versions made use of a head-scratching rear-loading packet system, with later iterations rather clumsily modified to also accept box magazines. Freshly bulkier and not any less burdened by its inherent issues, namely overheating and obtuse complexity, the weapon was rejected from US military trials, with Rivtech trying desperately to market the system to various security and private military contractors before the cataclysm.", + "name": { "str": "Rivtech 8x40mm machine gun" }, + "description": "An angular machine gun possessing a folding bipod as well as a hyper-burst mode that discharges two cartridges before recoil is felt, this weapon, manufactured by Rivtech, has room for great potential accuracy. Produced as a prototype alongside its caseless rifle brother for submission into US Army weapons trials, the design was upscaled to fire an 8mm caseless cartridge following its subsequent failure to win the military’s contract. Seeing limited production sales to third parties, including private military contractors, the machine gun was often criticised for attempting to be a jack of all trades firearm—light, highly accurate, suppressively potent, and packed to the gunnels with advanced technical features—at the cost of simplicity and end-user functionality.", "variant_type": "gun", "variants": [ { - "id": "xm614", - "name": { "str": "Rivtech XM614E2" }, - "description": "Built to complement the XM88 battle rifle, the XM614 formed the SAW component of the caseless rifle platform that Rivtech submitted for US Army service weapon trials. Fundamentally a larger XM88 fitted with a longer sustained-fire barrel and collapsible bipod, early E1 versions relied exclusively on a bizarre rear-loading packet clip system that left testers gawking. Revised E2 iterations of the weapon incorporated dual packet and box magazine compatibility, which succeeded in making the machinegun more ungainly in both form and function. After it had been summarily rejected from army trials, Rivtech struggled to market the XM614 to third-party security and PMC contractors.", + "id": "rcmg840", + "name": { "str": "Rivtech CMG-840 hailstorm" }, + "description": "An exceedingly angular machine gun housing a cylindrical, rotating breach free-floating within its boxy receiver and an upwards jutting cocking handle, the weapon possesses a recessed barrel under which a collapsing bipod is stowed. Produced as a prototype squad automatic weapon by Rivtech and presented for evaluation within the US military’s NGSW weapon trials alongside the XM88 rifle, this particular gun is a relatively recent production version of the design chambered for 8x40mm Caseless and offered for private contracters, law enforcement, and international sales after Rivtech failed to secure the contract. Possessing a hyper-burst mechanism that dispenses two cartridges before the recoil hits the shooter as well as standard automatic capabilities, it has the potential to achieve remarkable target accuracy.", "weight": 1 } ], @@ -107,10 +106,8 @@ "longest_side": "1030 mm", "barrel_length": "660 mm", "price": 3750000, - "price_postapoc": 1500, - "//2": "No sensible person in the apocalypse is going to put much value in an experimental, highly rare, overly bulky, high-maintenance gun with a history of malfunctions and unobtainable or reloadable ammo that requires an engineering degree just to field strip and tend to the damages that will take place and whose replacement parts are virtually non-existent.", + "price_postapoc": 3500, "to_hit": -1, - "bashing": 12, "material": [ "steel", "aluminum", "plastic" ], "symbol": "(", "color": "dark_gray", @@ -121,7 +118,6 @@ "reload": 200, "modes": [ [ "DEFAULT", "AUTO", "auto", 4 ] ], "built_in_mods": [ "riv_scope", "bipod_handguard" ], - "//3": "I couldn’t find any hard sources, but I’m going to assume that the factory stock must remain for the rear-loading packet system to function.", "valid_mod_locations": [ [ "accessories", 4 ], [ "barrel", 1 ], @@ -135,7 +131,7 @@ ], "flags": [ "WATERPROOF_GUN" ], "pocket_data": [ - { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_300_mag", "8x40_240_mag", "8x40_56_mag", "8x40_44_mag" ] } + { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_96_mag" ] } ] }, { @@ -264,7 +260,7 @@ { "id": "rsa840", "name": { "str": "Rivtech SA-840 Mirage" }, - "description": "Encased within a boxy aluminum receiver and uncannily similar to a sci-fi prop with a recessed barrel and pistol grip, this is a bullpup 8x40mm caseless rifle produced by the Rivtech corporation. Originally entered for military trials before being trounced by its competitors, this version of the design has been adapted, with a few extra bells and whistles in the ergonomics department, into a semi-automatic civilian rifle. While its impractically hefty price point made it little more than a trophy gun among the general population, and Rivtech’s latter-day controversy awarded it a less than ideal reputation, the SA-840 remains a capable rifle, and quite the goochy one at that.", + "description": "Encased within a boxy aluminum receiver and uncannily similar to a sci-fi prop with a recessed barrel and pistol grip, this is a bullpup 8x40mm caseless rifle produced by the Rivtech corporation. Originally entered for military trials as a battle rifle before being trounced by its competitors, this version of the design has been adapted, with a few extra bells and whistles in the ergonomics department, into a semi-automatic civilian rifle. While its impractically hefty price point made it little more than a trophy gun among the general population, and Rivtech’s latter-day controversy awarded it a less than ideal reputation, the SA-840 remains a capable rifle, and quite the goochy one at that.", "weight": 1 } ], diff --git a/data/json/items/magazine/8x40mm.json b/data/json/items/magazine/8x40mm.json index a6dd36342b3c4..7a44acd7200a9 100644 --- a/data/json/items/magazine/8x40mm.json +++ b/data/json/items/magazine/8x40mm.json @@ -3,7 +3,7 @@ "id": "8x40_24_mag", "looks_like": "stanag30", "type": "MAGAZINE", - "name": { "str": "Rivtech 24-round magazine" }, + "name": { "str": "Rivtech 24-round rifle magazine" }, "description": "A stubby, coffin-shaped 24-round magazine designed to interface with compatible Rivtech rifles. Formed from two conjoined 12-round magazines that feed two stacks of cartridges into a compatible firearm, this downsized magazine proved to be one of the company’s most popular, striking a favourable balance between practical dimensions while also offering a respectable amount of potential firepower.", "variant_type": "gun", "variants": [ @@ -31,7 +31,7 @@ "id": "8x40_42_mag", "looks_like": "stanag30", "type": "MAGAZINE", - "name": { "str": "Rivtech 42-round magazine" }, + "name": { "str": "Rivtech 42-round rifle magazine" }, "description": "A standard-capacity 42-round magazine designed to interface with compatible Rivtech rifles. Formed from two conjoined 21-round magazines that feed two stacks of cartridges into a compatible firearm, the magazine was the company’s original test bed offering when presenting their caseless weapon platform for military trials and remained the standard 8x40mm base line within civilian sales. Formed from advanced polymers, it was attractive for remaining smaller than comparable magazines while also retaining an impressive amount of ammunition.", "variant_type": "gun", "variants": [ @@ -59,7 +59,7 @@ "id": "8x40_54_mag", "looks_like": "stanag30", "type": "MAGAZINE", - "name": { "str": "Rivtech 54-round magazine" }, + "name": { "str": "Rivtech 54-round rifle magazine" }, "description": "An extended-capacity 54-round magazine designed to interface with compatible Rivtech rifles. Formed from two conjoined 27-round magazines that feed two stacks of cartridges into a compatible firearm, the hardware was mildly criticised for being the cause of more than its fair share of mechanical hiccups within civilian guns. That being said, considering the magazine’s very unconventional design, it actually functions quite well.", "variant_type": "gun", "variants": [ @@ -84,39 +84,31 @@ "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 54 } } ] }, { - "id": "8x40_240_mag", + "id": "8x40_96_mag", "looks_like": "stanag30", "type": "MAGAZINE", - "name": { "str": "8x40mm 240-round packet clip" }, - "description": "An odd, cuboid packet designed to hold 12 vertical stacks of 20 8x40mm cartridges, the \"magazine\" was designed for use with the Rivtech XM614 platform, where it would be rotated into the weapon’s breech through the buttstock. Needless to say, such an unconventional design prompted more than a few raised eyebrows during army testing, with its mechanics and, indeed, mechanical failures as perplexing and numerous as the rifle it feeds.", - "weight": "1440 g", - "volume": "2074 ml", - "longest_side": "24 cm", - "price": 40000, - "price_postapoc": 160, - "material": [ "plastic", "steel" ], - "symbol": "#", - "color": "dark_gray", - "ammo_type": [ "8x40mm" ], - "flags": [ "MAG_BULKY" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 240 } } ] - }, - { - "id": "8x40_300_mag", - "looks_like": "stanag30", - "type": "MAGAZINE", - "name": { "str": "8x40mm 300-round packet clip" }, - "description": "An odd, cuboid packet designed to hold 12 vertical stacks of 25 8x40mm cartridges, the \"magazine\" was designed for use with the Rivtech XM614 platform, where it would be rotated into the weapon’s breech through the buttstock. Needless to say, such an unconventional design prompted more than a few raised eyebrows during army testing, with its mechanics and, indeed, mechanical failures as perplexing and numerous as the rifle it feeds.", - "weight": "1800 g", - "volume": "2592 ml", - "longest_side": "30 cm", - "price": 46000, - "price_postapoc": 200, - "material": [ "plastic", "steel" ], + "name": { "str": "Rivtech 96-round machine gun magazine" }, + "description": " A svelte, light, and exceedingly lengthy magazine intended to feed 8x40mm light machine guns, it retains 96 rounds of ammunition and rests horizontally over a compatible weapon’s barrel.", + "variant_type": "gun", + "variants": [ + { + "id": "8x40_96_mag", + "name": { "str": "8x40mm 96-round magazine" }, + "description": "This is a svelte and, honestly, preposterously long box magazine constructed from translucent plastics, which brings to mind a visual kinship with P90 magazines. Manufactured by Rivtech for their line of light machine guns, the magazine slides and locks into place horizontally over a compatible weapons barrel and cycles 8x40mm cartridges downwards into its breach from a 96-round, double-stacked column. Truthfully, the mechanics behind how it achieves this latter feat are far beyond your pay grade to either understand or care about.", + "weight": 1 + } + ], + "weight": "163 g", + "volume": "607 ml", + "longest_side": "53 cm", + "//": "Assuming a roughly 24x44x528mm box designed to contain a double-stacked column of 11x11x40mm rounds. Also assuming a 2mm thickness of polymer for the magazine walls with a sectional density of 940 kg/m.", + "price": 22600, + "price_postapoc": 350, + "material": [ "thermo_resin", "steel" ], "symbol": "#", "color": "dark_gray", "ammo_type": [ "8x40mm" ], "flags": [ "MAG_BULKY" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 300 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 96 } } ] } ] diff --git a/data/json/obsoletion/migration_items.json b/data/json/obsoletion/migration_items.json index ae96abd51baf5..0099fa8112883 100644 --- a/data/json/obsoletion/migration_items.json +++ b/data/json/obsoletion/migration_items.json @@ -127,7 +127,12 @@ { "id": "rm298", "type": "MIGRATION", - "replace": "rm614_lmg" + "replace": "rcmg840" + }, + { + "id": "rm614_lmg", + "type": "MIGRATION", + "replace": "rcmg840" }, { "id": "rm51_assault_rifle",