From 0162c5b4117de2b3804b85bfcc2089c0e678a961 Mon Sep 17 00:00:00 2001
From: marvin9257 <72580196+marvin9257@users.noreply.github.com>
Date: Fri, 22 Nov 2024 09:20:06 -0600
Subject: [PATCH] fix: damage roll for psionic use with negative effect (#1694)

This release fixes an issue where damage rolls were made for psionic abilities when the skill roll failed (negative effect).
---
 src/module/entities/TwodsixItem.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/module/entities/TwodsixItem.ts b/src/module/entities/TwodsixItem.ts
index cac182200..cb81dac46 100644
--- a/src/module/entities/TwodsixItem.ts
+++ b/src/module/entities/TwodsixItem.ts
@@ -787,8 +787,9 @@ export default class TwodsixItem extends Item {
         await this.sendPsiUseToChat(psiCost, rollMode, rollEffect);
 
         // Roll damage and post, if necessary
-        if (this.system.damage !== "" && this.system.damage !== "0" && game.settings.get("twodsix", "automateDamageRollOnHit")) {
-          const damagePayload = await this.rollDamage(rollMode || game.settings.get('core', 'rollMode'), ` ${rollEffect}`, true, showThrowDiag);
+        if (this.system.damage !== "" && this.system.damage !== "0" && game.settings.get("twodsix", "automateDamageRollOnHit") && rollEffect >=0 ) {
+          const bonusDamage:string = game.settings.get("twodsix", "addEffectToDamage") && rollEffect !== 0 ?  ` ${rollEffect}` : ``;
+          const damagePayload = await this.rollDamage(rollMode || game.settings.get('core', 'rollMode'), bonusDamage, true, showThrowDiag);
           if (damagePayload?.damageValue > 0) {
             const targetTokens = Array.from(game.user.targets);
             if (targetTokens.length > 0) {