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 a larger size of sail, adjust recipes, show sails on top of vehicles #5368

Merged
merged 2 commits into from
Sep 17, 2024

Conversation

chaosvolt
Copy link
Member

Checklist

Required

Optional

Purpose of change

Fer plunderin'

Describe the solution

  1. Moved sails to the on_roof slot, as there is a sprite for them that now becomes visible when viewing the part from outside, and added a description to clarify these are smaller sails, and reduced time to install/repair. Speaking of...
  2. Defined a part for a larger set of sails with a higher baseline power.
  3. Defined the item form for large sails.
  4. Defined recipe, uses a wooden beam, rope, and in general more materials than normal sails.
  5. Misc: Added a single short rope to the requirements for small sails.

Describe alternatives you've considered

Adding a better sprite for sails, especially big ones. I'd have to test whether multi-tile sprites for vehicleparts works or not, a long time ago I tried testing that for tankmod and it had some weird layering issues.

Testing

  1. Checked affected files for syntax and lint errors.
  2. Load-tested in compiled test build.
  3. Temporarily added in a test vehicle uploaded below, a small sloop loaded with cannon.
  4. Confirmed it has enough power to sail around reliably, when installing small sails on it makes it spam "too heavy for engines" messages if you aren't catching enough with.
  5. Stepped off and confirmed I can see the sail. It's kinda smol though...

image

Test vehicle:
The Silly.json

Additional context

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

autofix-ci bot commented Sep 17, 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.

@Zireael07
Copy link
Contributor

Nb as the person who added the original sail recipe, it's supposed to be a simple square sail with two wooden beams, one at the top, the other at the bottom (I forget the exact English naming)

@chaosvolt
Copy link
Member Author

It's definitely a sail on the smaller end given the recipe, yeah. It uses no more than 4 planks rather than anything resembling a mast, for example.

@RoyalFox2140 RoyalFox2140 merged commit 077b084 into cataclysmbnteam:main Sep 17, 2024
9 checks passed
@chaosvolt chaosvolt deleted the set-sail-more-gooder branch September 17, 2024 20:26
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