Skip to content

Commit ebd8e42

Browse files
author
sasquach45932
committed
Attack chat-card fix
1 parent 512b16d commit ebd8e42

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/module/actor/actor.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ export class DemonlordActor extends Actor {
497497

498498
// Check if there is an ammo for weapon
499499
if (item.system.consume.ammorequired) {
500-
ammoItem = await this.ammo.find(x => x.id === item.system.consume.ammoitemid)
500+
ammoItem = await this.items.find(x => x.id === item.system.consume.ammoitemid)
501501
if (ammoItem) {
502502
if (ammoItem.system.quantity === 0) {
503503
return ui.notifications.warn(

src/module/chat/effect-messages.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,10 @@ export function buildAttackEffectsMessage(attacker, defender, item, attackAttrib
127127

128128
let horrifyingTextGM = '<div class="gmonly">' + _toMsg(`${game.i18n.localize('DL.CreatureHorrifying')} [${game.i18n.localize('DL.ActionTarget')}]`, -1) + '</div>'
129129

130-
let gmOnlyMsg = defenderBoonsArray.length ? '<div class="gmonly">' + changeListToMsgDefender(d, defenderBoonsArray, '', false) + '</div>' : ''
131-
let playerOnlyMsg = defenderBoonsArray.length ? '<div class="gmremove">' + changeListToMsgDefender(d, defenderBoonsArray, '', true) + '</div>' : ''
130+
let gmOnlyResult = changeListToMsgDefender(d, defenderBoonsArray, '', false)
131+
let playerOnlyResult = changeListToMsgDefender(d, defenderBoonsArray, '', true)
132+
let gmOnlyMsg = gmOnlyResult ? '<div class="gmonly">' + gmOnlyResult + '</div>' : ''
133+
let playerOnlyMsg = playerOnlyResult ? '<div class="gmremove">' + playerOnlyResult + '</div>' : ''
132134
let boonsMsg =
133135
changeListToMsg(m, [`system.bonuses.attack.boons.${attackAttribute}`, "system.bonuses.attack.boons.all"], '') +
134136
(itemBoons ? _toMsg(item.name, plusify(itemBoons)) : '') +

0 commit comments

Comments
 (0)