[Fix] Subclass Links (#1069)

* Attempt at making subclass aware of its class * Update compendium classes/subclasses * Fixed multiclass * Update compenidum browser subclass class filter * Added migration for subclass.linkedClass * Using foundry's isNewer function rather than custom one * Added migration for existing actor features --------- Co-authored-by: Dapoolp <elcatnet@gmail.com>
2026-01-12 03:31:07 +01:00 · 2025-08-24 02:13:15 +02:00 · 2025-08-24 02:13:15 +02:00 · 46ea4addd0
commit 46ea4addd0
parent 0b2694b007
41 changed files with 479 additions and 391 deletions
--- a/lang/en.json
+++ b/lang/en.json
@ -2371,7 +2371,8 @@
                "insufficientResources": "You have insufficient resources",
                "multiclassAlreadyPresent": "You already have a class and multiclass",
                "subclassesAlreadyPresent": "You already have a class and multiclass subclass",
-                "noDiceSystem": "Your selected dice {system} does not have a {faces} dice"
+                "noDiceSystem": "Your selected dice {system} does not have a {faces} dice",
+                "subclassAlreadyLinked": "{name} is already a subclass in the class {class}. Remove it from there if you want it to be a subclass to this class."
            },
            "Tooltip": {
                "disableEffect": "Disable Effect",
--- a/module/applications/characterCreation/characterCreation.mjs
+++ b/module/applications/characterCreation/characterCreation.mjs
@ -432,12 +432,17 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
            }
        };

-        if (type == 'domains')
+        if (type === 'domains')
            presets.filter = {
                'level.max': { key: 'level.max', value: 1 },
                'system.domain': { key: 'system.domain', value: this.setup.class?.system.domains ?? null }
            };

