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.

Sign up for GitHub

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

Added FN F2000 rifle #39926

Closed
wants to merge 2 commits into from
Closed

Added FN F2000 rifle #39926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b07297
Added FN F2000
Apr 26, 2020
ddb264f
Lint 223 json
Apr 26, 2020
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
9 changes: 8 additions & 1 deletion data/json/itemgroups/military.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,14 @@
{ "item": "m9", "prob": 6 },
{ "item": "usp_45", "prob": 6 },
{ "item": "m4a1", "prob": 7 },
{ "item": "m16a4", "prob": 5 },
{
"item": "m16a4",
"prob": 5
},
Comment on lines +172 to +175
Copy link

@ghost ghost Apr 26, 2020 •
edited by ghost
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Undo this as well

{
"item": "fn_f2000",
"prob": 5
},
Comment on lines +176 to +179
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The F2000 was never used by the U.S. military at any point. This would be in guns_rifle_rare

{ "item": "h&k416a5", "prob": 7 },
{ "item": "m1014", "prob": 2 },
{ "item": "scar_l", "prob": 6 },
Expand Down
171 changes: 147 additions & 24 deletions data/json/items/gun/223.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,17 @@
"symbol": "(",
"color": "dark_gray",
"ammo": "223",
"ranged_damage": { "damage_type": "stab", "amount": -1 },
"ranged_damage": {
"damage_type": "stab",
"amount": -1
},
Comment on lines +19 to +22
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Undo every change to the ranged_damage, modes, or magazines of every non-F2000.

