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

Disallow some guns from turrets based on action #72789

Merged
merged 2 commits into from
Apr 9, 2024
Merged

Disallow some guns from turrets based on action #72789

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9454093
first pass
tenmillimaster Apr 2, 2024
a9e2f87
Update 36paper.json
tenmillimaster Apr 2, 2024
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
2 changes: 1 addition & 1 deletion data/json/items/gun/22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
[ "underbarrel mount", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"flags": [ "RELOAD_ONE" ],
"flags": [ "RELOAD_ONE", "NO_TURRET" ],
"pocket_data": [
{
"pocket_type": "MAGAZINE",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/270win.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"clip_size": 4,
"barrel_volume": "750 ml",
"barrel_length": "610 mm",
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN" ],
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
"valid_mod_locations": [
[ "barrel", 1 ],
[ "brass catcher", 1 ],
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/gun/300.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dispersion": 90,
"durability": 8,
"barrel_volume": "500 ml",
"flags": [ "NEVER_JAMS", "EASY_CLEAN" ],
"flags": [ "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "m2010mag" ] } ],
"melee_damage": { "bash": 12 }
},
Expand All @@ -46,7 +46,7 @@
"blackpowder_tolerance": 24,
"clip_size": 3,
"barrel_volume": "750 ml",
"flags": [ "RELOAD_ONE", "EASY_CLEAN" ],
"flags": [ "RELOAD_ONE", "EASY_CLEAN", "NO_TURRET" ],
"valid_mod_locations": [
[ "barrel", 1 ],
[ "brass catcher", 1 ],
Expand Down Expand Up @@ -84,7 +84,7 @@
"blackpowder_tolerance": 24,
"clip_size": 3,
"barrel_volume": "750 ml",
"flags": [ "RELOAD_ONE", "EASY_CLEAN" ],
"flags": [ "RELOAD_ONE", "EASY_CLEAN", "NO_TURRET" ],
"valid_mod_locations": [
[ "barrel", 1 ],
[ "brass catcher", 1 ],
Expand Down Expand Up @@ -136,7 +136,7 @@
[ "stock accessory", 2 ],
[ "stock", 1 ]
],
"flags": [ "EASY_CLEAN" ],
"flags": [ "EASY_CLEAN", "NO_TURRET" ],
"pocket_data": [
{
"magazine_well": "300 ml",
Expand Down
7 changes: 4 additions & 3 deletions data/json/items/gun/3006.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
[ "underbarrel mount", 1 ]
],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"flags": [ "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "blrmag" ] } ],
"melee_damage": { "bash": 12 }
},
Expand Down Expand Up @@ -116,7 +117,7 @@
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "RELOAD_ONE", "EASY_CLEAN" ],
"flags": [ "RELOAD_ONE", "EASY_CLEAN", "NO_TURRET" ],
"pocket_data": [
{ "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "3006": 5 }, "allowed_speedloaders": [ "3006_clip" ] }
],
Expand Down Expand Up @@ -188,7 +189,7 @@
"blackpowder_tolerance": 24,
"clip_size": 4,
"barrel_volume": "750 ml",
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN" ],
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "3006": 4 } } ],
"melee_damage": { "bash": 12 }
},
Expand Down Expand Up @@ -232,7 +233,7 @@
[ "stock accessory", 2 ],
[ "stock", 1 ]
],
"flags": "RELOAD_ONE",
"flags": [ "RELOAD_ONE", "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "3006": 4 } } ],
"melee_damage": { "bash": 12 }
}
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/303.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"dispersion": 170,
"durability": 8,
"blackpowder_tolerance": 40,
"flags": [ "EASY_CLEAN" ],
"flags": [ "EASY_CLEAN", "NO_TURRET" ],
"valid_mod_locations": [
[ "barrel", 1 ],
[ "bayonet lug", 1 ],
Expand Down Expand Up @@ -74,7 +74,7 @@
"dispersion": 150,
"durability": 8,
"blackpowder_tolerance": 40,
"flags": [ "EASY_CLEAN" ],
"flags": [ "EASY_CLEAN", "NO_TURRET" ],
"valid_mod_locations": [
[ "barrel", 1 ],
[ "bayonet lug", 1 ],
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/gun/308.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
"blackpowder_tolerance": 24,
"clip_size": 3,
"barrel_volume": "750 ml",
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN" ],
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "308": 3 } } ],
"melee_damage": { "bash": 12 }
},
Expand Down Expand Up @@ -351,7 +351,7 @@
[ "rail mount", 1 ],
[ "underbarrel", 1 ]
],
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN" ],
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "308": 5 } } ],
"melee_damage": { "bash": 12 }
},
Expand Down Expand Up @@ -566,7 +566,7 @@
[ "underbarrel", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "NEVER_JAMS", "EASY_CLEAN" ],
"flags": [ "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "steyr_scout_mag", "steyr_scout_mag_makeshift" ] } ],
"melee_damage": { "bash": 10 }
}
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/gun/338lapua.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"durability": 10,
"blackpowder_tolerance": 24,
"default_mods": [ "cheek_pad", "butt_hook", "bipod", "rifle_scope", "muzzle_brake" ],
"flags": [ "EASY_CLEAN" ],
"flags": [ "EASY_CLEAN", "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ai_338mag", "ai_338mag_10" ] } ],
"melee_damage": { "bash": 12 }
},
Expand Down Expand Up @@ -75,7 +75,7 @@
[ "rail mount", 1 ],
[ "stock mount", 1 ]
],
"flags": [ "RELOAD_ONE", "RELOAD_EJECT", "EASY_CLEAN" ],
"flags": [ "RELOAD_ONE", "RELOAD_EJECT", "EASY_CLEAN", "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "338lapua": 1 } } ],
"melee_damage": { "bash": 12 }
},
Expand Down Expand Up @@ -108,7 +108,7 @@
"durability": 10,
"blackpowder_tolerance": 24,
"built_in_mods": [ "cheek_pad" ],
"flags": [ "EASY_CLEAN" ],
"flags": [ "EASY_CLEAN", "NO_TURRET" ],
"//": "Cheek pad required for holding the buttstock in place and keep it from folding.",
"default_mods": [ "match_trigger", "muzzle_brake" ],
"valid_mod_locations": [
Expand Down Expand Up @@ -166,7 +166,7 @@
[ "underbarrel", 1 ],
[ "stock", 1 ]
],
"flags": [ "NO_TURRET", "EASY_CLEAN" ],
"flags": [ "NO_TURRET", "EASY_CLEAN", "NO_TURRET" ],
"//3": "This should be removed once vehicle turrets are capable of mounting guns with mods attached. As it stands, trying to mount this style of weapon would require the player to remove the conversion kit, thus rendering it unusable anyhow.",
"melee_damage": { "bash": 12 }
}
Expand Down
3 changes: 2 additions & 1 deletion data/json/items/gun/36paper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"blackpowder_tolerance": 96,
"clip_size": 6,
"proportional": { "reload": 2.0 },
"flags": [ "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "36paper": 6 } } ],
"melee_damage": { "bash": 8 }
}
]
]
tenmillimaster marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion data/json/items/gun/38.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"reload": 200,
"valid_mod_locations": [ [ "grip", 1 ], [ "sights", 1 ], [ "underbarrel", 1 ], [ "rail mount", 1 ], [ "stock mount", 1 ] ],
"faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ],
"flags": [ "RELOAD_ONE", "RELOAD_EJECT", "EASY_CLEAN" ],
"flags": [ "RELOAD_ONE", "RELOAD_EJECT", "EASY_CLEAN", "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "38": 2 } } ],
"melee_damage": { "bash": 3 }
},
Expand Down
1 change: 1 addition & 0 deletions data/json/items/gun/44.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
[ "rail mount", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "44": 10 } } ],
"melee_damage": { "bash": 12 }
},
Expand Down
1 change: 1 addition & 0 deletions data/json/items/gun/44paper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"durability": 7,
"blackpowder_tolerance": 96,
"clip_size": 6,
"flags": [ "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "44paper": 6 } } ],
"melee_damage": { "bash": 8 }
}
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/4570.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "RELOAD_ONE" ],
"flags": [ "RELOAD_ONE", "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "4570": 6 } } ],
"melee_damage": { "bash": 12 }
},
Expand Down
1 change: 1 addition & 0 deletions data/json/items/gun/458wm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"price": 176000,
"price_postapoc": 5000,
"ammo": [ "458wm" ],
"flags": [ "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "458wm": 3 } } ]
}
]
3 changes: 2 additions & 1 deletion data/json/items/gun/45colt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
[ "stock mount", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT", "EASY_CLEAN" ],
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "RELOAD_EJECT", "EASY_CLEAN", "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45colt": 2, "410shot": 2 } } ],
"melee_damage": { "bash": 2 }
},
Expand Down Expand Up @@ -96,6 +96,7 @@
"clip_size": 6,
"blackpowder_tolerance": 56,
"//proportional": { "reload": 1.5 },
"flags": [ "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45colt": 6 } } ],
"melee_damage": { "bash": 8 }
}
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/50.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"reload": 450,
"barrel_volume": "1250 ml",
"default_mods": [ "recoil_stock", "bipod", "rifle_scope", "muzzle_brake" ],
"flags": [ "NEVER_JAMS", "EASY_CLEAN" ],
"flags": [ "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "tac50mag" ] } ],
"melee_damage": { "bash": 12 }
},
Expand Down Expand Up @@ -154,7 +154,7 @@
],
"default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ],
"clip_size": 1,
"flags": [ "NEVER_JAMS", "RELOAD_EJECT", "EASY_CLEAN" ],
"flags": [ "NEVER_JAMS", "RELOAD_EJECT", "EASY_CLEAN", "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "50": 1 } } ],
"melee_damage": { "bash": 12 }
}
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/762R.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
[ "stock accessory", 2 ],
[ "underbarrel", 1 ]
],
"flags": [ "RELOAD_ONE" ],
"flags": [ "RELOAD_ONE", "NO_TURRET" ],
"pocket_data": [
{ "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762R": 5 }, "allowed_speedloaders": [ "762R_clip" ] }
],
Expand Down Expand Up @@ -107,7 +107,7 @@
[ "stock accessory", 2 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "RELOAD_ONE" ],
"flags": [ "RELOAD_ONE", "NO_TURRET" ],
"pocket_data": [
{ "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "762R": 5 }, "allowed_speedloaders": [ "762R_clip" ] }
],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/77mm_jap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"durability": 10,
"blackpowder_tolerance": 24,
"clip_size": 5,
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN" ],
"flags": [ "RELOAD_ONE", "NEVER_JAMS", "EASY_CLEAN", "NO_TURRET" ],
"valid_mod_locations": [
[ "barrel", 1 ],
[ "bayonet lug", 1 ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/artisan_guns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"to_hit": { "grip": "weapon", "length": "hand", "surface": "point", "balance": "neutral" },
"qualities": [ [ "CUT", 2 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 14 ] ],
"techniques": [ "RAPID" ],
"flags": [ "DURABLE_MELEE", "ALLOWS_BODY_BLOCK" ],
"flags": [ "DURABLE_MELEE", "ALLOWS_BODY_BLOCK", "NO_TURRET" ],
"weapon_category": [ "AUTOMATIC_PISTOLS", "SHIVS" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "32": 2 } } ],
"melee_damage": { "stab": 16 }
Expand Down
5 changes: 3 additions & 2 deletions data/json/items/gun/shot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@
[ "sights mount", 1 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "RELOAD_ONE" ],
"flags": [ "RELOAD_ONE", "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 6 } } ],
"melee_damage": { "bash": 8 }
},
Expand Down Expand Up @@ -819,6 +819,7 @@
[ "stock accessory", 2 ],
[ "underbarrel mount", 1 ]
],
"flags": [ "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 4 } } ]
},
{
Expand Down Expand Up @@ -877,7 +878,7 @@
"reload": 600,
"modes": [ [ "DEFAULT", "single", 1 ] ],
"valid_mod_locations": [ [ "sling", 1 ], [ "sights mount", 1 ], [ "underbarrel mount", 1 ] ],
"flags": [ "RELOAD_EJECT", "EASY_CLEAN" ],
"flags": [ "RELOAD_EJECT", "EASY_CLEAN", "NO_TURRET" ],
"pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 1 } } ],
"melee_damage": { "bash": 8 }
},
Expand Down
Loading