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

Fix revives; improve dungeon exit flow #2409

Merged
merged 1 commit into from
Oct 26, 2023

Conversation

longfruit
Copy link
Contributor

Description

Fix "Internal Server Error" when reviving dead avatars.

  • On scene transition, new EntityAvatar instances are created. Ensure dead avatars stay dead here by looking in fight prop cur HP.
  • Avoid switching to dead avatars when leaving dungeons. On team wipe, revive and switch to the first avatar.
  • Ignore AbilityMetaSetKilledState for EntityAvatar. Pretty sure this is not supposed to immediately reset dead avatars to full HP, because it will bug revivals.

Allow quitting from tower on team wipe.

Fix player becoming stranded in dungeons by teleporting away.

  • DungeonSystem.exitDungeon normally teleports player out on exit. But when player quits a dungeon by teleporting on map, this causes double teleports:
    1. Teleport by DungeonSystem.exitDungeon
    2. Teleport by map waypoint
  • This causes the player to get stranded. Fix it by having DungeonSystem.exitDungeon delay its teleport by 200ms. If map teleport happens, the delayed teleport is canceled.

Some befores/afters:

Before After
Team wipe gif gif
Teleporting from dungeon gif gif
Revive gif gif

Issues fixed by this PR

Type of changes

  • Bug fix
  • New feature
  • Enhancement
  • Documentation

Checklist:

  • My code follows the style guidelines of this project
  • My pull request is unique and no other pull requests have been opened for these changes
  • I have read the Contributing note and Code of conduct
  • I am responsible for any copyright issues with my code if it occurs in the future.

@KingRainbow44
Copy link
Member

DOING GODS WORK RIGHT HERE
thanks for the GIFs too

@KingRainbow44 KingRainbow44 merged commit f86259a into Grasscutters:development Oct 26, 2023
2 checks passed
@longfruit longfruit deleted the fix-revives branch November 2, 2023 23:40
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.

None yet

2 participants