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

Jump to bottom

feat(content): Add Glock Auto-Sear(switch) #4831

Merged
merged 10 commits into from
Jun 19, 2024
Merged

feat(content): Add Glock Auto-Sear(switch) #4831

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5a318d1
Add Glock Switch to mechanisms.json
Crystal9156 Jun 19, 2024
e6ab93c
Adds Glock Link
Crystal9156 Jun 19, 2024
6d405a8
Merge branch 'main' of https://github.com/Crystal9156/Cataclysm-BN-Gl…
Crystal9156 Jun 19, 2024
5a3e838
Update mechanism.json
Crystal9156 Jun 19, 2024
273044f
style(autofix.ci): automated formatting
autofix-ci[bot] Jun 19, 2024
8107ede
Updates Glock Auto-Sear
Crystal9156 Jun 19, 2024
ebfb1ed
style(autofix.ci): automated formatting
autofix-ci[bot] Jun 19, 2024
a4080cf
Update data/json/items/gunmod/mechanism.json
Crystal9156 Jun 19, 2024
b538935
gswitch to glockswitch
Crystal9156 Jun 19, 2024
38e6a78
Update data/json/items/gunmod/mechanism.json
chaosvolt Jun 19, 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
21 changes: 21 additions & 0 deletions data/json/items/gunmod/mechanism.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,27 @@
"mode_modifier": [ [ "DEFAULT", "auto", 6 ] ],
"flags": [ "INSTALL_DIFFICULT" ]
},
{
"id": "gswitch",
Copy link
Contributor

Choose a reason for hiding this comment

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

maybe change it to glockswitch? Maybe we have a samey thing later also with the letter G.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah I'll do this in case I make more switches/sears in the future and they don't all start with a single letter.

chaosvolt marked this conversation as resolved.
Show resolved Hide resolved
"type": "GUNMOD",
"name": { "str": "glock switch" },
"description": "Patented in 1998 the Glock auto-sear or switch as it is called was illegal due to being able to turn Glock firearms full auto by applying force to a Glock's trigger bar. The switch allows for selective fire modes, a single shot or when flipped, a six round full auto fire.",

Check failure on line 77 in data/json/items/gunmod/mechanism.json

View workflow job for this annotation

GitHub Actions / GCC 12, Ubuntu, Curses 

([slow] ~starting_items)=> insufficient spaces at this location.  2 required, but only 1 found.

Check failure on line 77 in data/json/items/gunmod/mechanism.json

View workflow job for this annotation

GitHub Actions / GCC 12, Ubuntu, Curses 

(~[slow] ~[.],starting_items)=> insufficient spaces at this location.  2 required, but only 1 found.

Check failure on line 77 in data/json/items/gunmod/mechanism.json

View workflow job for this annotation

GitHub Actions / GCC 12, Ubuntu, Tiles, Sound, Lua, CMake, Languages 

(~[slow] ~[.],starting_items)=> insufficient spaces at this location.  2 required, but only 1 found.

Check failure on line 77 in data/json/items/gunmod/mechanism.json

View workflow job for this annotation

GitHub Actions / GCC 12, Ubuntu, Tiles, Sound, Lua, CMake, Languages 

([slow] ~starting_items)=> insufficient spaces at this location.  2 required, but only 1 found.
Crystal9156 marked this conversation as resolved.
Show resolved Hide resolved
"weight": "20 g",
"volume": "100 ml",
"integral_volume": "0 ml",
"price": "100 USD",
"price_postapoc": "2 USD",
"material": [ "steel" ],
"symbol": ":",
"color": "red",
"location": "mechanism",
"mod_targets": [ "glock_17", "glock_19", "glock_20", "glock_21", "glock_22", "glock_31" ],
"install_time": "10 m",
"min_skills": [ [ "weapon", 5 ] ],
"dispersion_modifier": 65,
"mode_modifier": [ [ "semi-auto", "auto", 6 ] ],
"flags": [ "INSTALL_DIFFICULT" ]
},
{
"id": "waterproof_gunmod",
"type": "GUNMOD",
Expand Down
25 changes: 25 additions & 0 deletions data/json/recipes/weapon/mods.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,31 @@
"tools": [ [ [ "ar15", -1 ] ], [ [ "small_repairkit", 40 ], [ "large_repairkit", 40 ] ] ],
"components": [ [ [ "sheet_metal_small", 2 ] ] ]
},
{
"type": "recipe",
"result": "gswitch",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_MODS",
"skill_used": "fabrication",
"skills_required": [ [ "pistol", 3 ] ],
"difficulty": 4,
"time": "1 h",
"//": "Slightly hard to make but worth it if you want to turn your glock full auto.",
"book_learn": [ [ "textbook_anarch", 3 ] ],
"qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
"tools": [
[
[ "glock_17", -1 ],
[ "glock_19", -1 ],
[ "glock_20", -1 ],
[ "glock_21", -1 ],
[ "glock_22", -1 ],
[ "glock_31", -1 ]
],
[ [ "small_repairkit", 40 ], [ "large_repairkit", 40 ] ]
],
"components": [ [ [ "sheet_metal_small", 2 ] ] ]
},
{
"type": "recipe",
"result": "bow_sight",
Expand Down
Loading