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

Mk47 #55867

Merged
merged 11 commits into from
Apr 22, 2022
Merged

Mk47 #55867

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
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@
{ "item": "pur_tablets", "prob": 10 },
{ "item": "pastaextruder", "prob": 10 },
{ "item": "can_sealer", "prob": 10 },
{ "item": "remotevehcontrol", "prob": 8 }
{ "item": "remotevehcontrol", "prob": 8 },
{ "item": "mk47", "prob": 4 }
]
},
{
Expand Down
9 changes: 6 additions & 3 deletions data/json/itemgroups/Weapons_Mods_Ammo/guns.json
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,8 @@
{ "item": "sks", "prob": 1, "charges-min": 0, "charges-max": 10 },
{ "item": "win70", "prob": 2, "charges-min": 0, "charges-max": 3 },
{ "item": "1895sbl", "prob": 1, "charges-min": 0, "charges-max": 6 },
{ "item": "aksemi", "prob": 2, "charges-min": 0, "charges-max": 30 }
{ "item": "aksemi", "prob": 2, "charges-min": 0, "charges-max": 30 },
{ "item": "mk47", "prob": 1, "charges-min": 0, "charges-max": 30 }
]
},
{
Expand All @@ -401,7 +402,8 @@
{ "item": "sharps", "prob": 10, "charges-min": 0, "charges-max": 0 },
{ "item": "sks", "prob": 20, "charges-min": 0, "charges-max": 0 },
{ "item": "m1a", "prob": 30, "charges-min": 0, "charges-max": 0 },
{ "item": "aksemi", "prob": 15, "charges-min": 0, "charges-max": 0 }
{ "item": "aksemi", "prob": 15, "charges-min": 0, "charges-max": 0 },
{ "item": "mk47", "prob": 10, "charges-min": 0, "charges-max": 0 }
]
},
{
Expand Down Expand Up @@ -915,7 +917,8 @@
{ "item": "mosin44", "prob": 2, "charges-min": 0, "charges-max": 5 },
{ "item": "remington700_270", "prob": 1, "charges-min": 0, "charges-max": 4 },
{ "item": "remington_700", "prob": 4, "charges-min": 0, "charges-max": 4 },
{ "item": "garand", "prob": 1, "charges-min": 0, "charges-max": 8 }
{ "item": "garand", "prob": 1, "charges-min": 0, "charges-max": 8 },
{ "item": "mk47", "prob": 1, "charges-min": 0, "charges-max": 30 }
]
}
]
34 changes: 34 additions & 0 deletions data/json/items/gun/762.json
Original file line number Diff line number Diff line change
Expand Up @@ -202,5 +202,39 @@
[ "underbarrel mount", 1 ]
],
"pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] } ]
},
{
"id": "mk47",
"type": "GUN",
"name": { "str": "Mk47 Mutant" },
"copy-from": "rifle_semi",
"description": "The CMMG Mk47 Mutant is an American rifle, natively chambered for 7.62x39mm ammo. Features a characteristic free-floating handguard, with a similar action mechanism to the AR-15, repurposed for the bigger, more potent ammo.",
"weight": "2540 g",
"volume": "2300 ml",
"longest_side": "930 mm",
"price": 170000,
"price_postapoc": 4000,
"to_hit": { "balance": "neutral", "grip": "solid", "length": "long", "surface": "point" },
"bashing": 12,
"material": [ "plastic", "steel" ],
"looks_like": "ar15",
"ammo": [ "762" ],
"built_in_mods": [ "pistol_grip" ],
RedMisao marked this conversation as resolved.
Show resolved Hide resolved
"dispersion": 150,
"durability": 7,
"loudness": 9,
"min_cycle_recoil": 1350,
"reload": 420,
"valid_mod_locations": [
[ "grip", 1 ],
[ "muzzle", 1 ],
[ "rail", 1 ],
[ "sights", 1 ],
[ "sling", 1 ],
[ "stock", 1 ],
[ "stock accessory", 2 ],
[ "underbarrel", 1 ]
],
"pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "akmag10", "akmag20", "akmag30", "akmag40", "akdrum75" ] } ]
}
]
3 changes: 2 additions & 1 deletion data/mods/Generic_Guns/firearms/gg_firearms_migration.json
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,8 @@
"aksemi",
"fs2000",
"robofac_gun",
"obrez"
"obrez",
"mk47"
],
"type": "MIGRATION",
"replace": "rifle_sporter"
Expand Down