Merge branch 'hotfix' into fix/877-hope-update-order

module/applications/levelup/companionLevelup.mjs

@@ -67,6 +67,28 @@ export default class DhCompanionLevelUp extends BaseLevelUp {
                 const levelKeys = Object.keys(this.levelup.levels);
                 const actorDamageDice = this.actor.system.attack.damage.parts[0].value.dice;
                 const actorRange = this.actor.system.attack.range;
+
+                let achievementExperiences = [];
+                for (var levelKey of levelKeys) {
+                    const level = this.levelup.levels[levelKey];
+                    if (Number(levelKey) < this.levelup.startLevel) continue;
+
+                    achievementExperiences = level.achievements.experiences
+                        ? Object.values(level.achievements.experiences).reduce((acc, experience) => {
+                              if (experience.name) acc.push(experience);
+                              return acc;
+                          }, [])
+                        : [];
+                }
+                context.achievements = {
+                    experiences: {
+                        values: achievementExperiences,
+                        shown: achievementExperiences.length > 0
+                    }
+                };
+
+                context.achievements = context.achievements.experiences.shown ? context.achievements : undefined;
+
                 const advancement = {};
                 for (var levelKey of levelKeys) {
                     const level = this.levelup.levels[levelKey];

module/applications/sheets-configs/companion-settings.mjs

@@ -1,5 +1,4 @@
 import { GMUpdateEvent, socketEvent } from '../../systemRegistration/socket.mjs';
-import DhCompanionlevelUp from '../levelup/companionLevelup.mjs';
 import DHBaseActorSettings from '../sheets/api/actor-setting.mjs';
 
 /**@typedef {import('@client/applications/_types.mjs').ApplicationClickAction} ApplicationClickAction */
@@ -11,8 +10,7 @@ export default class DHCompanionSettings extends DHBaseActorSettings {
         position: { width: 455, height: 'auto' },
         actions: {
             addExperience: DHCompanionSettings.#addExperience,
-            removeExperience: DHCompanionSettings.#removeExperience,
-            levelUp: DHCompanionSettings.#levelUp
+            removeExperience: DHCompanionSettings.#removeExperience
         }
     };
 
@@ -121,12 +119,4 @@ export default class DHCompanionSettings extends DHBaseActorSettings {
 
         await this.actor.update({ [`system.experiences.-=${target.dataset.experience}`]: null });
     }
-
-    /**
-     * Opens the companion level-up dialog for the associated actor.
-     * @type {ApplicationClickAction}
-     */
-    static async #levelUp() {
-        new DhCompanionlevelUp(this.actor).render({ force: true });
-    }
 }

module/applications/sheets/actors/companion.mjs

@@ -1,3 +1,4 @@
+import DhCompanionLevelUp from '../../levelup/companionLevelup.mjs';
 import DHBaseActorSheet from '../api/base-actor.mjs';
 
 /**@typedef {import('@client/applications/_types.mjs').ApplicationClickAction} ApplicationClickAction */
@@ -6,7 +7,9 @@ export default class DhCompanionSheet extends DHBaseActorSheet {
     static DEFAULT_OPTIONS = {
         classes: ['actor', 'companion'],
         position: { width: 300 },
-        actions: {}
+        actions: {
+            levelManagement: DhCompanionSheet.#levelManagement
+        }
     };
 
     static PARTS = {
@@ -25,4 +28,25 @@ export default class DhCompanionSheet extends DHBaseActorSheet {
             labelPrefix: 'DAGGERHEART.GENERAL.Tabs'
         }
     };
+
+    /** @inheritDoc */
+    async _onRender(context, options) {
+        await super._onRender(context, options);
+
+        this.element
+            .querySelector('.level-value')
+            ?.addEventListener('change', event => this.document.updateLevel(Number(event.currentTarget.value)));
+    }
+
+    /* -------------------------------------------- */
+    /*  Application Clicks Actions                  */
+    /* -------------------------------------------- */
+
+    /**
+     * Opens the companions level management window.
+     * @type {ApplicationClickAction}
+     */
+    static #levelManagement() {
+        new DhCompanionLevelUp(this.document).render({ force: true });
+    }
 }

module/applications/sheets/api/item-attachment-sheet.mjs

@@ -24,7 +24,7 @@ export default function ItemAttachmentSheet(Base) {
             ...super.TABS,
             primary: {
                 ...super.TABS?.primary,
-                tabs: [...(super.TABS?.primary?.tabs || []), { id: 'attachments' }],
+                tabs: [...(super.TABS?.primary?.tabs || []) /*{ id: 'attachments' }*/], // Disabled until fixed
                 initial: super.TABS?.primary?.initial || 'description',
                 labelPrefix: super.TABS?.primary?.labelPrefix || 'DAGGERHEART.GENERAL.Tabs'
             }