[Feature] ActiveEffect Auras (#2049)

* Added Attached type to action areas
* Added functionality to Elemental Aura

lang/en.json

@@ -113,7 +113,8 @@
                 "area": {
                     "sectionTitle": "Areas",
                     "shape": "Shape",
-                    "size": "Size"
+                    "size": "Size",
+                    "hasHole": "Area Hole"
                 },
                 "displayInChat": "Display in chat",
                 "deleteTriggerTitle": "Delete Trigger",
@@ -870,6 +871,10 @@
                 "bruiser": "for each Bruiser adversary.",
                 "solo": "for each Solo adversary."
             },
+            "AreaTypes": {
+                "attached": { "label": "Attached To Token" },
+                "placed": { "label": "Placed In Scene" }
+            },
             "ArmorInteraction": {
                 "none": { "label": "Ignores Armor" },
                 "active": { "label": "Active w/ Armor" },

module/applications/sheets/actors/adversary.mjs

@@ -7,7 +7,7 @@ export default class AdversarySheet extends DHBaseActorSheet {
     /** @inheritDoc */
     static DEFAULT_OPTIONS = {
         classes: ['adversary'],
-        position: { width: 660, height: 766 },
+        position: { width: 645, height: 760 },
         window: { resizable: true },
         actions: {
             toggleHitPoints: AdversarySheet.#toggleHitPoints,

module/canvas/placeables/regionLayer.mjs

@@ -96,7 +96,7 @@ export default class DhRegionLayer extends foundry.canvas.layers.RegionLayer {
         return inBounds.length === 1 ? inBounds[0] : null;
     }
 
-    static getTemplateShape({ type, angle, range, direction } = {}) {
+    static getTemplateShape({ shapeType, angle, range, direction, hasHole } = {}) {
         const { line, rectangle, inFront, cone, circle, emanation } = CONFIG.DH.GENERAL.templateTypes;
 
         /* Length calculation */
@@ -112,11 +112,11 @@ export default class DhRegionLayer extends foundry.canvas.layers.RegionLayer {
 
         const shapeData = {
             ...canvas.mousePosition,
-            type: type,
+            type: shapeType,
             direction: direction ?? 0
         };
 
-        switch (type) {
+        switch (shapeType) {
             case rectangle.id:
                 shapeData.width = length;
                 shapeData.height = length;
@@ -145,7 +145,8 @@ export default class DhRegionLayer extends foundry.canvas.layers.RegionLayer {
                     y: 0,
                     width: 1,
                     height: 1,
-                    shape: game.canvas.grid.isHexagonal ? CONST.TOKEN_SHAPES.ELLIPSE_1 : CONST.TOKEN_SHAPES.RECTANGLE_1
+                    shape: game.canvas.grid.isHexagonal ? CONST.TOKEN_SHAPES.ELLIPSE_1 : CONST.TOKEN_SHAPES.RECTANGLE_1,
+                    hole: hasHole
                 };
                 break;
         }

module/config/actionConfig.mjs

@@ -119,6 +119,10 @@ export const advantageState = {
 export const areaTypes = {
     placed: {
         id: 'placed',
-        label: 'Placed Area'
+        label: 'DAGGERHEART.CONFIG.AreaTypes.placed.label'
+    },
+    attached: {
+        id: 'attached',
+        label: 'DAGGERHEART.CONFIG.AreaTypes.attached.label'
     }
 };

module/data/fields/action/areasField.mjs

@@ -33,6 +33,10 @@ export default class AreasField extends fields.ArrayField {
                 initial: CONFIG.DH.GENERAL.range.veryClose.id,
                 label: 'DAGGERHEART.ACTIONS.Config.area.size'
             }),
+            hasHole: new fields.BooleanField({ 
+                initial: false,
+                label: 'DAGGERHEART.ACTIONS.Config.area.hasHole' 
+            }),
             effects: new fields.ArrayField(new fields.DocumentIdField())
         });
         super(element, options, context);

module/documents/chatMessage.mjs

@@ -276,8 +276,12 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
     async onCreateAreas(event) {
         const createArea = async selectedArea => {
             const effects = selectedArea.effects.map(effect => this.system.action.item.effects.get(effect).uuid);
-            const { shape: type, size: range } = selectedArea;
+            const { shape: shapeType, size: range, hasHole } = selectedArea;
-            const shapeData = CONFIG.Canvas.layers.regions.layerClass.getTemplateShape({ type, range });
+            const shapeData = CONFIG.Canvas.layers.regions.layerClass.getTemplateShape({ 
+                shapeType, 
+                range, 
+                hasHole 
+            });
 
             const scene = game.scenes.get(game.user.viewedScene);
             const level = scene.levels.find(x => x.isView);
@@ -305,7 +309,10 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
                 visibility: CONST.REGION_VISIBILITY.ALWAYS
             };
             const placeRegion = data => {
-                canvas.regions.placeRegion(data, { create: true });
+                canvas.regions.placeRegion(data, { 
+                    create: true, 
+                    attachToToken: selectedArea.type === CONFIG.DH.ACTIONS.areaTypes.attached.id 
+                });
             };
 
             // Regions with effects must be placed by the GM

module/enrichers/TemplateEnricher.mjs

@@ -58,10 +58,11 @@ export const renderMeasuredTemplate = async event => {
     if (!type || !range || !game.canvas.scene) return;
 
     const shapeData = CONFIG.Canvas.layers.regions.layerClass.getTemplateShape({
-        type,
+        shapetype: type,
         angle,
         range,
-        direction
+        direction,
+        hasHole: false
     });
 
     await canvas.regions.placeRegion(

module/helpers/utils.mjs

@@ -893,13 +893,12 @@ export function shouldUseHopeFearAutomation(options = { gmAsPlayer: true }) {
 
 export async function getWorldActor(baseActor) {
     if (baseActor.inCompendium) {
-        const worldActorCopy = game.actors.find(x => 
+        const worldActorCandidates = game.actors.filter(x =>
             x._stats.compendiumSource === baseActor.uuid &&
-            (!x.prototypeToken.actorLink || x.name === baseActor.name)
+            x.prototypeToken.actorLink === baseActor.prototypeToken.actorLink
         );
-
+        const worldActorCopy = worldActorCandidates.find(a => a.name === baseActor.name) ?? worldActorCandidates[0];
-        if (worldActorCopy)
+        if (worldActorCopy) return worldActorCopy;
-            return worldActorCopy;
 
         const baseActorData = baseActor;
         return await game.system.api.documents.DhpActor.create({ 

src/packs/subclasses/feature_Elemental_Aura_2JH9NaOh69yN80Gw.json

@@ -52,7 +52,7 @@
           "includeBase": false
         },
         "target": {
-          "type": "hostile",
+          "type": "",
           "amount": 1
         },
         "effects": [
@@ -63,13 +63,23 @@
         ],
         "name": "Fire",
         "img": "icons/magic/fire/barrier-wall-explosion-orange.webp",
-        "range": "close"
+        "range": "",
+        "areas": [
+          {
+            "name": "Elemental Aura: Fire",
+            "type": "attached",
+            "shape": "emanation",
+            "size": "close",
+            "hasHole": false,
+            "effects": []
+          }
+        ]
       },
       "xDBLH5TWidvrYF7z": {
         "type": "effect",
         "_id": "xDBLH5TWidvrYF7z",
         "systemPath": "actions",
-        "description": "<p>When an adversary marks 1 or more Hit Points, they must also mark a Stress.</p>",
+        "description": "<p>Your allies gain a +1 bonus to Strength.</p>",
         "chatDisplay": true,
         "actionType": "action",
         "cost": [],
@@ -78,19 +88,26 @@
           "max": "",
           "recovery": null
         },
-        "effects": [
+        "effects": [],
-          {
-            "_id": "WRuijfHxmUscAa69",
-            "onSave": false
-          }
-        ],
         "target": {
-          "type": "friendly",
+          "type": "",
           "amount": null
         },
         "name": "Earth",
         "img": "icons/magic/control/buff-strength-muscle-damage-red.webp",
-        "range": "close"
+        "range": "",
+        "areas": [
+          {
+            "name": "Elemental Aura: Earth",
+            "type": "attached",
+            "shape": "emanation",
+            "size": "close",
+            "hasHole": true,
+            "effects": [
+              "yvpWNCNobg0LLjey"
+            ]
+          }
+        ]
       },
       "S4t5HlgxWlHwaBDw": {
         "type": "effect",
@@ -112,12 +129,22 @@
           }
         ],
         "target": {
-          "type": "hostile",
+          "type": "self",
           "amount": null
         },
         "name": "Water",
         "img": "icons/magic/water/vortex-water-whirlpool.webp",
-        "range": "close"
+        "range": "self",
+        "areas": [
+          {
+            "name": "Elemental Aura: Water",
+            "type": "attached",
+            "shape": "emanation",
+            "size": "close",
+            "hasHole": false,
+            "effects": []
+          }
+        ]
       },
       "hAsKFFewtTqd1gg9": {
         "type": "attack",
@@ -138,15 +165,10 @@
           "includeBase": false
         },
         "target": {
-          "type": "any",
+          "type": "self",
           "amount": null
         },
-        "effects": [
+        "effects": [],
-          {
-            "_id": "mJBA2QTyM9SM5NVS",
-            "onSave": false
-          }
-        ],
         "roll": {
           "type": "diceSet",
           "trait": null,
@@ -169,7 +191,19 @@
         },
         "name": "Air",
         "img": "icons/magic/air/air-burst-spiral-blue-gray.webp",
-        "range": ""
+        "range": "self",
+        "areas": [
+          {
+            "name": "Elemental Aura: Air",
+            "type": "attached",
+            "shape": "emanation",
+            "size": "close",
+            "hasHole": false,
+            "effects": [
+              "vnKV5hsO4DVjURAl"
+            ]
+          }
+        ]
       }
     },
     "originItemType": null,
@@ -181,49 +215,6 @@
     }
   },
   "effects": [
-    {
-      "name": "Elemental Aura (Earth)",
-      "img": "icons/magic/control/buff-strength-muscle-damage-orange.webp",
-      "origin": "Compendium.daggerheart.subclasses.Item.2JH9NaOh69yN80Gw",
-      "transfer": false,
-      "_id": "WRuijfHxmUscAa69",
-      "type": "base",
-      "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        }
-      },
-      "changes": [
-        {
-          "key": "system.traits.strength.value",
-          "mode": 2,
-          "value": "1",
-          "priority": null
-        }
-      ],
-      "disabled": false,
-      "duration": {
-        "startTime": null,
-        "combat": null,
-        "seconds": null,
-        "rounds": null,
-        "turns": null,
-        "startRound": null,
-        "startTurn": null
-      },
-      "description": "",
-      "tint": "#ffffff",
-      "statuses": [],
-      "sort": 0,
-      "flags": {},
-      "_stats": {
-        "compendiumSource": null
-      },
-      "_key": "!items.effects!2JH9NaOh69yN80Gw.WRuijfHxmUscAa69"
-    },
     {
       "name": "Elemental Aura (Water)",
       "img": "icons/magic/water/vortex-water-whirlpool.webp",
@@ -237,18 +228,15 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        }
         },
-      "changes": [],
+        "changes": []
+      },
       "disabled": false,
       "duration": {
-        "startTime": null,
+        "value": null,
-        "combat": null,
+        "units": "seconds",
-        "seconds": null,
+        "expiry": null,
-        "rounds": null,
+        "expired": false
-        "turns": null,
-        "startRound": null,
-        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -258,6 +246,9 @@
       "_stats": {
         "compendiumSource": null
       },
+      "start": null,
+      "showIcon": 1,
+      "folder": null,
       "_key": "!items.effects!2JH9NaOh69yN80Gw.H7W52ps5d3UGmaFr"
     },
     {
@@ -273,18 +264,15 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        }
         },
-      "changes": [],
+        "changes": []
+      },
       "disabled": false,
       "duration": {
-        "startTime": null,
+        "value": null,
-        "combat": null,
+        "units": "seconds",
-        "seconds": null,
+        "expiry": null,
-        "rounds": null,
+        "expired": false
-        "turns": null,
-        "startRound": null,
-        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -294,43 +282,120 @@
       "_stats": {
         "compendiumSource": null
       },
+      "start": null,
+      "showIcon": 1,
+      "folder": null,
       "_key": "!items.effects!2JH9NaOh69yN80Gw.WX5AMEpmUAutB9Hm"
     },
     {
-      "name": "Elemental Aura (Air)",
+      "name": "Elemental Aura: Earth",
-      "img": "icons/magic/air/air-burst-spiral-blue-gray.webp",
+      "disabled": false,
-      "origin": "Compendium.daggerheart.subclasses.Item.2JH9NaOh69yN80Gw",
+      "img": "icons/magic/control/buff-strength-muscle-damage-red.webp",
+      "description": "<p>Your allies gain a +1 bonus to Strength.</p>",
       "transfer": false,
-      "_id": "mJBA2QTyM9SM5NVS",
+      "statuses": [],
-      "type": "base",
       "system": {
         "rangeDependence": {
           "enabled": false,
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
+        },
+        "changes": [
+          {
+            "key": "system.traits.strength.value",
+            "type": "add",
+            "value": 1,
+            "priority": null,
+            "phase": "initial"
           }
-      },
+        ],
-      "changes": [],
-      "disabled": false,
         "duration": {
-        "startTime": null,
-        "combat": null,
-        "seconds": null,
-        "rounds": null,
-        "turns": null,
-        "startRound": null,
-        "startTurn": null
-      },
           "description": "",
+          "type": ""
+        },
+        "stacking": null,
+        "targetDispositions": [
+          1
+        ]
+      },
+      "_id": "yvpWNCNobg0LLjey",
+      "type": "base",
+      "start": {
+        "time": 0,
+        "combat": null,
+        "combatant": null,
+        "initiative": null,
+        "round": null,
+        "turn": null
+      },
+      "duration": {
+        "value": null,
+        "units": "seconds",
+        "expiry": null,
+        "expired": false
+      },
+      "origin": null,
       "tint": "#ffffff",
-      "statuses": [],
+      "showIcon": 1,
+      "folder": null,
       "sort": 0,
       "flags": {},
       "_stats": {
         "compendiumSource": null
       },
-      "_key": "!items.effects!2JH9NaOh69yN80Gw.mJBA2QTyM9SM5NVS"
+      "_key": "!items.effects!2JH9NaOh69yN80Gw.yvpWNCNobg0LLjey"
+    },
+    {
+      "name": "Elemental Aura: Air",
+      "disabled": false,
+      "img": "icons/magic/air/air-burst-spiral-blue-gray.webp",
+      "description": "<p><span style=\"color:rgb(239, 230, 216);font-family:Montserrat, sans-serif;font-size:14px;font-style:normal;font-variant-ligatures:normal;font-variant-caps:normal;font-weight:400;letter-spacing:normal;orphans:2;text-align:start;text-indent:0px;text-transform:none;widows:2;word-spacing:0px;-webkit-text-stroke-width:0px;white-space:normal;background-color:rgba(24, 22, 46, 0.753);text-decoration-thickness:initial;text-decoration-style:initial;text-decoration-color:initial;display:inline !important;float:none\">When you or an ally takes damage from an attack beyond Melee range, reduce the damage by 1d8.</span></p>",
+      "transfer": false,
+      "statuses": [],
+      "system": {
+        "rangeDependence": {
+          "enabled": false,
+          "type": "withinRange",
+          "target": "hostile",
+          "range": "melee"
+        },
+        "changes": [],
+        "duration": {
+          "description": "",
+          "type": ""
+        },
+        "stacking": null,
+        "targetDispositions": [
+          1
+        ]
+      },
+      "_id": "vnKV5hsO4DVjURAl",
+      "type": "base",
+      "start": {
+        "time": 0,
+        "combat": null,
+        "combatant": null,
+        "initiative": null,
+        "round": null,
+        "turn": null
+      },
+      "duration": {
+        "value": null,
+        "units": "seconds",
+        "expiry": null,
+        "expired": false
+      },
+      "origin": null,
+      "tint": "#ffffff",
+      "showIcon": 1,
+      "folder": null,
+      "sort": 0,
+      "flags": {},
+      "_stats": {
+        "compendiumSource": null
+      },
+      "_key": "!items.effects!2JH9NaOh69yN80Gw.vnKV5hsO4DVjURAl"
     }
   ],
   "sort": 100000,

