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): th' ol' Jolly Roger #5375

Merged
merged 3 commits into from
Sep 19, 2024

Conversation

chaosvolt
Copy link
Member

Checklist

Required

Optional

Purpose of change

Fer th' fun o' it, now that th' witchin' hour has passed.

Translation: A flavor addition I've been planning the past 2-3 days, since right now it's past midnight on my end and thus technically now Talk Like A Pirate Day.

Describe the solution

  1. Rigged up the Jolly Roger itself, for ye t' find when yer goin' on account.
  2. Buried like th' treasure it is in dresser, home_display_case, museum_misc, lab_dorm, pawn, 'n costume_accessories.
  3. Fer good measure, let th' landlubbin' brigands 'n signalmen roll th' bones an' sometimes fly ol' Roger too.
  4. Let me hearties jury rig th' Roger yerself if ye please.
  5. Cobbled up th' flagstaff 'n rigged it so ye can hoist th' black flag.
  6. Got 'er looks all shipshape.
Translation:
  1. Added a Jolly Roger flag as an item to find or craft.
  2. Added to itemgroups dresser, home_display_case, museum_misc, lab_dorm, pawn, and costume_accessories.
  3. Gave bandit locations and radio towers a small chance of having a flagpole (wood and metal respectively) with pirate flag, the latter for a "pirate radio" joke.
  4. Added recipe, as is standard with the American flag and with pride mod flags. Unrelated: bit odd that you can draw sharpie marks over some cloth and make a US flag that's good enough to fool the NPC who asks you for one, at zero fabrication skill.
  5. Added furniture for a flagpole with jolly roger, and added the option to hoist it to construction menu.
  6. Added UDP external tileset sprites.

Describe alternatives you've considered

  1. Maroonin' it o'er in th' mod o' extra ensigns, but that'd be a wee bit o' folly.
  2. Writin' up this missive for the' lads in th' King's English.
Translation:
  1. Putting it in pride mod flag instead of vanilla, but that seems a bit silly since "pirate" isn't really a pride movement of any sort, and the mod's not really meant for flavor flag items of all sorts, just specific ones.
  2. Not writing this PR text in pirate-speak so I don't have to put translation notes here.

Testing

  1. Inspected t' write up proof everythin's all shipshape 'n seaworthy.
  2. Weighed anchor 'n hoisted the colors. Just as much a beaut as I recalled ol' Roger bein'.
Translation:
  1. Checked affected files for syntax and lint errors.
  2. Load-tested in compiled test build, confirmed added sprites look as expected.

image

Additional context

image

@github-actions github-actions bot added the JSON related to game datas in JSON format. label Sep 19, 2024
@github-actions github-actions bot added the docs PRs releated to docs page label Sep 19, 2024
Copy link
Contributor

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

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.

@RoyalFox2140 RoyalFox2140 merged commit e92c891 into cataclysmbnteam:main Sep 19, 2024
9 checks passed
@chaosvolt chaosvolt deleted the yarr-harr-fiddle-de-de branch September 19, 2024 07:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs PRs releated to docs page JSON related to game datas in JSON format.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants