Skip to content

Commit

Permalink
closes #114
Browse files Browse the repository at this point in the history
  • Loading branch information
Muttley committed Jun 23, 2024
1 parent 2b04cf6 commit 85d9b1f
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 3 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions system/src/roller/Roller2D20.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -351,6 +352,7 @@ export default class Roller2D20 {
}

let rollData = {
itemEffects,
damage,
effects,
item,
Expand Down
2 changes: 1 addition & 1 deletion system/system.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 5 additions & 1 deletion system/templates/chat/rollD6.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@
</div>
{{#if item}}
<p class="font-size-11">
Effects: {{{listDamageEffects item.system.effect}}}
{{#ifCond item.type "===" "spell"}}
{{localize "AC2D20.TEMPLATES.Effects"}}: {{itemEffects}}
{{else}}
{{localize "AC2D20.TEMPLATES.Effects"}}: {{{listDamageEffects item.system.effect}}}
{{/ifCond}}
</p>
{{/if}}
<div class="dices-result" style="display: flex; flex-wrap: wrap;">
Expand Down

0 comments on commit 85d9b1f

Please sign in to comment.