+        if (type === 'subclasses')
+            presets.filter = {
+                'system.linkedClass.uuid': { key: 'system.linkedClass.uuid', value: this.setup.class?.uuid }
+            };
+        
        if (equipment.includes(type))
            presets.filter = {
                'system.tier': { key: 'system.tier', value: 1 },
--- a/module/applications/sheets/items/class.mjs
+++ b/module/applications/sheets/items/class.mjs
@ -119,6 +119,15 @@ export default class ClassSheet extends DHBaseItemSheet {
        const itemType = data.data ? data.type : item.type;
        const target = event.target.closest('fieldset.drop-section');
        if (itemType === 'subclass') {
+            if (item.system.linkedClass) {
+                return ui.notifications.warn(
+                    game.i18n.format('DAGGERHEART.UI.Notifications.subclassAlreadyLinked', {
+                        name: item.name,
+                        class: this.document.name
+                    })
+                );
+            }
+            await item.update({ 'system.linkedClass': this.document.uuid });
            await this.document.update({
                'system.subclasses': [...this.document.system.subclasses.map(x => x.uuid), item.uuid]
            });
@ -181,6 +190,12 @@ export default class ClassSheet extends DHBaseItemSheet {
    static async #removeItemFromCollection(_event, element) {
        const { uuid, target } = element.dataset;
        const prop = foundry.utils.getProperty(this.document.system, target);
+
+        if (target === 'subclasses') {
+            const subclass = await foundry.utils.fromUuid(uuid);
+            await subclass.update({ 'system.linkedClass': null });
+        }
+
        await this.document.update({ [`system.${target}`]: prop.filter(i => i.uuid !== uuid).map(x => x.uuid) });
    }

--- a/module/applications/ui/itemBrowser.mjs
+++ b/module/applications/ui/itemBrowser.mjs
@ -235,7 +235,7 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
        filters.forEach(f => {
            if (typeof f.field === 'string') f.field = foundry.utils.getProperty(game, f.field);
            else if (typeof f.choices === 'function') {
-                f.choices = f.choices();
+                f.choices = f.choices(this.items);
            }
            f.name ??= f.key;
            f.value = this.presets?.filter?.[f.name]?.value ?? null;
@ -248,11 +248,8 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
    /* -------------------------------------------- */

    /**
-     * Create and initialize search filter instances for the inventory and loadout sections.
+     * Create and initialize search filter instance.
     *
-     * Sets up two {@link foundry.applications.ux.SearchFilter} instances:
-     * - One for the inventory, which filters items in the inventory grid.
-     * - One for the loadout, which filters items in the loadout/card grid.
     * @private
     */
    _createSearchFilter() {
@ -339,7 +336,7 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
                item = this.items.find(i => i.uuid === itemUUID);

            if (!item) continue;
-
+            
            const matchesMenu =
                this.fieldFilter.length === 0 ||
                this.fieldFilter.every(
--- a/module/config/itemBrowserConfig.mjs
+++ b/module/config/itemBrowserConfig.mjs
@ -2,404 +2,422 @@ export const typeConfig = {
    adversaries: {
        columns: [
            {
-                key: "system.tier",
-                label: "Tier"
+                key: 'system.tier',
+                label: 'Tier'
            },
            {
-                key: "system.type",
-                label: "Type"
+                key: 'system.type',
+                label: 'Type'
            }
        ],
        filters: [
            {
-                key: "system.tier",
-                label: "Tier",
+                key: 'system.tier',
+                label: 'Tier',
                field: 'system.api.models.actors.DhAdversary.schema.fields.tier'
            },
            {
-                key: "system.type",
-                label: "Type",
+                key: 'system.type',
+                label: 'Type',
                field: 'system.api.models.actors.DhAdversary.schema.fields.type'
            },
            {
-                key: "system.difficulty",
-                name: "difficulty.min",
-                label: "Difficulty (Min)",
+                key: 'system.difficulty',
+                name: 'difficulty.min',
+                label: 'Difficulty (Min)',
                field: 'system.api.models.actors.DhAdversary.schema.fields.difficulty',
-                operator: "gte"
+                operator: 'gte'
            },
            {
-                key: "system.difficulty",
-                name: "difficulty.max",
-                label: "Difficulty (Max)",
+                key: 'system.difficulty',
+                name: 'difficulty.max',
+                label: 'Difficulty (Max)',
                field: 'system.api.models.actors.DhAdversary.schema.fields.difficulty',
-                operator: "lte"
+                operator: 'lte'
            },
            {
-                key: "system.resources.hitPoints.max",
-                name: "hp.min",
-                label: "Hit Points (Min)",
+                key: 'system.resources.hitPoints.max',
+                name: 'hp.min',
+                label: 'Hit Points (Min)',
                field: 'system.api.models.actors.DhAdversary.schema.fields.resources.fields.hitPoints.fields.max',
-                operator: "gte"
+                operator: 'gte'
            },
            {
-                key: "system.resources.hitPoints.max",
-                name: "hp.max",
-                label: "Hit Points (Max)",
+                key: 'system.resources.hitPoints.max',
+                name: 'hp.max',
+                label: 'Hit Points (Max)',
                field: 'system.api.models.actors.DhAdversary.schema.fields.resources.fields.hitPoints.fields.max',
-                operator: "lte"
+                operator: 'lte'
            },
            {
-                key: "system.resources.stress.max",
-                name: "stress.min",
-                label: "Stress (Min)",
+                key: 'system.resources.stress.max',
+                name: 'stress.min',
+                label: 'Stress (Min)',
                field: 'system.api.models.actors.DhAdversary.schema.fields.resources.fields.stress.fields.max',
-                operator: "gte"
+                operator: 'gte'
            },
            {
-                key: "system.resources.stress.max",
-                name: "stress.max",
-                label: "Stress (Max)",
+                key: 'system.resources.stress.max',
+                name: 'stress.max',
+                label: 'Stress (Max)',
                field: 'system.api.models.actors.DhAdversary.schema.fields.resources.fields.stress.fields.max',
-                operator: "lte"
-            },
+                operator: 'lte'
+            }
        ]
    },
    items: {
        columns: [
            {
-                key: "type",
-                label: "Type"
+                key: 'type',
+                label: 'Type'
            },
            {
-                key: "system.secondary",
-                label: "Subtype",
-                format: (isSecondary) => isSecondary ? "secondary" : (isSecondary === false ? "primary" : '-')
+                key: 'system.secondary',
+                label: 'Subtype',
+                format: isSecondary => (isSecondary ? 'secondary' : isSecondary === false ? 'primary' : '-')
            },
            {
-                key: "system.tier",
-                label: "Tier"
+                key: 'system.tier',
+                label: 'Tier'
            }
        ],
        filters: [
            {
-                key: "type",
-                label: "Type",
-                choices: () => CONFIG.Item.documentClass.TYPES.filter(t => ["armor", "weapon", "consumable", "loot"].includes(t)).map(t => ({ value: t, label: t }))
+                key: 'type',
+                label: 'Type',
+                choices: () =>
+                    CONFIG.Item.documentClass.TYPES.filter(t =>
+                        ['armor', 'weapon', 'consumable', 'loot'].includes(t)
+                    ).map(t => ({ value: t, label: t }))
            },
            {
-                key: "system.secondary",
-                label: "Subtype",
+                key: 'system.secondary',
+                label: 'Subtype',
                choices: [
-                    { value: false, label: "Primary Weapon"},
-                    { value: true, label: "Secondary Weapon"}
+                    { value: false, label: 'Primary Weapon' },
+                    { value: true, label: 'Secondary Weapon' }
                ]
            },
            {
-                key: "system.tier",
-                label: "Tier",
-                choices: [{ value: "1", label: "1"}, { value: "2", label: "2"}, { value: "3", label: "3"}, { value: "4", label: "4"}]
+                key: 'system.tier',
+                label: 'Tier',
+                choices: [
+                    { value: '1', label: '1' },
+                    { value: '2', label: '2' },
+                    { value: '3', label: '3' },
+                    { value: '4', label: '4' }
+                ]
            },
            {
-                key: "system.burden",
-                label: "Burden",
+                key: 'system.burden',
+                label: 'Burden',
                field: 'system.api.models.items.DHWeapon.schema.fields.burden'
            },
            {
-                key: "system.attack.roll.trait",
-                label: "Trait",
+                key: 'system.attack.roll.trait',
+                label: 'Trait',
                field: 'system.api.models.actions.actionsTypes.attack.schema.fields.roll.fields.trait'
            },
            {
-                key: "system.attack.range",
-                label: "Range",
+                key: 'system.attack.range',
+                label: 'Range',
                field: 'system.api.models.actions.actionsTypes.attack.schema.fields.range'
            },
            {
-                key: "system.baseScore",
-                name: "armor.min",
-                label: "Armor Score (Min)",
+                key: 'system.baseScore',
+                name: 'armor.min',
+                label: 'Armor Score (Min)',
                field: 'system.api.models.items.DHArmor.schema.fields.baseScore',
-                operator: "gte"
+                operator: 'gte'
            },
            {
-                key: "system.baseScore",
-                name: "armor.max",
-                label: "Armor Score (Max)",
+                key: 'system.baseScore',
+                name: 'armor.max',
+                label: 'Armor Score (Max)',
                field: 'system.api.models.items.DHArmor.schema.fields.baseScore',
-                operator: "lte"
+                operator: 'lte'
            },
            {
-                key: "system.itemFeatures",
-                label: "Features",
-                choices: () => [...Object.entries(CONFIG.DH.ITEM.weaponFeatures), ...Object.entries(CONFIG.DH.ITEM.armorFeatures)].map(([k,v]) => ({ value: k, label: v.label})),
-                operator: "contains3"
+                key: 'system.itemFeatures',
+                label: 'Features',
+                choices: () =>
+                    [
+                        ...Object.entries(CONFIG.DH.ITEM.weaponFeatures),
+                        ...Object.entries(CONFIG.DH.ITEM.armorFeatures)
+                    ].map(([k, v]) => ({ value: k, label: v.label })),
+                operator: 'contains3'
            }
        ]
    },
    features: {
-        columns: [
-
-        ],
-        filters: [
-
-        ]
+        columns: [],
+        filters: []
    },
    cards: {
        columns: [
            {
-                key: "system.type",
-                label: "Type"
+                key: 'system.type',
+                label: 'Type'
            },
            {
-                key: "system.domain",
-                label: "Domain"
+                key: 'system.domain',
+                label: 'Domain'
            },
            {
-                key: "system.level",
-                label: "Level"
+                key: 'system.level',
+                label: 'Level'
            }
        ],
        filters: [
            {
-                key: "system.type",
-                label: "Type",
+                key: 'system.type',
+                label: 'Type',
                field: 'system.api.models.items.DHDomainCard.schema.fields.type'
            },
            {
-                key: "system.domain",
-                label: "Domain",
+                key: 'system.domain',
+                label: 'Domain',
                field: 'system.api.models.items.DHDomainCard.schema.fields.domain',
-                operator: "contains2"
+                operator: 'contains2'
            },
            {
-                key: "system.level",
-                name: "level.min",
-                label: "Level (Min)",
+                key: 'system.level',
+                name: 'level.min',
+                label: 'Level (Min)',
                field: 'system.api.models.items.DHDomainCard.schema.fields.level',
-                operator: "gte"
+                operator: 'gte'
            },
            {
-                key: "system.level",
-                name: "level.max",
-                label: "Level (Max)",
+                key: 'system.level',
+                name: 'level.max',
+                label: 'Level (Max)',
                field: 'system.api.models.items.DHDomainCard.schema.fields.level',
-                operator: "lte"
+                operator: 'lte'
            },
            {
-                key: "system.recallCost",
-                name: "recall.min",
-                label: "Recall Cost (Min)",
+                key: 'system.recallCost',
+                name: 'recall.min',
+                label: 'Recall Cost (Min)',
                field: 'system.api.models.items.DHDomainCard.schema.fields.recallCost',
-                operator: "gte"
+                operator: 'gte'
            },
            {
-                key: "system.recallCost",
-                name: "recall.max",
-                label: "Recall Cost (Max)",
+                key: 'system.recallCost',
+                name: 'recall.max',
+                label: 'Recall Cost (Max)',
                field: 'system.api.models.items.DHDomainCard.schema.fields.recallCost',
-                operator: "lte"
+                operator: 'lte'
            }
        ]
    },
    classes: {
        columns: [
            {
-                key: "system.evasion",
-                label: "Evasion"
+                key: 'system.evasion',
+                label: 'Evasion'
            },
            {
-                key: "system.hitPoints",
-                label: "Hit Points"
+                key: 'system.hitPoints',
+                label: 'Hit Points'
            },
            {
-                key: "system.domains",
-                label: "Domains"
+                key: 'system.domains',
+                label: 'Domains'
            }
        ],
        filters: [
            {
-                key: "system.evasion",
-                name: "evasion.min",
-                label: "Evasion (Min)",
+                key: 'system.evasion',
+                name: 'evasion.min',
+                label: 'Evasion (Min)',
                field: 'system.api.models.items.DHClass.schema.fields.evasion',
-                operator: "gte"
+                operator: 'gte'
            },
            {
-                key: "system.evasion",
-                name: "evasion.max",
-                label: "Evasion (Max)",
+                key: 'system.evasion',
+                name: 'evasion.max',
+                label: 'Evasion (Max)',
                field: 'system.api.models.items.DHClass.schema.fields.evasion',
-                operator: "lte"
+                operator: 'lte'
            },
            {
-                key: "system.hitPoints",
-                name: "hp.min",
-                label: "Hit Points (Min)",
+                key: 'system.hitPoints',
+                name: 'hp.min',
+                label: 'Hit Points (Min)',
                field: 'system.api.models.items.DHClass.schema.fields.hitPoints',
-                operator: "gte"
+                operator: 'gte'
            },
            {
-                key: "system.hitPoints",
-                name: "hp.max",
-                label: "Hit Points (Max)",
+                key: 'system.hitPoints',
+                name: 'hp.max',
+                label: 'Hit Points (Max)',
                field: 'system.api.models.items.DHClass.schema.fields.hitPoints',
-                operator: "lte"
+                operator: 'lte'
            },
            {
-                key: "system.domains",
-                label: "Domains",
-                choices: () => Object.values(CONFIG.DH.DOMAIN.domains).map(d => ({ value: d.id, label: d.label})),
-                operator: "contains2"
+                key: 'system.domains',
+                label: 'Domains',
+                choices: () => Object.values(CONFIG.DH.DOMAIN.domains).map(d => ({ value: d.id, label: d.label })),
+                operator: 'contains2'
            }
        ]
    },
    subclasses: {
        columns: [
            {
-                key: "id",
-                label: "Class",
-                format: (id) => {
-                    return "";
-                }
+                key: 'system.linkedClass',
+                label: 'Class',
+                format: linkedClass => linkedClass.name
            },
            {
-                key: "system.spellcastingTrait",
-                label: "Spellcasting Trait"
-            }
-        ],
-        filters: []
-    },
-    beastforms: {
-        columns: [
-            {
-                key: "system.tier",
-                label: "Tier"
-            },
-            {
-                key: "system.mainTrait",
-                label: "Main Trait"
+                key: 'system.spellcastingTrait',
+                label: 'Spellcasting Trait'
            }
        ],
        filters: [
            {
-                key: "system.tier",
-                label: "Tier",
+                key: 'system.linkedClass.uuid',
+                label: 'Class',
+                choices: (items) => {
+                    const list = items.map(item => ({ value: item.system.linkedClass.uuid, label: item.system.linkedClass.name }));
+                    return list.reduce((a,c) => {
+                        if(!(a.find(i => i.value === c.value))) a.push(c);
+                        return a;
+                    }, []);
+                }
+            }
+        ]
+    },
+    beastforms: {
+        columns: [
+            {
+                key: 'system.tier',
+                label: 'Tier'
+            },
+            {
+                key: 'system.mainTrait',
+                label: 'Main Trait'
+            }
+        ],
+        filters: [
+            {
+                key: 'system.tier',
+                label: 'Tier',
                field: 'system.api.models.items.DHBeastform.schema.fields.tier'
            },
            {
-                key: "system.mainTrait",
-                label: "Main Trait",
+                key: 'system.mainTrait',
+                label: 'Main Trait',
                field: 'system.api.models.items.DHBeastform.schema.fields.mainTrait'
            }
        ]
    }
-}
+};

 export const compendiumConfig = {
-    "daggerheart": {
-        id: "daggerheart",
-        label: "DAGGERHEART",
+    daggerheart: {
+        id: 'daggerheart',
+        label: 'DAGGERHEART',
        folders: {
-            "adversaries": {
-                id: "adversaries",
-                keys: ["adversaries"],
-                label: "Adversaries",
-                type: ["adversary"],
-                listType: "adversaries"
+            adversaries: {
+                id: 'adversaries',
+                keys: ['adversaries'],
+                label: 'Adversaries',
+                type: ['adversary'],
+                listType: 'adversaries'
            },
-            "ancestries": {
-                id: "ancestries",
-                keys: ["ancestries"],
-                label: "Ancestries",
-                type: ["ancestry"],
+            ancestries: {
+                id: 'ancestries',
+                keys: ['ancestries'],
+                label: 'Ancestries',
+                type: ['ancestry'],
                folders: {
-                    "features": {
-                        id: "features",
-                        keys: ["ancestries"],
-                        label: "Features",
-                        type: ["feature"]
+                    features: {
+                        id: 'features',
+                        keys: ['ancestries'],
+                        label: 'Features',
+                        type: ['feature']
                    }
                }
            },
-            "equipments": {
-                id: "equipments",
-                keys: ["armors", "weapons", "consumables", "loot"],
-                label: "Equipment",
-                type: ["armor", "weapon", "consumable", "loot"],
-                listType: "items"
+            equipments: {
+                id: 'equipments',
+                keys: ['armors', 'weapons', 'consumables', 'loot'],
+                label: 'Equipment',
+                type: ['armor', 'weapon', 'consumable', 'loot'],
+                listType: 'items'
            },
-            "classes": {
-                id: "classes",
-                keys: ["classes"],
-                label: "Classes",
-                type: ["class"],
+            classes: {
+                id: 'classes',
+                keys: ['classes'],
+                label: 'Classes',
+                type: ['class'],
                folders: {
-                    "features": {
-                        id: "features",
-                        keys: ["classes"],
-                        label: "Features",
-                        type: ["feature"]
+                    features: {
+                        id: 'features',
+                        keys: ['classes'],
+                        label: 'Features',
+                        type: ['feature']
                    },
-                    "items": {
-                        id: "items",
-                        keys: ["classes"],
-                        label: "Items",
-                        type: ["armor", "weapon", "consumable", "loot"],
-                        listType: "items"
+                    items: {
+                        id: 'items',
+                        keys: ['classes'],
+                        label: 'Items',
+                        type: ['armor', 'weapon', 'consumable', 'loot'],
+                        listType: 'items'
                    }
                },
-                listType: "classes"
+                listType: 'classes'
            },
-            "subclasses": {
-                id: "subclasses",
-                keys: ["subclasses"],
-                label: "Subclasses",
-                type: ["subclass"],
-                listType: "subclasses"
+            subclasses: {
+                id: 'subclasses',
+                keys: ['subclasses'],
+                label: 'Subclasses',
+                type: ['subclass'],
+                listType: 'subclasses'
            },
-            "domains": {
-                id: "domains",
-                keys: ["domains"],
-                label: "Domain Cards",
-                type: ["domainCard"],
-                listType: "cards"
+            domains: {
+                id: 'domains',
+                keys: ['domains'],
+                label: 'Domain Cards',
+                type: ['domainCard'],
+                listType: 'cards'
            },
-            "communities": {
-                id: "communities",
-                keys: ["communities"],
-                label: "Communities",
-                type: ["community"],
+            communities: {
+                id: 'communities',
+                keys: ['communities'],
+                label: 'Communities',
+                type: ['community'],
                folders: {
-                    "features": {
-                        id: "features",
-                        keys: ["communities"],
-                        label: "Features",
-                        type: ["feature"]
+                    features: {
+                        id: 'features',
+                        keys: ['communities'],
+                        label: 'Features',
+                        type: ['feature']
                    }
                }
            },
-            "environments": {
-                id: "environments",
-                keys: ["environments"],
-                label: "Environments",
-                type: ["environment"]
+            environments: {
+                id: 'environments',
+                keys: ['environments'],
+                label: 'Environments',
+                type: ['environment']
            },
-            "beastforms": {
-                id: "beastforms",
-                keys: ["beastforms"],
-                label: "Beastforms",
-                type: ["beastform"],
-                listType: "beastforms",
+            beastforms: {
+                id: 'beastforms',
+                keys: ['beastforms'],
+                label: 'Beastforms',
+                type: ['beastform'],
+                listType: 'beastforms',
                folders: {
-                    "features": {
-                        id: "features",
-                        keys: ["beastforms"],
-                        label: "Features",
-                        type: ["feature"]
+                    features: {
+                        id: 'features',
+                        keys: ['beastforms'],
+                        label: 'Features',
+                        type: ['feature']
                    }
                }
            }
        }
    }
-}
+};
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@ -317,7 +317,7 @@ export default class DhCharacter extends BaseDataActor {
    }

    get multiclass() {
-        const value = this.parent.items.find(x => x.type === 'Class' && x.system.isMulticlass);
+        const value = this.parent.items.find(x => x.type === 'class' && x.system.isMulticlass);
        const subclass = this.parent.items.find(x => x.type === 'subclass' && x.system.isMulticlass);

        return {
@ -443,7 +443,9 @@ export default class DhCharacter extends BaseDataActor {
                classFeatures.push(item);
            } else if (item.system.originItemType === CONFIG.DH.ITEM.featureTypes.subclass.id) {
                if (this.class.subclass) {
-                    const subclassState = this.class.subclass.system.featureState;
+                    const prop = item.system.multiclassOrigin ? 'multiclass' : 'class';
+                    const subclassState = this[prop].subclass?.system?.featureState;
+                    if (!subclassState) continue;

                    if (
                        item.system.identifier === CONFIG.DH.ITEM.featureSubTypes.foundation ||
--- a/module/data/item/base.mjs
+++ b/module/data/item/base.mjs
@ -148,7 +148,6 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
            for (let f of this.features) {
                const fBase = f.item ?? f;
                const feature = fBase.system ? fBase : await foundry.utils.fromUuid(fBase.uuid);
-                const multiclass = this.isMulticlass ? 'multiclass' : null;
                features.push(
                    foundry.utils.mergeObject(
                        feature.toObject(),
@ -156,7 +155,8 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
                            _stats: { compendiumSource: fBase.uuid },
                            system: {
                                originItemType: this.parent.type,
-                                identifier: multiclass ?? (f.item ? f.type : null)
+                                identifier: f.item ? f.type : null,
+                                multiclassOrigin: this.isMulticlass
                            }
                        },
                        { inplace: false }
--- a/module/data/item/feature.mjs
+++ b/module/data/item/feature.mjs
@ -29,6 +29,7 @@ export default class DHFeature extends BaseDataItem {
                nullable: true,
                initial: null
            }),
+            multiclassOrigin: new fields.BooleanField({ initial: false }),
            identifier: new fields.StringField()
        };
    }
--- a/module/data/item/subclass.mjs
+++ b/module/data/item/subclass.mjs
@ -1,3 +1,4 @@
+import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs';
 import ItemLinkFields from '../fields/itemLinkFields.mjs';
 import BaseDataItem from './base.mjs';

@ -25,7 +26,8 @@ export default class DHSubclass extends BaseDataItem {
            }),
            features: new ItemLinkFields(),
            featureState: new fields.NumberField({ required: true, initial: 1, min: 1 }),
-            isMulticlass: new fields.BooleanField({ initial: false })
+            isMulticlass: new fields.BooleanField({ initial: false }),
+            linkedClass: new ForeignDocumentUUIDField({ type: 'Item', nullable: true, initial: null })
        };
    }

--- a/module/documents/actor.mjs
+++ b/module/documents/actor.mjs
@ -1,7 +1,7 @@
 import { emitAsGM, GMUpdateEvent } from '../systemRegistration/socket.mjs';
 import { LevelOptionType } from '../data/levelTier.mjs';
 import DHFeature from '../data/item/feature.mjs';
-import { damageKeyToNumber, versionCompare } from '../helpers/utils.mjs';
+import { damageKeyToNumber } from '../helpers/utils.mjs';
 import DhCompanionLevelUp from '../applications/levelup/companionLevelup.mjs';

 export default class DhpActor extends Actor {
@ -164,10 +164,10 @@ export default class DhpActor extends Actor {
                if (multiclass) {
                    const multiclassItem = this.items.find(x => x.uuid === multiclass.itemUuid);
                    const multiclassFeatures = this.items.filter(
-                        x => x.system.originItemType === 'class' && x.system.identifier === 'multiclass'
+                        x => x.system.originItemType === 'class' && x.system.multiclassOrigin
                    );
                    const subclassFeatures = this.items.filter(
-                        x => x.system.originItemType === 'subclass' && x.system.identifier === 'multiclass'
+                        x => x.system.originItemType === 'subclass' && x.system.multiclassOrigin
                    );

                    this.deleteEmbeddedDocuments(
@ -759,7 +759,7 @@ export default class DhpActor extends Actor {
        }

        const parsedJSON = JSON.parse(json);
-        if (versionCompare(parsedJSON._stats.systemVersion, '1.1.0')) {
+        if (foundry.utils.isNewerVersion('1.1.0', parsedJSON._stats.systemVersion)) {
            const confirmed = await foundry.applications.api.DialogV2.confirm({
                window: {
                    title: game.i18n.localize('DAGGERHEART.ACTORS.Character.InvalidOldCharacterImportTitle')
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@ -420,14 +420,3 @@ export async function createEmbeddedItemsWithEffects(actor, baseData) {
 export const slugify = name => {
    return name.toLowerCase().replaceAll(' ', '-').replaceAll('.', '');
 };
-
-export const versionCompare = (current, target) => {
-    const currentSplit = current.split('.').map(x => Number.parseInt(x));
-    const targetSplit = target.split('.').map(x => Number.parseInt(x));
-    for (var i = 0; i < currentSplit.length; i++) {
-        if (currentSplit[i] < targetSplit[i]) return true;
-        if (currentSplit[i] > targetSplit[i]) return false;
-    }
-
-    return false;
-};
--- a/module/systemRegistration/migrations.mjs
+++ b/module/systemRegistration/migrations.mjs
@ -1,10 +1,8 @@
-import { versionCompare } from '../helpers/utils.mjs';
-
 export async function runMigrations() {
    let lastMigrationVersion = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LastMigrationVersion);
    if (!lastMigrationVersion) lastMigrationVersion = '1.0.6';

-    if (versionCompare(lastMigrationVersion, '1.1.0')) {
+    if (foundry.utils.isNewerVersion('1.1.0', lastMigrationVersion)) {
        const compendiumActors = [];
        for (let pack of game.packs) {
            const documents = await pack.getDocuments();
@ -37,5 +35,45 @@ export async function runMigrations() {
        lastMigrationVersion = '1.1.0';
    }

+    if (foundry.utils.isNewerVersion('1.1.1', lastMigrationVersion)) {
+        const compendiumClasses = [];
+        const compendiumActors = [];
+        for (let pack of game.packs) {
+            const documents = await pack.getDocuments();
+            compendiumClasses.push(...documents.filter(x => x.type === 'class'));
+            compendiumActors.push(...documents.filter(x => x.type === 'character'));
+        }
+
+        [...compendiumActors, ...game.actors.filter(x => x.type === 'character')].forEach(char => {
+            const multiclass = char.items.find(x => x.type === 'class' && x.system.isMulticlass);
+            const multiclassSubclass = multiclass.system.subclasses.length > 0 ? multiclass.system.subclasses[0] : null;
+            char.items.forEach(item => {
+                if (item.type === 'feature' && item.system.identifier === 'multiclass') {
+                    const base = item.system.originItemType === 'class' ? multiclass : multiclassSubclass;
+                    if (base) {
+                        const baseFeature = base.system.features.find(x => x.item.name === item.name);
+                        if (baseFeature) {
+                            item.update({
+                                system: {
+                                    multiclassOrigin: true,
+                                    identifier: baseFeature.type
+                                }
+                            });
+                        }
+                    }
+                }
+            });
+        });
+
+        const worldClasses = game.items.filter(x => x.type === 'class');
+        for (let classVal of [...compendiumClasses, ...worldClasses]) {
+            for (let subclass of classVal.system.subclasses) {
+                await subclass.update({ 'system.linkedClass': classVal.uuid });
+            }
+        }
+
+        lastMigrationVersion = '1.1.1';
+    }
+
    await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LastMigrationVersion, lastMigrationVersion);
 }
--- a/src/packs/classes/class_Bard_vegl3bFOq3pcFTWT.json
+++ b/src/packs/classes/class_Bard_vegl3bFOq3pcFTWT.json
@ -70,12 +70,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754174600538,
-    "modifiedTime": 1754325498779,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1755943467705,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_id": "vegl3bFOq3pcFTWT",
  "sort": 300000,
--- a/src/packs/classes/class_Druid_ZNwUTCyGCEcidZFv.json
+++ b/src/packs/classes/class_Druid_ZNwUTCyGCEcidZFv.json
@ -72,12 +72,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754222247012,
-    "modifiedTime": 1754325498779,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1755943479440,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!ZNwUTCyGCEcidZFv"
 }
--- a/src/packs/classes/class_Guardian_nRAyoC0fOzXPDa4z.json
+++ b/src/packs/classes/class_Guardian_nRAyoC0fOzXPDa4z.json
@ -68,12 +68,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754246931974,
-    "modifiedTime": 1754325498779,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1755943488697,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!nRAyoC0fOzXPDa4z"
 }
--- a/src/packs/classes/class_Ranger_BTyfve69LKqoOi9S.json
+++ b/src/packs/classes/class_Ranger_BTyfve69LKqoOi9S.json
@ -68,12 +68,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754268869310,
-    "modifiedTime": 1754325517617,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1755943505024,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!BTyfve69LKqoOi9S"
 }
--- a/src/packs/classes/class_Rogue_CvHlkHZfpMiCz5uT.json
+++ b/src/packs/classes/class_Rogue_CvHlkHZfpMiCz5uT.json
@ -72,12 +72,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754325275832,
-    "modifiedTime": 1754500637635,
-    "lastModifiedBy": "Q9NoTaEarn3VMS6Z"
+    "modifiedTime": 1755943515533,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!CvHlkHZfpMiCz5uT"
 }
--- a/src/packs/classes/class_Seraph_5ZnlJ5bEoyOTkUJv.json
+++ b/src/packs/classes/class_Seraph_5ZnlJ5bEoyOTkUJv.json
@ -68,12 +68,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754351482530,
-    "modifiedTime": 1754355938087,
-    "lastModifiedBy": "Q9NoTaEarn3VMS6Z"
+    "modifiedTime": 1755943523935,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!5ZnlJ5bEoyOTkUJv"
 }
--- a/src/packs/classes/class_Sorcerer_DchOzHcWIJE9FKcR.json
+++ b/src/packs/classes/class_Sorcerer_DchOzHcWIJE9FKcR.json
@ -76,12 +76,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754349743129,
-    "modifiedTime": 1754350005553,
-    "lastModifiedBy": "Q9NoTaEarn3VMS6Z"
+    "modifiedTime": 1755943536635,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!DchOzHcWIJE9FKcR"
 }
--- a/src/packs/classes/class_Warrior_xCUWwJz4WSthvLfy.json
+++ b/src/packs/classes/class_Warrior_xCUWwJz4WSthvLfy.json
@ -72,12 +72,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754255776706,
-    "modifiedTime": 1754325510730,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1755943545980,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!xCUWwJz4WSthvLfy"
 }
--- a/src/packs/classes/class_Wizard_5LwX4m8ziY3F1ZGC.json
+++ b/src/packs/classes/class_Wizard_5LwX4m8ziY3F1ZGC.json
@ -72,12 +72,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754253505323,
-    "modifiedTime": 1754325500455,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1755943555087,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!5LwX4m8ziY3F1ZGC"
 }
--- a/src/packs/subclasses/subclass_Beastbound_TIUsIlTS1WkK5vr2.json
+++ b/src/packs/subclasses/subclass_Beastbound_TIUsIlTS1WkK5vr2.json
@ -30,7 +30,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.BTyfve69LKqoOi9S"
  },
  "effects": [],
  "sort": 0,
@ -43,12 +44,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754268237448,
-    "modifiedTime": 1754268308097,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1755943503629,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!TIUsIlTS1WkK5vr2"
 }
--- a/src/packs/subclasses/subclass_Call_Of_The_Brave_NAFU9roaVG7f3RNJ.json
+++ b/src/packs/subclasses/subclass_Call_Of_The_Brave_NAFU9roaVG7f3RNJ.json
@ -26,7 +26,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.xCUWwJz4WSthvLfy"
  },
  "effects": [],
  "sort": 0,
@ -39,12 +40,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754256077777,
-    "modifiedTime": 1754256954656,
-    "lastModifiedBy": "MQSznptE5yLT7kj8"
+    "modifiedTime": 1755943544886,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!NAFU9roaVG7f3RNJ"
 }
--- a/src/packs/subclasses/subclass_Call_Of_The_Slayer_bcNe5qP3o6CKadhK.json
+++ b/src/packs/subclasses/subclass_Call_Of_The_Slayer_bcNe5qP3o6CKadhK.json
@ -22,7 +22,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.xCUWwJz4WSthvLfy"
  },
  "effects": [],
  "sort": 0,
@ -35,12 +36,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754256112978,
-    "modifiedTime": 1754256959532,
-    "lastModifiedBy": "MQSznptE5yLT7kj8"
+    "modifiedTime": 1755943545973,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!bcNe5qP3o6CKadhK"
 }
--- a/src/packs/subclasses/subclass_Divine_Wielder_M5mpGoAj8LRkylrY.json
+++ b/src/packs/subclasses/subclass_Divine_Wielder_M5mpGoAj8LRkylrY.json
@ -26,7 +26,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.5ZnlJ5bEoyOTkUJv"
  },
  "effects": [],
  "sort": 0,
@ -39,12 +40,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754352806098,
-    "modifiedTime": 1754354057333,
-    "lastModifiedBy": "Q9NoTaEarn3VMS6Z"
+    "modifiedTime": 1755943522722,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!M5mpGoAj8LRkylrY"
 }
--- a/src/packs/subclasses/subclass_Elemental_Origin_wg1H0hROc2acHwZh.json
+++ b/src/packs/subclasses/subclass_Elemental_Origin_wg1H0hROc2acHwZh.json
@ -22,7 +22,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.DchOzHcWIJE9FKcR"
  },
  "effects": [],
  "sort": 0,
@ -35,12 +36,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754349604941,
-    "modifiedTime": 1754349648910,
-    "lastModifiedBy": "Q9NoTaEarn3VMS6Z"
+    "modifiedTime": 1755943535524,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!wg1H0hROc2acHwZh"
 }
--- a/src/packs/subclasses/subclass_Nightwalker_h161OSIK24Up4qNd.json
+++ b/src/packs/subclasses/subclass_Nightwalker_h161OSIK24Up4qNd.json
@ -30,7 +30,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.CvHlkHZfpMiCz5uT"
  },
  "effects": [],
  "sort": 0,
@ -43,12 +44,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754322815758,
-    "modifiedTime": 1754323509061,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1755943514465,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!h161OSIK24Up4qNd"
 }
--- a/src/packs/subclasses/subclass_Primal_Origin_GLpRVxnY5E82khxH.json
+++ b/src/packs/subclasses/subclass_Primal_Origin_GLpRVxnY5E82khxH.json
@ -22,7 +22,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.DchOzHcWIJE9FKcR"
  },
  "effects": [],
  "sort": 0,
@ -35,12 +36,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754349604941,
-    "modifiedTime": 1754349673276,
-    "lastModifiedBy": "Q9NoTaEarn3VMS6Z"
+    "modifiedTime": 1755943536628,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!GLpRVxnY5E82khxH"
 }
--- a/src/packs/subclasses/subclass_School_Of_Knowledge_qqQlgCqhOivUFoQn.json
+++ b/src/packs/subclasses/subclass_School_Of_Knowledge_qqQlgCqhOivUFoQn.json
@ -34,7 +34,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.5LwX4m8ziY3F1ZGC"
  },
  "effects": [],
  "sort": 0,
@ -47,12 +48,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754253538384,
-    "modifiedTime": 1754254543287,
-    "lastModifiedBy": "MQSznptE5yLT7kj8"
+    "modifiedTime": 1755943553625,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!qqQlgCqhOivUFoQn"
 }
--- a/src/packs/subclasses/subclass_School_Of_War_4y9Ph7RsCIAbkwTk.json
+++ b/src/packs/subclasses/subclass_School_Of_War_4y9Ph7RsCIAbkwTk.json
@ -34,7 +34,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.5LwX4m8ziY3F1ZGC"
  },
  "effects": [],
  "sort": 0,
@ -47,12 +48,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754253587683,
-    "modifiedTime": 1754254721869,
-    "lastModifiedBy": "MQSznptE5yLT7kj8"
+    "modifiedTime": 1755943555081,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!4y9Ph7RsCIAbkwTk"
 }
--- a/src/packs/subclasses/subclass_Stalwart_rKRxFBlkbh9cDK8K.json
+++ b/src/packs/subclasses/subclass_Stalwart_rKRxFBlkbh9cDK8K.json
@ -34,7 +34,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.nRAyoC0fOzXPDa4z"
  },
  "effects": [],
  "sort": 0,
@ -47,12 +48,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754245881893,
-    "modifiedTime": 1754245958817,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1755943487549,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!rKRxFBlkbh9cDK8K"
 }
--- a/src/packs/subclasses/subclass_Syndicate_95QxNZwgyEm1LqdG.json
+++ b/src/packs/subclasses/subclass_Syndicate_95QxNZwgyEm1LqdG.json
@ -22,7 +22,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.CvHlkHZfpMiCz5uT"
  },
  "effects": [],
  "sort": 0,
@ -35,12 +36,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754323643089,
-    "modifiedTime": 1754323735227,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1755943515526,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!95QxNZwgyEm1LqdG"
 }
--- a/src/packs/subclasses/subclass_Troubadour_ld8MIvk0xVJydSBz.json
+++ b/src/packs/subclasses/subclass_Troubadour_ld8MIvk0xVJydSBz.json
@ -21,7 +21,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.vegl3bFOq3pcFTWT"
  },
  "effects": [],
  "ownership": {
@ -33,12 +34,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754174653653,
-    "modifiedTime": 1754236659263,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1755943465827,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_id": "ld8MIvk0xVJydSBz",
  "sort": 100000,
--- a/src/packs/subclasses/subclass_Vengeance_SUo8NPBPO8aN193u.json
+++ b/src/packs/subclasses/subclass_Vengeance_SUo8NPBPO8aN193u.json
@ -26,7 +26,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.nRAyoC0fOzXPDa4z"
  },
  "effects": [],
  "sort": 0,
