Skip to content

feat: Jellyfish v2#898

Merged
zicklag merged 12 commits intofishfolk:mainfrom
nelson137:jellyfish-v2
Jan 12, 2024
Merged

feat: Jellyfish v2#898
zicklag merged 12 commits intofishfolk:mainfrom
nelson137:jellyfish-v2

Conversation

@nelson137
Copy link
Contributor

@nelson137 nelson137 commented Jan 10, 2024

Take 2 🎬 this is the second iteration of the Jellyfish item, based on Duck Game's RC Controller.

More tweaks may come in follow-up PRs

Notable Changes from v1

  • The camera follows any entity with the new CameraSubject component
    • Entity must also have a Transform and KinematicBody to work properly
  • The flappy jellyfish collides with solids
    • The flappy is now much more jerky and overly responsive to user input, I may add acceleration to the left/right movement so that it floats around more to give it a more natural feel
  • Control the jellyfish like Duck Game's RC Controller
  • The flappy is tied to the jellyfish hat, not the player
    • If the driver dies/drops the jellyfish the flappy doesn't explode, another player can pick it up and take control
  • Despawn & dehydrate the jellyfish item when the flappy explodes

ToDo

  • Try to get the jellyfish on the player's head (will handle in another PR for cosmetic changes)

@nelson137 nelson137 changed the title Jellyfish v2 feat: Jellyfish v2 Jan 10, 2024
@nelson137 nelson137 marked this pull request as ready for review January 11, 2024 16:55
@zicklag
Copy link
Member

zicklag commented Jan 11, 2024

FYI I merged your other PR so you'll need to rebase.

Also, when testing this, it seems that you can't control the jellyfish anymore. The jellyfish spawns when you activate the item, but the player is still moving normally.

@nelson137
Copy link
Contributor Author

@zicklag are you holding down the use/fire button? When you let go you lose control.

@zicklag
Copy link
Member

zicklag commented Jan 12, 2024

Ohhhh, I haven't red the wiki page yet. That's actually really cool. And you got collisions working well, it even interacts with sproingers which is fun. :)

In that case, all we need is the rebase.

@nelson137
Copy link
Contributor Author

Earlier I discovered that if you stop driving while the jellyfish is on a spoinger it goes flying up in the air.... I'll need to fix that, I think it's not clamping the y velocity when no one's driving

@nelson137
Copy link
Contributor Author

That's fixed, let me know if you find anything else off!

@zicklag
Copy link
Member

zicklag commented Jan 12, 2024

I think it's good enough to merge!

@zicklag zicklag added this pull request to the merge queue Jan 12, 2024
Merged via the queue into fishfolk:main with commit 7a6c0fb Jan 12, 2024
@nelson137 nelson137 deleted the jellyfish-v2 branch January 12, 2024 03:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants