Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2222 #5

Merged
merged 1 commit into from
Apr 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion data/json/items/gun/robofac_gun.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
]
},
Expand Down Expand Up @@ -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 } } ]
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand Down Expand Up @@ -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.",
Expand All @@ -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" }
Expand Down
4 changes: 3 additions & 1 deletion data/mods/Generic_Guns/magazines/gg_magazines_migration.json
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,9 @@
"8x40_500_mag",
"8x40_50_mag",
"famasmag",
"robofac40"
"robofac40",
"robofac100",
"robofac50"
],
"type": "MIGRATION",
"replace": "rifle_mag"
Expand Down