-
-
Notifications
You must be signed in to change notification settings - Fork 683
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
Martial Arts combo meter & fixes #12179
Open
Tsar-Salat
wants to merge
13
commits into
BeeStation:master
Choose a base branch
from
Tsar-Salat:martial-artspain
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
+945
−669
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
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
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.
About The Pull Request
This ports the combat meter from TG, as well as a few fixes to martial arts in general.
Also, all living mobs now have a healthbar/hud settings, because it was breaking for them.
Ports:
Why It's Good For The Game
Its really annoying keeping track of what combos you did. This should make it significantly easier.
I atomized this out of combat mode because it was bloating that PR a lot. I think this PR is needed if we want to move forward with combat mode.
Testing Photographs and Procedure
Screenshots&Videos
dreamseeker_J7puoJSPSZ.mp4
Carp vignette and healthbar
Ian healthbar
Changelog
🆑 rkz, haukeschuemann, tralezab, Jack LeCroy, Ghommie,
add: adds combo meter for martial arts
add: all mobs now have a healthbar
add: buffs plasmafist
tweak: combos will now reset after 6 seconds. No more 10 minute pauses between combos
fix: martial arts no longer expect only human attackers and victims
/:cl: