Skip to content

Commit

Permalink
122 bug flags from midiqol not shown in tooltips and calcs (#123)
Browse files Browse the repository at this point in the history
* Allow flags shown on tooltips and calcs

Remove check for `settings.keypressOverrides` from adding any flags altering the rolls (MidiQOL relevant)
  • Loading branch information
thatlonelybugbear authored Apr 22, 2024
1 parent fa79cac commit 0302643
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
3 changes: 3 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## v11.315312.6
* Closes [#122](https://github.com/thatlonelybugbear/automated-conditions-5e/issues/122) - reinstates compatibility with MidiQOL flags altering rolls (and shows a generic MidiQOL (flags)) in the tooltip.

## v11.315312.5
* Update pt-BR.json by @Kharmans in [#111](https://github.com/thatlonelybugbear/automated-conditions-5e/pull/111) and [#116](https://github.com/thatlonelybugbear/automated-conditions-5e/pull/116)
* Closes [#110](https://github.com/thatlonelybugbear/automated-conditions-5e/issues/110) - nearbyFoe calcs no matter options for target enforcement by @thatlonelybugbear in [#113](https://github.com/thatlonelybugbear/automated-conditions-5e/pull/113)
Expand Down
4 changes: 2 additions & 2 deletions module.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "automated-conditions-5e",
"title": "Automated Conditions 5e",
"description": "A small module for Foundry VTT that tries to automate some rolling aspects of the common 5e Conditions.",
"version": "11.315312.5",
"version": "11.315312.6",
"authors": [
{
"name": "thatlonelybugbear",
Expand Down Expand Up @@ -52,6 +52,6 @@
"url": "https://github.com/thatlonelybugbear/automated-conditions-5e",
"license": "https://raw.githubusercontent.com/thatlonelybugbear/automated-conditions-5e/main/LICENSE",
"manifest": "https://github.com/thatlonelybugbear/automated-conditions-5e/releases/latest/download/module.json",
"download": "https://github.com/thatlonelybugbear/automated-conditions-5e/releases/download/v11.315312.5/module.zip",
"download": "https://github.com/thatlonelybugbear/automated-conditions-5e/releases/download/v11.315312.6/module.zip",
"changelog": "https://raw.githubusercontent.com/thatlonelybugbear/automated-conditions-5e/main/Changelog.md"
}
6 changes: 3 additions & 3 deletions scripts/ac5e-helpers.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -411,11 +411,11 @@ export function _getConfig(config, hookType, tokenId, targetId) {
if (disKey) disadvantage = [`${moduleID} (keyPress)`];
if (critKey && ['damage', 'itemDamage'].includes(hookType))
critical = [`${moduleID} (keyPress)`];
if (config.advantage && !settings.keypressOverrides)
if (config.advantage /*&& !settings.keypressOverrides*/) //to-do: why was that here in the first place? Changed when added multi rollers compat?
advantage = advantage.concat(`${moduleID} (flags)`);
if (config.disadvantage && !settings.keypressOverrides)
if (config.disadvantage /*&& !settings.keypressOverrides*/)
disadvantage = disadvantage.concat(`${moduleID} (flags)`);
if (config.critical === true && !settings.keypressOverrides)
if (config.critical === true /*&& !settings.keypressOverrides*/)
critical = critical.concat(`${moduleID} (flags)`);
if (settings.debug) {
console.warn(
Expand Down

0 comments on commit 0302643

Please sign in to comment.