From 8cdad5172e8ced14b354370612f5cb843cb3ae9c Mon Sep 17 00:00:00 2001
From: WBHarry <williambjrklund@gmail.com>
Date: Wed, 23 Jul 2025 22:27:53 +0200
Subject: [PATCH] Small random fixes

---
 .../characterCreation/characterCreation.mjs   | 23 +++++++++++++++++--
 .../applications/levelup/characterLevelup.mjs |  6 ++---
 .../dialog/level-up/selections-container.less |  1 -
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/module/applications/characterCreation/characterCreation.mjs b/module/applications/characterCreation/characterCreation.mjs
index b8759cc5..bf2bd245 100644
--- a/module/applications/characterCreation/characterCreation.mjs
+++ b/module/applications/characterCreation/characterCreation.mjs
@@ -205,7 +205,11 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
 
     _getSetupTabs(tabs) {
         for (const v of Object.values(tabs)) {
-            v.active = this.tabGroups[v.group] ? this.tabGroups[v.group] === v.id : v.active;
+            v.active = this.tabGroups[v.group]
+                ? this.tabGroups[v.group] === v.id
+                : this.tabGroups.primary !== 'equipment'
+                  ? v.active
+                  : false;
             v.cssClass = v.active ? 'active' : '';
 
             switch (v.id) {
@@ -242,6 +246,16 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
                     marker.classList.remove('active');
                 }
             }
+
+            if (tab === 'equipment') {
+                this.tabGroups.setup = null;
+                this.element.querySelector('section[data-group="setup"].active')?.classList?.remove?.('active');
+            } else {
+                this.tabGroups.setup = 'domainCards';
+                this.element
+                    .querySelector('section[data-group="setup"][data-tab="domainCards"]')
+                    ?.classList?.add?.('active');
+            }
         }
     }
 
@@ -256,6 +270,11 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
         });
     }
 
+    async _preFirstRender(_context, _options) {
+        this.tabGroups.primary = 'setup';
+        this.tabGroups.setup = 'ancestry';
+    }
+
     async _prepareContext(_options) {
         const context = await super._prepareContext(_options);
         context.tabs = this._getTabs(this.constructor.TABS);
@@ -266,7 +285,7 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
     async _preparePartContext(partId, context) {
         switch (partId) {
             case 'footer':
-                context.isLastTab = this.tabGroups.setup === 'domainCards';
+                context.isLastTab = this.tabGroups.setup === 'domainCards' || this.tabGroups.primary !== 'setup';
                 switch (this.tabGroups.setup) {
                     case null:
                     case 'ancestry':
diff --git a/module/applications/levelup/characterLevelup.mjs b/module/applications/levelup/characterLevelup.mjs
index d6bbe2db..7cde0ffb 100644
--- a/module/applications/levelup/characterLevelup.mjs
+++ b/module/applications/levelup/characterLevelup.mjs
@@ -1,7 +1,7 @@
 import LevelUpBase from './levelup.mjs';
 import { DhLevelup } from '../../data/levelup.mjs';
 import { domains } from '../../config/domainConfig.mjs';
-import { abilities } from '../../config/actorConfig.mjs';
+import { abilities, subclassFeatureLabels } from '../../config/actorConfig.mjs';
 
 export default class DhCharacterLevelUp extends LevelUpBase {
     constructor(actor) {
@@ -349,8 +349,8 @@ export default class DhCharacterLevelUp extends LevelUpBase {
                             if (!acc) acc = {};
                             acc[traitKey] = {
                                 label: game.i18n.localize(abilities[traitKey].label),
-                                old: this.actor.system.traits[traitKey].max,
-                                new: this.actor.system.traits[traitKey].max + advancement.trait[traitKey]
+                                old: this.actor.system.traits[traitKey].value,
+                                new: this.actor.system.traits[traitKey].value + advancement.trait[traitKey]
                             };
                         }
                         return acc;
diff --git a/styles/less/dialog/level-up/selections-container.less b/styles/less/dialog/level-up/selections-container.less
index 182e2962..10d61ed6 100644
--- a/styles/less/dialog/level-up/selections-container.less
+++ b/styles/less/dialog/level-up/selections-container.less
@@ -45,7 +45,6 @@
                     display: flex;
                     flex-direction: column;
                     align-items: center;
-                    flex: 1;
                     position: relative;
                     cursor: pointer;