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.

Sign up for GitHub

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

Jump to bottom

feat(content,port): add SEAT_REQUIRES_BALANCE and skateboard vehicle/profession #5849

Merged
merged 14 commits into from
Jan 3, 2025
Merged

feat(content,port): add SEAT_REQUIRES_BALANCE and skateboard vehicle/profession #5849

merged 14 commits into from
Jan 3, 2025

Conversation

shmakota
Copy link
Contributor

@shmakota shmakota commented Dec 28, 2024 •
edited
Loading

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

shmakota and others added 12 commits December 25, 2024 04:47
@shmakota
basic port of DDA skateboard
599627a 
adds seat_requires_balance tag which allows falling off of vehicle seats with this flag. initial json changes, still needs a few more things ported
@shmakota
add spawn location of skateboard vehicle. added items for vehicle par…
faa0675 
…ts, and fixed engine "power" to be more reasonable
@shmakota
add skateboard item, separate skater professions CDDA66813, and fix f…
1acffc7 
…or part install/uninstall CDDA67123
@shmakota
fixed error
0cf07e9
@shmakota
fixes so build works
8e90fe6
@shmakota
fold_up changes (changed wheelchair name as well), add skater profess…
4cd2840 
…ion, item, and fix misc json
@shmakota
fixed character.cpp and added skateboard to mapgen and npc item lists
9daac5b
@shmakota @balinck
@KittyTac @casswedson
add parking garage spawn and increase skate park spawns. adds co-auth…
ae71528 
…ors. run json linter

Co-Authored-By: Bruce Linck <balinck@gmail.com>
Co-Authored-By: KittyTac <52408044+KittyTac@users.noreply.github.com>
Co-Authored-By: casswedson <casswedson@users.noreply.github.com>
@shmakota
recipes for skateboard crafting, more spawn locations near roller_blades
7704648
@shmakota
vehicle_use can_be_folded checks and profession parity between skaters
f3110d8
@shmakota
add documentation to json_flags for SEAT_REQUIRES_BALANCE
ad6c6ff
@shmakota @LovamKicsiGazsii
add skatepark, fix items falling from skater inventory
2a2fa9a 
Co-Authored-By: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com>
@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
@autofix-ci autofix.ci
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.

chaosvolt
chaosvolt approved these changes Jan 3, 2025
View reviewed changes
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.

Compile-tested and all seems to work, only oddity I'm running into is:
image

Auto-wield isn't working with the skateboard for some reason? It spawns you in with it dropped onto the floor, picking it up to wield it after entering gameplay works fine so I dunno why it's doing that.

@chaosvolt
Copy link
Member

Oh wait, I just saw my githib desktop seemed to have been giving me an outdated version of this branch, possibly as I likely checked it out earlier. Will retest.

chaosvolt
chaosvolt approved these changes Jan 3, 2025
View reviewed changes
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.

Yep, that fixes it.

t84djvcnc6w51

@chaosvolt chaosvolt merged commit 3592b65 into cataclysmbnteam:main Jan 3, 2025
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chaosvolt chaosvolt chaosvolt approved these changes

Assignees
No one assigned
Labels
docs PRs releated to docs page JSON related to game datas in JSON format. src changes related to source code.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@shmakota @chaosvolt