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

Don't display scrolling combat text if the token is secret #3728

Merged
merged 1 commit into from
Jun 11, 2024

Conversation

dev7355608
Copy link
Contributor

@dev7355608 dev7355608 commented Jun 11, 2024

@dev7355608 dev7355608 self-assigned this Jun 11, 2024
@@ -3341,7 +3341,7 @@ export default class Actor5e extends SystemDocumentMixin(Actor) {
const fill = CONFIG.DND5E.tokenHPColors[key];

for ( const token of tokens ) {
if ( !token.object?.visible || !token.object?.renderable ) continue;
if ( !token.object?.visible || token.isSecret ) continue;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TokenDocument#isSecret will be an addition with V12 Stable 4. Considering it is undefined in prior versions, we don't really need a version check here, I think.

@@ -3341,7 +3341,7 @@ export default class Actor5e extends SystemDocumentMixin(Actor) {
const fill = CONFIG.DND5E.tokenHPColors[key];

for ( const token of tokens ) {
if ( !token.object?.visible || !token.object?.renderable ) continue;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We removed renderable in core ActiveEffect#_displayScrollingStatus with V12 Stable 4. Removing renderable makes the combat scrolling text appear when the token config is open, which wasn't the case previously.

@dev7355608 dev7355608 requested a review from Fyorl June 11, 2024 17:48
@Fyorl Fyorl modified the milestone: D&D5E 3.2.1 Jun 11, 2024
@Fyorl Fyorl merged commit be6c3a8 into 3.2.x Jun 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants