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): adds a shark plush sleep aid #5559

Merged
merged 2 commits into from
Oct 11, 2024

Conversation

cutecacodemon
Copy link
Contributor

Required

Purpose of change

I noticed there was a severe lack of shark plushies in BN so I decided to add one myself

Describe the solution

I have added a shark plush item and several spawn pool locations for it, the sprite was graciously done by inthedark4557 who can be found on several social media platforms

Describe alternatives you've considered

no shark plush :(

Testing

I have tested spawn pool locations, made sure the sprite appears in game and has a sprite when wielded

Additional context

Credits to inthedark4557 for the sprite and robbie4179 for helping me fix issues with getting it in the game, this is my first ever pr and I have 2 days experience with coding so forgive me if there's any issues
Screenshot 2024-10-11 185017
Screenshot 2024-10-11 184912
Screenshot 2024-10-11 184838
Screenshot 2024-10-11 185327
image
shark_plush

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

autofix-ci bot commented Oct 11, 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.

@RoyalFox2140 RoyalFox2140 changed the title Feat(Content): adds a shark plush sleep aid feat(Content): adds a shark plush sleep aid Oct 11, 2024
@RoyalFox2140 RoyalFox2140 changed the title feat(Content): adds a shark plush sleep aid feat(content): adds a shark plush sleep aid Oct 11, 2024
Copy link
Collaborator

@RoyalFox2140 RoyalFox2140 left a comment

Choose a reason for hiding this comment

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

Seems okay. The authorship on the graphics being an artist that isn't on Github at all seems a bit hard to properly credit, but I'm willing to merge because credit seems to have been given in the way the artist requested.

Thoughts from @chaosvolt

Copy link
Member

@chaosvolt chaosvolt left a comment

Choose a reason for hiding this comment

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

Thoughts from @chaosvolt

blahaj-spin
I'll want to remember to merge the sprite into the normal sprite sheet instead of having a bespoke image containing only a single sprite, but we can wrangle that another day.

@chaosvolt chaosvolt merged commit bca5ab3 into cataclysmbnteam:main Oct 11, 2024
9 checks passed
@RoyalFox2140
Copy link
Collaborator

Thoughts from @chaosvolt

blahaj-spin blahaj-spin I'll want to remember to merge the sprite into the normal sprite sheet instead of having a bespoke image containing only a single sprite, but we can wrangle that another day.

New contributor woes

@cutecacodemon cutecacodemon deleted the shark_plush branch October 12, 2024 01:02
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants