daggerheart.d.ts

@@ -4,15 +4,6 @@ import '@common/primitives/global.mjs';
 import Canvas from '@client/canvas/board.mjs';
 import { ResourceUpdateMap } from './module/data/action/baseAction.mjs';
 
-import * as applications from './module/applications/_module.mjs';
-import * as data from './module/data/_module.mjs';
-import * as models from './module/data/_module.mjs';
-import * as documents from './module/documents/_module.mjs';
-import { macros } from './module/_module.mjs';
-import * as dice from './module/dice/_module.mjs';
-import * as fields from './module/data/fields/_module.mjs';
-
-
 // Foundry's use of `Object.assign(globalThis) means many globally available objects are not read as such
 // This declare global hopefully fixes that
 // Note: eslint is not aware of these, whatever is added here should go in the eslint's globals list
@@ -89,17 +80,3 @@ declare global {
         damageOptions: object;
     }
 }
-
-declare module '@client/packages/system.mjs' {
-    export default interface System {
-        api: {
-            applications: typeof applications,
-            data: typeof data,
-            models: typeof models,
-            documents: typeof documents,
-            macros: typeof macros,
-            dice: typeof dice,
-            fields: typeof fields
-        };
-    }
-}

lang/en.json

@@ -114,8 +114,7 @@
                 "area": {
                     "sectionTitle": "Areas",
                     "shape": "Shape",
-                    "size": "Size",
-                    "hasHole": "Area Hole"
+                    "size": "Size"
                 },
                 "displayInChat": "Display in chat",
                 "deleteTriggerTitle": "Delete Trigger",
@@ -872,10 +871,6 @@
                 "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: 645, height: 760 },
+        position: { width: 660, height: 766 },
         window: { resizable: true },
         actions: {
             toggleHitPoints: AdversarySheet.#toggleHitPoints,
@@ -58,13 +58,12 @@ export default class AdversarySheet extends DHBaseActorSheet {
             template: 'systems/daggerheart/templates/sheets/actors/adversary/features.hbs',
             scrollable: ['.feature-section']
         },
+        notes: {
+            template: 'systems/daggerheart/templates/sheets/actors/adversary/notes.hbs'
+        },
         effects: {
             template: 'systems/daggerheart/templates/sheets/actors/adversary/effects.hbs',
             scrollable: ['.effects-sections']
-        },
-        notes: {
-            template: 'systems/daggerheart/templates/sheets/actors/adversary/notes.hbs',
-            scrollable: ['.editor-content']
         }
     };
 

module/applications/sheets/actors/character.mjs

@@ -1057,7 +1057,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
             direction: 'DOWN'
         });
 
