Merge pull request dmdorman#1519 from aeauseth/main

Publish 4.0.8
phBalance · Nov 24, 2024 · 532d2ef · 532d2ef
2 parents c42f7f6 + 262f45e
commit 532d2ef
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Releases
 
-## Version 4.0.8 (So far...) [Hero System 6e (Unofficial) v2](https://github.com/dmdorman/hero6e-foundryvtt)
+## Version 4.0.8 [Hero System 6e (Unofficial) v2](https://github.com/dmdorman/hero6e-foundryvtt)
 
 - Support striking appearance. Striking appearance and reputation can be optionally enabled for presence and interaction skill rolls. [#1509](https://github.com/dmdorman/hero6e-foundryvtt/issues/1509)
 - Improved DEADLYBLOW so it does not apply to adjustment powers, sense-affecting powers, or ENTANGLES. Also the extra DCs are not shown in the Attacks tab (which was confusing). GM still has to confirm DEADLYBLOW with applicable powers. [#1493](https://github.com/dmdorman/hero6e-foundryvtt/issues/1493)

diff --git a/module/item/item-attack.mjs b/module/item/item-attack.mjs
@@ -141,7 +141,7 @@ export async function AttackAoeToHit(item, options) {
 
     const aoeTemplate =
         game.scenes.current.templates.find((o) => o.flags.itemId === item.id) ||
-        game.scenes.current.templates.find((o) => o.user.id === game.user.id);
+        game.scenes.current.templates.find((o) => o.author.id === game.user.id);
     if (!aoeTemplate) {
         return ui.notifications.error(`Attack AOE template was not found.`);
     }
@@ -2789,7 +2789,7 @@ async function _performAbsorptionForToken(token, absorptionItems, damageDetail,
                     maxAbsorption = 0;
                 }
 
-                // Present the roll.
+                // `Presen`t the roll.
                 const cardHtml = await absorptionRoller.render(`${attackType} attack vs ${absorptionItem.name}`);
 
                 const speaker = ChatMessage.getSpeaker({

diff --git a/module/item/item.mjs b/module/item/item.mjs
@@ -4906,6 +4906,15 @@ export class HeroSystem6eItem extends Item {
         const aoe = this.findModsByXmlid("AOE");
         const explosion5e = this.findModsByXmlid("EXPLOSION");
 
+        // Kluge: DARKNESS is inherently and AOE
+        // if (this.system.XMLID === "DARKNESS" && !aoe) {
+        //     const _darknessAoe = {
+        //         XMLID: "AOE",
+        //         LEVELS: this.system.LEVELS,
+        //     };
+        //     return _darknessAoe;
+        // }
+
         return aoe || explosion5e;
     }
 

diff --git a/module/utility/presence-attack.mjs b/module/utility/presence-attack.mjs
@@ -156,8 +156,9 @@ export async function presenceAttackPopOut(actor) {
     const content = await _renderForm(actor, {});
 
     // Attack Card as a Pop Out
-    let options = {
-        width: 300,
+    const options = {
+        width: "auto",
+        classes: ["hero"],
     };
 
     return new Promise((resolve) => {

diff --git a/scss/components/_forms.scss b/scss/components/_forms.scss
@@ -76,3 +76,13 @@
         padding: 0 8px;
     }
 }
+
+// .presence-attack-card label {
+//     // flex: 1;
+//     color: blue;
+// }
+
+// .presence-attack-card table {
+//     // flex: 1;
+//     color: red;
+// }
diff --git a/system.json b/system.json
@@ -3,7 +3,7 @@
     "name": "hero6e-foundryvtt-v2",
     "title": "Hero System 6e (Unofficial) v2",
     "description": "The Hero System 6e for FoundryVTT!",
-    "version": "4.0.7",
+    "version": "4.0.8",
     "compatibility": {
         "minimum": "12",
         "verified": "12.331",

diff --git a/templates/pop-out/presence-attack-card.hbs b/templates/pop-out/presence-attack-card.hbs
@@ -1,5 +1,5 @@
-<form>
-    <div class="form-group">
+<form class="hero presence-attack-card">
+    <div class="form-group ">
         <label>Roll Modifier</label>
         <input type="number" name="mod" value="0"/>
     </div>