@ -39,12 +40,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754246011733,
-    "modifiedTime": 1754246076491,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1755943488691,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!SUo8NPBPO8aN193u"
 }
--- a/src/packs/subclasses/subclass_Warden_of_Renewal_xp0XMjYT85Q7E90o.json
+++ b/src/packs/subclasses/subclass_Warden_of_Renewal_xp0XMjYT85Q7E90o.json
@ -29,7 +29,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.ZNwUTCyGCEcidZFv"
  },
  "effects": [],
  "folder": "AZWrSJzGXltzQhAJ",
@ -43,12 +44,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754221346981,
-    "modifiedTime": 1754236671909,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1755943479431,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!xp0XMjYT85Q7E90o"
 }
--- a/src/packs/subclasses/subclass_Warden_of_the_Elements_W9hs5kxOWeY7eA4Q.json
+++ b/src/packs/subclasses/subclass_Warden_of_the_Elements_W9hs5kxOWeY7eA4Q.json
@ -21,7 +21,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.ZNwUTCyGCEcidZFv"
  },
  "effects": [],
  "folder": "AZWrSJzGXltzQhAJ",
@ -35,12 +36,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754221102716,
-    "modifiedTime": 1754236671090,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1755943478132,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!W9hs5kxOWeY7eA4Q"
 }
