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

refactor(mods/craftgp): add Luty's book and mainline recipes for the Luty SMGs #4050

Merged
merged 3 commits into from
Jan 7, 2024

Conversation

RobbieNeko
Copy link
Contributor

@RobbieNeko RobbieNeko commented Jan 3, 2024

Purpose of change

There aren't many craftable firearms in the vanilla game at the moment, and the entire point of the Luty submachine guns irl was to be able to be made from materials and using tools that you can easily obtain at a hardware store. Thus, this felt like a perfect match for adding some of these recipes in, especially considering how we already have the Luty submachine guns in the game in the first place.

Describe the solution

  1. Mainlines the recipes for the three variants of the Luty submachine gun
  2. Adds Luty's book "Expedient Homemade Firearms"
  3. Adds the recipes to the book at a level of 4, while keeping the autolearn intact.
  4. Adds the book to most of the same itemgroups as the pocket guide to firearms, but at a reduced odds.

Describe alternatives you've considered

  • Leave the recipes out of mainline and just leave them in the CGP
    I just don't see the point in having the Luty submachine guns in mainline if we don't have a way to craft them in mainline

  • Remove the autolearn from the recipes and just have it be booklearn
    We all know how infuriating it can be when you're locked out of a recipe by a rare book. Besides, a survivor would surely at least come up with a similar design after a certain amount of study on their own.

  • Just keep the guns as autolearn without adding the book
    Valid, just felt like tossing the booklearn in there as a nice bonus to people who find it.

Testing

Made sure it does not yell at me upon loading into a world or spawning the book or looking at the recipes. Did not confirm that the book actually spawns in the correct itemgroups, but that's because I could easily see it being infuriating to check for that. (Also, I feel any errors that would actually cause such an issue large enough that the game either would yell at me, or that it would be affecting many more items)

Additional context

Credit for the original SMG recipes found in the Craftable Gun Pack that are being mainlined goes to Noctifer-de-Mortem

image
image

Expedient Homemade Firearms does not currently have a unique sprite, and instead just looks like the pocket guide to firearms. This is because I'm too lazy to go in and make a good-looking sprite based on the actual book

I did not bother porting any of the other recipes in the Craftable Gun Pack because I was primarily focused on the Luty.

I am not entirely sure about the itemgroups I put the book in, but figured that putting it in most of the same groups as the pocket guide made enough sense.

Philip Luty's website is still up (despite him being dead of cancer), and actually has PDF versions of most of his books! It's fairly easily found by googling.

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Jan 3, 2024
Copy link
Contributor

autofix-ci bot commented Jan 3, 2024

The Autofix app has found code style violation and automatically formatted this Pull Request.

I locally edit my commits (e.g: git, github desktop)

Please choose following options:

I'd like to accept the automated commit
  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.

This PR is complete and I don't want to edit it anymore

It's safe to ignore this message.

I edit this PR through web UI

You can ignore this message and continue working.

I have no idea what this message is talking about

You can ignore this message and continue working. If you find any problem, please ask for help and ping @scarf005.

@scarf005
Copy link
Member

scarf005 commented Jan 6, 2024

Mainlines the recipes for the three variants of the Luty submachine gun

is this a port of an existing mod? if so, could we get the name and email of original author? this is needed to properly attribute original author.

@scarf005 scarf005 changed the title feat(content, balance): Mainline Craftable Gun Pack's recipes for the Luty submachine guns, add Luty's book feat(content,port): Mainline Craftable Gun Pack's recipes for the Luty submachine guns, add Luty's book Jan 6, 2024
@RobbieNeko
Copy link
Contributor Author

RobbieNeko commented Jan 6, 2024

Mainlines the recipes for the three variants of the Luty submachine gun

is this a port of an existing mod? if so, could we get the name and email of original author? this is needed to properly attribute original author.

This is mainlining the 3 SMG recipes found in the in-repo Craftable Gun Pack mod, yes. Noctifer-de-Mortem
is the person who originally added the recipes as far as I can tell.

e256d2c being the original addition, and 21d7072 being the follow-up that set Noct as maintainer of that mod and also changed the recipes to be what they are today

@github-actions github-actions bot added the mods PR changes related to mods. label Jan 7, 2024
@scarf005 scarf005 changed the title feat(content,port): Mainline Craftable Gun Pack's recipes for the Luty submachine guns, add Luty's book refactor(content): Mainline Craftable Gun Pack's recipes for the Luty submachine guns, add Luty's book Jan 7, 2024
@scarf005 scarf005 self-requested a review January 7, 2024 04:31
@scarf005 scarf005 self-assigned this Jan 7, 2024
RobbieNeko and others added 3 commits January 7, 2024 13:44
Co-authored-by: Zaweri <mrampuja@gmail.com>
Co-authored-by: Noctifer-de-Mortem <batchmarksman96@gmail.com>
@scarf005 scarf005 changed the title refactor(content): Mainline Craftable Gun Pack's recipes for the Luty submachine guns, add Luty's book refactor(mods/craftgp): add Luty's book and mainline Luty SMGs Jan 7, 2024
Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

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

image

local tests pass, LGTM.

@scarf005 scarf005 merged commit 21fd3d9 into cataclysmbnteam:main Jan 7, 2024
9 checks passed
@RobbieNeko RobbieNeko changed the title refactor(mods/craftgp): add Luty's book and mainline Luty SMGs refactor(mods/craftgp): add Luty's book and mainline recipes for the Luty SMGs Jan 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format. mods PR changes related to mods.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants