From 841819ee89c15a375c3cf4036895c4b72ad1bc3e Mon Sep 17 00:00:00 2001
From: Dapoulp <74197441+Dapoulp@users.noreply.github.com>
Date: Fri, 15 Aug 2025 21:27:55 +0200
Subject: [PATCH 1/2] Fix/941 companion hope ranger (#950)

* Temp ActionField attack type missing

* Move missing attack type to getModel

* Fix Companion not updating Partner resources
---
 module/data/action/baseAction.mjs | 7 ++++---
 module/documents/actor.mjs        | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs
index a886bf49..3666b6e7 100644
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@@ -208,8 +208,9 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
     }
 
     async consume(config, successCost = false) {
-        const usefulResources = {
-            ...foundry.utils.deepClone(this.actor.system.resources),
+        const actor= this.actor.system.partner ?? this.actor,
+            usefulResources = {
+            ...foundry.utils.deepClone(actor.system.resources),
             fear: {
                 value: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Resources.Fear),
                 max: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).maxFear,
@@ -246,7 +247,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
                 }
             }, []);
 
-        await (this.actor.system.partner ?? this.actor).modifyResource(resources);
+        await actor.modifyResource(resources);
         if (
             config.uses?.enabled &&
             ((!successCost && (!config.uses?.consumeOnSuccess || config.roll?.success)) ||
diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs
index 6b01c058..05c4cbaa 100644
--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@@ -631,7 +631,7 @@ export default class DhpActor extends Actor {
     }
 
     async modifyResource(resources) {
-        if (!resources.length) return;
+        if (!resources?.length) return;
 
         if (resources.find(r => r.key === 'stress')) this.convertStressDamageToHP(resources);
         let updates = {

From ba42892eedada7c518928c0df71ac263a7a4ba3e Mon Sep 17 00:00:00 2001
From: Dapoulp <74197441+Dapoulp@users.noreply.github.com>
Date: Fri, 15 Aug 2025 21:29:24 +0200
Subject: [PATCH 2/2] Fix sheet img (#966)

* Temp ActionField attack type missing

* Move missing attack type to getModel

* Fix sheet portrait image css
---
 styles/less/sheets/actors/actor-sheet-shared.less | 8 ++++++++
 styles/less/sheets/actors/adversary/sidebar.less  | 3 ---
 styles/less/sheets/actors/character/sidebar.less  | 3 ---
 styles/less/sheets/actors/companion/header.less   | 3 ---
 styles/less/sheets/actors/environment/header.less | 3 ---
 styles/less/sheets/index.less                     | 2 ++
 6 files changed, 10 insertions(+), 12 deletions(-)
 create mode 100644 styles/less/sheets/actors/actor-sheet-shared.less

diff --git a/styles/less/sheets/actors/actor-sheet-shared.less b/styles/less/sheets/actors/actor-sheet-shared.less
new file mode 100644
index 00000000..91a2323f
--- /dev/null
+++ b/styles/less/sheets/actors/actor-sheet-shared.less
@@ -0,0 +1,8 @@
+
+.application.sheet.daggerheart.actor.dh-style {
+    .portrait img, .profile {
+        width: 100%;
+        object-fit: cover;
+        object-position: top center;
+    }
+}
\ No newline at end of file
diff --git a/styles/less/sheets/actors/adversary/sidebar.less b/styles/less/sheets/actors/adversary/sidebar.less
index 79927881..cd58ab8c 100644
--- a/styles/less/sheets/actors/adversary/sidebar.less
+++ b/styles/less/sheets/actors/adversary/sidebar.less
@@ -53,9 +53,6 @@
 
             img {
                 height: 275px;
-                width: 275px;
-                object-fit: cover;
-                object-position: top center;
             }
 
             .death-roll-btn {
diff --git a/styles/less/sheets/actors/character/sidebar.less b/styles/less/sheets/actors/character/sidebar.less
index 3d8e829a..b8069aef 100644
--- a/styles/less/sheets/actors/character/sidebar.less
+++ b/styles/less/sheets/actors/character/sidebar.less
@@ -56,9 +56,6 @@
 
         img {
             height: 275px;
-            width: 275px;
-            object-fit: cover;
-            object-position: top center;
         }
 
         .death-roll-btn {
diff --git a/styles/less/sheets/actors/companion/header.less b/styles/less/sheets/actors/companion/header.less
index bc1995aa..240f9df8 100644
--- a/styles/less/sheets/actors/companion/header.less
+++ b/styles/less/sheets/actors/companion/header.less
@@ -10,9 +10,6 @@
 
         .profile {
             height: 235px;
-            width: 235px;
-            object-fit: cover;
-            object-position: top center;
             cursor: pointer;
             mask-image: linear-gradient(0deg, transparent 0%, black 10%);
         }
diff --git a/styles/less/sheets/actors/environment/header.less b/styles/less/sheets/actors/environment/header.less
index c9d01754..f7353b10 100644
--- a/styles/less/sheets/actors/environment/header.less
+++ b/styles/less/sheets/actors/environment/header.less
@@ -9,10 +9,7 @@
         text-align: center;
 
         .profile {
-            width: 235px;
             height: 235px;
-            object-fit: cover;
-            object-position: top center;
             mask-image: linear-gradient(0deg, transparent 0%, black 10%);
             cursor: pointer;
         }
diff --git a/styles/less/sheets/index.less b/styles/less/sheets/index.less
index 76c1a320..a8f36a63 100644
--- a/styles/less/sheets/index.less
+++ b/styles/less/sheets/index.less
@@ -1,3 +1,5 @@
+@import './actors/actor-sheet-shared.less';
+
 @import './actors/adversary/actions.less';
 @import './actors/adversary/header.less';
 @import './actors/adversary/sheet.less';