--- a/src/packs/subclasses/subclass_Wayfinder_zsUglcU4NgZ8tNgZ.json
+++ b/src/packs/subclasses/subclass_Wayfinder_zsUglcU4NgZ8tNgZ.json
@ -26,7 +26,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.BTyfve69LKqoOi9S"
  },
  "effects": [],
  "sort": 0,
@ -39,12 +40,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754268318903,
-    "modifiedTime": 1754268377047,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1755943505016,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!zsUglcU4NgZ8tNgZ"
 }
--- a/src/packs/subclasses/subclass_Winged_Sentinel_y7ERWRIpJsdP9Re4.json
+++ b/src/packs/subclasses/subclass_Winged_Sentinel_y7ERWRIpJsdP9Re4.json
@ -26,7 +26,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.5ZnlJ5bEoyOTkUJv"
  },
  "effects": [],
  "sort": 0,
@ -39,12 +40,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754354451615,
-    "modifiedTime": 1754355901649,
-    "lastModifiedBy": "Q9NoTaEarn3VMS6Z"
+    "modifiedTime": 1755943523928,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_key": "!items!y7ERWRIpJsdP9Re4"
 }
--- a/src/packs/subclasses/subclass_Wordsmith_XTSODVM8st75Os8M.json
+++ b/src/packs/subclasses/subclass_Wordsmith_XTSODVM8st75Os8M.json
@ -25,7 +25,8 @@
      }
    ],
    "featureState": 1,
