5.2.1

Plushtoast · Nov 17, 2023 · b223c7d · b223c7d
1 parent 6638c2a
commit b223c7d
Show file tree

Hide file tree

Showing 32 changed files with 134 additions and 87 deletions.
diff --git a/COPYRIGHT-NOTICE b/COPYRIGHT-NOTICE
@@ -1,7 +1,6 @@
-
-Copyright © 2020 by Ulisses Spiele GmbH, Waldems. THE DARK EYE, AVENTURIA, DERE, MYRANOR, RIESLAND, THARUN, and UTHURIA are trademarks of Ulisses Spiele. All rights reserved.
+Copyright © 2023 by Ulisses Spiele GmbH, Waldems. THE DARK EYE, AVENTURIA, DERE, MYRANOR, RIESLAND, THARUN, and UTHURIA are trademarks of Ulisses Spiele. All rights reserved.
 This publication is protected under the copyright laws of the United States of America. No part of this publication may be reproduced, stored in a retrieval system, or transmitted, in any form or by any means, whether electronic, mechanical, photocopy, recording, or otherwise, without prior written consent by Ulisses Spiele GmbH, Waldems.
 
 DAS SCHWARZE AUGE, AVENTURIEN, DERE, MYRANOR, RIESLAND, THARUN, UTHURIA und THE DARK EYE sind eingetragene Marken der Ulisses Spiele GmbH, Waldems.
-Copyright © 2020 by Ulisses Spiele GmbH. Alle Rechte vorbehalten.
+Copyright © 2023 by Ulisses Spiele GmbH. Alle Rechte vorbehalten.
 Titel und Inhalte dieses Werkes sind urheberrechtlich geschützt. Der Nachdruck, auch auszugsweise, die Bearbeitung, Verarbeitung, Verbreitung und Vervielfältigung des Werkes in jedweder Form, insbesondere die Vervielfältigung auf photomechanischem, elektronischem oder ähnlichem Weg, sind nur mit schriftlicher Genehmigung der Ulisses Spiele GmbH, Waldems, gestattet.
