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

[AFTERSHOCK] Basic Ballistic Weapons #47559

Merged
merged 20 commits into from
Feb 24, 2021
92 changes: 92 additions & 0 deletions data/mods/Aftershock/itemgroups/gun_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,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_6.5mm_caseless", "prob": 40 }, { "item": "afs_6.5mm_lr", "prob": 50 } ]
},
{
"type": "item_group",
"id": "ammo_rifle_milspec",
"subtype": "distribution",
"entries": [ { "item": "afs_6.5mm_caseless", "prob": 40 }, { "item": "afs_6.5mm_lr", "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 } ]
}
]
2 changes: 1 addition & 1 deletion data/mods/Aftershock/itemgroups/spaceship_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -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_6.5mm_lr", "charges": 18 },
{ "item": "afs_landfall_kit_2_instructions" }
]
}
Expand Down
44 changes: 44 additions & 0 deletions data/mods/Aftershock/items/ammo/10mm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
[
{
"id": "afs_10mm_caseless_FMJ",
"type": "AMMO",
"name": { "str_sp": "10mm FMJ caseless" },
"description": "10mm ammunition with a brass jacketed bullet. 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.",
Mom-Bun marked this conversation as resolved.
Show resolved Hide resolved
"weight": "9 g",
"volume": "117 ml",
"price": 400,
"price_postapoc": 800,
"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": "10mm ammunition with hollow point bullet. 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.",
Mom-Bun marked this conversation as resolved.
Show resolved Hide resolved
"weight": "7 g",
"volume": "115 ml",
"price": 150,
"price_postapoc": 1000,
"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" ]
}
]
24 changes: 24 additions & 0 deletions data/mods/Aftershock/items/ammo/25mm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[
{
"id": "afs_25mm_shot",
"type": "AMMO",
"name": { "str_sp": "25mm canister shot" },
"description": "25mm caseless rounds. The most common type of ammo used for light grenade launchers.",
Mom-Bun marked this conversation as resolved.
Show resolved Hide resolved
"weight": "130 g",
"volume": "230 ml",
"price": 225,
"price_postapoc": 8000,
Mom-Bun marked this conversation as resolved.
Show resolved Hide resolved
"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" ]
}
]
44 changes: 44 additions & 0 deletions data/mods/Aftershock/items/ammo/6.5mm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
[
{
"id": "afs_6.5mm_caseless",
"type": "AMMO",
"name": { "str_sp": "6.5mm caseless" },
"description": "An intermediate bullet, popularized during the first years of the Reclamation, these bullets are interchangeable between most modern assault rifles and machine guns. These rounds being caseless cannot be disassembled or reloaded.",
"weight": "12 g",
"volume": "194 ml",
"price": 280,
"price_postapoc": 900,
"material": [ "lead" ],
"symbol": "=",
"color": "yellow",
"count": 30,
"stack_size": 47,
"ammo_type": "afs_6.5mm",
"range": 36,
"damage": { "damage_type": "bullet", "amount": 44, "armor_penetration": 2 },
"dispersion": 30,
"recoil": 1500,
"effects": [ "COOKOFF" ]
},
{
"id": "afs_6.5mm_lr",
"type": "AMMO",
"name": { "str_sp": "6.5mm LR" },
"description": "6.5mm Long Rifle ammunition with unjacketed bullets. The 6.5mm LR round is extremely weak with very low stopping power, short range, and negligible recoil. It is extremely cheap to manufacture, and is only useful for rifle training, and hunting small animals. These rounds being caseless cannot be disassembled or reloaded.",
"weight": "3 g",
"volume": "65 ml",
"price": 150,
"price_postapoc": 800,
"material": [ "lead" ],
"symbol": "=",
"color": "yellow",
"count": 80,
"stack_size": 100,
"ammo_type": "afs_6.5mm",
"range": 13,
"damage": { "damage_type": "bullet", "amount": 12 },
"dispersion": 60,
"recoil": 150,
"effects": [ "COOKOFF" ]
}
]
18 changes: 18 additions & 0 deletions data/mods/Aftershock/items/ammo_type.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,23 @@
"id": "afs_shydrogen",
"name": "solid hydrogen",
"default": "afs_shydrogen"
},
{
"type": "ammunition_type",
"id": "afs_25mm",
"name": "25x40mm",
"default": "afs_25mm_shot"
},
{
"type": "ammunition_type",
"id": "afs_10mm",
"name": "10mm",
"default": "afs_10mm_caseless_JHP"
},
{
"type": "ammunition_type",
"id": "afs_6.5mm",
"name": "6.5mm",
"default": "afs_6.5mm_caseless"
}
]
15 changes: 15 additions & 0 deletions data/mods/Aftershock/items/casing.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[
{
"id": "afs_25_casing",
"type": "GENERIC",
"category": "spare_parts",
"name": { "str": "25mm casing" },
"description": "A large casing from a spent 25x40mm cartridge.",
Mom-Bun marked this conversation as resolved.
Show resolved Hide resolved
"weight": "50 g",
"volume": "45ml",
"material": [ "superalloy" ],
"symbol": "=",
"stackable": true,
"color": "dark_gray"
}
]
36 changes: 36 additions & 0 deletions data/mods/Aftershock/items/gun/10mm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
[
{
"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 particulary 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,
"price_postapoc": 2500,
"to_hit": -2,
"bashing": 8,
"material": [ "plastic", "superalloy" ],
"symbol": "(",
"color": "dark_gray",
"ammo": "afs_10mm",
"ranged_damage": { "damage_type": "bullet", "amount": -10 },
Mom-Bun marked this conversation as resolved.
Show resolved Hide resolved
"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" ]
}
]
}
]
48 changes: 48 additions & 0 deletions data/mods/Aftershock/items/gun/25mm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
[
{
"id": "afs_gibs_shotgun",
"looks_like": "m79",
"type": "GUN",
"reload_noise_volume": 10,
"name": { "str": "Gibson S86" },
"description": "The Gibson S86 is a light-weight grenade launcher manufactured by Gibson Armory, designed to take care of heavily armored opponents like power armor users. However due to its recoil, the gun is only usable if its either mounted, or wielded by a person with sufficent strength like a power armor user.",
"weight": "2700 g",
"volume": "2800 ml",
"longest_side": "736 mm",
"price": 550000,
"price_postapoc": 50000,
"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", "auto", 6 ] ],
John-Candlebury marked this conversation as resolved.
Show resolved Hide resolved
"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 ]
]
}
]
Loading