-    "isMulticlass": false
+    "isMulticlass": false,
+    "linkedClass": "Compendium.daggerheart.classes.Item.vegl3bFOq3pcFTWT"
  },
  "effects": [],
  "ownership": {
@ -37,12 +38,12 @@
    "compendiumSource": null,
    "duplicateSource": null,
    "exportSource": null,
-    "coreVersion": "13.346",
+    "coreVersion": "13.347",
    "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.0",
    "createdTime": 1754174655078,
-    "modifiedTime": 1754236660088,
-    "lastModifiedBy": "LgnbNMLaxandgMQq"
+    "modifiedTime": 1755943467695,
+    "lastModifiedBy": "tt3PwMBXcTLCtIQU"
  },
  "_id": "XTSODVM8st75Os8M",
  "sort": 200000,
--- a/styles/less/ui/item-browser/item-browser.less
+++ b/styles/less/ui/item-browser/item-browser.less
@ -356,6 +356,8 @@
            display: grid;
            grid-template-rows: 0fr;
            transition: all 0.3s ease-in-out;
+            width: 100%;
+            
            .wrapper {
                overflow: hidden;
                display: grid;
--- a/system.json
+++ b/system.json
@ -2,7 +2,7 @@
    "id": "daggerheart",
    "title": "Daggerheart",
    "description": "An unofficial implementation of the Daggerheart system",
-    "version": "1.1.0",
+    "version": "1.1.1",
    "compatibility": {
        "minimum": "13",
        "verified": "13.347",