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

Tweak - Rando freestanding/skulltula ice trap behaviour #2230

Merged

Conversation

aMannus
Copy link
Contributor

@aMannus aMannus commented Dec 21, 2022

Introduces an actor freeze before the ice trap is triggered when a skulltula or freestanding ice trap is obtained.

For skulltulas, the ice trap only triggers after the textbox has been closed. Sadly, the function for freestanding items isn't called the same way as the skulltulas (it's only called once), so that one instead has a fixed freeze timer of 30.

Old skulltula behaviour:
https://user-images.githubusercontent.com/4244591/208966904-44a57e91-0e9e-43fa-929b-6a17fc89ede5.mp4

New skulltula behaviour:
https://user-images.githubusercontent.com/4244591/208966966-d628a6ea-26e5-4870-b9ed-2a92ced143ab.mp4

Old freestanding behaviour:
https://user-images.githubusercontent.com/4244591/208967023-c2a4f30d-a83b-4f41-ab65-44e12f55bc11.mp4

New freestanding behaviour:
https://user-images.githubusercontent.com/4244591/208967074-1c5f3706-60c6-4fa0-bbeb-e2b32fa4ed6c.mp4

Build Artifacts

@briaguya-ai briaguya-ai added the merge conflicts PR has conflicts that need to be resolved before it can be merged label Jan 19, 2023
@briaguya-ai
Copy link
Contributor

even github thinks this one has merge conflicts! (just need to update the cvar methods)

overall this one is super exciting, let's resolve those conflicts and :shipit:

@aMannus aMannus added merge ready and removed merge conflicts PR has conflicts that need to be resolved before it can be merged labels Jan 20, 2023
@briaguya-ai briaguya-ai merged commit 1b9ab52 into HarbourMasters:develop Jan 21, 2023
@aMannus aMannus deleted the freestanding-ice-traps-freeze branch January 23, 2023 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants