Merge remote-tracking branch 'upstream/master' into move-to-DialogV2

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [5.12.1](https://github.com/xdy/twodsix-foundryvtt/compare/v5.12.0...v5.12.1) (2024-11-22)
+
+
+### Bug Fixes
+
+* damage roll for psionic use with negative effect ([#1694](https://github.com/xdy/twodsix-foundryvtt/issues/1694)) ([0162c5b](https://github.com/xdy/twodsix-foundryvtt/commit/0162c5b4117de2b3804b85bfcc2089c0e678a961))
+
 # [5.12.0](https://github.com/xdy/twodsix-foundryvtt/compare/v5.11.3...v5.12.0) (2024-11-20)
 
 

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "twodsix",
-  "version": "5.12.0",
+  "version": "5.12.1",
   "description": "A 2d6 system",
   "scripts": {
     "build": "gulp build",

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) {

static/system.json

@@ -4,8 +4,8 @@
   "url": "https://github.com/xdy/twodsix-foundryvtt/",
   "manifest": "https://github.com/xdy/twodsix-foundryvtt/releases/latest/download/system.json",
   "readme": "https://raw.githubusercontent.com/xdy/twodsix-foundryvtt/master/README.md",
-  "download": "https://github.com/xdy/twodsix-foundryvtt/releases/download/v5.12.0/twodsix.zip",
-  "version": "5.12.0",
+  "download": "https://github.com/xdy/twodsix-foundryvtt/releases/download/v5.12.1/twodsix.zip",
+  "version": "5.12.1",
   "socket": true,
   "background": "systems/twodsix/assets/pause/sunburst.svg",
   "changelog": "https://raw.githubusercontent.com/xdy/twodsix-foundryvtt/master/CHANGELOG.md",