From d55a7de15e5366f934773bd29dacf6c2064477b7 Mon Sep 17 00:00:00 2001 From: Mom-Bun <43492737+Mom-Bun@users.noreply.github.com> Date: Wed, 24 Feb 2021 03:54:04 -0600 Subject: [PATCH] [AFTERSHOCK] Basic Ballistic Weapons (#47559) --- .../itemgroups/spaceship_groups.json | 2 +- .../itemgroups/weapons/energy_gun_groups.json | 92 +++++++++++++++++ data/mods/Aftershock/items/ammo/10mm.json | 42 ++++++++ data/mods/Aftershock/items/ammo/25mm.json | 23 +++++ data/mods/Aftershock/items/ammo/7.50mm.json | 42 ++++++++ data/mods/Aftershock/items/ammo_type.json | 18 ++++ data/mods/Aftershock/items/casing.json | 15 +++ data/mods/Aftershock/items/gun/10mm.json | 35 +++++++ data/mods/Aftershock/items/gun/25mm.json | 47 +++++++++ data/mods/Aftershock/items/gun/7.50mm.json | 98 +++++++++++++++++++ .../Aftershock/items/gun/combination.json | 19 ---- data/mods/Aftershock/items/magazine/10mm.json | 19 ++++ data/mods/Aftershock/items/magazine/25mm.json | 18 ++++ .../Aftershock/items/magazine/7.50mm.json | 37 +++++++ .../mods/Aftershock/items/magazine/alien.json | 1 - .../Aftershock/vehicles/vehicle_parts.json | 28 ++++++ 16 files changed, 515 insertions(+), 21 deletions(-) create mode 100644 data/mods/Aftershock/items/ammo/10mm.json create mode 100644 data/mods/Aftershock/items/ammo/25mm.json create mode 100644 data/mods/Aftershock/items/ammo/7.50mm.json create mode 100644 data/mods/Aftershock/items/casing.json create mode 100644 data/mods/Aftershock/items/gun/10mm.json create mode 100644 data/mods/Aftershock/items/gun/25mm.json create mode 100644 data/mods/Aftershock/items/gun/7.50mm.json delete mode 100644 data/mods/Aftershock/items/gun/combination.json create mode 100644 data/mods/Aftershock/items/magazine/10mm.json create mode 100644 data/mods/Aftershock/items/magazine/25mm.json create mode 100644 data/mods/Aftershock/items/magazine/7.50mm.json diff --git a/data/mods/Aftershock/itemgroups/spaceship_groups.json b/data/mods/Aftershock/itemgroups/spaceship_groups.json index 53f1b65c30d41..2e664bacb8d8e 100644 --- a/data/mods/Aftershock/itemgroups/spaceship_groups.json +++ b/data/mods/Aftershock/itemgroups/spaceship_groups.json @@ -19,7 +19,7 @@ { "item": "emer_blanket", "count": 2 }, { "item": "afs_radiobeacon" }, { "item": "afs_landfall_gun", "container-item": "back_holster" }, - { "item": "22_lr", "charges": 18 }, + { "item": "afs_7.50mm_rp", "charges": 18 }, { "item": "afs_landfall_kit_2_instructions" } ] } diff --git a/data/mods/Aftershock/itemgroups/weapons/energy_gun_groups.json b/data/mods/Aftershock/itemgroups/weapons/energy_gun_groups.json index 1516ee5b1b817..829ca018ce3d8 100644 --- a/data/mods/Aftershock/itemgroups/weapons/energy_gun_groups.json +++ b/data/mods/Aftershock/itemgroups/weapons/energy_gun_groups.json @@ -40,5 +40,97 @@ "subtype": "distribution", "ammo": 100, "items": [ [ "afs_4g_plasma", 30 ] ] + }, + { + "type": "item_group", + "id": "guns_pistol_rare", + "items": [ { "item": "afs_orion_84K", "prob": 15, "charges-min": 0, "charges-max": 20 } ] + }, + { + "type": "item_group", + "id": "guns_pistol_rare_display", + "items": [ { "item": "afs_orion_84K", "prob": 15, "charges-min": 0, "charges-max": 0 } ] + }, + { + "type": "item_group", + "id": "guns_pistol_obscure", + "items": [ { "item": "afs_orion_84K", "prob": 50, "charges-min": 0, "charges-max": 20 } ] + }, + { + "type": "item_group", + "id": "guns_rifle_rare_display", + "items": [ + { "item": "afs_gibrifle", "prob": 1, "charges-min": 0, "charges-max": 0 }, + { "item": "afs_Accipitermg", "prob": 1, "charges-min": 0, "charges-max": 0 } + ] + }, + { + "type": "item_group", + "id": "guns_rifle_rare", + "items": [ + { "item": "afs_gibrifle", "prob": 25, "charges-min": 0, "charges-max": 30 }, + { "item": "afs_Accipitermg", "prob": 20, "charges-min": 0, "charges-max": 30 } + ] + }, + { + "type": "item_group", + "id": "guns_rifle_milspec", + "items": [ + { "item": "afs_gibrifle", "prob": 50, "charges-min": 0, "charges-max": 30 }, + { "item": "afs_Accipitermg", "prob": 45, "charges-min": 0, "charges-max": 30 } + ] + }, + { + "type": "item_group", + "id": "guns_shotgun_milspec", + "items": [ { "item": "afs_gibs_shotgun", "prob": 20, "charges-min": 0, "charges-max": 40 } ] + }, + { + "type": "item_group", + "id": "mags_pistol_rare", + "items": [ [ "afs_84k_20mag", 15 ] ] + }, + { + "type": "item_group", + "id": "mags_rifle_rare", + "items": [ [ "afs_UICASTA30", 40 ], [ "afs_UICASTA100drum", 20 ] ] + }, + { + "type": "item_group", + "id": "mags_shotgun_rare", + "items": [ [ "afs_25mm_mag", 50 ] ] + }, + { + "type": "item_group", + "id": "ammo_pistol_rare", + "subtype": "distribution", + "entries": [ { "item": "afs_10mm_caseless_FMJ", "prob": 20 }, { "item": "afs_10mm_caseless_JHP", "prob": 15 } ] + }, + { + "type": "item_group", + "id": "ammo_rifle_rare", + "//": "Less common rifle ammo including that only used by police/paramilitary forces.", + "subtype": "distribution", + "entries": [ { "item": "afs_7.50mm_caseless", "prob": 40 }, { "item": "afs_7.50mm_rp", "prob": 50 } ] + }, + { + "type": "item_group", + "id": "ammo_rifle_milspec", + "subtype": "distribution", + "entries": [ { "item": "afs_7.50mm_caseless", "prob": 40 }, { "item": "afs_7.50mm_rp", "prob": 50 } ] + }, + { + "type": "item_group", + "id": "ammo_shotgun_rare", + "//": "Less common shotgun ammo including that only used by police/paramilitary forces.", + "subtype": "distribution", + "entries": [ { "item": "afs_25mm_shot", "prob": 10 } ] + }, + { + "type": "item_group", + "id": "ammo_shotgun_milspec", + "//": "Military specification shotgun ammo found at military sites.", + "subtype": "distribution", + "entries": [ { "item": "afs_25mm_shot", "prob": 10 } ] } ] diff --git a/data/mods/Aftershock/items/ammo/10mm.json b/data/mods/Aftershock/items/ammo/10mm.json new file mode 100644 index 0000000000000..6f9a8ff576377 --- /dev/null +++ b/data/mods/Aftershock/items/ammo/10mm.json @@ -0,0 +1,42 @@ +[ + { + "id": "afs_10mm_caseless_FMJ", + "type": "AMMO", + "name": { "str_sp": "10mm FMJ caseless" }, + "description": "Standardized 10mm ammunition with a brass jacketed projectile. For as long as you can remember bullets like these have been used for military, law enforcement, and civilian use. Being caseless, these cannot be disassembled or reloaded.", + "weight": "9 g", + "volume": "117 ml", + "price": 400, + "material": [ "lead" ], + "symbol": "=", + "color": "yellow", + "count": 40, + "stack_size": 40, + "ammo_type": "afs_10mm", + "range": 14, + "damage": { "damage_type": "bullet", "amount": 29, "armor_penetration": 4 }, + "dispersion": 60, + "recoil": 650, + "effects": [ "COOKOFF" ] + }, + { + "id": "afs_10mm_caseless_JHP", + "type": "AMMO", + "name": { "str_sp": "10mm JHP caseless" }, + "description": "Standardized 10mm ammunition with a hollow point projectile. While they have inferior penetration to FMJ rounds, their expansion slightly increases stopping power against unarmed targets and reduces overpenetration. Being caseless, these cannot be disassembled or reloaded.", + "weight": "7 g", + "volume": "115 ml", + "price": 150, + "material": [ "lead" ], + "symbol": "=", + "color": "yellow", + "count": 40, + "stack_size": 40, + "ammo_type": "afs_10mm", + "range": 14, + "damage": { "damage_type": "bullet", "amount": 31 }, + "dispersion": 60, + "recoil": 600, + "effects": [ "COOKOFF" ] + } +] diff --git a/data/mods/Aftershock/items/ammo/25mm.json b/data/mods/Aftershock/items/ammo/25mm.json new file mode 100644 index 0000000000000..e9d0a9c5c4b0b --- /dev/null +++ b/data/mods/Aftershock/items/ammo/25mm.json @@ -0,0 +1,23 @@ +[ + { + "id": "afs_25mm_shot", + "type": "AMMO", + "name": { "str_sp": "25mm canister shot" }, + "description": "A 25mm grenade with a canister shot load, deals devastating damage against moderately armored foes within mid to close range. Relatively low tech and affordable when compared to other 25mm grenades, these are often fielded by frontier outfits due to their adequate performance in anti-drone and close quarters combat.", + "weight": "130 g", + "volume": "230 ml", + "price": 8000, + "material": [ "superalloy", "powder", "lead" ], + "symbol": "=", + "color": "pink", + "count": 6, + "stack_size": 1, + "ammo_type": "afs_25mm", + "casing": "afs_25_casing", + "range": 24, + "damage": { "damage_type": "bullet", "amount": 60, "armor_penetration": 15 }, + "dispersion": 75, + "recoil": 2200, + "effects": [ "NEVER_MISFIRES" ] + } +] diff --git a/data/mods/Aftershock/items/ammo/7.50mm.json b/data/mods/Aftershock/items/ammo/7.50mm.json new file mode 100644 index 0000000000000..43a949af6248a --- /dev/null +++ b/data/mods/Aftershock/items/ammo/7.50mm.json @@ -0,0 +1,42 @@ +[ + { + "id": "afs_7.50mm_caseless", + "type": "AMMO", + "name": { "str_sp": "7.50mm caseless" }, + "description": "An intermediate bullet with an acceptable all-round performance. Due to their role as UICA's standard issue rifle cartridge, these are ubiquitous wherever Earth makes its presence be known. Being caseless, these cannot be disassembled or reloaded.", + "weight": "12 g", + "volume": "194 ml", + "price": 280, + "material": [ "lead" ], + "symbol": "=", + "color": "yellow", + "count": 30, + "stack_size": 47, + "ammo_type": "afs_7.50mm", + "range": 36, + "damage": { "damage_type": "bullet", "amount": 44, "armor_penetration": 2 }, + "dispersion": 30, + "recoil": 1500, + "effects": [ "COOKOFF" ] + }, + { + "id": "afs_7.50mm_rp", + "type": "AMMO", + "name": { "str_sp": "7.50mm RP" }, + "description": "Civilian-legal 7.50mm ammunition featuring a reduced propellant case and unjacketed projectiles. The 7.50mm RP round is extremely weak with very low stopping power, short range, and negligible recoil. While cheaper than military grade rounds, its only really useful for rifle training, and for hunting small animals. Being caseless, these cannot be disassembled or reloaded.", + "weight": "3 g", + "volume": "65 ml", + "price": 150, + "material": [ "lead" ], + "symbol": "=", + "color": "yellow", + "count": 80, + "stack_size": 100, + "ammo_type": "afs_7.50mm", + "range": 13, + "damage": { "damage_type": "bullet", "amount": 12 }, + "dispersion": 60, + "recoil": 150, + "effects": [ "COOKOFF" ] + } +] diff --git a/data/mods/Aftershock/items/ammo_type.json b/data/mods/Aftershock/items/ammo_type.json index 4701fc308abba..c27192d8af173 100644 --- a/data/mods/Aftershock/items/ammo_type.json +++ b/data/mods/Aftershock/items/ammo_type.json @@ -22,5 +22,23 @@ "id": "afs_shydrogen", "name": "solid hydrogen", "default": "afs_shydrogen" + }, + { + "type": "ammunition_type", + "id": "afs_25mm", + "name": "25mm", + "default": "afs_25mm_shot" + }, + { + "type": "ammunition_type", + "id": "afs_10mm", + "name": "10mm", + "default": "afs_10mm_caseless_JHP" + }, + { + "type": "ammunition_type", + "id": "afs_7.50mm", + "name": "7.50mm", + "default": "afs_7.50mm_caseless" } ] diff --git a/data/mods/Aftershock/items/casing.json b/data/mods/Aftershock/items/casing.json new file mode 100644 index 0000000000000..581288094ed15 --- /dev/null +++ b/data/mods/Aftershock/items/casing.json @@ -0,0 +1,15 @@ +[ + { + "id": "afs_25_casing", + "type": "GENERIC", + "category": "spare_parts", + "name": { "str": "25mm casing" }, + "description": "A large casing from a spent 25mm cartridge.", + "weight": "50 g", + "volume": "45ml", + "material": [ "superalloy" ], + "symbol": "=", + "stackable": true, + "color": "dark_gray" + } +] diff --git a/data/mods/Aftershock/items/gun/10mm.json b/data/mods/Aftershock/items/gun/10mm.json new file mode 100644 index 0000000000000..1dfe73939b256 --- /dev/null +++ b/data/mods/Aftershock/items/gun/10mm.json @@ -0,0 +1,35 @@ +[ + { + "id": "afs_orion_84K", + "copy-from": "pistol_base", + "looks_like": "glock_17", + "type": "GUN", + "name": { "str": "Seyfert 84K" }, + "description": "Commonly carried by shipping crews that can afford it, Seyfert Armistice's 84K pistol doesn't particularly shine or show anything special but it keeps you safe on long journeys in the vast dark of Orion's Arm.", + "weight": "780 g", + "volume": "480 ml", + "longest_side": "205 mm", + "price": 59200, + "to_hit": -2, + "bashing": 8, + "material": [ "plastic", "superalloy" ], + "symbol": "(", + "color": "dark_gray", + "ammo": "afs_10mm", + "ranged_damage": { "damage_type": "bullet", "amount": -5 }, + "dispersion": 480, + "durability": 8, + "blackpowder_tolerance": 48, + "min_cycle_recoil": 570, + "pocket_data": [ + { + "magazine_well": "103 ml", + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "afs_84k_20mag" ] + } + ] + } +] diff --git a/data/mods/Aftershock/items/gun/25mm.json b/data/mods/Aftershock/items/gun/25mm.json new file mode 100644 index 0000000000000..5868bc0ba49d6 --- /dev/null +++ b/data/mods/Aftershock/items/gun/25mm.json @@ -0,0 +1,47 @@ +[ + { + "id": "afs_gibs_shotgun", + "looks_like": "m79", + "type": "GUN", + "reload_noise_volume": 10, + "name": { "str": "Gibson S86" }, + "description": "Manufactured by Gibson Armory, the S86 is a light-weight grenade launcher designed to take care of moderately armored opponents. While the S86 firepower is nothing to truly gawk at, it still packs quite a punch both for the target and user and is usually mounted as it is impossible to fire with average strength.", + "weight": "2700 g", + "volume": "2800 ml", + "longest_side": "736 mm", + "price": 550000, + "to_hit": -3, + "bashing": 10, + "material": [ "superalloy", "plastic" ], + "symbol": "(", + "color": "brown", + "min_strength": 18, + "ranged_damage": { "damage_type": "bullet", "amount": 10 }, + "skill": "launcher", + "modes": [ [ "DEFAULT", "DOUBLE", 4 ] ], + "dispersion": 90, + "durability": 6, + "ammo": [ "afs_25mm" ], + "clip_size": 1, + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "afs_25mm_mag" ] + } + ], + "reload": 400, + "valid_mod_locations": [ + [ "accessories", 2 ], + [ "barrel", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "grip mount", 1 ], + [ "rail mount", 1 ], + [ "stock mount", 1 ], + [ "underbarrel mount", 1 ] + ] + } +] diff --git a/data/mods/Aftershock/items/gun/7.50mm.json b/data/mods/Aftershock/items/gun/7.50mm.json new file mode 100644 index 0000000000000..483e77a8f31f9 --- /dev/null +++ b/data/mods/Aftershock/items/gun/7.50mm.json @@ -0,0 +1,98 @@ +[ + { + "id": "afs_landfall_gun", + "type": "GUN", + "copy-from": "rifle_22", + "name": { "str": "landfall survival gun" }, + "description": "A lightweight, bolt-action gun that is barely more than a 6.55mm barrel mounted within a flimsy metal assembly. Cheaply made and outdated in all respects, it's only useful in the most extenuating of circumstances.", + "price": 5000, + "material": [ "steel", "plastic" ], + "flags": [ "NEVER_JAMS", "RELOAD_EJECT" ], + "dispersion": 250, + "longest_side": "60 cm", + "reload": 100, + "durability": 5, + "blackpowder_tolerance": 60, + "ammo": [ "afs_7.50mm" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "afs_7.50mm": 1 } } ], + "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ] + }, + { + "id": "afs_Accipitermg", + "copy-from": "rifle_auto", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "Accipiter Hawk-00" }, + "description": "A light machine gun manufactured by Accipiter Firearms and distributed by Wraitheon. The Hawk-00's high rate of fire makes it ideally suited to lay down suppressive fire; but also makes it exceedingly hard to control while unmounted.", + "weight": "7500 g", + "volume": "10610 ml", + "longest_side": "1035 mm", + "price": 750000, + "to_hit": -1, + "bashing": 12, + "material": [ "superalloy", "plastic" ], + "symbol": "(", + "color": "dark_gray", + "ammo": [ "afs_7.50mm" ], + "dispersion": 200, + "durability": 7, + "min_cycle_recoil": 1350, + "reload": 400, + "modes": [ [ "DEFAULT", "burst", 4 ] ], + "built_in_mods": [ "bipod" ], + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "barrel", 1 ], + [ "bore", 1 ], + [ "brass catcher", 1 ], + [ "grip", 1 ], + [ "mechanism", 4 ], + [ "muzzle", 1 ], + [ "rail", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "stock", 1 ] + ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "afs_UICASTA30", "afs_UICASTA100drum" ] + } + ] + }, + { + "id": "afs_gibrifle", + "copy-from": "rifle_semi", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "G&W SR-P9" }, + "description": "An eminently sturdy and reliable bullpup rifle issued by UICA's military during early reclamation expeditions. Although its been out of service for nearly two decades, many a private military and contractor has found a use for the SR-P9, and it remains common long past its initial introduction into service.", + "weight": "3170 g", + "volume": "3100 ml", + "longest_side": "630 mm", + "price": 125000, + "to_hit": -1, + "bashing": 12, + "material": [ "superalloy", "plastic" ], + "ranged_damage": { "damage_type": "bullet", "amount": -7 }, + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "burst", 2 ] ], + "symbol": "(", + "color": "dark_gray", + "ammo": [ "afs_7.50mm" ], + "dispersion": 150, + "durability": 10, + "min_cycle_recoil": 1350, + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "afs_UICASTA30" ] + } + ] + } +] diff --git a/data/mods/Aftershock/items/gun/combination.json b/data/mods/Aftershock/items/gun/combination.json deleted file mode 100644 index 694a5f95fea72..0000000000000 --- a/data/mods/Aftershock/items/gun/combination.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "id": "afs_landfall_gun", - "type": "GUN", - "copy-from": "rifle_22", - "name": { "str": "landfall survival gun" }, - "description": "A lightweight, bolt-action gun that is barely more than a .22 barrel mounted within a flimsy metal assembly. Cheaply made and outdated in all respects, it's only useful in the most extenuating of circumstances.", - "price": 5000, - "price_postapoc": 5000, - "material": [ "steel", "plastic" ], - "flags": [ "NEVER_JAMS", "RELOAD_EJECT" ], - "dispersion": 250, - "longest_side": "60 cm", - "reload": 100, - "durability": 5, - "blackpowder_tolerance": 60, - "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ] - } -] diff --git a/data/mods/Aftershock/items/magazine/10mm.json b/data/mods/Aftershock/items/magazine/10mm.json new file mode 100644 index 0000000000000..e211e6613d77e --- /dev/null +++ b/data/mods/Aftershock/items/magazine/10mm.json @@ -0,0 +1,19 @@ +[ + { + "id": "afs_84k_20mag", + "looks_like": "glock17_17", + "type": "MAGAZINE", + "name": { "str": "84k 10mm 20-round magazine" }, + "description": "A 20-round magazine for use with the Seyfert 84k.", + "weight": "70 g", + "volume": "103 ml", + "longest_side": "114 mm", + "price": 2400, + "material": [ "plastic", "superalloy" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "afs_10mm" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "afs_10mm": 20 } } ] + } +] diff --git a/data/mods/Aftershock/items/magazine/25mm.json b/data/mods/Aftershock/items/magazine/25mm.json new file mode 100644 index 0000000000000..64c3ac9736f93 --- /dev/null +++ b/data/mods/Aftershock/items/magazine/25mm.json @@ -0,0 +1,18 @@ +[ + { + "id": "afs_25mm_mag", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "25mm 40-round magazine" }, + "description": "A 40-round magazine for use with 25mm firearms.", + "weight": "340 g", + "volume": "2 L", + "price": 70000, + "material": [ "superalloy", "plastic" ], + "symbol": "#", + "color": "dark_gray", + "ammo_type": [ "afs_25mm" ], + "reload_time": 60, + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "afs_25mm": 40 } } ] + } +] diff --git a/data/mods/Aftershock/items/magazine/7.50mm.json b/data/mods/Aftershock/items/magazine/7.50mm.json new file mode 100644 index 0000000000000..0967b6f04edd1 --- /dev/null +++ b/data/mods/Aftershock/items/magazine/7.50mm.json @@ -0,0 +1,37 @@ +[ + { + "id": "afs_UICASTA30", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "UICASTA 30-round magazine" }, + "description": "A standardized 30-round magazine compatible with most UICA issue rifles.", + "weight": "265 g", + "volume": "290 ml", + "longest_side": "190 mm", + "price": 8000, + "material": [ "superalloy" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "afs_7.50mm" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "afs_7.50mm": 30 } } ] + }, + { + "id": "afs_UICASTA100drum", + "looks_like": "stanag30", + "type": "MAGAZINE", + "name": { "str": "UICASTA 100-round double drum magazine" }, + "description": "A standardized 100-round double drum magazine compatible with most UICA issue rifles.", + "weight": "1700 g", + "volume": "1200 ml", + "longest_side": "300 mm", + "price": 14000, + "material": [ "plastic", "superalloy" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "afs_7.50mm" ], + "reload_time": 200, + "flags": [ "MAG_BULKY" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "afs_7.50mm": 100 } } ] + } +] diff --git a/data/mods/Aftershock/items/magazine/alien.json b/data/mods/Aftershock/items/magazine/alien.json index f9b12cb95b11b..7fbeaab6184aa 100644 --- a/data/mods/Aftershock/items/magazine/alien.json +++ b/data/mods/Aftershock/items/magazine/alien.json @@ -8,7 +8,6 @@ "weight": "1000 g", "volume": "1225ml", "price": 100000, - "price_postapoc": 5000, "material": [ "iron", "plastic" ], "symbol": "=", "color": "yellow", diff --git a/data/mods/Aftershock/vehicles/vehicle_parts.json b/data/mods/Aftershock/vehicles/vehicle_parts.json index b7aad54ed241c..377859a40a80c 100644 --- a/data/mods/Aftershock/vehicles/vehicle_parts.json +++ b/data/mods/Aftershock/vehicles/vehicle_parts.json @@ -28,6 +28,34 @@ "removal": { "skills": [ [ "mechanics", 3 ] ] } } }, + { + "id": "afs_mounted_gibs_shotgun", + "copy-from": "turret", + "type": "vehicle_part", + "name": { "str": "mounted Gibson S86" }, + "item": "afs_gibs_shotgun", + "color": "magenta", + "broken_color": "magenta", + "breaks_into": [ { "item": "scrap", "count": 9 }, { "item": "steel_chunk", "count": 4 }, { "item": "steel_lump", "count": 1 } ], + "requirements": { + "install": { "skills": [ [ "mechanics", 5 ], [ "electronics", 5 ] ] }, + "removal": { "skills": [ [ "mechanics", 3 ] ] } + } + }, + { + "id": "afs_mounted_Accipitermg", + "copy-from": "turret", + "type": "vehicle_part", + "name": { "str": "mounted Accipiter Hawk-00" }, + "item": "afs_Accipitermg", + "color": "magenta", + "broken_color": "magenta", + "breaks_into": [ { "item": "scrap", "count": 9 }, { "item": "steel_chunk", "count": 4 }, { "item": "steel_lump", "count": 1 } ], + "requirements": { + "install": { "skills": [ [ "mechanics", 5 ], [ "electronics", 5 ] ] }, + "removal": { "skills": [ [ "mechanics", 3 ] ] } + } + }, { "id": "afs_laser_rifle", "copy-from": "turret",