6.1.4

Plushtoast · Oct 21, 2024 · cbd4f13 · cbd4f13
1 parent da91747
commit cbd4f13
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,9 @@
+![Version](https://img.shields.io/github/v/tag/Plushtoast/dsa5-foundryVTT?label=Version&style=flat-square&color=2577a1) ![Foundry Core Compatible Version](https://img.shields.io/badge/dynamic/json.svg?url=https%3A%2F%2Fraw.githubusercontent.com%2FPlushtoast%2Fdsa5-foundryVTT%2Ffoundry12%2Fsystem.json&label=Foundry%20Core%20Compatible%20Version&query=$.compatibility.verified&style=flat-square&color=ff6400)
+
 # Official Das Schwarze Auge/The Dark Eye system for Foundry
 ![](https://repository-images.githubusercontent.com/311655339/4d523800-55a9-11eb-9e2e-6bbc2b71d8a4)
 
 ## Current Version and Compatibility:
-6.0.x - FoundryVTT 12.+
 This system is intended for usage with [Foundry Virtual Tabletop](https://foundryvtt.com/) to play "Das Schwarze Auge" 5th edition.
 If you want to learn more checkout the [German](https://ulisses-spiele.de/virtual-tabletop-dsa-vtt/) or [English](https://ulisses-us.com/ulisses-virtual-tabletops/virtual-tabletop-dsa-vtt/) VTT Page by Ulisses Spiele.
 

diff --git a/bundle/modules/dsa5.js b/bundle/modules/dsa5.js
diff --git a/modules/actor/actor-dsa5.js b/modules/actor/actor-dsa5.js
@@ -1821,17 +1821,22 @@ export default class Actordsa5 extends Actor {
               await DiceDSA5.showDiceSoNice(newRoll, newTestData.rollMode);
 
               let ind = 0;
-              let changedRolls = [];
+              const changedRolls = [];
+              const changes = [];
 
+              newTestData.roll = Roll.fromData(newTestData.roll);
               for (let k of diesToReroll) {
                 const characteristic = newTestData.source.system[`characteristic${k + 1}`];
                 const attr = characteristic ? game.i18n.localize(`CHARAbbrev.${characteristic.value.toUpperCase()}`) + ' - ' : '';
 
-                changedRolls.push(`${attr}${newTestData.roll.terms[k * 2].results[0].result}/${newRoll.terms[ind * 2].results[0].result}`);
-                newTestData.roll.terms[k * 2].results[0].result = Math.min(newRoll.terms[ind * 2].results[0].result, newTestData.roll.terms[k * 2].results[0].result);
+                let val = newRoll.terms[ind * 2].results[0].result;
+                changedRolls.push(`${attr}${newTestData.roll.terms[k * 2].results[0].result}/${val}`);
+                val = Math.min(val, newTestData.roll.terms[k * 2].results[0].result);
 
+                changes.push({ index: k, val });
                 ind += 1;
               }
+              newTestData.roll.editRollAtIndex(changes);
               infoMsg += `<b>${game.i18n.localize('Roll')}</b>: ${changedRolls.join(', ')}`;
               ChatMessage.create(DSA5_Utility.chatDataSetup(infoMsg));
 
@@ -1888,17 +1893,21 @@ export default class Actordsa5 extends Actor {
               const phexTradition = game.i18n.localize('LocalizedIDs.traditionPhex');
               const isPhex = actor.items.some((x) => x.type == 'specialability' && x.name == phexTradition);
 
-              //todo replace with roll.editrollatindex & istalented
+              newTestData.roll = Roll.fromData(newTestData.roll);
+
+              const changes = [];
               for (let k of diesToReroll) {
                 const characteristic = newTestData.source.system[`characteristic${k + 1}`];
                 const attr = characteristic ? `${game.i18n.localize(`CHARAbbrev.${characteristic.value.toUpperCase()}`)} - ` : '';
-                changedRolls.push(`${attr}${newTestData.roll.terms[k * 2].results[0].result}/${newRoll.terms[ind * 2].results[0].result}`);
-                if (isPhex) newTestData.roll.terms[k * 2].results[0].result = Math.min(newRoll.terms[ind * 2].results[0].result, newTestData.roll.terms[k * 2].results[0].result);
-                else newTestData.roll.terms[k * 2].results[0].result = newRoll.terms[ind * 2].results[0].result;
 
+                let val = newRoll.terms[ind * 2].results[0].result;
+                changedRolls.push(`${attr}${newTestData.roll.terms[k * 2].results[0].result}/${val}`);
+
+                if (isPhex) val = Math.min(val, newTestData.roll.terms[k * 2].results[0].result);
+                changes.push({ index: k, val });
                 ind += 1;
               }
-
+              newTestData.roll.editRollAtIndex(changes);
               infoMsg += `<br><b>${game.i18n.localize('Roll')}</b>: ${changedRolls.join(', ')}`;
               ChatMessage.create(DSA5_Utility.chatDataSetup(infoMsg));
               newTestData.fateUsed = true;
@@ -1971,7 +1980,8 @@ export default class Actordsa5 extends Actor {
                   value: fws.join('|'),
                   type: 'roll',
                 };
-                newTestData.roll.terms[diesToUpgrade * 2].results[0].result = Math.max(1, newTestData.roll.terms[diesToUpgrade * 2].results[0].result - 2);
+                newTestData.roll = Roll.fromData(newTestData.roll);
+                newTestData.roll.editRollAtIndex([{ index: diesToUpgrade, val: Math.max(1, newTestData.roll.terms[diesToUpgrade * 2].results[0].result - 2) }]);
                 newTestData.situationalModifiers.push(modifier);
                 this[`${data.postData.postFunction}`]({ testData: newTestData, cardOptions }, { rerenderMessage: message });
                 await message.update({ 'flags.data.fateImproved': true });
@@ -1993,7 +2003,8 @@ export default class Actordsa5 extends Actor {
         type: 'roll',
       };
       newTestData.situationalModifiers.push(modifier);
-      newTestData.roll.terms[0].results[0].result = Math.max(1, newTestData.roll.terms[0].results[0].result - 2);
+      newTestData.roll = Roll.fromData(newTestData.roll);
+      newTestData.roll.editRollAtIndex([{ index: 0, val: Math.max(1, newTestData.roll.terms[0].results[0].result - 2) }]);
       this[`${data.postData.postFunction}`]({ testData: newTestData, cardOptions }, { rerenderMessage: message });
       await message.update({ 'flags.data.fateImproved': true });
       await this.reduceSchips(schipsource);
@@ -2471,7 +2482,7 @@ export default class Actordsa5 extends Actor {
       if (item.system.guidevalue.value != '-') {
         let val = Math.max(...item.system.guidevalue.value.split('/').map((x) => Number(actorData.system.characteristics[x].value)));
         let extra = Math.max(val - Number(item.system.damageThreshold.value), 0) + gripDamageMod;
-        if (extra > 0) {
+        if (extra != 0) {
           item.extraDamage = extra;
           item.damageAdd = Roll.safeEval(item.damageAdd + ' + ' + Number(extra));
           item.damageAdd = (item.damageAdd > 0 ? '+' : '') + item.damageAdd;

diff --git a/modules/system/opposed-dsa5.js b/modules/system/opposed-dsa5.js
@@ -465,8 +465,8 @@ export default class OpposedDsa5 {
       opposeResult.winner = 'attacker';
 
       const title = [
-        damage.armorMod != 0 ? `${damage.armorMod + ' ' + game.i18n.localize('Modifier')}` : '',
-        damage.armorMultiplier != 1 ? '*' + damage.armorMultiplier + ' ' + game.i18n.localize('Modifier') : '',
+        damage.armorMod != 0 ? `${damage.armorMod} ${game.i18n.localize('Modifier')}` : '',
+        damage.armorMultiplier != 1 ? `*${damage.armorMultiplier} ${game.i18n.localize('Modifier')}` : '',
         damage.spellArmor != 0 ? `${damage.spellArmor} ${game.i18n.localize('spellArmor')}` : '',
         damage.liturgyArmor != 0 ? `${damage.liturgyArmor} ${game.i18n.localize('liturgyArmor')}` : '',
       ].join('');
@@ -477,6 +477,10 @@ export default class OpposedDsa5 {
         description,
         value: damage.sum,
         sp: damage.damage,
+        armorMod: damage.armorMod,
+        armorMultiplier: damage.armorMultiplier,
+        spellArmor: damage.spellArmor,
+        liturgyArmor: damage.liturgyArmor,
       };
     } else {
       opposeResult.winner = 'defender';

diff --git a/system.json b/system.json
@@ -2,8 +2,8 @@
     "id": "dsa5",
     "title": "Das Schwarze Auge/The Dark Eye (5th Edition)",
     "description": "The \"Das Schwarze Auge\" system for Foundry VTT. Includes all relevant mechanisms to play in the wonderous world of Aventuria and Das Schwarze Auge/The Dark Eye.",
-    "version": "6.1.3",
-    "download": "https://github.com/Plushtoast/dsa5-foundryVTT/releases/download/6.1.3/dsa5-foundryVTT-6.1.3.zip",
+    "version": "6.1.4",
+    "download": "https://github.com/Plushtoast/dsa5-foundryVTT/releases/download/6.1.4/dsa5-foundryVTT-6.1.4.zip",
     "authors": [
         {
             "name": "Plushtoast"