-        html.querySelectorAll('.armor .slot').forEach(element => {
+        html.querySelectorAll('.armor-slot').forEach(element => {
             element.addEventListener('click', CharacterSheet.armorSourcePipUpdate);
         });
     }
@@ -1072,7 +1072,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
 
     /** Update specific armor source */
     static async armorSourcePipUpdate(event) {
-        const target = event.target.closest('.slot');
+        const target = event.target.closest('.armor-slot');
         const { uuid, value } = target.dataset;
         const document = await foundry.utils.fromUuid(uuid);
 
@@ -1100,7 +1100,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
         }
 
         const container = target.closest('.slot-bar');
-        for (const armorSlot of container.querySelectorAll('.armor .slot i')) {
+        for (const armorSlot of container.querySelectorAll('.armor-slot i')) {
             const index = Number.parseInt(armorSlot.dataset.index);
             if (decreasing && index >= newCurrent) {
                 armorSlot.classList.remove('fa-shield');

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({ shapeType, angle, range, direction, hasHole } = {}) {
+    static getTemplateShape({ type, angle, range, direction } = {}) {
         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: shapeType,
+            type: type,
             direction: direction ?? 0
         };
 
-        switch (shapeType) {
+        switch (type) {
             case rectangle.id:
                 shapeData.width = length;
                 shapeData.height = length;
@@ -145,8 +145,7 @@ 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,
-                    hole: hasHole
+                    shape: game.canvas.grid.isHexagonal ? CONST.TOKEN_SHAPES.ELLIPSE_1 : CONST.TOKEN_SHAPES.RECTANGLE_1
                 };
                 break;
         }

module/config/actionConfig.mjs

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

module/data/action/baseAction.mjs

@@ -114,10 +114,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
         return this._id;
     }
 
-    /** 
-     * Returns true if the current user is the owner of the containing item.
-     * @returns {boolean}
-     */
+    /** Returns true if the current user is the owner of the containing item */
     get isOwner() {
         return this.item?.isOwner ?? true;
     }
@@ -146,7 +143,6 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
 
     /**
      * Return the first Actor parent found.
-     * @returns {DhpActor | null}
      */
     get actor() {
         return this.item instanceof DhpActor
@@ -159,7 +155,6 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
     /**
      * Returns true if the action is usable.
      * An action is usable on any actor type. For example, an adversary might have a base attack action.
-     * @returns {boolean}
      */
     get usable() {
         const actor = this.actor;

module/data/fields/action/areasField.mjs

@@ -33,10 +33,6 @@ 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/data/fields/action/transformField.mjs

@@ -2,10 +2,6 @@ import { getWorldActor } from '../../../helpers/utils.mjs';
 
 const fields = foundry.data.fields;
 
-/**
- * @import DHSummonAction from '../../action/summonAction.mjs'
- */
-
 export default class DHSummonField extends fields.SchemaField {
     /**
      * Action Workflow order
@@ -26,11 +22,6 @@ export default class DHSummonField extends fields.SchemaField {
         super(transformFields, options, context);
     }
 
-    /**
-     * Runs the execute. This is run on behalf of DHSummonAction.
-     * @todo move this function to be on the summon action.
-     * @this DHSummonAction
-     */
     static async execute() {
         if (!this.transform.actorUUID) {
             ui.notifications.warn(game.i18n.localize('DAGGERHEART.ACTIONS.TYPES.transform.noTransformActor'));
@@ -48,11 +39,10 @@ export default class DHSummonField extends fields.SchemaField {
             return false;
         }
 
-        const activeTokens = this.actor.getActiveTokens(false, true);
+        const activeTokens = this.actor.getActiveTokens().map(x => x.document);
         const controlledMatchingTokens = canvas.tokens.controlled
             .filter(x => x.actor && x.actor.uuid === this.actor.uuid)
             .map(x => x.document);
-        /** @type {typeof game.system.api.documents.DhToken | null} */
         const token = this.actor.token ?? (
             activeTokens.length === 1 ? activeTokens[0] :
                 (controlledMatchingTokens.length === 1 ? controlledMatchingTokens[0] : null)
@@ -72,10 +62,9 @@ export default class DHSummonField extends fields.SchemaField {
         const tokenSizes = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).tokenSizes;
         const tokenSize = actor?.system.metadata.usesSize ? tokenSizes[actor.system.size] : actor.prototypeToken.width;
 
-        const prototypeTokenData = actor.prototypeToken.toObject();
-        const createdToken = (await canvas.scene.createEmbeddedDocuments(
+        const createdTokens = await canvas.scene.createEmbeddedDocuments(
             'Token', [{
-                ...prototypeTokenData,
+                ...actor.prototypeToken.toObject(),
                 actorId: actor.id,
                 x: token.x,
                 y: token.y,
@@ -85,7 +74,8 @@ export default class DHSummonField extends fields.SchemaField {
                 elevation: token.elevation
             }],
             { controlObject: true, parent: canvas.scene }
-        ))[0];
+        );
+        const createdToken = createdTokens[0];
 
         /* Swap out previous combatant for a new one if applicable */
         if (token.combatant) {

module/documents/_types.d.ts

@@ -3,26 +3,17 @@ import DHItem from './item.mjs';
 import BaseDataItem from '../data/item/base.mjs';
 import DhActiveEffect from './activeEffect.mjs';
 import EmbeddedCollection from '@common/abstract/embedded-collection.mjs';
-import DHToken from './token.mjs';
-import Actor from '@client/documents/actor.mjs';
-import Item from '@client/documents/item.mjs';
 
 declare module './actor.mjs' {
-    export default interface DhpActor<T extends BaseDataActor = BaseDataActor> extends Actor {
+    export default interface DhpActor<T extends BaseDataActor = BaseDataActor> {
         system: T;
         items: EmbeddedCollection<DHItem>;
         effects: EmbeddedCollection<DhActiveEffect>;
-        get token(): DHToken | null;
-
-        /** @inheritdoc */
-        getActiveTokens(linked?: boolean, document?: boolean): (DHToken | foundry.canvas.placeables.Token)[];
-        getActiveTokens(linked?: boolean, document: true): DHToken[];
-        getActiveTokens(linked?: boolean, document: false): foundry.canvas.placeables.Token[];
     }
 }
 
 declare module './item.mjs' {
-    export default interface DHItem<T extends BaseDataItem = BaseDataItem> extends Item {
+    export default interface DHItem<T extends BaseDataItem = BaseDataItem> {
         parent: DhpActor;
         actor: DhpActor;
         system: T;

module/documents/chatMessage.mjs

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

module/enrichers/TemplateEnricher.mjs

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

module/helpers/utils.mjs

@@ -1,10 +1,6 @@
 import { diceTypes, getDiceSoNicePresets, getDiceSoNicePreset, range } from '../config/generalConfig.mjs';
 import Tagify from '@yaireo/tagify';
 
-/**
- * @import DhpActor from '../documents/actor.mjs';
- */
-
 export const capitalize = string => {
     return string.charAt(0).toUpperCase() + string.slice(1);
 };
@@ -895,21 +891,15 @@ export function shouldUseHopeFearAutomation(options = { gmAsPlayer: true }) {
     return (!game.user.isGM || options.gmAsPlayer) ? hopeFear.players : hopeFear.gm; 
 }
 
-/**
- * Returns the given actor if its a world actor, 
- * finds a world actor equivalent, 
- * or imports the actor and returns the imported actor.
- * @param {DhpActor} baseActor 
- * @returns {Promise<DhpActor>} a world actor
- */
 export async function getWorldActor(baseActor) {
     if (baseActor.inCompendium) {
-        const worldActorCandidates = game.actors.filter(x =>
+        const worldActorCopy = game.actors.find(x => 
             x._stats.compendiumSource === baseActor.uuid && 
-            x.prototypeToken.actorLink === baseActor.prototypeToken.actorLink
+            (!x.prototypeToken.actorLink || x.name === baseActor.name)
         );
-        const worldActorCopy = worldActorCandidates.find(a => a.name === baseActor.name) ?? worldActorCandidates[0];
-        if (worldActorCopy) return worldActorCopy;
+
+        if (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": "",
+          "type": "hostile",
           "amount": 1
         },
         "effects": [
@@ -63,23 +63,13 @@
         ],
         "name": "Fire",
         "img": "icons/magic/fire/barrier-wall-explosion-orange.webp",
-        "range": "",
-        "areas": [
-          {
-            "name": "Elemental Aura: Fire",
-            "type": "attached",
-            "shape": "emanation",
-            "size": "close",
-            "hasHole": false,
-            "effects": []
-          }
-        ]
+        "range": "close"
       },
       "xDBLH5TWidvrYF7z": {
         "type": "effect",
         "_id": "xDBLH5TWidvrYF7z",
         "systemPath": "actions",
-        "description": "<p>Your allies gain a +1 bonus to Strength.</p>",
+        "description": "<p>When an adversary marks 1 or more Hit Points, they must also mark a Stress.</p>",
         "chatDisplay": true,
         "actionType": "action",
         "cost": [],
@@ -88,26 +78,19 @@
           "max": "",
           "recovery": null
         },
-        "effects": [],
+        "effects": [
+          {
+            "_id": "WRuijfHxmUscAa69",
+            "onSave": false
+          }
+        ],
         "target": {
-          "type": "",
+          "type": "friendly",
           "amount": null
         },
         "name": "Earth",
         "img": "icons/magic/control/buff-strength-muscle-damage-red.webp",
-        "range": "",
-        "areas": [
-          {
-            "name": "Elemental Aura: Earth",
-            "type": "attached",
-            "shape": "emanation",
-            "size": "close",
-            "hasHole": true,
-            "effects": [
-              "yvpWNCNobg0LLjey"
-            ]
-          }
-        ]
+        "range": "close"
       },
       "S4t5HlgxWlHwaBDw": {
         "type": "effect",
@@ -129,22 +112,12 @@
           }
         ],
         "target": {
-          "type": "self",
+          "type": "hostile",
           "amount": null
         },
         "name": "Water",
         "img": "icons/magic/water/vortex-water-whirlpool.webp",
-        "range": "self",
-        "areas": [
-          {
-            "name": "Elemental Aura: Water",
-            "type": "attached",
-            "shape": "emanation",
-            "size": "close",
-            "hasHole": false,
-            "effects": []
-          }
-        ]
+        "range": "close"
       },
       "hAsKFFewtTqd1gg9": {
         "type": "attack",
@@ -165,10 +138,15 @@
           "includeBase": false
         },
         "target": {
-          "type": "self",
+          "type": "any",
           "amount": null
         },
-        "effects": [],
+        "effects": [
+          {
+            "_id": "mJBA2QTyM9SM5NVS",
+            "onSave": false
+          }
+        ],
         "roll": {
           "type": "diceSet",
           "trait": null,
@@ -191,19 +169,7 @@
         },
         "name": "Air",
         "img": "icons/magic/air/air-burst-spiral-blue-gray.webp",
-        "range": "self",
-        "areas": [
-          {
-            "name": "Elemental Aura: Air",
-            "type": "attached",
-            "shape": "emanation",
-            "size": "close",
-            "hasHole": false,
-            "effects": [
-              "vnKV5hsO4DVjURAl"
-            ]
-          }
-        ]
+        "range": ""
       }
     },
     "originItemType": null,
@@ -215,6 +181,49 @@
     }
   },
   "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",
@@ -228,15 +237,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": []
+        }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -246,9 +258,6 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": null,
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!2JH9NaOh69yN80Gw.H7W52ps5d3UGmaFr"
     },
     {
@@ -264,15 +273,18 @@
           "type": "withinRange",
           "target": "hostile",
           "range": "melee"
-        },
-        "changes": []
+        }
       },
+      "changes": [],
       "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
       "description": "",
       "tint": "#ffffff",
@@ -282,120 +294,43 @@
       "_stats": {
         "compendiumSource": null
       },
-      "start": null,
-      "showIcon": 1,
-      "folder": null,
       "_key": "!items.effects!2JH9NaOh69yN80Gw.WX5AMEpmUAutB9Hm"
     },
     {
-      "name": "Elemental Aura: Earth",
-      "disabled": false,
-      "img": "icons/magic/control/buff-strength-muscle-damage-red.webp",
-      "description": "<p>Your allies gain a +1 bonus to Strength.</p>",
-      "transfer": false,
-      "statuses": [],
-      "system": {
-        "rangeDependence": {
-          "enabled": false,
-          "type": "withinRange",
-          "target": "hostile",
-          "range": "melee"
-        },
-        "changes": [
-          {
-            "key": "system.traits.strength.value",
-            "type": "add",
-            "value": 1,
-            "priority": null,
-            "phase": "initial"
-          }
-        ],
-        "duration": {
-          "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",
-      "showIcon": 1,
-      "folder": null,
-      "sort": 0,
-      "flags": {},
-      "_stats": {
-        "compendiumSource": null
-      },
-      "_key": "!items.effects!2JH9NaOh69yN80Gw.yvpWNCNobg0LLjey"
-    },
-    {
-      "name": "Elemental Aura: Air",
-      "disabled": false,
+      "name": "Elemental Aura (Air)",
       "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>",
+      "origin": "Compendium.daggerheart.subclasses.Item.2JH9NaOh69yN80Gw",
       "transfer": false,
-      "statuses": [],
+      "_id": "mJBA2QTyM9SM5NVS",
+      "type": "base",
       "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
+        }
       },
+      "changes": [],
+      "disabled": false,
       "duration": {
-        "value": null,
-        "units": "seconds",
-        "expiry": null,
-        "expired": false
+        "startTime": null,
+        "combat": null,
+        "seconds": null,
+        "rounds": null,
+        "turns": null,
+        "startRound": null,
+        "startTurn": null
       },
-      "origin": null,
+      "description": "",
       "tint": "#ffffff",
-      "showIcon": 1,
-      "folder": null,
+      "statuses": [],
       "sort": 0,
       "flags": {},
       "_stats": {
         "compendiumSource": null
       },
-      "_key": "!items.effects!2JH9NaOh69yN80Gw.vnKV5hsO4DVjURAl"
+      "_key": "!items.effects!2JH9NaOh69yN80Gw.mJBA2QTyM9SM5NVS"
     }
   ],
   "sort": 100000,

styles/less/global/elements.less

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

styles/less/global/resource-bar.less

@@ -9,107 +9,110 @@
     }   
 });
 
-/** Pips styling, can exist standalone even without a slot-value */
-.slot-bar {
-    display: flex;
-    gap: 4px;
-    padding: 5px;
-    border: 1px solid @color-border;
-    border-radius: 6px;
-    z-index: 1;
-    color: @color-text-emphatic;
-    width: fit-content;
-    min-height: 22px;
-    flex-wrap: wrap;
-
-    .slot {
-        transition: all 0.3s ease;
-        cursor: pointer;
-    }
-
-    .slot:not(:has(i)) {
-        width: 15px;
-        height: 10px;
-        border: 1px solid @color-border;
-        background: light-dark(@dark-blue-10, @golden-10);
-        border-radius: 3px;
-
-        &.large {
-            width: 20px;
-        }
-
-        &.filled {
-            background: light-dark(@dark-blue, @golden);
-        }
-    }
-
-    &.armor .slot {
-        font-size: var(--font-size-12);
-        .fa-shield-halved {
-            color: light-dark(@dark-blue-40, @golden-40);
-        }
-    }
-
-    .empty-slot {
-        width: 15px;
-        height: 10px;
-    }
-}
-
-.slot-value {
-    display: flex;
-    flex-direction: column;
-    font-size: 1.5rem;
-    align-items: center;
-    justify-content: center;
-    text-align: center;
-    z-index: 2;
-    color: @beige;
-
-    .slot-label {
-        display: flex;
-        align-items: center;
-        color: light-dark(@beige, @dark-blue);
-        background: light-dark(@dark-blue, @golden);
-        padding: 0 5px;
-        width: fit-content;
-        font-weight: bold;
-        border-radius: 0px 0px 5px 5px;
-        font-size: var(--font-size-12);
-
-        .label {
-            padding-right: 5px;
-        }
-
-        .value {
-            padding-left: 6px;
-            border-left: 1px solid light-dark(@beige, @dark-golden);
-        }
-    }
-}
-
 .status-bar {
     display: flex;
-    flex-direction: column;
-    align-items: center;
+    justify-content: center;
     position: relative;
+    width: 120px;
+    height: 40px;
 
-    .status-value {
+    .status-label {
         position: relative;
+        top: 40px;
+        height: 22px;
+        width: 79px;
+        clip-path: path('M0 0H79L74 16.5L39 22L4 16.5L0 0Z');
+        background: light-dark(@dark-blue, @golden);
+
+        h4 {
+            font-weight: bold;
+            text-align: center;
+            line-height: 18px;
+            color: light-dark(@beige, @dark-blue);
+        }
+    }
+    .slot-value {
+        position: absolute;
         display: flex;
+        flex-direction: column;
         padding: 0 5px;
         font-size: 1.5rem;
         align-items: center;
-        width: 100px;
+        width: 140px;
         height: 40px;
         justify-content: center;
         text-align: center;
         z-index: 2;
         color: @beige;
 
-        > * {
+        .slot-bar {
+            display: flex;
+            flex-wrap: wrap;
+            gap: 5px;
+            padding: 5px;
+            border: 1px solid @color-border;
+            border-radius: 6px;
             z-index: 1;
+            color: @color-text-emphatic;
+            width: fit-content;
+
+            .slot {
+                width: 15px;
+                height: 10px;
+                border: 1px solid @color-border;
+                background: light-dark(@dark-blue-10, @golden-10);
+                border-radius: 3px;
+                transition: all 0.3s ease;
+                cursor: pointer;
+
+                &.large {
+                    width: 20px;
+                }
+
+                &.filled {
+                    background: light-dark(@dark-blue, @golden);
+                }
+            }
+
+            .empty-slot {
+                width: 15px;
+                height: 10px;
+            }
         }
+        .slot-label {
+            display: flex;
+            align-items: center;
+            color: light-dark(@beige, @dark-blue);
+            background: light-dark(@dark-blue, @golden);
+            padding: 0 5px;
+            width: fit-content;
+            font-weight: bold;
+            border-radius: 0px 0px 5px 5px;
+            font-size: var(--font-size-12);
+
+            .label {
+                padding-right: 5px;
+            }
+
+            .value {
+                padding-left: 6px;
+                border-left: 1px solid light-dark(@beige, @dark-golden);
+            }
+        }
+    }
+
+    .status-value {
+        position: absolute;
+        display: flex;
+        padding: 0 5px;
+        font-size: 1.5rem;
+        align-items: center;
+        width: 140px;
+        height: 40px;
+        justify-content: center;
+        text-align: center;
+        z-index: 2;
+        color: @beige;
 
         input[type='number'] {
             background: transparent;
@@ -143,11 +146,11 @@
     .progress-bar {
         position: absolute;
         appearance: none;
-        width: 100%;
-        height: 100%;
+        width: 100px;
+        height: 40px;
         border: 1px solid @color-border;
         border-radius: 6px;
-        z-index: 0;
+        z-index: 1;
         background: @dark-blue;
 
         &::-webkit-progress-bar {
@@ -172,29 +175,4 @@
             border-radius: 6px;
         }
     }
-    .status-label {
-        position: relative;
-        height: 22px;
-        width: 79px;
-        background: light-dark(@dark-blue, @golden);
-
-        &.pointy {
-            clip-path: path('M0 0H79L74 16.5L39 22L4 16.5L0 0Z');
-            margin-bottom: -2px; // compensate for pointy bottom so spacing feels more "right"
-        }
-
-        h4 {
-            font-weight: bold;
-            text-align: center;
-            line-height: 18px;
-            color: light-dark(@beige, @dark-blue);
-        }
-    }
-}
-
-// Overrides for sidebar usage.
-aside[data-application-part="sidebar"] .resources-section .slot-bar {
-    display: grid;
-    grid-template-columns: repeat(6, min-content);
-    grid-auto-flow: row;
 }

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

@@ -1,6 +1,7 @@
-@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,37 +2,35 @@
 @import '../../../utils/fonts.less';
 
 .application.sheet.daggerheart.actor.dh-style.adversary {
-    --sidebar-width: 260px;
-
     .window-content {
         display: grid;
-        grid-template-columns: var(--sidebar-width) 1fr;
+        grid-template-columns: 275px 1fr;
         grid-template-rows: auto 1fr;
         height: 100%;
         width: 100%;
         padding-bottom: 0;
-    }
 
-    .adversary-sidebar-sheet {
-        grid-row: 1 / span 2;
-        grid-column: 1;
-        overflow: hidden;
-        display: flex;
-        flex-direction: column;
-    }
-
-    .adversary-header-sheet {
-        grid-row: 1;
-        grid-column: 2;
-    }
-
-    .tab {
-        grid-row: 2;
-        grid-column: 2;
-        &.active {
+        .adversary-sidebar-sheet {
+            grid-row: 1 / span 2;
+            grid-column: 1;
             overflow: hidden;
             display: flex;
             flex-direction: column;
         }
+
+        .adversary-header-sheet {
+            grid-row: 1;
+            grid-column: 2;
+        }
+
+        .tab {
+            grid-row: 2;
+            grid-column: 2;
+            &.active {
+                overflow: hidden;
+                display: flex;
+                flex-direction: column;
+            }
+        }
     }
 }

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

@@ -22,8 +22,8 @@
 
 .application.sheet.daggerheart.actor.dh-style.adversary {
     .adversary-sidebar-sheet {
-        width: var(--sidebar-width);
-        min-width: var(--sidebar-width);
+        width: 275px;
+        min-width: 275px;
         border-right: 1px solid light-dark(@dark-blue, @golden);
 
         .portrait {
@@ -52,7 +52,7 @@
             }
 
             img {
-                height: var(--sidebar-width);
+                height: 275px;
             }
 
             .death-roll-btn {
@@ -63,7 +63,7 @@
         .threshold-section {
             position: relative;
             display: flex;
-            gap: 7px;
+            gap: 10px;
             background-color: light-dark(transparent, @dark-blue);
             color: @color-text-emphatic;
             padding: 5px 10px;
@@ -106,8 +106,8 @@
             display: flex;
             flex-direction: column;
             top: -20px;
-            gap: 10px;
-            margin-bottom: -16px;
+            gap: 16px;
+            margin-bottom: -10px;
 
             &.pip-display {
                 top: -15px;
@@ -120,6 +120,105 @@
             .resources-section {
                 display: flex;
                 justify-content: space-evenly;
+                margin-bottom: 16px;
+
+                .status-bar {
+                    display: flex;
+                    justify-content: center;
+                    position: relative;
+                    width: 100px;
+                    height: 40px;
+
+                    .status-label {
+                        position: relative;
+                        top: 40px;
+                        height: 22px;
+                        width: 79px;
+                        clip-path: path('M0 0H79L74 16.5L39 22L4 16.5L0 0Z');
+                        background: light-dark(@dark-blue, @golden);
+
+                        h4 {
+                            font-weight: bold;
+                            text-align: center;
+                            line-height: 18px;
+                            color: light-dark(@beige, @dark-blue);
+                        }
+                    }
+                    .status-value {
+                        position: absolute;
+                        display: flex;
+                        padding: 0 6px;
+                        font-size: 1.5rem;
+                        align-items: center;
+                        width: 100px;
+                        height: 40px;
+                        justify-content: center;
+                        text-align: center;
+                        z-index: 2;
+                        color: @beige;
+
+                        input[type='number'] {
+                            background: transparent;
+                            font-size: 1.5rem;
+                            width: 40px;
+                            height: 30px;
+                            text-align: center;
+                            border: none;
+                            outline: 2px solid transparent;
+                            color: @beige;
+
+                            &.bar-input {
+                                padding: 0;
+                                color: @beige;
+                                backdrop-filter: none;
+                                background: transparent;
+                                transition: all 0.3s ease;
+
+                                &:hover,
+                                &:focus {
+                                    background: @semi-transparent-dark-blue;
+                                    backdrop-filter: blur(9.5px);
+                                }
+                            }
+                        }
+
+                        .bar-label {
+                            width: 40px;
+                        }
+                    }
+                    .progress-bar {
+                        position: absolute;
+                        appearance: none;
+                        width: 100px;
+                        height: 40px;
+                        border: 1px solid @color-border;
+                        border-radius: 6px;
+                        z-index: 1;
+                        background: @dark-blue;
+
+                        &::-webkit-progress-bar {
+                            border: none;
+                            background: @dark-blue;
+                            border-radius: 6px;
+                        }
+                        &::-webkit-progress-value {
+                            background: @gradient-hp;
+                            border-radius: 6px;
+                        }
+                        &.stress-color::-webkit-progress-value {
+                            background: @gradient-stress;
+                            border-radius: 6px;
+                        }
+                        &::-moz-progress-bar {
+                            background: @gradient-hp;
+                            border-radius: 6px;
+                        }
+                        &.stress-color::-moz-progress-bar {
+                            background: @gradient-stress;
+                            border-radius: 6px;
+                        }
+                    }
+                }
             }
 
             .status-section {
@@ -157,7 +256,7 @@
                     .status-label {
                         padding: 2px 10px;
                         width: 100%;
-                        border-radius: 0 0 3px 3px;
+                        border-radius: 3px;
                         background: light-dark(@dark-blue, @golden);
 
                         h4 {
@@ -185,8 +284,8 @@
 
         .shortcut-items-section {
             overflow-y: hidden;
-            padding: 10px 0;
-            flex: 1;
+            padding-top: 10px;
+            padding-bottom: 20px;
             scrollbar-gutter: stable;
             .with-scroll-shadows();
 
@@ -214,6 +313,8 @@
         }
 
         .experience-section {
+            margin-bottom: 20px;
+
             .title {
                 display: flex;
                 gap: 15px;
@@ -230,21 +331,21 @@
                 gap: 5px;
                 width: 100%;
                 margin-top: 10px;
-                align-items: stretch;
-                padding: 0 4px 0 12px;
+                align-items: center;
 
                 .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;
                     }
@@ -269,7 +370,9 @@
 
         .reaction-section {
             display: flex;
-            margin: 10px;
+            padding: 0 10px;
+            margin-top: 20px;
+            width: 100%;
 
             button {
                 height: 40px;

styles/less/sheets/actors/character/sidebar.less

@@ -89,13 +89,113 @@
 
             .resources-section {
                 justify-content: space-around;
-                margin: 8px 2px 0 2px;
+                margin: 8px 2px 8px 2px;
             }
         }
 
         .resources-section {
             display: flex;
             justify-content: space-evenly;
+            margin-bottom: 20px;
+
+            .status-bar {
+                display: flex;
+                justify-content: center;
+                position: relative;
+                width: 120px;
+                height: 40px;
+
+                .status-label {
+                    position: relative;
+                    top: 40px;
+                    height: 22px;
+                    width: 79px;
+                    clip-path: path('M0 0H79L74 16.5L39 22L4 16.5L0 0Z');
+                    background: light-dark(@dark-blue, @golden);
+
+                    h4 {
+                        font-weight: bold;
+                        text-align: center;
+                        line-height: 18px;
+                        color: light-dark(@beige, @dark-blue);
+                    }
+                }
+
+                .status-value {
+                    position: absolute;
+                    display: flex;
+                    padding: 0 5px;
+                    font-size: 1.5rem;
+                    align-items: center;
+                    width: 140px;
+                    height: 40px;
+                    justify-content: center;
+                    text-align: center;
+                    z-index: 2;
+                    color: @beige;
+
+                    input[type='number'] {
+                        background: transparent;
+                        font-size: 1.5rem;
+                        width: 40px;
+                        height: 30px;
+                        text-align: center;
+                        border: none;
+                        outline: 2px solid transparent;
+                        color: @beige;
+
+                        &.bar-input {
+                            padding: 0;
+                            color: @beige;
+                            backdrop-filter: none;
+                            background: transparent;
+                            transition: all 0.3s ease;
+
+                            &:hover,
+                            &:focus {
+                                background: @semi-transparent-dark-blue;
+                                backdrop-filter: blur(9.5px);
+                            }
+                        }
+                    }
+
+                    .bar-label {
+                        width: 40px;
+                    }
+                }
+                .progress-bar {
+                    position: absolute;
+                    appearance: none;
+                    width: 100px;
+                    height: 40px;
+                    border: 1px solid @color-border;
+                    border-radius: 6px;
+                    z-index: 1;
+                    background: @dark-blue;
+
+                    &::-webkit-progress-bar {
+                        border: none;
+                        background: @dark-blue;
+                        border-radius: 6px;
+                    }
+                    &::-webkit-progress-value {
+                        background: @gradient-hp;
+                        border-radius: 6px;
+                    }
+                    &.stress-color::-webkit-progress-value {
+                        background: @gradient-stress;
+                        border-radius: 6px;
+                    }
+                    &::-moz-progress-bar {
+                        background: @gradient-hp;
+                        border-radius: 6px;
+                    }
+                    &.stress-color::-moz-progress-bar {
+                        background: @gradient-stress;
+                        border-radius: 6px;
+                    }
+                }
+            }
         }
 
         .status-section {
@@ -145,21 +245,21 @@
 
             .status-bar.armor-slots {
                 display: flex;
+                justify-content: center;
+                position: relative;
                 width: 95px;
+                height: 30px;
                 white-space: nowrap;
 
-                .status-label {
-                    height: 30px;
-                }
-
                 .status-label {
                     padding: 2px 2px;
                     position: relative;
+                    top: 30px;
                     height: 22px;
                     width: 95px;
                     border-radius: 3px;
                     background: light-dark(@dark-blue, @golden);
-
+                    clip-path: none;
                     display: flex;
                     align-items: center;
                     justify-content: center;
@@ -191,16 +291,40 @@
                     }
                 }
                 .slot-value {
+                    position: absolute;
+                    display: flex;
+                    padding: 0 5px;
                     font-size: 1.2rem;
+                    align-items: center;
                     width: 80px;
                     height: 30px;
+                    justify-content: center;
+                    text-align: center;
+                    z-index: 2;
                     color: light-dark(@dark-blue, @beige);
                     flex-direction: column;
 
                     .slot-bar {
+                        display: flex;
+                        flex-wrap: wrap;
+                        gap: 4px;
+                        padding: 5px;
+                        border: 1px solid @color-border;
+                        border-radius: 6px;
+                        z-index: 1;
                         background: @dark-blue;
                         justify-content: center;
-                        border-bottom: none;
+                        color: @color-text-emphatic;
+
+                        .armor-slot {
+                            cursor: pointer;
+                            transition: all 0.3s ease;
+                            font-size: var(--font-size-12);
+
+                            .fa-shield-halved {
+                                color: light-dark(@dark-blue-40, @golden-40);
+                            }
+                        }
                     }
                     .slot-label {
                         display: flex;
@@ -240,21 +364,41 @@
                     }
                 }
                 .status-value {
+                    position: absolute;
+                    display: flex;
                     padding: 0 6px;
                     font-size: 1.2rem;
+                    align-items: center;
                     width: 80px;
                     height: 30px;
                     justify-content: center;
+                    text-align: center;
+                    z-index: 2;
                     color: light-dark(@dark-blue, @beige);
+                    border: 1px solid @color-border;
+                    border-bottom: none;
+                    border-radius: 6px 6px 0 0;
 
                     input[type='number'] {
+                        background: transparent;
                         font-size: 1.2rem;
                         width: 30px;
                         height: 20px;
+                        text-align: center;
+                        border: none;
+                        outline: 2px solid transparent;
                         color: light-dark(@dark-blue, @beige);
 
                         &.bar-input {
+                            padding: 0;
                             color: light-dark(@dark-blue, @beige);
+                            backdrop-filter: none;
+                            background: transparent;
+                            &:hover,
+                            &:focus {
+                                background: @semi-transparent-dark-blue;
+                                backdrop-filter: blur(9.5px);
+                            }
                         }
                     }
 
@@ -263,9 +407,32 @@
                     }
                 }
                 .progress-bar {
+                    position: absolute;
+                    appearance: none;
+                    width: 80px;
+                    height: 30px;
+                    border: 1px solid @color-border;
+                    border-radius: 6px;
+                    z-index: 1;
                     background: light-dark(transparent, @dark-blue);
                     border-bottom: none;
                     border-radius: 6px 6px 0 0;
+                    &::-webkit-progress-bar {
+                        border: none;
+                        background: light-dark(transparent, @dark-blue);
+                    }
+                    &::-webkit-progress-value {
+                        background: @gradient-stress;
+                    }
+                    &.stress-color::-webkit-progress-value {
+                        background: @gradient-stress;
+                    }
+                    &::-moz-progress-bar {
+                        background: @gradient-stress;
+                    }
+                    &.stress-color::-moz-progress-bar {
+                        background: @gradient-stress;
+                    }
                 }
             }
 

styles/less/sheets/actors/party/party-members.less

@@ -206,12 +206,42 @@
                     }
 
                     .slot-bar {
+                        display: flex;
                         align-items: center;
                         flex-wrap: wrap;
+                        gap: 4px;
+
                         background-color: light-dark(@dark-blue-10, @dark-blue);
+                        color: @color-text-emphatic;
                         padding: 2px 5px;
+                        border: 1px solid @color-border;
                         border-radius: 0 6px 6px 0;
                         width: fit-content;
+                        min-height: 22px;
+
+                        .armor-slot {
+                            cursor: pointer;
+                            transition: all 0.3s ease;
+                            font-size: var(--font-size-12);
+
+                            .fa-shield-halved {
+                                color: light-dark(@dark-blue-40, @golden-40);
+                            }
+                        }
+
+                        .slot {
+                            width: 16px;
+                            height: 10px;
+                            border: 1px solid @color-border;
+                            background: light-dark(@dark-blue-10, @golden-10);
+                            border-radius: 3px;
+                            transition: all 0.3s ease;
+                            cursor: pointer;
+
+                            &.filled {
+                                background: light-dark(@dark-blue, @golden);
+                            }
+                        }
                     }
                 }
             }

templates/actionTypes/areas.hbs

@@ -11,10 +11,9 @@
             <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 blank=false}}
-            {{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 blank=false}}
-            {{formField ../fields.hasHole value=area.hasHole name=(concat "areas." index ".hasHole") localize=true classes="auto-sized" }}
+            {{formField ../fields.type value=area.type name=(concat "areas." index ".type") localize=true}}
+            {{formField ../fields.shape value=area.shape name=(concat "areas." index ".shape") localize=true}}
+            {{formField ../fields.size value=area.size name=(concat "areas." index ".size") localize=true}}
         </div>
 
         <div class="sub-section-header">

templates/sheets/actors/adversary/sidebar.hbs

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

templates/sheets/actors/character/sidebar.hbs

@@ -23,9 +23,9 @@
                 <div class="status-bar armor-slots">
                     {{#if useResourcePips}}
                     <div class='slot-value'>
-                        <div class="slot-bar armor">
+                        <div class="slot-bar">
                         {{#times document.system.armorScore.max}}
-                            <a class="slot" data-action="toggleArmor" data-value="{{add this 1}}">
+                            <a class='armor-slot' data-action='toggleArmor' data-value="{{add this 1}}">
                                 {{#if (gte ../document.system.armorScore.value (add this 1))}}
                                     <i class="fa-solid fa-shield"></i>
                                 {{else}}
@@ -44,15 +44,15 @@
                     </div>
                     {{else}}
                     <div class='status-value'>
-                        <progress
-                            class='progress-bar stress-color'
-                            value='{{document.system.armorScore.value}}'
-                            max='{{document.system.armorScore.max}}'
-                        ></progress>
                         <input class="bar-input armor-marks-input" value="{{document.system.armorScore.value}}" type="number" id="{{document.uuid}}-armor-slots">
                         <span>/</span>
                         <span class="bar-label">{{document.system.armorScore.max}}</span>
                     </div>
+                    <progress
+                        class='progress-bar stress-color'
+                        value='{{document.system.armorScore.value}}'
+                        max='{{document.system.armorScore.max}}'
+                    ></progress>
                     <a class="status-label" data-action="toggleArmorMangement" {{disabled (not @root.editable)}}>
                         <h4>{{localize "DAGGERHEART.GENERAL.armorSlots"}}</h4>
                         {{#if @root.editable}}<i class="fa-solid fa-gear" inert></i>{{/if}}

templates/sheets/actors/party/party-members.hbs

@@ -135,9 +135,9 @@
                                             <span class="max">{{member.armorScore.max}}</span>
                                         </span>
                                     </div>
-                                    <div class="slot-bar armor">
+                                    <div class="slot-bar">
                                         {{#times member.armorScore.max}}
-                                            <a class="slot" data-action="toggleArmorSlot" data-actor-id="{{member.uuid}}" data-value="{{add this 1}}">
+                                            <a class='armor-slot' data-action='toggleArmorSlot' data-actor-id="{{member.uuid}}" data-value="{{add this 1}}">
                                             {{#if (gte member.armorScore.value (add this 1))}}
                                                 <i class="fa-solid fa-shield"></i>
                                             {{else}}

templates/sheets/global/partials/resource-bar.hbs

@@ -1,35 +1,35 @@
-{{#if useResourcePips}}
-    <div class="slot-value">
-        <div class="slot-bar">
-            {{#times resource.max}}
-                <span class='slot {{#if (gte ../resource.value (add this 1))}}filled{{/if}} {{#if ../largePips}}large{{/if}}' data-action="{{../action}}" data-value="{{add this 1}}">
-                </span>
-            {{/times}}
+<div class="status-bar">
+    {{#if useResourcePips}}
+        <div class='slot-value'>
+            <div class="slot-bar">
+                {{#times resource.max}}
+                    <span class='slot {{#if (gte ../resource.value (add this 1))}}filled{{/if}} {{#if ../largePips}}large{{/if}}' data-action="{{../action}}" data-value="{{add this 1}}">
+                    </span>
+                {{/times}}
             
-            {{#times resource.emptyPips}}
-                <span class="empty-slot"></span>
-            {{/times}}
+                {{#times resource.emptyPips}}
+                    <span class="empty-slot"></span>
+                {{/times}}
+            </div>
+            <div class="slot-label">
+                <span class="label">{{localize label}}</span>
+                <span class="value">{{resource.value}} / {{resource.max}}</span>
+            </div> 
         </div>
-        <div class="slot-label">
-            <span class="label">{{localize label}}</span>
-            <span class="value">{{resource.value}} / {{resource.max}}</span>
-        </div> 
-    </div>
-{{else}}
-    <div class="status-bar">
+    {{else}}
         <div class='status-value'>
-            <progress
-                class='progress-bar'
-                max='{{resource.max}}'
-                value='{{resource.value}}'
-            ></progress>
             <input class="bar-input" name="{{key}}" min="0" max='{{resource.max}}'
                     value="{{resource.value}}" type="number">
             <span>/</span>
             <span class="bar-label">{{resource.max}}</span>
         </div>
-        <div class="status-label pointy">
+        <progress
+            class='progress-bar'
+            max='{{resource.max}}'
+            value='{{resource.value}}'
+        ></progress>
+        <div class="status-label">
             <h4>{{localize label}}</h4>
         </div>
-    </div>
- {{/if}}
+    {{/if}}
+</div>

templates/ui/chat/chat-message.hbs

@@ -6,13 +6,18 @@
             <div class="message-sub-header-container">
                 {{#if message.title}}
                     <h4>{{message.title}}</h4>
-                    <div>{{alias}} {{#if author.isGM}}(GM){{/if}}</div>
+                    <div>{{actor.name}} {{#if author.isGM}}(GM){{/if}}</div>
                 {{else}}
                     {{#unless actor.name}}
                         <h4>{{author.name}}</h4>
                     {{else}}
-                        <h4>{{alias}}</h4>
-                        <div>{{author.name}}</div>
+                        {{#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>
+                        {{/if}}
                     {{/unless}}
                 {{/if}}
             </div>

templates/ui/tooltip/armorManagement.hbs

@@ -3,9 +3,9 @@
     {{#each sources as |source|}}
         <div class="armor-source-container">
             <p class="armor-source-label">{{source.name}}</p>
-            <div class="slot-bar armor">
+            <div class="slot-bar">
                 {{#times source.max}}
-                    <a class="slot" data-value="{{add this 1}}" data-uuid="{{source.uuid}}">
+                    <a class='armor-slot' data-value="{{add this 1}}" data-uuid="{{source.uuid}}">
                         {{#if (gte ../current (add this 1))}}
                             <i class="fa-solid fa-shield" data-index="{{this}}"></i>
                         {{else}}