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

[MSX] Butterly nets and robin eggs #2378

Merged
merged 11 commits into from
May 29, 2024
Merged

Conversation

Karol1223
Copy link
Contributor

@Karol1223 Karol1223 commented May 27, 2024

Summary

Content of the change

New sprites:

  • Butterfly net - item and wielded
  • Collapsible butterfly net - item and wielded
  • Collapsible butterfly net (extended) - item and wielded
  • American robin egg
  • Large rock - wielded

Edited sprites:

  • Rock - item and wielded
  • Flaking rock
  • Large rock - item
  • Sharp rock - item and wielded
  • Egg - barely edited, actually; just minor denoising and moving it onto a smaller canvas

Also moved the items using the old outdated sharp rock wielded sprite into a single JSON file and made them use the new one instead

Testing

Additional information

@Fris0uman
Copy link
Collaborator

Commenting here too for book keeping: I don't think we need to redo the rocks to unify the pallettes.

@Karol1223 Karol1223 marked this pull request as draft May 27, 2024 19:07
This reverts commit d355323.
This reverts commit 081a8e4.
This reverts commit f6aee10.
This reverts commit da7d4c5.
@Karol1223 Karol1223 changed the title [MSX] Rocks, butterly nets, and robin eggs [MSX] Butterly nets, and robin eggs May 28, 2024
@Karol1223 Karol1223 changed the title [MSX] Butterly nets, and robin eggs [MSX] Butterly nets and robin eggs May 28, 2024
@Karol1223 Karol1223 marked this pull request as ready for review May 28, 2024 08:08
@Fris0uman Fris0uman merged commit db9991d into I-am-Erk:master May 29, 2024
2 checks passed
@Karol1223 Karol1223 deleted the item-time branch May 30, 2024 09:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants