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(port): move vehicles in elevator #3151

Merged
merged 8 commits into from
Sep 17, 2023

Conversation

scarf005
Copy link
Member

@scarf005 scarf005 commented Sep 15, 2023

Summary

SUMMARY: Features "Allow elevators to transport vehicles, and choose arbitrary floor"

Purpose of change

the (not) long awaited sequel of #1531.
looting labs with shopping carts would be very convenient.

Describe the solution

port CleverRaven/Cataclysm-DDA#58840 by @andrei8l

Describe alternatives you've considered

port more overmap/submap PRs first?

Testing

vehicles are moved together (with their directions kept)

2023-09-16_20-13-28.mp4

creatures/npc are shoved away

2023-09-16_20-45-54.mp4

vehicles can block the elevator from working
image

vehicles at destination floor is also checked to prevent amalgamation

2023-09-16_21-20-52.mp4

Additional notes

might have to port these as well

@github-actions github-actions bot added the src changes related to source code. label Sep 15, 2023
@scarf005 scarf005 force-pushed the move-vehicle-in-elevator branch 2 times, most recently from 7d705cc to 54e6a10 Compare September 16, 2023 11:46
@scarf005 scarf005 marked this pull request as ready for review September 16, 2023 11:46
@scarf005 scarf005 force-pushed the move-vehicle-in-elevator branch from 185e686 to 3bcfc72 Compare September 16, 2023 11:48
@scarf005 scarf005 force-pushed the move-vehicle-in-elevator branch from 7f97c05 to 51a12e2 Compare September 16, 2023 11:53
src/iexamine_elevator.cpp Outdated Show resolved Hide resolved
scarf005 and others added 2 commits September 16, 2023 21:03
prevent exciting magic numbers from happening

Co-authored-by: andrei <[email protected]>
prevents exciting amalgamations from happening
@scarf005 scarf005 force-pushed the move-vehicle-in-elevator branch from d4ca2e2 to 4b5bff5 Compare September 16, 2023 12:31
make MSYS2 happy
@scarf005 scarf005 force-pushed the move-vehicle-in-elevator branch from eb0cef3 to f1780ca Compare September 16, 2023 23:37
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.

  1. Compiled and load-tested.
  2. Located a minilab and spawned in a shopping cart, filled it with some loot.
  3. Moving up and down the elevator takes the cart with me as expected. Contents stay in the cart and don't seem to change. If I was dragging the cart, I silently let go of it but no errors occur.
  4. Spawned in and recruited a companion NPC, loaded us into a sidecar motorocycle on the elevator.
  5. We stay in our seats when I shift our elevation, engine stays on and doesn't do anything weird.
  6. Backing the bike partway out of the elevator and hitting the switch cancels the elevator instead of cutting the vehicle in half, metal as fuck though that would've been.

@chaosvolt chaosvolt merged commit 4e48081 into cataclysmbnteam:upload Sep 17, 2023
16 checks passed
@scarf005 scarf005 deleted the move-vehicle-in-elevator branch September 17, 2023 01:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
src changes related to source code.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants