From 85d9b1f1dc2d6289d6a3c3e89e7e5ec632f9b4cc Mon Sep 17 00:00:00 2001 From: Paul Maskelyne Date: Sun, 23 Jun 2024 21:49:18 +0100 Subject: [PATCH] closes #114 --- CHANGELOG.md | 12 +++++++++++- system/src/roller/Roller2D20.mjs | 2 ++ system/system.json | 2 +- system/templates/chat/rollD6.hbs | 6 +++++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17bab09..d44817e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,19 @@ +## v11.6.2 + +### Bugfix +- [#114] Spell cost roll not displaying result in chat + +### Chores +- [#113] Merge new Polish translation updates from Crowdin + +--- + ## v11.6.1 ### Enhancement - [#109] Add support for the Polish language -### Bugfix +### Bugfixq - [#110] Adding Truth to NPC or Vehicle record in a Compendium Throws error ### Chores diff --git a/system/src/roller/Roller2D20.mjs b/system/src/roller/Roller2D20.mjs index f777b72..5dd9cd7 100644 --- a/system/src/roller/Roller2D20.mjs +++ b/system/src/roller/Roller2D20.mjs @@ -342,6 +342,7 @@ export default class Roller2D20 { ).effect; let item; + let itemEffects; if (itemId && actorId) { item = game.actors.get(actorId)?.items.get(itemId) ?? null; @@ -351,6 +352,7 @@ export default class Roller2D20 { } let rollData = { + itemEffects, damage, effects, item, diff --git a/system/system.json b/system/system.json index caa1dbd..484b909 100644 --- a/system/system.json +++ b/system/system.json @@ -2,7 +2,7 @@ "id": "ac2d20", "title": "Achtung! Cthulhu 2d20", "description": "An unofficial system for playing Achtung! Cthulhu 2d20 from Modiphius Entertainment Ltd.", - "version": "11.6.1", + "version": "11.6.2", "compatibility": { "minimum": "11", "verified": "12" diff --git a/system/templates/chat/rollD6.hbs b/system/templates/chat/rollD6.hbs index 37e7ab1..4cb864c 100644 --- a/system/templates/chat/rollD6.hbs +++ b/system/templates/chat/rollD6.hbs @@ -14,7 +14,11 @@ {{#if item}}

- Effects: {{{listDamageEffects item.system.effect}}} + {{#ifCond item.type "===" "spell"}} + {{localize "AC2D20.TEMPLATES.Effects"}}: {{itemEffects}} + {{else}} + {{localize "AC2D20.TEMPLATES.Effects"}}: {{{listDamageEffects item.system.effect}}} + {{/ifCond}}

{{/if}}