StaticFlags: Implement CANNOT_DAZE #540
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
killerwife
reviewed
Oct 6, 2024
src/game/Entities/Unit.cpp
Outdated
| @@ -3271,7 +3271,7 @@ bool Unit::CanGlance() const | |||
| bool Unit::CanDaze() const | |||
| { | |||
| // Generally, only npcs are able to daze targets in melee | |||
| return (GetTypeId() == TYPEID_UNIT && !HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED)); | |||
| return (GetTypeId() == TYPEID_UNIT && !HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED) && !static_cast<const Creature*>(this)->GetSettings().HasFlag(CreatureStaticFlags4::CANNOT_DAZE)); | |||
There was a problem hiding this comment.
Make the function virtual, return false by default, override it in creature and there do isplayercontrolled and the other check (at this point we know how daze works so encapsulation wont hinder anything and will be nicer)
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.
🍰 Pullrequest
This PR implements CreatureStaticFlags4::CANNOT_DAZE