Add more RevealDisguiseOn types and unhardcode some events #13639
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
GraionDilach
approved these changes
Jul 15, 2017
Mailaender
requested changes
Aug 31, 2017
| if (cloak != null && cloak.Info.UncloakOn.HasFlag(UncloakType.Infiltrate)) | ||
| cloak.Uncloak(); | ||
| foreach (var ini in notifiers) | ||
| ini.Infiltrating(self); | ||
|
|
||
| foreach (var t in target.TraitsImplementing<INotifyInfiltrated>()) |
There was a problem hiding this comment.
There is already a very similar interface so I suggest to either use that one or move the Infiltrating check before OnInside is triggered.
There was a problem hiding this comment.
This is using the traits of the target, while we want the traits of self. Moving could work, but are you sure that we don't regress anything else then? (The uncloaking also happened after checking if the infiltration is valid.)
abcdefg30
force-pushed
the
disguiseTypes
branch
from
96b6eff
to
fa4548d
Compare
|
Rebased. |
Mailaender
approved these changes
Sep 12, 2017
| if (cloak != null && cloak.Info.UncloakOn.HasFlag(UncloakType.Infiltrate)) | ||
| cloak.Uncloak(); | ||
| foreach (var ini in notifiers) | ||
| ini.Infiltrating(self); | ||
|
|
||
| foreach (var t in target.TraitsImplementing<INotifyInfiltrated>()) |
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.
Events means things like
Infiltration,DemolitionandUnloading. That was hardcoded to only uncloak units before, but now calls an interface which can be easily implemented by custom traits.