From 44c51a442a58abae8ab93069cca7dc7ba14d6f97 Mon Sep 17 00:00:00 2001 From: tornikeo <56438982+tornikeo@users.noreply.github.com> Date: Mon, 25 Apr 2022 16:27:44 +0400 Subject: [PATCH] Add two new drum magazines to Hub01 gun (#57128) * Add two new drum-type magazines for Hub01's HWP * Add new mags to generic guns migration list * Update data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json Co-authored-by: Dillon Matchett * Update data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json Co-authored-by: Dillon Matchett Co-authored-by: Dillon Matchett --- data/json/items/gun/robofac_gun.json | 37 ++++++++++++++++++- .../robofac_intercom_prototypes.json | 16 +++++++- .../magazines/gg_magazines_migration.json | 4 +- 3 files changed, 53 insertions(+), 4 deletions(-) diff --git a/data/json/items/gun/robofac_gun.json b/data/json/items/gun/robofac_gun.json index 03a92dcfd7675..3f65f5a2b6bd4 100644 --- a/data/json/items/gun/robofac_gun.json +++ b/data/json/items/gun/robofac_gun.json @@ -36,7 +36,7 @@ "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", - "item_restriction": [ "robofac40", "robofac20", "robofac10", "robofac60", "exodiiBRmag" ] + "item_restriction": [ "robofac40", "robofac20", "robofac50", "robofac100", "robofac10", "robofac60", "exodiiBRmag" ] } ] }, @@ -271,5 +271,40 @@ "ammo_type": [ "308" ], "flags": [ "MAG_COMPACT" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "308": 20 } } ] + }, + { + "id": "robofac50", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "HWP 50-round 7.62 magazine" }, + "description": "A 50-round drum magazine for use with the Hub 01 Hybrid Weapons Platform.", + "weight": "400 g", + "volume": "1 L", + "longest_side": "232 mm", + "price": 8900, + "price_postapoc": 750, + "material": [ "plastic", "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "308" ], + "flags": [ "MAG_BULKY" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "308": 50 } } ] + }, + { + "id": "robofac100", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "HWP 100-round 5.56 magazine" }, + "description": "A bulky 100-round double drum magazine for use with the Hub 01 Hybrid Weapons Platform.", + "weight": "1700 g", + "volume": "1200 ml", + "longest_side": "300 mm", + "price": 8900, + "material": [ "plastic", "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "223" ], + "flags": [ "MAG_BULKY" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "223": 100 } } ] } ] diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json index 19d13fee46933..89ecb6098f893 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json @@ -328,7 +328,7 @@ "id": "TALK_ROBOFAC_INTERCOM_RIFLE_BREAKTHROUGH", "//": "getting an HWP", "type": "talk_topic", - "dynamic_line": "The weapon is complete. I have been instructed to remind all operatives that they must install a barrel in the HWP for it to work as a gun. Here are the requested items. If you require more magazines of any caliber we can sell those directly at 1 coin for 2 mags.", + "dynamic_line": "The weapon is complete. I have been instructed to remind all operatives that they must install a barrel in the HWP for it to work as a gun. Here are the requested items. If you require more compact magazines of any caliber we can sell those directly at 1 coin for 2 mags. Several high-capacity magazines are also available for purchase at 3 coins per mag.", "responses": [ { "text": "Thanks.", @@ -543,7 +543,7 @@ "id": "TALK_ROBOFAC_INTERCOM_MAG_BUY", "//": "Buying HWP Magazines", "type": "talk_topic", - "dynamic_line": "Certainly, we can immediately provide you with a loaded magazine of 5.56 NATO, 7.62 NATO, 9mm Parabellum, or 2 shotgun magazines for 1 coin.", + "dynamic_line": "Certainly, we can immediately provide you with a loaded magazine of 5.56 NATO, 7.62 NATO, 9mm Parabellum, or 2 shotgun magazines for 1 coin. We also offer drum magazines for 3 coins, since some of our operatives have found a sustained high-caliber firepower quite necessary lately.", "responses": [ { "text": "[1 HGC] I'll take a 5.56 NATO mag.", @@ -569,6 +569,18 @@ "effect": [ { "u_sell_item": "RobofacCoin", "count": 1 }, { "u_spawn_item": "robofac10", "count": 2 } ], "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" }, + { + "text": "[3 HGC] I'll take a 7.62 NATO drum mag.", + "condition": { "u_has_items": { "item": "RobofacCoin", "count": 3 } }, + "effect": [ { "u_sell_item": "RobofacCoin", "count": 3 }, { "u_spawn_item": "robofac50", "count": 1 } ], + "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" + }, + { + "text": "[3 HGC] I'll take a 5.56 NATO drum mag.", + "condition": { "u_has_items": { "item": "RobofacCoin", "count": 3 } }, + "effect": [ { "u_sell_item": "RobofacCoin", "count": 3 }, { "u_spawn_item": "robofac100", "count": 1 } ], + "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" + }, { "text": "What about another project?", "topic": "TALK_ROBOFAC_INTERCOM_PROTOTYPE_MENU" }, { "text": "I want to talk about something else.", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" }, { "text": "I'll check in later.", "topic": "TALK_DONE" } diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json index 6d09c15e8f220..f16acb3f0ca70 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json @@ -277,7 +277,9 @@ "8x40_500_mag", "8x40_50_mag", "famasmag", - "robofac40" + "robofac40", + "robofac100", + "robofac50" ], "type": "MIGRATION", "replace": "rifle_mag"