styles/less/global/elements.less

@@ -384,6 +384,10 @@
                 justify-content: space-between;
             }
 
+            label {
+                white-space: nowrap;
+            }
+
             .btn {
                 padding-top: 15px;
             }
@@ -399,6 +403,13 @@
             > .checkbox {
                 align-self: end;
             }
+
+            .auto-sized {
+                width: auto;
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+            }
         }
 
         .form-group {

styles/less/global/resource-bar.less

@@ -59,7 +59,6 @@
 .slot-value {
     display: flex;
     flex-direction: column;
-    padding: 0 5px;
     font-size: 1.5rem;
     align-items: center;
     justify-content: center;

styles/less/sheets/actors/adversary/index.less

@@ -1,7 +1,6 @@
+@import './sheet.less';
 @import './features.less';
 @import './header.less';
-@import './sheet.less';
 @import './sidebar.less';
 @import './effects.less';
 @import './notes.less';
-

styles/less/sheets/actors/adversary/sheet.less

@@ -2,13 +2,16 @@
 @import '../../../utils/fonts.less';
 
 .application.sheet.daggerheart.actor.dh-style.adversary {
+    --sidebar-width: 260px;
+
     .window-content {
         display: grid;
-        grid-template-columns: 275px 1fr;
+        grid-template-columns: var(--sidebar-width) 1fr;
         grid-template-rows: auto 1fr;
         height: 100%;
         width: 100%;
         padding-bottom: 0;
+    }
 
     .adversary-sidebar-sheet {
         grid-row: 1 / span 2;
@@ -33,4 +36,3 @@
         }
     }
 }
-}