"dispersion": 150,
"durability": 8,
"min_cycle_recoil": 1350,
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
"modes": [
[ "DEFAULT", "semi-auto", 1 ],
[ "AUTO", "auto", 4 ]
],
"barrel_length": "250 ml",
"built_in_mods": [ "folding_stock" ],
"magazines": [
Expand Down Expand Up @@ -107,7 +113,12 @@
"dispersion": 380,
"durability": 6,
"min_cycle_recoil": 1350,
"magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
"magazines": [
[
"223",
[ "stanag30", "stanag50", "survivor223mag" ]
]
]
},
{
"id": "famas",
Expand Down Expand Up @@ -144,7 +155,47 @@
[ "underbarrel mount", 1 ],
[ "underbarrel", 1 ]
],
"magazines": [ [ "223", [ "famasmag" ] ] ]
"magazines": [
[
"223",
[ "famasmag" ]
]
]
},
{
"id": "fn_f2000",
"copy-from": "rifle_auto",
"looks_like": "ar15",
"type": "GUN",
"name": { "str": "FN F2000" },
"description": "A Belgian bullpup rifle chambered in NATO 5.56x45mm rounds, this assault rifle features a compact and modular design resembling a tuna fish.",
"weight": "3400 g",
"volume": "1700 ml",
Comment on lines +172 to +173
Copy link

@ghost ghost Apr 26, 2020 •
edited by ghost
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"weight": "3400 g",
"volume": "1700 ml",
"weight": "3319 g",
"volume": "7986 ml",

From #36838.

"price": 200000,
"to_hit": -1,
"bashing": 10,
"material": [ "steel", "plastic" ],
"symbol": "(",
"color": "dark_gray",
"ammo": "223",
"ranged_damage": {
"damage_type": "stab",
"amount": -2
},
"dispersion": 170,
"durability": 9,
"min_cycle_recoil": 1350,
"modes": [
[ "DEFAULT", "semi-auto", 1 ],
[ "AUTO", "auto", 4 ]
],
"built_in_mods": [ "barrel_ported", "grip_mount", "rail_mount", "sights_mount", "tele_sight" ],
"magazines": [
[
"223",
[ "stanag30", "stanag50", "survivor223mag" ]
]
Comment on lines +193 to +197
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"magazines": [
[
"223",
[ "stanag30", "stanag50", "survivor223mag" ]
]
"magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ],
"magazine_well": "228 ml"

]
},
{
"id": "h&k416a5",
Expand All @@ -164,11 +215,17 @@
"symbol": "(",
"color": "dark_gray",
"ammo": "223",
"ranged_damage": { "damage_type": "stab", "amount": -2 },
"ranged_damage": {
"damage_type": "stab",
"amount": -2
},
"dispersion": 180,
"durability": 8,
"min_cycle_recoil": 1350,
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
"modes": [
[ "DEFAULT", "semi-auto", 1 ],
[ "AUTO", "auto", 4 ]
],
"magazines": [
[
"223",
Expand Down Expand Up @@ -210,8 +267,16 @@
"dispersion": 150,
"durability": 8,
"min_cycle_recoil": 1350,
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
"magazines": [ [ "223", [ "g36mag_30rd", "g36mag_100rd" ] ] ]
"modes": [
[ "DEFAULT", "semi-auto", 1 ],
[ "AUTO", "auto", 4 ]
],
"magazines": [
[
"223",
[ "g36mag_30rd", "g36mag_100rd" ]
]
]
},
{
"id": "m249",
Expand Down Expand Up @@ -278,7 +343,10 @@
"name": { "str": "M27 IAR" },
"description": "A H&K416 carbine outfitted with a heavier barrel to enable higher amounts of suppressive fire while retaining a good degree of mobility.",
"weight": "3710 g",
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
"modes": [
[ "DEFAULT", "semi-auto", 1 ],
[ "AUTO", "auto", 4 ]
],
"magazines": [
[
"223",
Expand All @@ -299,7 +367,13 @@
]
]
],
"relative": { "ranged_damage": { "damage_type": "stab", "amount": 1 }, "durability": 1 }
"relative": {
"ranged_damage": {
"damage_type": "stab",
"amount": 1
},
"durability": 1
}
},
{
"id": "m4a1",
Expand All @@ -318,11 +392,17 @@
"symbol": "(",
"color": "dark_gray",
"ammo": "223",
"ranged_damage": { "damage_type": "stab", "amount": -2 },
"ranged_damage": {
"damage_type": "stab",
"amount": -2
},
"dispersion": 180,
"durability": 6,
"min_cycle_recoil": 1350,
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
"modes": [
[ "DEFAULT", "semi-auto", 1 ],
[ "AUTO", "auto", 4 ]
],
"magazines": [
[
"223",
Expand Down Expand Up @@ -364,7 +444,10 @@
"dispersion": 150,
"durability": 7,
"min_cycle_recoil": 1350,
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ] ],
"modes": [
[ "DEFAULT", "semi-auto", 1 ],
[ "BURST", "3 rd.", 3 ]
],
"magazines": [
[
"223",
Expand Down Expand Up @@ -408,14 +491,22 @@
"dispersion": 380,
"durability": 6,
"min_cycle_recoil": 1350,
"magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ]
"magazines": [
[
"223",
[ "stanag30", "stanag50", "survivor223mag" ]
]
]
},
{
"id": "rifle_223",
"copy-from": "gun_base",
"looks_like": "ar15",
"type": "GUN",
"name": { "str": "pipe rifle: .223", "str_pl": "pipe rifles: .223" },
"name": {
"str": "pipe rifle: .223",
"str_pl": "pipe rifles: .223"
},
"description": "A homemade rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.",
"weight": "4080 g",
"volume": "3 L",
Expand All @@ -428,7 +519,10 @@
"color": "brown",
"ammo": "223",
"skill": "rifle",
"ranged_damage": { "damage_type": "stab", "amount": -2 },
"ranged_damage": {
"damage_type": "stab",
"amount": -2
},
"dispersion": 550,
"durability": 6,
"blackpowder_tolerance": 60,
Expand Down Expand Up @@ -466,7 +560,10 @@
"symbol": "(",
"color": "brown",
"ammo": "223",
"ranged_damage": { "damage_type": "stab", "amount": 1 },
"ranged_damage": {
"damage_type": "stab",
"amount": 1
},
"dispersion": 100,
"durability": 8,
"min_cycle_recoil": 1350,
Expand All @@ -485,7 +582,12 @@
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
],
"magazines": [ [ "223", [ "ruger20", "ruger5", "ruger10", "ruger30", "ruger90", "ruger100", "ruger_makeshiftmag" ] ] ]
"magazines": [
[
"223",
[ "ruger20", "ruger5", "ruger10", "ruger30", "ruger90", "ruger100", "ruger_makeshiftmag" ]
]
]
},
{
"id": "scar_l",
Expand All @@ -504,11 +606,17 @@
"symbol": "(",
"color": "dark_gray",
"ammo": "223",
"ranged_damage": { "damage_type": "stab", "amount": -2 },
"ranged_damage": {
"damage_type": "stab",
"amount": -2
},
"dispersion": 150,
"durability": 8,
"min_cycle_recoil": 1350,
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
"modes": [
[ "DEFAULT", "semi-auto", 1 ],
[ "AUTO", "auto", 4 ]
],
"magazines": [
[
"223",
Expand Down Expand Up @@ -548,7 +656,11 @@
"dispersion": 180,
"durability": 9,
"min_cycle_recoil": 1350,
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 4 ] ],
"modes": [
[ "DEFAULT", "semi-auto", 1 ],
[ "BURST", "3 rd.", 3 ],
[ "AUTO", "auto", 4 ]
],
"built_in_mods": [ "folding_stock" ],
"magazines": [
[
Expand Down Expand Up @@ -591,7 +703,10 @@
"dispersion": 140,
"durability": 8,
"min_cycle_recoil": 1350,
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
"modes": [
[ "DEFAULT", "semi-auto", 1 ],
[ "AUTO", "auto", 4 ]
],
"built_in_mods": [ "grip" ],
"valid_mod_locations": [
[ "accessories", 4 ],
Expand All @@ -607,7 +722,12 @@
[ "sling", 1 ],
[ "underbarrel", 1 ]
],
"magazines": [ [ "223", [ "augmag_30rd", "augmag_10rd", "augmag_42rd", "augmag_100rd" ] ] ]
"magazines": [
[
"223",
[ "augmag_30rd", "augmag_10rd", "augmag_42rd", "augmag_100rd" ]
]
]
},
{
"id": "surv_carbine_223",
Expand All @@ -627,7 +747,10 @@
"symbol": "(",
"color": "brown",
"ammo": "223",
"ranged_damage": { "damage_type": "stab", "amount": -4 },
"ranged_damage": {
"damage_type": "stab",
"amount": -4
},
"dispersion": 550,
"durability": 6,
"blackpowder_tolerance": 32,
Expand Down