Fix roll formula not being displayed in roll tags #499
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
wyrmisis
reviewed
Feb 8, 2024
wyrmisis
approved these changes
Feb 14, 2024
wyrmisis
reviewed
Feb 16, 2024
apewall
force-pushed
the
roll-formula-tags
branch
from
17fb6c7 to
7f0cb6d
Compare
anthonyronda
approved these changes
Mar 29, 2024
There was a problem hiding this comment.
LGTM
I noted that there might be a merge conflict while trying to merge after #497, which I can take care of
src/module/item/entity.js
Outdated
| @@ -188,9 +188,8 @@ export default class OseItem extends Item { | |||
|
|
|||
| _getRollTag(data) { | |||
| if (data.roll) { | |||
| const roll = `${data.roll}${ | |||
| data.rollTarget ? CONFIG.OSE.roll_type[data.rollType] : "" | |||
| }${data.rollTarget ? data.rollTarget : ""}`; | |||
There was a problem hiding this comment.
Same as in #497 (not a problem)
Sounds good, these ended up related and I forgot to update the formatting on this. 👍 |
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.
This updates the roll tags on abilities and spells so roll formulas can be displayed in the footer cards properly if they include @attributes.
Regarding #488. Duration and Range could likely be calculated similarly but they would probably need to return totals instead and involve adding additional data for turns/rounds/ft etc.
Before when using a 2nd level character:
After:
