Enhancement: MM-Style Static Explosion Radius #2322
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aMannus
requested changes
Jan 1, 2023
Comment on lines
180
to
181
| this->explosionCollider.elements[0].dim.worldSphere.radius += this->actor.shape.rot.z + 8; | ||
| if (CVar_GetS32("gStaticExplosionRadius", 1)) { | ||
| this->explosionCollider.elements[0].dim.worldSphere.radius = 40; |
There was a problem hiding this comment.
The second number in CVar_GetS32 means it would default to being on which I don't really agree with, I'd change it to 0.
There was a problem hiding this comment.
Agreed, that was a typo on my part
aMannus
approved these changes
Jan 1, 2023
dcvz
approved these changes
Jan 2, 2023
briaguya-ai
force-pushed
the
develop
branch
2 times, most recently
from
05bd4a3
to
ba13e6b
Compare
briaguya-ai
added
the
merge conflicts
|
@splemb can you please revert the libultraship update. Generally unless you changed something in libultraship and are needing to pull in a new commit, you should not commit the submodule change. If you are seeing libultraship is "changed" on your local changes, then you might need to run |
This reverts commit d0e2435.
aMannus
removed
the
merge conflicts
briaguya-ai
approved these changes
Jan 21, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In OoT, bomb explosions increase in size before despawning. In MM and OoT3D, this behaviour was changed so that bomb explosions have a fixed size, about halfway between the minimum and maximum sizes of OoT. This has the side effect of making bomb and bombchu hovering much easier to perform.
This PR adds a checkbox in Enhancements/Items to toggle between the original and modified explosion behaviour.
Comparision Of Explosion Collider Size With and Without Enhancement:
https://cdn.discordapp.com/attachments/818494239847088170/1059224147093360740/staticExplosions.mp4
Build Artifacts