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

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

Merged
merged 10 commits into from
Jun 19, 2024

Conversation

Crystal9156
Copy link
Contributor

@Crystal9156 Crystal9156 commented Jun 19, 2024

Checklist

Required

Optional

Purpose of change

Describe the solution

Describe alternatives you've considered

Not making this PR.

Testing

Made the recipes, spawned all the parts ingame, made the Glock switch, added it to a gun, and fired it. There's a video up on Discord that shows it working.

Additional context

@github-actions github-actions bot added the data PRs related to datas. Won't crash game (probably) label Jun 19, 2024
Copy link
Contributor

autofix-ci bot commented Jun 19, 2024

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

@cdru123
Copy link

cdru123 commented Jun 19, 2024

The Glock 20 was recently added to the game, so make sure to include it as a valid tool and mod recipient

@Crystal9156
Copy link
Contributor Author

It was just added 5 minutes ago I'm crying.

@Crystal9156 Crystal9156 reopened this Jun 19, 2024
@Crystal9156
Copy link
Contributor Author

Updated to add the Glock 20

Copy link
Contributor

@Lamandus Lamandus left a comment

Choose a reason for hiding this comment

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

check if the other "auto switcher" for the AR guns is also in item groups (spawning somewhere) if so, add it into those lists alongside the AR one.

data/json/items/gunmod/mechanism.json Outdated Show resolved Hide resolved
@@ -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.

Crystal9156 and others added 2 commits June 19, 2024 16:25
Gets rid of a double space

Co-authored-by: Viss Valdyr <33199510+Lamandus@users.noreply.github.com>
Change gswitch to glockswitch
@Crystal9156
Copy link
Contributor Author

check if the other "auto switcher" for the AR guns is also in item groups (spawning somewhere) if so, add it into those lists alongside the AR one.

Lightning links and Autosears do not naturally spawn form what I see, I'll leave adding them and glock switches to the spawn pool for another PR if that's okay.

@chaosvolt
Copy link
Member

Lightning links and Autosears do not naturally spawn form what I see, I'll leave adding them and glock switches to the spawn pool for another PR if that's okay.

Definitely weird but not surprising that it doesn't spawn. I suppose I'll tinker with it in a followup in a bit then.

@chaosvolt chaosvolt merged commit 12a2c78 into cataclysmbnteam:main Jun 19, 2024
10 checks passed
@scarf005
Copy link
Member

I have committed my changes to new branch that isn't main so it won't cause conflict when updating main branch later.

could this be checked again? the PR is opened from main branch, which makes it harder to pull updates

@chaosvolt
Copy link
Member

No one actually pays attention to what the checklist says... XD

@scarf005
Copy link
Member

No one actually pays attention to what the checklist says... XD

it should be, in order to prevent nasty branch issues

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
data PRs related to datas. Won't crash game (probably)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants