From 4418685a91e6d87d89643cb3b80f2befa6c71c11 Mon Sep 17 00:00:00 2001 From: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Sun, 16 Apr 2023 16:03:41 +0200 Subject: [PATCH 1/9] starts the rework. --- data/json/items/gun/8x40mm.json | 125 +++++++++------------- data/json/obsoletion/migration_items.json | 5 + 2 files changed, 53 insertions(+), 77 deletions(-) diff --git a/data/json/items/gun/8x40mm.json b/data/json/items/gun/8x40mm.json index ca250a8cde5f4..afc042746af24 100644 --- a/data/json/items/gun/8x40mm.json +++ b/data/json/items/gun/8x40mm.json @@ -35,6 +35,54 @@ "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "magazine_well": "250 ml", "item_restriction": [ "8x40_10_mag", "8x40_25_mag" ] } ] }, + { + "id": "rm88_battle_rifle", + "//": "Essentially a modernized H&K G11 assault rifle, upsized and chambered for full-power rifle cartridges, it retains the G11’s bullpup layout, fire modes, and general features.", + "looks_like": "ar15", + "type": "GUN", + "reload_noise_volume": 10, + "name": { "str": "Rivtech battle rifle" }, + "description": "Originally produced for military use, the Rivtech battle rifle was designed for durability and extreme firepower under less than ideal circumstances, with a heavy ported barrel for maximum controllability. Accepts box and RMGD250 drum magazines.", + "variant_type": "gun", + "variants": [ + { + "id": "rm88_battle_rifle", + "name": { "str": "RM88" }, + "description": "Originally produced for military use, the Rivtech RM88 battle rifle was designed for durability and extreme firepower under less than ideal circumstances, with a heavy ported barrel for maximum controllability. Accepts box and RMGD250 drum magazines.", + "weight": 1 + } + ], + "weight": "3650 g", + "volume": "4200 ml", + "longest_side": "750 mm", + "price": 900000, + "price_postapoc": 17500, + "to_hit": -1, + "bashing": 12, + "material": [ "steel", "aluminum", "plastic" ], + "symbol": "(", + "color": "dark_gray", + "ammo": [ "8x40mm" ], + "skill": "rifle", + "ranged_damage": { "damage_type": "bullet", "amount": 10 }, + "dispersion": 80, + "durability": 8, + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "hyper-burst", 4 ], [ "AUTO", "auto", 2 ] ], + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "grip", 1 ], + [ "mechanism", 4 ], + [ "rail", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "stock", 1 ], + [ "stock accessory", 1 ], + [ "underbarrel", 1 ] + ], + "flags": [ "WATERPROOF_GUN" ], + "weapon_category": [ "AUTOMATIC_RIFLES" ], + "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_50_mag", "8x40_100_mag" ] } ] + }, { "id": "rm11b_sniper_rifle", "looks_like": "ar15", @@ -111,44 +159,6 @@ "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_25_mag", "8x40_10_mag" ] } ] }, - { - "id": "rm298", - "type": "GUN", - "reload_noise_volume": 10, - "name": { "str": "RM298 HMG" }, - "description": "Utilizing a powerful and unusual caliber, the Rivtech RM298 heavy machine gun was designed for durability and extreme volume of sustained fire under the worst possible circumstances. Accepts RMXB500 box and RMGD250 drum magazines.", - "weight": "24500 g", - "volume": "10500 ml", - "longest_side": "1260 mm", - "price": 7500000, - "price_postapoc": 15000, - "to_hit": -4, - "bashing": 18, - "material": [ "superalloy", "ceramic" ], - "symbol": "(", - "color": "dark_gray", - "ammo": [ "8x40mm" ], - "skill": "rifle", - "range": -6, - "ranged_damage": { "damage_type": "bullet", "amount": 10 }, - "dispersion": 90, - "durability": 9, - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ], - "reload": 400, - "barrel_volume": "1500 ml", - "valid_mod_locations": [ - [ "barrel", 1 ], - [ "grip", 1 ], - [ "mechanism", 4 ], - [ "rail", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "stock", 1 ], - [ "stock accessory", 1 ] - ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], - "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_500_mag", "8x40_250_mag" ] } ] - }, { "id": "rm51_assault_rifle", "type": "GUN", @@ -225,44 +235,5 @@ ], "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_250_mag", "8x40_500_mag" ] } ] - }, - { - "id": "rm88_battle_rifle", - "type": "GUN", - "reload_noise_volume": 10, - "name": { "str": "RM88 battle rifle" }, - "description": "Originally produced for military use, the Rivtech RM88 battle rifle was designed for durability and extreme firepower under less than ideal circumstances, with a heavy ported barrel for maximum controllability. Accepts box and RMGD250 drum magazines.", - "weight": "3200 g", - "volume": "2500 ml", - "longest_side": "995 mm", - "price": 900000, - "price_postapoc": 17500, - "to_hit": -1, - "bashing": 12, - "material": [ "superalloy", "ceramic" ], - "symbol": "(", - "color": "dark_gray", - "ammo": [ "8x40mm" ], - "skill": "rifle", - "ranged_damage": { "damage_type": "bullet", "amount": 10 }, - "dispersion": 30, - "durability": 9, - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], - "barrel_volume": "500 ml", - "valid_mod_locations": [ - [ "accessories", 4 ], - [ "grip", 1 ], - [ "mechanism", 4 ], - [ "rail", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "stock", 1 ], - [ "stock accessory", 1 ], - [ "underbarrel", 1 ] - ], - "magazines": [ [ "8x40mm", [ "8x40_100_mag", "8x40_50_mag", "8x40_250_mag" ] ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], - "weapon_category": [ "AUTOMATIC_RIFLES" ], - "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_100_mag", "8x40_50_mag", "8x40_250_mag" ] } ] } ] diff --git a/data/json/obsoletion/migration_items.json b/data/json/obsoletion/migration_items.json index 423382471c679..5ec5303a18df5 100644 --- a/data/json/obsoletion/migration_items.json +++ b/data/json/obsoletion/migration_items.json @@ -100,5 +100,10 @@ "id": "badge_cybercop", "type": "MIGRATION", "replace": "badge_marshal" + }, + { + "id": "rm298", + "type": "MIGRATION", + "replace": "rm614_lmg" } ] From 35ffd057da7112cb58bf5f6017db5a13ebb6a42d Mon Sep 17 00:00:00 2001 From: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Tue, 18 Apr 2023 08:19:47 +0200 Subject: [PATCH 2/9] finishes up most of the stuff related with the XM88E1. --- data/json/items/gun/8x40mm.json | 17 ++++----- data/json/items/gunmod/sights.json | 4 +-- data/json/items/magazine/8x40mm.json | 54 ++++++++++++++++++---------- 3 files changed, 47 insertions(+), 28 deletions(-) diff --git a/data/json/items/gun/8x40mm.json b/data/json/items/gun/8x40mm.json index afc042746af24..62c304e32d8f3 100644 --- a/data/json/items/gun/8x40mm.json +++ b/data/json/items/gun/8x40mm.json @@ -36,25 +36,26 @@ "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "magazine_well": "250 ml", "item_restriction": [ "8x40_10_mag", "8x40_25_mag" ] } ] }, { - "id": "rm88_battle_rifle", + "id": "xm88", "//": "Essentially a modernized H&K G11 assault rifle, upsized and chambered for full-power rifle cartridges, it retains the G11’s bullpup layout, fire modes, and general features.", "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "Rivtech battle rifle" }, - "description": "Originally produced for military use, the Rivtech battle rifle was designed for durability and extreme firepower under less than ideal circumstances, with a heavy ported barrel for maximum controllability. Accepts box and RMGD250 drum magazines.", + "name": { "str": "experimental Rivtech battle rifle" }, + "description": "A highly experimental battle rifle utilizing a proprietary caseless cartridge, this weapon was unexpectedly released by Rivtech for army weapons trials a few years before the Cataclysm. Failing to gain favor thanks to its cuckoo clock-level complexity and unpleasant propensity for overheating and, subsequently, detonating, Rivtech attempted to commercialize the project. Marketing it as \"yesterday’s future weapon, reimagined for the present\" the rifle’s civilian iterations met with limited interest and would have likely been relegated to obscurity had the Cataclysm not given its testers a dramatically shorter life span.", "variant_type": "gun", "variants": [ { - "id": "rm88_battle_rifle", - "name": { "str": "RM88" }, - "description": "Originally produced for military use, the Rivtech RM88 battle rifle was designed for durability and extreme firepower under less than ideal circumstances, with a heavy ported barrel for maximum controllability. Accepts box and RMGD250 drum magazines.", + "id": "xm88", + "name": { "str": "Rivtech XM88E1" }, + "description": "An experimental, caseless bullpup battle rifle with a rotary breech action free-floating within its boxy receiver and an integral gun sight peeking over its recessed barrel, the XM88 was unexpectedly introduced by Rivtech a few years before the Cataclysm and submitted for US Army Next Generation Service Weapon trials. With only a handful of prototypes produced, the weapon failed to impress thanks to overheating and cookoff issues, as well as its general complexity. Rivtech sought to commercialize the project, marketing it as \"yesterday’s future weapon, reimagined for the present\" although, had the Cataclysm not insured that the rifle would outlive its testers, the XM88 would have likely still faded into obscurity.", "weight": 1 } ], "weight": "3650 g", "volume": "4200 ml", - "longest_side": "750 mm", + "longest_side": "840 mm", + "barrel_length": "533 mm", "price": 900000, "price_postapoc": 17500, "to_hit": -1, @@ -64,10 +65,10 @@ "color": "dark_gray", "ammo": [ "8x40mm" ], "skill": "rifle", - "ranged_damage": { "damage_type": "bullet", "amount": 10 }, "dispersion": 80, "durability": 8, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "hyper-burst", 4 ], [ "AUTO", "auto", 2 ] ], + "built_in_mods": [ "riv_scope" ], "valid_mod_locations": [ [ "accessories", 4 ], [ "grip", 1 ], diff --git a/data/json/items/gunmod/sights.json b/data/json/items/gunmod/sights.json index 08d91845639a8..9e7b24ef7f8fd 100644 --- a/data/json/items/gunmod/sights.json +++ b/data/json/items/gunmod/sights.json @@ -264,11 +264,11 @@ "copy-from": "rifle_scope", "type": "GUNMOD", "name": { "str": "RS1219 scope" }, - "description": "An integral component of the RM11B rifle system, the RS1219 Accipiter digital scope provides auto-adjusting focal length, a user-selectable reticle, and an offset reflex sight for close objectives.", + "description": "An integral component of experimental Rivtech NGSW trial rifles, the RS1219 Accipiter digital scope provides auto-adjusting focal length, a user-selectable reticle, and an offset reflex sight for close objectives.", "weight": "0 g", "volume": "0 ml", "price": 0, - "material": [ "superalloy", "ceramic" ], + "material": [ "aluminum", "plastic", "glass" ], "aim_speed_modifier": 0, "flags": [ "ZOOM", "IRREMOVABLE" ] }, diff --git a/data/json/items/magazine/8x40mm.json b/data/json/items/magazine/8x40mm.json index f8bfd76fd72a5..65624f89286df 100644 --- a/data/json/items/magazine/8x40mm.json +++ b/data/json/items/magazine/8x40mm.json @@ -17,6 +17,42 @@ "flags": [ "MAG_BULKY" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 100 } } ] }, + { + "id": "8x40_45_mag", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "8x40mm 45-round magazine" }, + "description": "a 45-round box magazine for Rivtech 8x40mm caseless firearms, built from translucent polymer and designed to lock into place above a weapon’s barrel and cycle cartridges perpendicularly downwards into a firearm’s chamber.", + "weight": "285 g", + "volume": "405 ml", + "longest_side": "241 mm", + "price": 25000, + "price_postapoc": 500, + "material": [ "steel", "plastic" ], + "symbol": "#", + "color": "dark_gray", + "ammo_type": [ "8x40mm" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 50 } } ] + }, + { + "id": "8x40_50_mag", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "8x40mm 50-round magazine" }, + "description": "a 50-round box magazine for Rivtech 8x40mm caseless firearms, built from translucent polymer and designed to lock into place above a weapon’s barrel and cycle cartridges perpendicularly downwards into a firearm’s chamber.", + "weight": "363 g", + "volume": "450 ml", + "longest_side": "268 mm", + "price": 25000, + "price_postapoc": 500, + "material": [ "steel", "plastic" ], + "symbol": "#", + "color": "dark_gray", + "ammo_type": [ "8x40mm" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 50 } } ] + }, { "id": "8x40_10_mag", "looks_like": "glock17_17", @@ -85,23 +121,5 @@ "color": "dark_gray", "ammo_type": [ "8x40mm" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 500 } } ] - }, - { - "id": "8x40_50_mag", - "looks_like": "stanag30", - "type": "MAGAZINE", - "name": { "str": "8x40mm 50-round magazine" }, - "description": "A 50-round box magazine for use with Rivtech 8x40mm caseless firearms. Designated as RMGB50.", - "weight": "110 g", - "volume": "500 ml", - "price": 25000, - "price_postapoc": 500, - "material": [ "superalloy", "plastic" ], - "symbol": "#", - "color": "dark_gray", - "ammo_type": [ "8x40mm" ], - "reload_time": 50, - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 50 } } ] } ] From 1f70e426eba8f11f407f2b90e6ef65ec8b389ae3 Mon Sep 17 00:00:00 2001 From: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Tue, 18 Apr 2023 15:34:37 +0200 Subject: [PATCH 3/9] finishes reworking the battle rifle and LMG. --- data/json/items/gun/8x40mm.json | 105 +++++++++++++++------------ data/json/items/magazine/8x40mm.json | 82 +++++++++++++-------- 2 files changed, 110 insertions(+), 77 deletions(-) diff --git a/data/json/items/gun/8x40mm.json b/data/json/items/gun/8x40mm.json index 62c304e32d8f3..221c6d13238d8 100644 --- a/data/json/items/gun/8x40mm.json +++ b/data/json/items/gun/8x40mm.json @@ -41,7 +41,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "experimental Rivtech battle rifle" }, + "name": { "str": "automatic 8x40mm rifle" }, "description": "A highly experimental battle rifle utilizing a proprietary caseless cartridge, this weapon was unexpectedly released by Rivtech for army weapons trials a few years before the Cataclysm. Failing to gain favor thanks to its cuckoo clock-level complexity and unpleasant propensity for overheating and, subsequently, detonating, Rivtech attempted to commercialize the project. Marketing it as \"yesterday’s future weapon, reimagined for the present\" the rifle’s civilian iterations met with limited interest and would have likely been relegated to obscurity had the Cataclysm not given its testers a dramatically shorter life span.", "variant_type": "gun", "variants": [ @@ -52,12 +52,13 @@ "weight": 1 } ], - "weight": "3650 g", - "volume": "4200 ml", + "weight": "3850 g", + "volume": "4704 ml", "longest_side": "840 mm", "barrel_length": "533 mm", "price": 900000, - "price_postapoc": 17500, + "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.", "to_hit": -1, "bashing": 12, "material": [ "steel", "aluminum", "plastic" ], @@ -68,7 +69,7 @@ "dispersion": 80, "durability": 8, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "hyper-burst", 4 ], [ "AUTO", "auto", 2 ] ], - "built_in_mods": [ "riv_scope" ], + "built_in_mods": [ "high_end_folding_stock", "riv_scope" ], "valid_mod_locations": [ [ "accessories", 4 ], [ "grip", 1 ], @@ -82,7 +83,60 @@ ], "flags": [ "WATERPROOF_GUN" ], "weapon_category": [ "AUTOMATIC_RIFLES" ], - "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_50_mag", "8x40_100_mag" ] } ] + "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_56_mag", "8x40_45_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.", + "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.", + "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.", + "weight": 1 + } + ], + "weight": "7000 g", + "volume": "10815 ml", + "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.", + "to_hit": -1, + "bashing": 12, + "material": [ "steel", "aluminum", "plastic" ], + "symbol": "(", + "color": "dark_gray", + "ammo": [ "8x40mm" ], + "skill": "rifle", + "dispersion": 180, + "durability": 8, + "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 ], + [ "grip", 1 ], + [ "mechanism", 4 ], + [ "rail", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "stock accessory", 1 ], + [ "underbarrel", 1 ] + ], + "flags": [ "WATERPROOF_GUN" ], + "pocket_data": [ + { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_300_mag", "8x40_240_mag", "8x40_56_mag", "8x40_44_mag" ] } + ] }, { "id": "rm11b_sniper_rifle", @@ -197,44 +251,5 @@ "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], "weapon_category": [ "AUTOMATIC_RIFLES" ], "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_50_mag", "8x40_100_mag" ] } ] - }, - { - "id": "rm614_lmg", - "type": "GUN", - "reload_noise_volume": 10, - "name": { "str": "RM614 LMG" }, - "description": "Utilizing a powerful and unusual caliber, the Rivtech RM614 light machine gun was designed for durability and extreme volume of sustained fire under the worst possible circumstances. Accepts RMXB500 box and RMGD250 drum magazines.", - "weight": "4600 g", - "volume": "2750 ml", - "longest_side": "935 mm", - "price": 3750000, - "price_postapoc": 15000, - "to_hit": -1, - "bashing": 12, - "material": [ "superalloy", "ceramic" ], - "symbol": "(", - "color": "dark_gray", - "ammo": [ "8x40mm" ], - "skill": "rifle", - "ranged_damage": { "damage_type": "bullet", "amount": 5 }, - "dispersion": 70, - "durability": 9, - "reload": 200, - "barrel_volume": "500 ml", - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "4 rd.", 4 ], [ "AUTO", "auto", 6 ] ], - "valid_mod_locations": [ - [ "accessories", 4 ], - [ "barrel", 1 ], - [ "grip", 1 ], - [ "mechanism", 4 ], - [ "rail", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "stock", 1 ], - [ "stock accessory", 1 ], - [ "underbarrel", 1 ] - ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], - "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_250_mag", "8x40_500_mag" ] } ] } ] diff --git a/data/json/items/magazine/8x40mm.json b/data/json/items/magazine/8x40mm.json index 65624f89286df..234a36f6efe80 100644 --- a/data/json/items/magazine/8x40mm.json +++ b/data/json/items/magazine/8x40mm.json @@ -1,57 +1,75 @@ [ { - "id": "8x40_100_mag", + "id": "8x40_44_mag", "looks_like": "stanag30", "type": "MAGAZINE", - "name": { "str": "8x40mm 100-round magazine" }, - "description": "A 100-round box magazine for use with Rivtech 8x40mm caseless firearms. Designated as RMGB100.", - "weight": "150 g", - "volume": "750 ml", - "price": 40000, - "price_postapoc": 750, - "material": [ "superalloy", "plastic" ], + "name": { "str": "8x40mm 44-round magazine" }, + "description": "a shortened 44-round box magazine for Rivtech 8x40mm caseless firearms, built from translucent polymer and designed to lock into place above a weapon’s barrel and cycle cartridges perpendicularly downwards into a firearm’s chamber.", + "weight": "264 g", + "volume": "395 ml", + "longest_side": "235 mm", + "price": 18000, + "price_postapoc": 100, + "material": [ "plastic", "steel" ], "symbol": "#", "color": "dark_gray", "ammo_type": [ "8x40mm" ], - "reload_time": 50, - "flags": [ "MAG_BULKY" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 100 } } ] + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 44 } } ] }, { - "id": "8x40_45_mag", + "id": "8x40_56_mag", "looks_like": "stanag30", "type": "MAGAZINE", - "name": { "str": "8x40mm 45-round magazine" }, - "description": "a 45-round box magazine for Rivtech 8x40mm caseless firearms, built from translucent polymer and designed to lock into place above a weapon’s barrel and cycle cartridges perpendicularly downwards into a firearm’s chamber.", - "weight": "285 g", - "volume": "405 ml", - "longest_side": "241 mm", - "price": 25000, - "price_postapoc": 500, - "material": [ "steel", "plastic" ], + "name": { "str": "8x40mm 56-round magazine" }, + "description": "a 56-round box magazine for Rivtech 8x40mm caseless firearms, built from translucent polymer and designed to lock into place above a weapon’s barrel and cycle cartridges perpendicularly downwards into a firearm’s chamber.", + "weight": "336 g", + "volume": "504 ml", + "longest_side": "30 cm", + "price": 20000, + "price_postapoc": 125, + "material": [ "plastic", "steel" ], "symbol": "#", "color": "dark_gray", "ammo_type": [ "8x40mm" ], "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 50 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 56 } } ] }, { - "id": "8x40_50_mag", + "id": "8x40_240_mag", "looks_like": "stanag30", "type": "MAGAZINE", - "name": { "str": "8x40mm 50-round magazine" }, - "description": "a 50-round box magazine for Rivtech 8x40mm caseless firearms, built from translucent polymer and designed to lock into place above a weapon’s barrel and cycle cartridges perpendicularly downwards into a firearm’s chamber.", - "weight": "363 g", - "volume": "450 ml", - "longest_side": "268 mm", - "price": 25000, - "price_postapoc": 500, - "material": [ "steel", "plastic" ], + "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_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 50 } } ] + "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" ], + "symbol": "#", + "color": "dark_gray", + "ammo_type": [ "8x40mm" ], + "flags": [ "MAG_BULKY" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 300 } } ] }, { "id": "8x40_10_mag", From e911ffc92368f4175799c84ad50988745cb163bc Mon Sep 17 00:00:00 2001 From: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Mon, 24 Apr 2023 13:30:34 +0200 Subject: [PATCH 4/9] Starts to add some lore snippets. --- data/json/snippets/newspapers.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/data/json/snippets/newspapers.json b/data/json/snippets/newspapers.json index 380bb81a89f16..c07f95097e226 100644 --- a/data/json/snippets/newspapers.json +++ b/data/json/snippets/newspapers.json @@ -128,6 +128,14 @@ "text": { "str": "THE 'UNCANNY' SUCCESS STORY. Everyone's talking about the meteoric rise of tech startup \"Uncanny\" over the last few months. From zero to household name, the company leapt to the public eye with its, well, uncanny line of talking toys. Before we even knew what to expect, they were Wall Street's new darling, with the fastest rise in manufacturing capacity of any company in the last thirty years. We spoke to James Hawthorne, America's newest billionaire and the man behind the name on everyone's lips. Interview on page 3." } + }, + { + "id": "years_old_news_12", + "text": "FROM SCI-FI TO REALITY: RIVTECH'S CASELESS TECHNOLOGY ENTERS THE NEXT-GEN SERVICE WEAPON RACE.\n\nWith the US Army’s Next Generation Squad Weapon (NGSW) trials on track to find a replacement for the military's M16 rifle series and M249 machinegun, a brand-new and riveting competitor has joined Sig Sauer, General Dynamics, and Textron Systems in the race to define the next service rifle platform. Rivtech, a defense contractor already possessing a mandate to produce advanced components for the army’s combat exoskeleton program, has recently unveiled its contenders for the multibillion-dollar weapons contract: the XM88 and XM614 caseless rifles.\n\n\"We’re looking to bring the future ideas of yesterday to practical life in the present,\" said the project’s lead engineer, Angela Griffith, during the weapons' unveiling earlier today. \"A lot's changed since the days of the H&K G11, and with our advanced materials and machining techniques, we believed that it was time to give caseless technology a fresh shake. Our preliminary design was going to revolve around an 8x40mm round weighing in at 170 grains, but, per army requirements, we’ve scaled it down to a .270-caliber projectile and, using our proprietary high-ignition gunpowder, have waved good-bye to any overheating and cookoff issues that caseless tech had in the past. What's more, while we’ve upsized the bullet from 5.56mm, giving it greater long-range terminal bolistics and man-stopping potential, we've still been able to make 40 percent weight savings, resulting in a battlefield SAW loadout with an XM614 and 900 rounds of ammunition that only weighs 31.3 pounds, as apposed to a comparably equipped M249's 48.28 pounds. All this, gentlemen, and we've not even touched on our platform’s accuracy potential with its delayed-recoil system.\"\n\nAt present, Rivtech has supplied 53 XM88 rifles, 43 XM614 light machine guns, and over 800,000 rounds of 6.8x40mm caseless ammunition for Soldier Touchpoint testing." + }, + { + "id": "years_old_news_13", + "text": "RIVTECH'S NGSW ENTRIES: WILL THE ARMY BITE THE BULLET?\n\nWith the winner of the US military’s Next Generation Squad Weapon trials expected to be announced in the fall of 2022, excitement runs high to see which of the three remaining contenders will take back home the prized 8-year army contract. Certainly, among all the entries, the Rivtech XM88 rifle and XM614 SAW systems have stood out as the most unique and ambitious projects from the lot.\n\nAccording to the project’s engineering leader, Angela Griffith, the firearms were designed with feedback from soldiers in mind. \"As much as possible, we’ve tried, in the XM88 and XM614, to create a weapon system that molds next-generation technology around the feedback from the soldiers who’ll be using the guns,\" Griffith said.\n\nWith their round of touchpoint testing concluded, Rivtech has sent 33 of their NGSW rifles and 23 machineguns for formal evaluation, though concerns over the very features that make the rifles distinct, their caseless and bullpup nature, do exist. \"Fundamentally, the Rivtech stuff’s something we haven’t seen for 30 years,\" said corporal Ian Kasarda, a member of the Special Operations unit formerly testing the weapons. \"That said, I reckon that we were all surprised to find just how well the guns worked, with only about 15 malfunctions per 1000 rounds, and their low weight's also something to appreciate.\" The soldier wasn’t shy about voicing his concerns, however. \"We can’t overlook the fact that they’re complicated guns, complicated to make, complicated to field strip, and so different from what we’ve got fielded that each soldier would require a complete re-familiarization program just to use. They’re fine pieces of kit,\" added Kasarda, \"but, in an age where drones and heavy weapons are dictating the flow of warfare far more than the average soldier, I’d be surprised if the army splashes out that sort of cash.\"" } ] }, From 97c423db5f201eec5022640c30a0736242bef587 Mon Sep 17 00:00:00 2001 From: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Sun, 2 Jul 2023 15:57:37 +0200 Subject: [PATCH 5/9] fixes merge errors. --- data/mods/MindOverMatter/README.md | 102 ++++++++++++++--------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/data/mods/MindOverMatter/README.md b/data/mods/MindOverMatter/README.md index 693265f731680..ffff8e34c43a1 100644 --- a/data/mods/MindOverMatter/README.md +++ b/data/mods/MindOverMatter/README.md @@ -1,52 +1,52 @@ -# Mind Over Matter -A Psionics mod for Cataclysm: Dark Days Ahead - -This mod adds (currently) seven separate psionic power paths to Cataclysm, including: - -1) Biokinesis - Control of the body. Biokinetics can become stronger and faster than an ordinary human, and even change their form in limited ways. (starting profession: Star Athlete) -2) Clairsentience - Extending the senses beyond the body. Clairsentients can see in the dark and through walls, and eventually gain a bird's eye view of their surroundings, as well as perform in combat by anticipating their enemies' movements. (starting profession: Doomseer) -3) Pyrokinesis - Manipulating fire and heat. Pyrokinetics can start fires and protect themselves from heat, and even cover their whole body in raging flames to discourage attack (starting profession: Firestarter) -4) Telekinesis - Moving objects at a distance. Telekinetics can pull objects to them and hurl their enemies away, and even collapse buildings or shield themselves with a barrier of telekinetic force. (starting profession: Test Subject, Project ONYX LIGHTNING) -5) Telepathy - Control of the mind. Telepaths can become more persuasive and shield their presence from their enemies, and a powerful one can seize control of their enemies' minds. (starting profession: Government Interrogater (DECEASED)) -6) Teleportation - Moving without crossing the intervening distance. Teleporters can escape danger and move quickly, and at higher levels they can travel long distances across the ravaged earth or hurl their enemies away to the space between dimensions. (starting profession: Itzcuauhtli Corps Liaison, Yohualli Èhecatl Division) -7) Vitakinesis - Control of health and injury. Vitakinetics can bind their own wounds and speed healing, eventually recovering from even near-crippling injuries. (starting profession: Faith Healer) - -If you would like a random power path, pick the profession "Awakening Psion." - -The goal is for each path to be upgraded through usage, since sitting and studying a book for hours doesn't really fit the fiction of improving psychic powers. Powers are gained progressively, with increasing mastery of lower-tier powers unlocking new ones. Powers are based on a new skill called "metaphysics" which you can learn through recipes found from appropriate books in the world. - -ADVANTAGES - -1) Psionic powers are fast. Many powers take less than 100 moves to use, with high-level powers sometimes taking much less (a level 10 Telekinetic Hand takes only 10 moves!), reflecting that they are as fast as thought. - -2) Powers use Stamina as their power source, meaning that a fully-charged psychic is only a five-minute breather away. -3) Powers are generally very quiet (generally. Pyrokinesis is very loud) - -DISADVANTAGES - -1) Powers use Stamina as their power source. This is also a disadvantage because every power use reduces your ability to run away. -2) All powers require concentration and thus are affected by Focus. It's very difficult to concentrate enough to lift a pursuing boomer if you've just fought off a grappler in close range and there's blood all around you. - -3) Long-term power use is debilitating--powers have a chance to cause Drain, which will gradually reduce your maximum Stamina, Strength, Dexterity, and Perception as well as make you hungry and tired. Drain goes away naturally on its own with rest. (I would have used weariness but that's impossible) - -LORE - -When the government began noticing that some XEDRA explorers of alternate dimensions returned with anomalous capabilities, Project PHAVIAN was founded to study these in full. Within the year, this led to the discover of latent psychic powers in a portion of humanity. On Earth these were minor, almost trivial--the ability to always find your lost keys or know the next sentence someone is going to say moments before they do are useful powers but not lifechanging--but exposure to extra-dimensional energy seemed to increase psionic power. A PHAVIAN test subject who on Earth could manipulate a quarter to make sure it always landed heads up could sometimes throw large objects on the other side of a portal, or even lift a person. Soon after, it was discovered that specific crystalline formations found in extra-dimensional locations had the effect of amplifying psionic power even further, and that exposure to these crystals could awaken powers in previously mundane individuals. - -Soon after that, the world ended. The weakening of dimensional barriers has made psionic power much stronger on Earth, but there's no longer anyone around to conduct any experiments on it. It's just one more method that survivors use in the wake of the Cataclysm. - -GAINING POWERS - -The easiest way to gain psionics is to pick a profession that starts with them (or debug them in). There are also some strange crystals you might find in places with a strong connection with the Nether, or which are carried by psychic ferals. Or you could walk out into a portal storm unprotected. - -Listen to the voices. - -Bathe in the energies of the Nether. - -We have such sights to show you. - -WAIT, STAMINA? - -I realize it's a bit counterintuitive that taking Indefatiguable or mutating mouse will make you a better psychic, but this was the best solution I could think of for compatibility. There's no way to implement cooldowns for individual powers and I don't want to use mana and make it regenerate very fast for psychics because that breaks compatibility with every single magic mod out there. Fatigue or Weariness would also fit but it's not currently possible to use Fatigue as a spell power source without adding a custom extra effect for every single power, and not possible to interact with Weariness at all, so until that's an option or there's a way to make a custom power pool, Stamina it is. - +# Mind Over Matter +A Psionics mod for Cataclysm: Dark Days Ahead + +This mod adds (currently) seven separate psionic power paths to Cataclysm, including: + +1) Biokinesis - Control of the body. Biokinetics can become stronger and faster than an ordinary human, and even change their form in limited ways. (starting profession: Star Athlete) +2) Clairsentience - Extending the senses beyond the body. Clairsentients can see in the dark and through walls, and eventually gain a bird's eye view of their surroundings, as well as perform in combat by anticipating their enemies' movements. (starting profession: Doomseer) +3) Pyrokinesis - Manipulating fire and heat. Pyrokinetics can start fires and protect themselves from heat, and even cover their whole body in raging flames to discourage attack (starting profession: Firestarter) +4) Telekinesis - Moving objects at a distance. Telekinetics can pull objects to them and hurl their enemies away, and even collapse buildings or shield themselves with a barrier of telekinetic force. (starting profession: Test Subject, Project ONYX LIGHTNING) +5) Telepathy - Control of the mind. Telepaths can become more persuasive and shield their presence from their enemies, and a powerful one can seize control of their enemies' minds. (starting profession: Government Interrogater (DECEASED)) +6) Teleportation - Moving without crossing the intervening distance. Teleporters can escape danger and move quickly, and at higher levels they can travel long distances across the ravaged earth or hurl their enemies away to the space between dimensions. (starting profession: Itzcuauhtli Corps Liaison, Yohualli Èhecatl Division) +7) Vitakinesis - Control of health and injury. Vitakinetics can bind their own wounds and speed healing, eventually recovering from even near-crippling injuries. (starting profession: Faith Healer) + +If you would like a random power path, pick the profession "Awakening Psion." + +The goal is for each path to be upgraded through usage, since sitting and studying a book for hours doesn't really fit the fiction of improving psychic powers. Powers are gained progressively, with increasing mastery of lower-tier powers unlocking new ones. Powers are based on a new skill called "metaphysics" which you can learn through recipes found from appropriate books in the world. + +ADVANTAGES + +1) Psionic powers are fast. Many powers take less than 100 moves to use, with high-level powers sometimes taking much less (a level 10 Telekinetic Hand takes only 10 moves!), reflecting that they are as fast as thought. + +2) Powers use Stamina as their power source, meaning that a fully-charged psychic is only a five-minute breather away. +3) Powers are generally very quiet (generally. Pyrokinesis is very loud) + +DISADVANTAGES + +1) Powers use Stamina as their power source. This is also a disadvantage because every power use reduces your ability to run away. +2) All powers require concentration and thus are affected by Focus. It's very difficult to concentrate enough to lift a pursuing boomer if you've just fought off a grappler in close range and there's blood all around you. + +3) Long-term power use is debilitating--powers have a chance to cause Drain, which will gradually reduce your maximum Stamina, Strength, Dexterity, and Perception as well as make you hungry and tired. Drain goes away naturally on its own with rest. (I would have used weariness but that's impossible) + +LORE + +When the government began noticing that some XEDRA explorers of alternate dimensions returned with anomalous capabilities, Project PHAVIAN was founded to study these in full. Within the year, this led to the discover of latent psychic powers in a portion of humanity. On Earth these were minor, almost trivial--the ability to always find your lost keys or know the next sentence someone is going to say moments before they do are useful powers but not lifechanging--but exposure to extra-dimensional energy seemed to increase psionic power. A PHAVIAN test subject who on Earth could manipulate a quarter to make sure it always landed heads up could sometimes throw large objects on the other side of a portal, or even lift a person. Soon after, it was discovered that specific crystalline formations found in extra-dimensional locations had the effect of amplifying psionic power even further, and that exposure to these crystals could awaken powers in previously mundane individuals. + +Soon after that, the world ended. The weakening of dimensional barriers has made psionic power much stronger on Earth, but there's no longer anyone around to conduct any experiments on it. It's just one more method that survivors use in the wake of the Cataclysm. + +GAINING POWERS + +The easiest way to gain psionics is to pick a profession that starts with them (or debug them in). There are also some strange crystals you might find in places with a strong connection with the Nether, or which are carried by psychic ferals. Or you could walk out into a portal storm unprotected. + +Listen to the voices. + +Bathe in the energies of the Nether. + +We have such sights to show you. + +WAIT, STAMINA? + +I realize it's a bit counterintuitive that taking Indefatiguable or mutating mouse will make you a better psychic, but this was the best solution I could think of for compatibility. There's no way to implement cooldowns for individual powers and I don't want to use mana and make it regenerate very fast for psychics because that breaks compatibility with every single magic mod out there. Fatigue or Weariness would also fit but it's not currently possible to use Fatigue as a spell power source without adding a custom extra effect for every single power, and not possible to interact with Weariness at all, so until that's an option or there's a way to make a custom power pool, Stamina it is. + Weariness is still my goal here, but until it's possible to use it in spells Drain (described above) is the substitute. \ No newline at end of file From 764889dc9597f7d63b73114f2d9563b2ee893d9e Mon Sep 17 00:00:00 2001 From: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Sat, 29 Jul 2023 14:02:45 +0200 Subject: [PATCH 6/9] Gives another shake at reworking the standard rifle magazines. Dedicated machinegun magazines still need to be hammered out. --- data/json/items/magazine/8x40mm.json | 155 ++++++++++++--------------- 1 file changed, 67 insertions(+), 88 deletions(-) diff --git a/data/json/items/magazine/8x40mm.json b/data/json/items/magazine/8x40mm.json index 234a36f6efe80..29523c7db0b3a 100644 --- a/data/json/items/magazine/8x40mm.json +++ b/data/json/items/magazine/8x40mm.json @@ -1,39 +1,87 @@ [ { - "id": "8x40_44_mag", + "id": "8x40_24_mag", "looks_like": "stanag30", "type": "MAGAZINE", - "name": { "str": "8x40mm 44-round magazine" }, - "description": "a shortened 44-round box magazine for Rivtech 8x40mm caseless firearms, built from translucent polymer and designed to lock into place above a weapon’s barrel and cycle cartridges perpendicularly downwards into a firearm’s chamber.", - "weight": "264 g", - "volume": "395 ml", - "longest_side": "235 mm", - "price": 18000, + "name": { "str": "Rivtech 24-round 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 large amount of potential firepower.", + "variant_type": "gun", + "variants": [ + { + "id": "8x40_24_mag", + "name": { "str": "8x40mm 24-round magazine" }, + "description": "Consisting of two parallelly fused, double-stacked compartments, this is a shortened magazine for the Rivtech caseless rifle platform. With the front of one compartment melded with the spine of its partner, both magazines possess their own follower assemblies and plastic witness holes. When cycling, the cartridges at the apex of each compartment are shuttled forward, with the front round being delivered into the chamber while its twin replaces its position at the foremost magazine's top. For its pleasant balance between compactness and round capacity, this downsized magazine proved to be one of Rivtech’s more popular offerings within civilian spheres, despite the occasional failures to feed that it’s unconventional design prompts.", + "weight": 1 + } + ], + "weight": "266 g", + "volume": "283 ml", + "longest_side": "134 mm", + "//": "Assuming a roughly 24x88x134mm box designed to contain two double-stacked columns of 11x11x40mm rounds. Given the VAG-73-like dual compartment system that this magazine uses, which is fundamentally two double-stack magazines connected one behind the other, the depth of the magazine is that of two rounds held nose to tip, the width is the breadth of a single round multiplied by 1.86, and the height is that of 12 11mm tall cartridges. Also assuming a 2mm thickness of polymer for the magazine walls with a sectional density of 940 kg/m.", + "price": 16000, + "price_postapoc": 120, + "material": [ "thermo_resin", "steel" ], + "symbol": "#", + "color": "dark_gray", + "ammo_type": [ "8x40mm" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 24 } } ] + }, + { + "id": "8x40_42_mag", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "Rivtech 42-round 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": [ + { + "id": "8x40_42_mag", + "name": { "str": "8x40mm 42-round magazine" }, + "description": "Consisting of two parallelly fused, double-stacked compartments, this is a standard magazine for the Rivtech caseless rifle platform. With the front of one compartment melded with the spine of its partner, both magazines possess their own follower assemblies and plastic witness holes. When cycling, the cartridges at the apex of each compartment are shuttled forward, with the front round being delivered into the chamber while its twin replaces its position at the foremost magazine's top. Having been Rivtech’s original offering when still competing within NGSW trials, it, due to its comparatively small size and plentiful ammunition capacity, remained the standard within 8x40mm magazine designs.", + "weight": 1 + } + ], + "weight": "463 g", + "volume": "492 ml", + "longest_side": "233 mm", + "//": "Assuming a roughly 24x88x233mm box designed to contain two double-stacked columns of 11x11x40mm rounds. Given the VAG-73-like dual compartment system that this magazine uses, which is fundamentally two double-stack magazines connected one behind the other, the depth of the magazine is that of two rounds held nose to tip, the width is the breadth of a single round multiplied by 1.86, and the height is that of 21 11mm tall cartridges. Also assuming a 2mm thickness of polymer for the magazine walls with a sectional density of 940 kg/m.", + "price": 16500, "price_postapoc": 100, - "material": [ "plastic", "steel" ], + "material": [ "thermo_resin", "steel" ], "symbol": "#", "color": "dark_gray", "ammo_type": [ "8x40mm" ], "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 44 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 42 } } ] }, { - "id": "8x40_56_mag", + "id": "8x40_54_mag", "looks_like": "stanag30", "type": "MAGAZINE", - "name": { "str": "8x40mm 56-round magazine" }, - "description": "a 56-round box magazine for Rivtech 8x40mm caseless firearms, built from translucent polymer and designed to lock into place above a weapon’s barrel and cycle cartridges perpendicularly downwards into a firearm’s chamber.", - "weight": "336 g", - "volume": "504 ml", - "longest_side": "30 cm", - "price": 20000, - "price_postapoc": 125, - "material": [ "plastic", "steel" ], + "name": { "str": "Rivtech 54-round 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-offered guns. That being said, considering the magazine’s very unconventional design, it actually functions quite well.", + "variant_type": "gun", + "variants": [ + { + "id": "8x40_54_mag", + "name": { "str": "8x40mm 54-round magazine" }, + "description": "Consisting of two parallelly fused, double-stacked compartments, this is a high-capacity magazine proprietary to the Rivtech caseless rifle platform. With the front of one compartment melded with the spine of its partner, both magazines possess their own follower assemblies and plastic witness holes. when cycling, the cartridges at the apex of each compartment are shuttled forward, with the front round being delivered into the chamber while its twin replaces it's position at the foremost magazine's top. Before the Cataclysm, the contraption was mildly criticised for incurring a substantial number of failures to feed, though, all things considered, this Rube Goldberg machine of a magazine actually functions surprisingly well.", + "weight": 1 + } + ], + "weight": "593 g", + "volume": "631 ml", + "longest_side": "299 mm", + "//": "Assuming a roughly 24x88x299mm box designed to contain two double-stacked columns of 11x11x40mm rounds. Given the VAG-73-like dual compartment system that this magazine uses, which is fundamentally two double-stack magazines connected one behind the other, the depth of the magazine is that of two rounds held nose to tip, the width is the breadth of a single round multiplied by 1.86, and the height is that of 27 11mm tall cartridges. Also assuming a 2mm thickness of polymer for the magazine walls with a sectional density of 940 kg/m.", + "price": 18200, + "price_postapoc": 150, + "material": [ "thermo_resin", "steel" ], "symbol": "#", "color": "dark_gray", "ammo_type": [ "8x40mm" ], "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 56 } } ] + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 54 } } ] }, { "id": "8x40_240_mag", @@ -70,74 +118,5 @@ "ammo_type": [ "8x40mm" ], "flags": [ "MAG_BULKY" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 300 } } ] - }, - { - "id": "8x40_10_mag", - "looks_like": "glock17_17", - "type": "MAGAZINE", - "name": { "str": "8x40mm 10-round magazine" }, - "description": "A 10-round stick magazine for use with Rivtech 8x40mm caseless firearms. Designated as RMGP10.", - "weight": "60 g", - "volume": "250 ml", - "price": 9000, - "price_postapoc": 250, - "material": [ "superalloy", "plastic" ], - "symbol": "#", - "color": "dark_gray", - "ammo_type": [ "8x40mm" ], - "reload_time": 40, - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 10 } } ] - }, - { - "id": "8x40_250_mag", - "looks_like": "stanag30", - "type": "MAGAZINE", - "name": { "str": "8x40mm 250-round drum magazine" }, - "description": "A 250-round drum magazine for use with Rivtech 8x40mm caseless firearms. Designated as RMGD250.", - "weight": "340 g", - "volume": "2 L", - "price": 70000, - "price_postapoc": 1000, - "material": [ "superalloy", "plastic" ], - "symbol": "#", - "color": "dark_gray", - "ammo_type": [ "8x40mm" ], - "reload_time": 60, - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 250 } } ] - }, - { - "id": "8x40_25_mag", - "looks_like": "glock17_17", - "type": "MAGAZINE", - "name": { "str": "8x40mm 25-round magazine" }, - "description": "A 25-round stick magazine for use with Rivtech 8x40mm caseless firearms. Designated as RMGP25.", - "weight": "90 g", - "volume": "500 ml", - "price": 12500, - "price_postapoc": 500, - "material": [ "superalloy", "plastic" ], - "symbol": "#", - "color": "dark_gray", - "ammo_type": [ "8x40mm" ], - "reload_time": 50, - "flags": [ "MAG_COMPACT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 25 } } ] - }, - { - "id": "8x40_500_mag", - "looks_like": "stanag30", - "type": "MAGAZINE", - "name": { "str": "8x40mm 500-round drum magazine" }, - "description": "A 500-round drum magazine for use with Rivtech 8x40mm caseless firearms. Designated as RMGD500.", - "weight": "1400 g", - "volume": "4 L", - "price": 100000, - "price_postapoc": 1000, - "material": [ "superalloy", "plastic" ], - "symbol": "#", - "color": "dark_gray", - "ammo_type": [ "8x40mm" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "8x40mm": 500 } } ] } ] From 4d090b60b6d7e55929f5526f0ac0eff4ad14fd02 Mon Sep 17 00:00:00 2001 From: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Fri, 29 Sep 2023 07:21:21 +0200 Subject: [PATCH 7/9] gets back to the rework, starts by establishing the semi-auto rifle. --- data/json/items/gun/8x40mm.json | 50 +++++++++------------------- data/json/items/magazine/8x40mm.json | 6 ++-- data/json/snippets/e_logs.json | 2 +- 3 files changed, 20 insertions(+), 38 deletions(-) diff --git a/data/json/items/gun/8x40mm.json b/data/json/items/gun/8x40mm.json index a135605439c8d..f0a9f695cfb5a 100644 --- a/data/json/items/gun/8x40mm.json +++ b/data/json/items/gun/8x40mm.json @@ -82,9 +82,8 @@ [ "stock accessory", 1 ], [ "underbarrel", 1 ] ], - "flags": [ "WATERPROOF_GUN" ], "weapon_category": [ "AUTOMATIC_RIFLES" ], - "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_56_mag", "8x40_45_mag" ] } ] + "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_42_mag", "8x40_24_mag", "8x40_54_mag" ] } ] }, { "id": "xm614", @@ -255,39 +254,22 @@ "melee_damage": { "bash": 18 } }, { - "id": "rm51_assault_rifle", + "id": "rsa840", "type": "GUN", - "reload_noise_volume": 10, - "name": { "str": "RM51 assault rifle" }, - "description": "Originally produced for military use, the Rivtech RM51 assault rifle was designed for durability and ease of use under less than ideal circumstances, with its considerable bulk minimized by a compact and ergonomic layout. Accepts box magazines.", - "weight": "2850 g", - "volume": "2150 ml", - "longest_side": "905 mm", - "price": 1800000, - "price_postapoc": 12000, - "to_hit": -1, - "material": [ "superalloy", "ceramic" ], - "symbol": "(", - "color": "dark_gray", - "ammo": [ "8x40mm" ], - "skill": "rifle", - "dispersion": 50, - "durability": 9, - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ], - "valid_mod_locations": [ - [ "grip", 1 ], - [ "mechanism", 4 ], - [ "muzzle", 1 ], - [ "rail", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "stock", 1 ], - [ "stock accessory", 1 ], - [ "underbarrel", 1 ] + "copy-from": "xm88", + "name": { "str": "Rivtech 8x40mm bullpup rifle" }, + "description": "A large and hefty rifle that looks suspiciously like a weapon prop that escaped from the set of a sci-fi blockbuster, this advanced offering from Rivtech is chambered for proprietary 8x40mm caseless munitions. Originally entered for military trials years before the Cataclysm, what rests before you today is a civilian, semi-automatic version of the design offered by Rivtech shortly after their prototype failed to win the US Army’s weapon contract. Sold as a novelty rifle before the end of the world, its steep price and the company’s later controversy kept it out of most laymen’s hands and shy of achieving true market success.", + "variant_type": "gun", + "variants": [ + { + "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.", + "weight": 1 + } ], - "flags": [ "WATERPROOF_GUN" ], - "weapon_category": [ "AUTOMATIC_RIFLES" ], - "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "8x40_50_mag", "8x40_100_mag" ] } ], - "melee_damage": { "bash": 12 } + "price": 396500, + "price_postapoc": 85000, + "modes": [ [ "DEFAULT", "semi-auto", 1 ] ] } ] diff --git a/data/json/items/magazine/8x40mm.json b/data/json/items/magazine/8x40mm.json index 29523c7db0b3a..a6dd36342b3c4 100644 --- a/data/json/items/magazine/8x40mm.json +++ b/data/json/items/magazine/8x40mm.json @@ -4,7 +4,7 @@ "looks_like": "stanag30", "type": "MAGAZINE", "name": { "str": "Rivtech 24-round 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 large amount of potential firepower.", + "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": [ { @@ -38,7 +38,7 @@ { "id": "8x40_42_mag", "name": { "str": "8x40mm 42-round magazine" }, - "description": "Consisting of two parallelly fused, double-stacked compartments, this is a standard magazine for the Rivtech caseless rifle platform. With the front of one compartment melded with the spine of its partner, both magazines possess their own follower assemblies and plastic witness holes. When cycling, the cartridges at the apex of each compartment are shuttled forward, with the front round being delivered into the chamber while its twin replaces its position at the foremost magazine's top. Having been Rivtech’s original offering when still competing within NGSW trials, it, due to its comparatively small size and plentiful ammunition capacity, remained the standard within 8x40mm magazine designs.", + "description": "Consisting of two parallelly fused, double-stacked compartments, this is a standard magazine for the Rivtech caseless rifle platform. With the front of one compartment melded with the spine of its partner, both magazines possess their own follower assemblies and plastic witness holes. When cycling, the cartridges at the apex of each compartment are shuttled forward, with the front round being delivered into the chamber while its twin replaces its position at the foremost magazine's top. Having been Rivtech’s original offering when still competing within military trials, it, due to its comparatively small size and plentiful ammunition capacity, remained the standard within 8x40mm magazine designs.", "weight": 1 } ], @@ -60,7 +60,7 @@ "looks_like": "stanag30", "type": "MAGAZINE", "name": { "str": "Rivtech 54-round 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-offered guns. That being said, considering the magazine’s very unconventional design, it actually functions quite well.", + "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": [ { diff --git a/data/json/snippets/e_logs.json b/data/json/snippets/e_logs.json index 09f57bd166cb0..ccaabf4f818aa 100644 --- a/data/json/snippets/e_logs.json +++ b/data/json/snippets/e_logs.json @@ -62,7 +62,7 @@ }, { "id": "local_files_simple_15", - "text": "Downloads/taufledermaus_8x40_shooting.mp4.\n\nA middle aged man in a field shows off some pricey looking caseless cartridges for an even pricier looking handgun, before shooting them at a range of targets. A slo-mo camera catches the shots ripping through a block of ballistic gel like air." + "text": "Downloads/taufledermaus_8x40_shooting.mp4.\n\nA middle aged man in a field shows off some pricey looking caseless cartridges for an even pricier looking rifle, before shooting them at a range of targets. A slo-mo camera catches the shots ripping through a block of ballistic gel like air." }, { "id": "local_files_simple_16", From 9b85605dc2b21b174fec4ec5ce13b28e5ad84cbb Mon Sep 17 00:00:00 2001 From: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Sun, 8 Oct 2023 12:57:11 +0200 Subject: [PATCH 8/9] item groups for the Rivtech SA-840, migrates the rm51. --- data/json/itemgroups/Weapons_Mods_Ammo/guns.json | 7 ++++--- data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json | 8 ++++---- data/json/itemgroups/military.json | 1 - data/json/obsoletion/migration_items.json | 5 +++++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index 7bd1cf7bf1d33..bcf8f3dca6263 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -611,7 +611,8 @@ { "group": "nested_zpapm90", "prob": 1 }, { "group": "nested_zpap85", "prob": 1 }, { "group": "nested_rfb_308", "prob": 5 }, - { "group": "nested_greasegun", "prob": 1 } + { "group": "nested_greasegun", "prob": 1 }, + { "group": "nested_rsa840", "prob": 15 } ] }, { @@ -653,7 +654,8 @@ { "group": "nested_ar15_with_kits", "prob": 15 }, { "group": "nested_mdrx_with_kits", "prob": 10 }, { "group": "nested_axmc_with_kits", "prob": 10 }, - { "item": "rfb_308", "prob": 10 } + { "item": "rfb_308", "prob": 10 }, + { "item": "rsa840", "prob": 15 } ] }, { @@ -700,7 +702,6 @@ { "group": "nested_m60", "prob": 15 }, { "group": "nested_rm11b_sniper_rifle", "prob": 15 }, { "group": "nested_rm298", "prob": 10 }, - { "group": "nested_rm51_assault_rifle", "prob": 25 }, { "group": "nested_rm614_lmg", "prob": 10 }, { "group": "nested_rm88_battle_rifle", "prob": 25 }, { "group": "nested_sig_assault_rifle", "prob": 50 }, diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json index 1825b83bc6b2a..64f66af94763c 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -1857,15 +1857,15 @@ ] }, { - "id": "nested_rm51_assault_rifle", + "id": "nested_rsa840", "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": "rm51_assault_rifle", "charges-min": 0, "charges-max": 50 }, - { "item": "8x40_50_mag" }, - { "item": "8x40_50_mag", "prob": 50 }, + { "item": "rsa840", "charges-min": 0, "charges-max": 42 }, + { "item": "8x40_42_mag" }, + { "item": "8x40_42_mag", "prob": 50 }, { "group": "on_hand_8x40" } ] }, diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index c1cdf95db2bb1..477d5335ef85f 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -695,7 +695,6 @@ { "item": "atgm_heat", "prob": 1 }, { "item": "m202_flash", "prob": 2 }, { "item": "m74_clip", "prob": 3 }, - { "item": "rm51_assault_rifle", "prob": 1 }, { "item": "rm88_battle_rifle", "prob": 1 }, { "item": "rm614_lmg", "prob": 1 }, { "item": "rm2000_smg", "prob": 1 }, diff --git a/data/json/obsoletion/migration_items.json b/data/json/obsoletion/migration_items.json index c0da0e9667054..ae96abd51baf5 100644 --- a/data/json/obsoletion/migration_items.json +++ b/data/json/obsoletion/migration_items.json @@ -129,6 +129,11 @@ "type": "MIGRATION", "replace": "rm614_lmg" }, + { + "id": "rm51_assault_rifle", + "type": "MIGRATION", + "replace": "rsa840" + }, { "id": "bio_power_armor_interface", "type": "MIGRATION", 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 9/9] 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",