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,port): add SEAT_REQUIRES_BALANCE and skateboard vehicle/profession #5849

Open
wants to merge 14 commits into
base: main
Choose a base branch
from

Conversation

shmakota
Copy link
Contributor

@shmakota shmakota commented Dec 28, 2024

Checklist

Required

Optional

  • This PR ports commits from DDA or other cataclysm forks.
    • I have attributed original authors in the commit messages adding Co-Authored-By in the commit message.
    • I have linked the URL of original PR(s) in the description.
  • This is a C++ PR that modifies JSON loading or behavior. (Does adding a flag count?)
    • I have documented the changes in the appropriate location in the doc/ folder.

Purpose of change

This is a port of the following:
CleverRaven/Cataclysm-DDA#66596
CleverRaven/Cataclysm-DDA#66813
CleverRaven/Cataclysm-DDA#67123
CleverRaven/Cataclysm-DDA#58723

Describe the solution

This PR combines the four mentioned PR's into one for organization purposes, since the latter three are smaller PR's that are based off or related to the first one anyways. The following changes are made:

  • Skateboards added as a vehicle, and spawns in the world where rollerblades and rollerskates do (and where it makes sense).
  • Skater profession has now been split between two separate professions: Rollerblades and Skateboard version.
  • Skateboards can be disassembled with the proper tools. Recipes for the deck and stuff are added as well.
  • Skateparks have been overhauled to look better, and added new tiles for it as well representative of halfpipes/ramps.

Describe alternatives you've considered

Testing

  • Spawned a skateboard. Placed it down, rode it around, picked it up. Ran into wall at 8mph without skater or deft trait and player falls off consistently. Ran into a wall at 12mph with both traits and player very rarely fell off.
  • Spawned items to craft a skateboard. Crafted it from scratch materials in debug.
  • Tested skater profession, functions as expected, however the skateboard falls to the ground because the player does not have enough carrying space. This was fixed with an auto-equip flag.
  • Spawned the new skatepark a bunch, and saw items are spawning correctly and the skatepark location looks as expected.
  • Created a world with city size set to max, observed that the skate park still spawns correctly.

Additional context

The new items/tiles need sprites. Most important ones are probably skateboard and the ramp.
image
image
image

image

@github-actions github-actions bot added docs PRs releated to docs page src changes related to source code. JSON related to game datas in JSON format. labels Dec 28, 2024
Copy link
Contributor

autofix-ci bot commented Dec 28, 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.

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. src changes related to source code.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant