Merge branch 'main' into release

module/data/activeEffect/beastformEffect.mjs

@@ -61,11 +61,12 @@ export default class BeastformEffect extends BaseEffect {
                 ...baseUpdate,
                 'texture': {
                     enabled: this.characterTokenData.usesDynamicToken,
-                    src: token.flags.daggerheart.beastformTokenImg
+                    src: token.flags.daggerheart?.beastformTokenImg ?? this.characterTokenData.tokenImg
                 },
                 'ring': {
                     subject: {
-                        texture: token.flags.daggerheart.beastformSubjectTexture
+                        texture:
+                            token.flags.daggerheart?.beastformSubjectTexture ?? this.characterTokenData.tokenRingImg
                     }
                 },
                 'flags.daggerheart': { '-=beastformTokenImg': null, '-=beastformSubjectTexture': null }

styles/less/ui/combat-sidebar/token-actions.less

@@ -21,11 +21,6 @@
                 padding: 8px;
                 --button-size: 0;
 
-                &.used {
-                    opacity: 0.5;
-                    background: transparent;
-                }
-
                 &.inactive {
                     background: var(--color-warm-2);
                     color: var(--color-light-1);
@@ -35,6 +30,11 @@
                         filter: none;
                     }
                 }
+
+                &.used {
+                    opacity: 0.5;
+                    background: transparent;
+                }
             }
         }
 

system.json

@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "compatibility": {
         "minimum": "13",
         "verified": "13.351",