styles/less/sheets/actors/adversary/sidebar.less

@@ -22,8 +22,8 @@
 
 .application.sheet.daggerheart.actor.dh-style.adversary {
     .adversary-sidebar-sheet {
-        width: 275px;
+        width: var(--sidebar-width);
-        min-width: 275px;
+        min-width: var(--sidebar-width);
         border-right: 1px solid light-dark(@dark-blue, @golden);
 
         .portrait {
@@ -52,7 +52,7 @@
             }
 
             img {
-                height: 275px;
+                height: var(--sidebar-width);
             }
 
             .death-roll-btn {
@@ -63,7 +63,7 @@
         .threshold-section {
             position: relative;
             display: flex;
-            gap: 10px;
+            gap: 7px;
             background-color: light-dark(transparent, @dark-blue);
             color: @color-text-emphatic;
             padding: 5px 10px;
@@ -107,7 +107,7 @@
             flex-direction: column;
             top: -20px;
             gap: 10px;
-            margin-bottom: -10px;
+            margin-bottom: -16px;
 
             &.pip-display {
                 top: -15px;
@@ -185,8 +185,8 @@
 
         .shortcut-items-section {
             overflow-y: hidden;
-            padding-top: 10px;
+            padding: 10px 0;
-            padding-bottom: 20px;
+            flex: 1;
             scrollbar-gutter: stable;
             .with-scroll-shadows();
 
@@ -214,8 +214,6 @@
         }
 
         .experience-section {
-            margin-bottom: 20px;
-
             .title {
                 display: flex;
                 gap: 15px;
@@ -232,21 +230,21 @@
                 gap: 5px;
                 width: 100%;
                 margin-top: 10px;
-                align-items: center;
+                align-items: stretch;
+                padding: 0 4px 0 12px;
 
                 .experience-row {
                     display: flex;
                     gap: 5px;
-                    width: 250px;
                     align-items: center;
                     justify-content: space-between;
 
                     .experience-name {
-                        width: 180px;
                         display: flex;
                         align-items: center;
                         text-align: start;
                         font-size: var(--font-size-14);
+                        flex: 1;
                         color: light-dark(@dark, @beige);
                         line-height: 1;
                     }
@@ -271,9 +269,7 @@
 
         .reaction-section {
             display: flex;
-            padding: 0 10px;
+            margin: 10px;
-            margin-top: 20px;
-            width: 100%;
 
             button {
                 height: 40px;

templates/actionTypes/areas.hbs

@@ -11,9 +11,10 @@
             <a class="btn" data-tooltip="{{localize "CONTROLS.CommonDelete"}}" data-action="removeElement" data-index="{{index}}"><i class="fas fa-trash"></i></a>
         </div>
         <div class="nest-inputs">
-            {{formField ../fields.type value=area.type name=(concat "areas." index ".type") localize=true}}
+            {{formField ../fields.type value=area.type name=(concat "areas." index ".type") localize=true blank=false}}
-            {{formField ../fields.shape value=area.shape name=(concat "areas." index ".shape") localize=true}}
+            {{formField ../fields.shape value=area.shape name=(concat "areas." index ".shape") localize=true blank=false}}
-            {{formField ../fields.size value=area.size name=(concat "areas." index ".size") localize=true}}
+            {{formField ../fields.size value=area.size name=(concat "areas." index ".size") localize=true blank=false}}
+            {{formField ../fields.hasHole value=area.hasHole name=(concat "areas." index ".hasHole") localize=true classes="auto-sized" }}
         </div>
 
         <div class="sub-section-header">

templates/sheets/actors/adversary/sidebar.hbs

@@ -92,9 +92,11 @@
                 {{/each}}
             </div>
         </div>
-        <line-div></line-div>
-        <div class="reaction-section">
-            <button type="button" data-action="reactionRoll">{{localize "DAGGERHEART.GENERAL.Roll.reaction"}}</button>
     </div>
+    <div class="reaction-section">
+        <button type="button" data-action="reactionRoll">
+            <i class="fa-solid fa-dice"></i>
+            {{localize "DAGGERHEART.GENERAL.Roll.reaction"}}
+        </button>
     </div>
 </aside>

templates/ui/chat/chat-message.hbs

@@ -6,18 +6,13 @@
             <div class="message-sub-header-container">
                 {{#if message.title}}
                     <h4>{{message.title}}</h4>
-                    <div>{{actor.name}} {{#if author.isGM}}(GM){{/if}}</div>
+                    <div>{{alias}} {{#if author.isGM}}(GM){{/if}}</div>
                 {{else}}
                     {{#unless actor.name}}
                         <h4>{{author.name}}</h4>
-                    {{else}}
-                        {{#if (eq message.type 'base')}}
-                            <h4>{{actor.name}}</h4>
-                            <div>{{author.name}}</div>
                     {{else}}
                         <h4>{{alias}}</h4>
-                            <div>{{actor.name}} {{#if author.isGM}}(GM){{/if}}</div>
+                        <div>{{author.name}}</div>
-                        {{/if}}
                     {{/unless}}
                 {{/if}}
             </div>