Display Heritages in the Features Tab

src/module/actor/character/feats/collection.ts

@@ -247,6 +247,9 @@ class CharacterFeats<TActor extends CharacterPF2e> extends Collection<string, Fe
                 if (granter?.isOfType("feat") && granter.grants.includes(feat) && isNested) {
                     continue;
                 }
+                if (granter?.isOfType("heritage") && isNested) {
+                    continue;
+                }
             }
 
             // Find the group then assign the feat

src/module/actor/character/sheet.ts

@@ -71,7 +71,7 @@ import {
 } from "./data.ts";
 import type { CharacterPF2e } from "./document.ts";
 import { ElementalBlast, ElementalBlastConfig } from "./elemental-blast.ts";
-import type { FeatBrowserFilterProps, FeatGroup } from "./feats/index.ts";
+import type { FeatBrowserFilterProps, FeatGroup, FeatSlot } from "./feats/index.ts";
 import { getItemProficiencyRank } from "./helpers.ts";
 import { PCSheetTabManager } from "./tab-manager.ts";
 import { CHARACTER_SHEET_TABS } from "./values.ts";
@@ -85,6 +85,28 @@ class CharacterSheetPF2e<TActor extends CharacterPF2e> extends CreatureSheetPF2e
     /** Non-persisted tweaks to formula data */
     #formulaQuantities: Record<string, number> = {};
 
+    /** Nested feat rows for sheet UI from `flags.pf2e.itemGrants` (same rules as `FeatGroup.#getChildSlots`). */
+    #getNestedSlots(granter: ItemPF2e): FeatSlot<FeatPF2e<TActor>>[] {
+        const itemGrants = (granter.flags?.[SYSTEM_ID]?.itemGrants ?? {}) as Record<
+            string,
+            { id?: string; nested?: boolean }
+        >;
+
+        return Object.values(itemGrants)
+            .filter((g) => (g?.nested ?? null) !== false)
+            .map((g) => (typeof g?.id === "string" && g.id.length > 0 ? (this.actor.items.get(g.id) ?? null) : null))
+            .filter((i): i is FeatPF2e<TActor> => !!i && i.isOfType("feat"))
+            .map(
+                (grant): FeatSlot<FeatPF2e<TActor>> => ({
+                    id: grant.id,
+                    label: null,
+                    level: null,
+                    feat: grant,
+                    children: this.#getNestedSlots(grant),
+                }),
+            );
+    }
+
     static override get defaultOptions(): ActorSheetOptions {
         const options = super.defaultOptions;
         options.classes = [...options.classes, "character"];
@@ -288,7 +310,23 @@ class CharacterSheetPF2e<TActor extends CharacterPF2e> extends CreatureSheetPF2e
         // Is the stamina variant rule enabled?
         sheetData.hasStamina = game.pf2e.settings.variants.stamina;
         sheetData.actions = this.#prepareAbilities();
-        sheetData.feats = [...actor.feats, actor.feats.bonus];
+
+        const featGroups: FeatGroup[] = [...actor.feats, actor.feats.bonus];
+        const ancestryFeatures = featGroups.find((g) => g.id === "ancestryfeature");
+        // Add the heritage to the ancestry features if it is not already present
+        if (actor.heritage && ancestryFeatures) {
+            const alreadyPresent = ancestryFeatures.feats.some((f) => f.feat?.id === actor.heritage?.id);
+            if (!alreadyPresent) {
+                ancestryFeatures.feats.unshift({
+                    id: "heritage",
+                    label: null,
+                    level: null,
+                    feat: actor.heritage,
+                    children: this.#getNestedSlots(actor.heritage),
+                } as never);
+            }
+        }
+        sheetData.feats = featGroups;
 
         sheetData.crafting = await this.#prepareCrafting();