diff --git a/bundle/dsa5.bundle.js b/bundle/dsa5.bundle.js
diff --git a/modules/hooks/texteditor.js b/modules/hooks/texteditor.js
@@ -5,6 +5,7 @@ export function setEnrichers() {
     const icons = { "Rq": "dice", "Gc": "dice", "Ch": "user-shield", "AP": "trophy", "Pay": "coins", "GetPaid": "piggy-bank" }
     const titles = { "Rq": "", "Gc": `${game.i18n.localize("HELP.groupcheck")} `, "Ch": "", "AP": "", "Pay": "", "GetPaid": "" }
     const modRegex = /(-|\+)?\d+/
+    const payRegex = /(-|\+)?\d+(\.\d+)?/
     const replaceRegex = /\[[a-zA-ZöüäÖÜÄ&; -]+/
     const replaceRegex2 = /[\[\]]/g
     const payStrings = {
@@ -36,11 +37,11 @@ export function setEnrichers() {
             }
         },
         {
-            pattern: /@(Pay|GetPaid|AP)\[(-|\+)?\d+\]({[a-zA-ZöüäÖÜÄß\(\)&; -]+})?/g,
+            pattern: /@(Pay|GetPaid|AP)\[(-|\+)?\d+(\.\d+)?\]({[a-zA-ZöüäÖÜÄß\(\)&; -]+})?/g,
             enricher: (match, options) => {
                 const str = match[0]
                 const type = match[1]
-                const mod = Number(str.match(modRegex)[0])
+                const mod = Number(str.match(payRegex)[0])
                 const customText = str.match(/\{.*\}/) ? str.match(/\{.*\}/)[0].replace(/[\{\}]/g, "") : payStrings[type]
                 return $(`<a class="roll-button request-${type}" data-type="skill" data-modifier="${mod}" data-label="${customText}"><em class="fas fa-${icons[type]}"></em>${titles[type]}${customText} (${mod})</a>`)[0]
             }
@@ -67,9 +68,9 @@ export function setEnrichers() {
                     enrichedqs4: await TextEditor.enrichHTML(item.system.qs4, { async: true }),
                     enrichedqs5: await TextEditor.enrichHTML(item.system.qs5, { async: true }),
                     enrichedqs6: await TextEditor.enrichHTML(item.system.qs6, { async: true }),
-                    enrichedCrit: await TextEditor.enrichHTML(this.item.system.crit, { async: true }),
-                    enrichedBotch: await TextEditor.enrichHTML(this.item.system.botch, { async: true }),
-                    enrichedFail: await TextEditor.enrichHTML(this.item.system.fail, { async: true }),
+                    enrichedCrit: await TextEditor.enrichHTML(item.system.crit, { async: true }),
+                    enrichedBotch: await TextEditor.enrichHTML(item.system.botch, { async: true }),
+                    enrichedFail: await TextEditor.enrichHTML(item.system.fail, { async: true }),
                 }
 
                 const templ = await renderTemplate("systems/dsa5/templates/items/infopreview.html", { item, enriched })

diff --git a/modules/macros/treatWounds.js b/modules/macros/treatWounds.js
@@ -2,12 +2,12 @@ const dict = {
     de: {
         treatWounds: "Wunden versorgen",
         treatPain: "Schmerzen lindern",
-        description: `<b>Wunden versorgen</b>: Alle Ziele erhalten einen Bonus von QS (${qs}) auf die nächste Regeneration.</br><b>Schmerzen lindern</b>: Pro QS kann eine Stufe Schmerz bei allen Zielen gelindert werden.`
+        description: `<b>Wunden versorgen</b>: Alle Ziele erhalten einen Bonus von <b>QS (${qs})</b> auf die nächste Regeneration (wenn schon ein Wert eingetragen ist, wird der höhere verwendet).</br><b>Schmerzen lindern</b>: Pro QS kann eine Stufe Schmerz bei allen Zielen gelindert werden.`
     },
     en: {
         treatWounds: "Treat Wounds",
         treatPain: "Treat Pain",
-        description: `<b>Treat Wounds</b>: All targets receive a bonus of QS (${qs}) on the next regeneration.</br><b>Treat Pain</b>: For each QS, one level of pain can be treated on the targets.`
+        description: `<b>Treat Wounds</b>: All targets receive a bonus of <b>QS (${qs})</b> on the next regeneration (the higher one will be kept, if there is already an entry).</br><b>Treat Pain</b>: For each QS, one level of pain can be treated on the targets.`
     }
 }[game.i18n.lang == "de" ? "de" : "en"]
 
@@ -36,11 +36,26 @@ class TreatWounds extends Application {
         super.activateListeners(html);
         html.find('.treatWounds').click(this._onTreatWounds.bind(this));
         html.find('.treatPain').click(this._onTreatPain.bind(this));
+        html.find('.content-link').click(ev => this.openUuid(ev))
+    }
+
+    async openUuid(ev) {
+        const uuid = ev.currentTarget.dataset.uuid
+        const item = game.items.get(uuid)
+        if(item) {
+            item.sheet.render(true)
+        }
+    }
+
+    updateTargets(html) {
+        const targets = Array.from(game.user.targets)
+        this.targets = targets.map(x => x.actor)
+        html.find('.targets').html(this.buildAnchors(targets))
     }
 
     async _onTreatPain(event) {
-        for(let target of Array.from(game.user.targets)) {
-            if(!target.actor) continue
+        for(let actor of this.targets) {
+            if(!actor) continue
 
             const ef = {
                 name: `${dict.treatPain} (${this.macroData.qs})`,
@@ -56,26 +71,36 @@ class TreatWounds extends Application {
                     },
                 },
             }
-            await target.actor.addCondition(ef)
+            await actor.addCondition(ef)
         }
         this.close()
     }
 
     async _onTreatWounds(event) {
-        for(let target of Array.from(game.user.targets)) {
-            if(!target.actor) continue
+        for(let actor of this.targets) {
+            if(!actor) continue
 
-            await target.actor.update({ "system.status.regeneration.LePTemp": Math.max(this.macroData.qs, target.actor.system.status.regeneration.LePTemp)})
+            await actor.update({ "system.status.regeneration.LePTemp": Math.max(this.macroData.qs, actor.system.status.regeneration.LePTemp)})
         }
         this.close()
     }
 
+    buildAnchors(targets) {
+        const res = []
+        for(const target of targets) {   
+            res.push(target.toAnchor().outerHTML)
+        }   
+        return res.join(", ")
+    }
 
     async getData() {
         const data = super.getData();
+        this.targets = [actor]
         data.macroData = this.macroData
-        data.lang = dict
-        return data;
+        data.source = this.buildAnchors([args.sourceActor])
+        data.lang = dict        
+        data.targets = this.buildAnchors(this.targets)
+        return data
     }
 }
 

diff --git a/modules/status/active_effects.js b/modules/status/active_effects.js
@@ -110,11 +110,11 @@ export default class DSAActiveEffectConfig extends ActiveEffectConfig {
         if (effectConfigs.hasSpellEffects || effectConfigs.hasDamageTransformation || effectConfigs.hasTriggerEffects) {
             advancedFunctions.push({ name: `ActiveEffects.advancedFunctions.none`, index: 0 })
         }
-        
+
         if(effectConfigs.hasSpellEffects){
-            ["systemEffect", "macro", "creature"].map((x) => {
-                return { name: `ActiveEffects.advancedFunctions.${x}`, index: (index += 1) };
-            });
+            for(let x of ["systemEffect", "macro", "creature"]){
+                advancedFunctions.push({ name: `ActiveEffects.advancedFunctions.${x}`, index: (index += 1) })
+            }
         }
 
         if (effectConfigs.hasDamageTransformation) {
@@ -289,7 +289,7 @@ export default class DSAActiveEffectConfig extends ActiveEffectConfig {
             DSA5_Utility.getSpeaker(getProperty(message.flags, "data.preData.extra.speaker")) || 
             game.actors.get(getProperty(message.flags, "data.preData.extra.actor.id"))
 
-        let sourceActor = attacker;
+        const sourceActor = attacker;
         let effects = (await this._parseEffectDuration(source, testData, message.flags.data.preData, attacker)).filter(x => !getProperty(x, "flags.dsa5.applyToOwner"));
         if (options.effectIds) effects = effects.filter(x => options.effectIds.includes(x._id))
         let actors = [];

diff --git a/modules/status/status_effects.js b/modules/status/status_effects.js
@@ -73,6 +73,10 @@ export default class DSA5StatusEffects {
                 data.conditions.push(condition)
             else if (!cnd.notApplicable) {
                 condition.uuid = cnd.uuid
+                condition.parent = {
+                    uuid: cnd.parent?.uuid,
+                    name: cnd.parent?.name
+                }
                 data.transferedConditions.push(condition)
             }
         }

diff --git a/modules/system/triggers.js b/modules/system/triggers.js
@@ -8,12 +8,16 @@ export default class DSATriggers {
     static async postOpposed(data) {
         const actor = DSA5_Utility.getSpeaker(data.attacker.speaker);
 
+        if(!actor) return
+
         await this.runMacro(actor, data.attacker.testResult, 7, data);
     }
 
     static async postRoll(data) {
         const actor = DSA5_Utility.getSpeaker(data.testData.speaker);
 
+        if(!actor) return
+
         await this.runMacro(actor, data.testData, 6, data);
     }
 

diff --git a/packs/macros/000090.log b/packs/macros/000090.log
diff --git a/packs/macros/000092.ldb b/packs/macros/000092.ldb
diff --git a/packs/macros/CURRENT b/packs/macros/CURRENT
@@ -1 +1 @@
-MANIFEST-000006
+MANIFEST-000088
diff --git a/packs/macros/LOG b/packs/macros/LOG
@@ -1,8 +1,15 @@
-2023/10/29-00:48:01.996 2b24 Recovering log #4
-2023/10/29-00:48:01.999 2b24 Delete type=0 #4
-2023/10/29-00:48:02.000 2b24 Delete type=3 #2
-2023/10/29-00:51:10.727 11b8 Level-0 table #9: started
-2023/10/29-00:51:10.727 11b8 Level-0 table #9: 0 bytes OK
-2023/10/29-00:51:10.728 11b8 Delete type=0 #7
-2023/10/29-00:51:10.732 11b8 Manual compaction at level-0 from '!macros!vwfC8jo9pBESMV3I' @ 72057594037927935 : 1 .. '!macros!vwfC8jo9pBESMV3I' @ 0 : 0; will stop at (end)
-2023/10/29-00:51:10.732 11b8 Manual compaction at level-1 from '!macros!vwfC8jo9pBESMV3I' @ 72057594037927935 : 1 .. '!macros!vwfC8jo9pBESMV3I' @ 0 : 0; will stop at (end)
+2023/11/17-08:49:21.295 b134 Recovering log #87
+2023/11/17-08:49:21.305 b134 Delete type=0 #87
+2023/11/17-08:49:21.305 b134 Delete type=3 #86
+2023/11/17-15:59:47.486 66d8 Level-0 table #91: started
+2023/11/17-15:59:47.489 66d8 Level-0 table #91: 59207 bytes OK
+2023/11/17-15:59:47.490 66d8 Delete type=0 #89
+2023/11/17-15:59:47.501 66d8 Manual compaction at level-0 from '!macros!vwfC8jo9pBESMV3I' @ 72057594037927935 : 1 .. '!macros!vwfC8jo9pBESMV3I' @ 0 : 0; will stop at (end)
+2023/11/17-15:59:47.501 66d8 Manual compaction at level-1 from '!macros!vwfC8jo9pBESMV3I' @ 72057594037927935 : 1 .. '!macros!vwfC8jo9pBESMV3I' @ 0 : 0; will stop at '!macros!vwfC8jo9pBESMV3I' @ 15 : 1
+2023/11/17-15:59:47.501 66d8 Compacting 1@1 + 1@2 files
+2023/11/17-15:59:47.515 66d8 Generated table #92@1: 1 keys, 2417 bytes
+2023/11/17-15:59:47.515 66d8 Compacted 1@1 + 1@2 files => 2417 bytes
+2023/11/17-15:59:47.516 66d8 compacted to: files[ 0 0 1 0 0 0 0 ]
+2023/11/17-15:59:47.516 66d8 Delete type=2 #5
+2023/11/17-15:59:47.516 66d8 Delete type=2 #91
+2023/11/17-15:59:47.519 66d8 Manual compaction at level-1 from '!macros!vwfC8jo9pBESMV3I' @ 15 : 1 .. '!macros!vwfC8jo9pBESMV3I' @ 0 : 0; will stop at (end)
diff --git a/packs/macros/LOG.old b/packs/macros/LOG.old
@@ -1,5 +1,3 @@
-2023/10/29-00:02:47.749 5338 Delete type=3 #1
-2023/10/29-00:47:21.409 4d10 Level-0 table #5: started
-2023/10/29-00:47:21.412 4d10 Level-0 table #5: 8001 bytes OK
-2023/10/29-00:47:21.413 4d10 Delete type=0 #3
-2023/10/29-00:47:21.426 4d10 Manual compaction at level-0 from '!macros!vwfC8jo9pBESMV3I' @ 72057594037927935 : 1 .. '!macros!vwfC8jo9pBESMV3I' @ 0 : 0; will stop at (end)
+2023/11/17-07:44:33.511 a2a0 Recovering log #85
+2023/11/17-07:44:33.514 a2a0 Delete type=0 #85
+2023/11/17-07:44:33.514 a2a0 Delete type=3 #84
diff --git a/packs/macros/MANIFEST-000088 b/packs/macros/MANIFEST-000088
diff --git a/packs/skills/000944.log b/packs/skills/000944.log
diff --git a/packs/skills/000946.ldb b/packs/skills/000946.ldb
diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT
@@ -1 +1 @@
-MANIFEST-000900
+MANIFEST-000942
diff --git a/packs/skills/LOG b/packs/skills/LOG
@@ -1,8 +1,15 @@
-2023/11/15-19:12:43.131 2a50 Recovering log #899
-2023/11/15-19:12:43.133 2a50 Delete type=0 #899
-2023/11/15-19:12:43.133 2a50 Delete type=3 #898
-2023/11/15-19:13:27.542 3150 Level-0 table #903: started
-2023/11/15-19:13:27.542 3150 Level-0 table #903: 0 bytes OK
-2023/11/15-19:13:27.542 3150 Delete type=0 #901
-2023/11/15-19:13:27.542 3150 Manual compaction at level-0 from '!folders!0iLiLK65ZWIWvrPz' @ 72057594037927935 : 1 .. '!items.effects!xiAk4ULFBLNBPLqk.Ots9JEnjkFc0OXmH' @ 0 : 0; will stop at (end)
-2023/11/15-19:13:27.542 3150 Manual compaction at level-1 from '!folders!0iLiLK65ZWIWvrPz' @ 72057594037927935 : 1 .. '!items.effects!xiAk4ULFBLNBPLqk.Ots9JEnjkFc0OXmH' @ 0 : 0; will stop at (end)
+2023/11/17-08:49:21.251 bf90 Recovering log #941
+2023/11/17-08:49:21.255 bf90 Delete type=0 #941
+2023/11/17-08:49:21.255 bf90 Delete type=3 #940
+2023/11/17-15:59:47.449 66d8 Level-0 table #945: started
+2023/11/17-15:59:47.461 66d8 Level-0 table #945: 1260 bytes OK
+2023/11/17-15:59:47.463 66d8 Delete type=0 #943
+2023/11/17-15:59:47.464 66d8 Manual compaction at level-0 from '!folders!0iLiLK65ZWIWvrPz' @ 72057594037927935 : 1 .. '!items.effects!xiAk4ULFBLNBPLqk.Ots9JEnjkFc0OXmH' @ 0 : 0; will stop at (end)
+2023/11/17-15:59:47.464 66d8 Manual compaction at level-1 from '!folders!0iLiLK65ZWIWvrPz' @ 72057594037927935 : 1 .. '!items.effects!xiAk4ULFBLNBPLqk.Ots9JEnjkFc0OXmH' @ 0 : 0; will stop at '!items.effects!dtcW9zovqQmMKEZ0.JVlrHXMEwzAlOgJE' @ 244 : 0
+2023/11/17-15:59:47.465 66d8 Compacting 1@1 + 1@2 files
+2023/11/17-15:59:47.468 66d8 Generated table #946@1: 97 keys, 25062 bytes
+2023/11/17-15:59:47.468 66d8 Compacted 1@1 + 1@2 files => 25062 bytes
+2023/11/17-15:59:47.469 66d8 compacted to: files[ 0 0 1 0 0 0 0 ]
+2023/11/17-15:59:47.469 66d8 Delete type=2 #863
+2023/11/17-15:59:47.469 66d8 Delete type=2 #945
+2023/11/17-15:59:47.480 66d8 Manual compaction at level-1 from '!items.effects!dtcW9zovqQmMKEZ0.JVlrHXMEwzAlOgJE' @ 244 : 0 .. '!items.effects!xiAk4ULFBLNBPLqk.Ots9JEnjkFc0OXmH' @ 0 : 0; will stop at (end)
diff --git a/packs/skills/LOG.old b/packs/skills/LOG.old
@@ -1,3 +1,3 @@
-2023/11/14-17:30:21.078 76c8 Recovering log #897
-2023/11/14-17:30:21.081 76c8 Delete type=0 #897
-2023/11/14-17:30:21.081 76c8 Delete type=3 #896
+2023/11/17-07:44:33.403 7f8c Recovering log #939
+2023/11/17-07:44:33.407 7f8c Delete type=0 #939
+2023/11/17-07:44:33.407 7f8c Delete type=3 #938
diff --git a/packs/skills/MANIFEST-000942 b/packs/skills/MANIFEST-000942
diff --git a/packs/skillsen/000944.log b/packs/skillsen/000944.log
diff --git a/packs/skillsen/000946.ldb b/packs/skillsen/000946.ldb
diff --git a/packs/skillsen/CURRENT b/packs/skillsen/CURRENT
@@ -1 +1 @@
-MANIFEST-000900
+MANIFEST-000942
diff --git a/packs/skillsen/LOG b/packs/skillsen/LOG
@@ -1,8 +1,15 @@
-2023/11/15-19:12:43.137 5ea0 Recovering log #899
-2023/11/15-19:12:43.139 5ea0 Delete type=0 #899
-2023/11/15-19:12:43.139 5ea0 Delete type=3 #898
-2023/11/15-19:13:27.544 3150 Level-0 table #903: started
-2023/11/15-19:13:27.544 3150 Level-0 table #903: 0 bytes OK
-2023/11/15-19:13:27.545 3150 Delete type=0 #901
-2023/11/15-19:13:27.549 3150 Manual compaction at level-0 from '!folders!T8EjjafpseLIrqoT' @ 72057594037927935 : 1 .. '!items.effects!aYvUnCvmeOP3vlLn.NBPcA4PeMC6SD0OL' @ 0 : 0; will stop at (end)
-2023/11/15-19:13:27.549 3150 Manual compaction at level-1 from '!folders!T8EjjafpseLIrqoT' @ 72057594037927935 : 1 .. '!items.effects!aYvUnCvmeOP3vlLn.NBPcA4PeMC6SD0OL' @ 0 : 0; will stop at (end)
+2023/11/17-08:49:21.260 b134 Recovering log #941
+2023/11/17-08:49:21.264 b134 Delete type=0 #941
+2023/11/17-08:49:21.264 b134 Delete type=3 #940
+2023/11/17-15:59:47.470 66d8 Level-0 table #945: started
+2023/11/17-15:59:47.472 66d8 Level-0 table #945: 12824 bytes OK
+2023/11/17-15:59:47.474 66d8 Delete type=0 #943
+2023/11/17-15:59:47.480 66d8 Manual compaction at level-0 from '!folders!T8EjjafpseLIrqoT' @ 72057594037927935 : 1 .. '!items.effects!aYvUnCvmeOP3vlLn.NBPcA4PeMC6SD0OL' @ 0 : 0; will stop at (end)
+2023/11/17-15:59:47.480 66d8 Manual compaction at level-1 from '!folders!T8EjjafpseLIrqoT' @ 72057594037927935 : 1 .. '!items.effects!aYvUnCvmeOP3vlLn.NBPcA4PeMC6SD0OL' @ 0 : 0; will stop at '!items.effects!CKi28vgtdnnwXPpm.iOLTdfOzkIYaR2Uq' @ 186 : 0
+2023/11/17-15:59:47.480 66d8 Compacting 1@1 + 1@2 files
+2023/11/17-15:59:47.483 66d8 Generated table #946@1: 97 keys, 25488 bytes
+2023/11/17-15:59:47.483 66d8 Compacted 1@1 + 1@2 files => 25488 bytes
+2023/11/17-15:59:47.484 66d8 compacted to: files[ 0 0 1 0 0 0 0 ]
+2023/11/17-15:59:47.484 66d8 Delete type=2 #863
+2023/11/17-15:59:47.484 66d8 Delete type=2 #945
+2023/11/17-15:59:47.486 66d8 Manual compaction at level-1 from '!items.effects!CKi28vgtdnnwXPpm.iOLTdfOzkIYaR2Uq' @ 186 : 0 .. '!items.effects!aYvUnCvmeOP3vlLn.NBPcA4PeMC6SD0OL' @ 0 : 0; will stop at (end)
diff --git a/packs/skillsen/LOG.old b/packs/skillsen/LOG.old
@@ -1,3 +1,3 @@
-2023/11/14-17:30:21.085 2328 Recovering log #897
-2023/11/14-17:30:21.088 2328 Delete type=0 #897
-2023/11/14-17:30:21.088 2328 Delete type=3 #896
+2023/11/17-07:44:33.422 a2a0 Recovering log #939
+2023/11/17-07:44:33.425 a2a0 Delete type=0 #939
+2023/11/17-07:44:33.425 a2a0 Delete type=3 #938
diff --git a/packs/skillsen/MANIFEST-000942 b/packs/skillsen/MANIFEST-000942
diff --git a/styles/css/dsa5.css b/styles/css/dsa5.css
diff --git a/styles/css/dsa5.css.map b/styles/css/dsa5.css.map
diff --git a/styles/scss/dsa5.scss b/styles/scss/dsa5.scss
@@ -3888,6 +3888,10 @@
       box-shadow: inset 0px 0px 5px black;
     }
   }
+
+  .rowHover:hover {
+    box-shadow: inset 0px 0px 5px black;
+  }
 
   /* Foundry9 fixes */
 

diff --git a/system.json b/system.json
@@ -2,7 +2,7 @@
     "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": "5.2.0",
+    "version": "5.2.1",
     "authors": [{
         "name": "Plushtoast"
     },{
@@ -91,7 +91,7 @@
     },
     "url": "https://github.com/Plushtoast/dsa5-foundryVTT",
     "manifest": "https://raw.githubusercontent.com/Plushtoast/dsa5-foundryVTT/foundry11/system.json",
-    "download": "https://github.com/Plushtoast/dsa5-foundryVTT/releases/download/5.2.0/dsa5-foundryVTT-5.2.0.zip",
+    "download": "https://github.com/Plushtoast/dsa5-foundryVTT/releases/download/5.2.1/dsa5-foundryVTT-5.2.1.zip",
     "name": "dsa5",
     "minimumCoreVersion": "11.306",
     "packFolders": [

diff --git a/templates/actors/merchant/merchant-tradeoptions.html b/templates/actors/merchant/merchant-tradeoptions.html
@@ -1,10 +1,9 @@
-<div>
+<div style="margin: 0 10px;margin-bottom:10px;">
     <p>{{localize 'MERCHANT.startExchange'}}</p>
     {{#each actors as |actor|}}
-    <div class="row-section towtable startTrade inventory item" style="cursor:pointer;" data-id="{{actor.id}}">
+    <div class="rowHover row-section towtable startTrade inventory item" style="cursor:pointer;" data-id="{{actor.id}}">
         <div class="col ten image {{item.enchantClass}}">
             <div class="image" style="background-image: url('{{actor.img}}')">
-
             </div>
         </div>
         <div class="col ninety">