Updating mechanics for OS protocols

src/lib/builder/loadout-combat.test.ts

@@ -259,7 +259,7 @@ describe('loadout mechanic timeline', () => {
     ).toEqual([1, 2]);
   });
 
-  it('falls back to a documented Tier I mechanic when equipment Tier II is absent', () => {
+  it('falls back to a documented Tier I mechanic when exotic Tier II is absent', () => {
     const persistedRule = {
       rule: {
         id: 'tier-i-only',
@@ -327,6 +327,7 @@ describe('loadout mechanic timeline', () => {
     const adapted = equippedConditionalProgram({
       key: 'weapon:0:exotic-talent',
       tier: 2,
+      isExotic: true,
       rule: persistedRule,
     });
 

src/lib/builder/loadout-combat.ts

@@ -283,7 +283,7 @@ export function equippedConditionalProgram(
     : 'base';
   return (
     conditionalProgram(equipped.rule, variant) ??
-    (equipmentTalent && variant === 'II'
+    (equipmentTalent && equipped.isExotic && variant === 'II'
       ? conditionalProgram(equipped.rule, 'I')
       : null)
   );

src/lib/builder/loadout-summary.test.ts

@@ -425,11 +425,58 @@ describe('summarizeLoadout', () => {
     expect(stat(summary, 'mechanic')).toBeUndefined();
   });
 
-  it('renders the selected Talent tier without applying its mechanic outcomes to stats', () => {
+  it('uses a gear Talent tier independently from the gear tier', () => {
+    const draft = createDraft();
+    draft.gear.Holster.itemId = 'gear';
+    draft.gear.Holster.talentId = 'talent';
+    Object.assign(draft.gear.Holster, { talentTier: 2 });
+
+    const summary = summarizeLoadout(
+      draft,
+      catalog({
+        attributes: [attribute('bonus', 'Bonus', { unit: '%' })],
+        gear: [{ id: 'gear', tier: 0, base_armor_min: null }],
+        talents: [
+          {
+            id: 'talent',
+            name: 'Reinforced',
+            template: 'Gain {1}.',
+            tiers: [
+              {
+                tier: 'I',
+                effects: [{ stat_attribute_id: 'bonus', value: 10 }],
+              },
+              {
+                tier: 'II',
+                effects: [{ stat_attribute_id: 'bonus', value: 20 }],
+              },
+            ],
+          },
+        ],
+      }),
+    );
+
+    expect(summary.equippedTalents).toEqual([
+      expect.objectContaining({
+        id: 'talent',
+        tier: 2,
+        tierLabel: 'TIER II',
+        description: 'Gain 20%.',
+      }),
+    ]);
+  });
+
+  it('uses each weapon Talent tier independently without applying mechanic outcomes to stats', () => {
     const draft = createDraft();
     draft.weapons[0].itemId = 'weapon';
     draft.weapons[0].tier = 2;
-    draft.weapons[0].talent1Id = 'talent';
+    draft.weapons[0].talent1Id = 'talent-one';
+    draft.weapons[0].talent2Id = 'talent-two';
+    Object.assign(draft.weapons[0], {
+      talent1Tier: 1,
+      talent2Tier: 2,
+      exoticTalentTier: 1,
+    });
 
     const rule = {
       clauses: [
@@ -455,13 +502,13 @@ describe('summarizeLoadout', () => {
           {
             id: 'weapon',
             name: 'Test Weapon',
-            exotic_talent_id: null,
+            exotic_talent_id: 'exotic-talent',
             baseBonuses: [],
           },
         ],
         talents: [
           {
-            id: 'talent',
+            id: 'talent-one',
             name: 'Measured',
             template: 'Gain {1} for {2}.',
             tiers: [
@@ -482,17 +529,60 @@ describe('summarizeLoadout', () => {
             ],
             rule,
           },
+          {
+            id: 'talent-two',
+            name: 'Calibrated',
+            template: 'Gain {1}.',
+            tiers: [
+              {
+                tier: 'I',
+                effects: [{ stat_attribute_id: 'talent-stat', value: 30 }],
+              },
+              {
+                tier: 'II',
+                effects: [{ stat_attribute_id: 'talent-stat', value: 40 }],
+              },
+            ],
+          },
+          {
+            id: 'exotic-talent',
+            name: 'Exotic Talent',
+            template: 'Gain {1}.',
+            tiers: [
+              {
+                tier: 'I',
+                effects: [{ stat_attribute_id: 'talent-stat', value: 50 }],
+              },
+              {
+                tier: 'II',
+                effects: [{ stat_attribute_id: 'talent-stat', value: 60 }],
+              },
+            ],
+          },
         ],
       }),
     );
 
     expect(summary.equippedTalents).toEqual([
       expect.objectContaining({
-        id: 'talent',
-        tier: 2,
-        description: 'Gain 20% for 3 Shots.',
+        id: 'talent-one',
+        tier: 1,
+        tierLabel: 'TIER I',
+        description: 'Gain 10% for 2 Shots.',
         rule,
       }),
+      expect.objectContaining({
+        id: 'talent-two',
+        tier: 2,
+        tierLabel: 'TIER II',
+        description: 'Gain 40%.',
+      }),
+      expect.objectContaining({
+        id: 'exotic-talent',
+        tier: 1,
+        tierLabel: 'TIER I',
+        description: 'Gain 50%.',
+      }),
     ]);
     expect(stat(summary, 'talent-stat')).toBeUndefined();
   });

src/lib/builder/loadout-summary.ts

@@ -1,4 +1,9 @@
-import { gearSlots, scaled, type LoadoutDraft } from '$lib/builder/loadout';
+import {
+  gearSlots,
+  scaled,
+  type LoadoutDraft,
+  type TalentTier,
+} from '$lib/builder/loadout';
 
 export type LoadoutCatalog = {
   attributes: any[];
@@ -100,18 +105,21 @@ function unitValue(catalog: LoadoutCatalog, value: unknown, statId: string) {
   return unit === 'Shots' ? `${rendered} ${unit}` : `${rendered}${unit}`;
 }
 
-function talentTier(catalog: LoadoutCatalog, talentId: string, tier: number) {
+function talentTier(
+  catalog: LoadoutCatalog,
+  talentId: string,
+  tier: TalentTier,
+) {
   const item = catalog.talents.find((entry) => entry.id === talentId);
-  return (
-    item?.tiers.find((entry: any) => entry.tier === (tier >= 2 ? 'II' : 'I')) ??
-    item?.tiers[0]
+  return item?.tiers.find(
+    (entry: any) => entry.tier === (tier === 2 ? 'II' : 'I'),
   );
 }
 
 function talentDescription(
   catalog: LoadoutCatalog,
   talentId: string,
-  tier: number,
+  tier: TalentTier,
 ) {
   const item = catalog.talents.find((entry) => entry.id === talentId);
   const configured = talentTier(catalog, talentId, tier);
@@ -255,12 +263,14 @@ export function summarizeLoadout(
         rule:
           catalog.talents.find((entry) => entry.id === selection.talentId)
             ?.rule ?? null,
-        tier: Number(item.tier),
+        tier: selection.talentTier,
+        tierLabel: selection.talentTier === 2 ? 'TIER II' : 'TIER I',
+        isExotic: false,
         source: slot,
         description: talentDescription(
           catalog,
           selection.talentId,
-          Number(item.tier),
+          selection.talentTier,
         ),
       });
     }
@@ -305,19 +315,39 @@ export function summarizeLoadout(
         roll.value,
         `${index ? 'Secondary' : 'Primary'} weapon roll`,
       );
-    for (const talentId of [
-      selection.talent1Id,
-      selection.talent2Id,
-      item.exotic_talent_id,
-    ].filter(Boolean)) {
+    const equippedWeaponTalents = [
+      {
+        id: selection.talent1Id,
+        tier: selection.talent1Tier,
+        isExotic: false,
+      },
+      {
+        id: selection.talent2Id,
+        tier: selection.talent2Tier,
+        isExotic: false,
+      },
+      {
+        id: item.exotic_talent_id,
+        tier: selection.exoticTalentTier,
+        isExotic: true,
+      },
+    ].filter((entry) => entry.id);
+    for (const equippedTalent of equippedWeaponTalents) {
       equippedTalents.push({
-        key: `weapon:${index}:${talentId}`,
-        id: talentId,
+        key: `weapon:${index}:${equippedTalent.id}`,
+        id: equippedTalent.id,
         rule:
-          catalog.talents.find((entry) => entry.id === talentId)?.rule ?? null,
-        tier: selection.tier,
+          catalog.talents.find((entry) => entry.id === equippedTalent.id)
+            ?.rule ?? null,
+        tier: equippedTalent.tier,
+        tierLabel: equippedTalent.tier === 2 ? 'TIER II' : 'TIER I',
+        isExotic: equippedTalent.isExotic,
         source: index ? 'Secondary weapon' : 'Primary weapon',
-        description: talentDescription(catalog, talentId, selection.tier),
+        description: talentDescription(
+          catalog,
+          equippedTalent.id,
+          equippedTalent.tier,
+        ),
       });
     }
   }

src/lib/builder/loadout.test.ts

@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest';
 import {
   createDraft,
+  migrateLoadoutDraftV5,
   parseLoadoutDraft,
   skillChipSecondaryCapacity,
   type SkillChipQuality,
@@ -8,13 +9,40 @@ import {
 
 const copyDraft = () => structuredClone(createDraft());
 
+const talentTierFields = [
+  [
+    'gear talentTier',
+    (draft: ReturnType<typeof copyDraft>) =>
+      draft.gear.Holster as unknown as Record<string, unknown>,
+    'talentTier',
+  ],
+  [
+    'weapon talent1Tier',
+    (draft: ReturnType<typeof copyDraft>) =>
+      draft.weapons[0] as unknown as Record<string, unknown>,
+    'talent1Tier',
+  ],
+  [
+    'weapon talent2Tier',
+    (draft: ReturnType<typeof copyDraft>) =>
+      draft.weapons[0] as unknown as Record<string, unknown>,
+    'talent2Tier',
+  ],
+  [
+    'weapon exoticTalentTier',
+    (draft: ReturnType<typeof copyDraft>) =>
+      draft.weapons[0] as unknown as Record<string, unknown>,
+    'exoticTalentTier',
+  ],
+] as const;
+
 describe('parseLoadoutDraft', () => {
   it('accepts a current draft and returns an independent clone', () => {
     const draft = createDraft();
     const parsed = parseLoadoutDraft(draft);
 
     expect(parsed).toEqual(draft);
-    expect(parsed?.version).toBe(5);
+    expect(parsed?.version).toBe(6);
     expect(parsed?.chips[0]).toEqual({
       setId: '',
       quality: 'Standard',
@@ -27,6 +55,37 @@ describe('parseLoadoutDraft', () => {
     expect(draft.gear.Holster.level).toBe(50);
   });
 
+  it('defaults every equipment Talent tier to Tier I', () => {
+    const draft = createDraft();
+
+    expect(
+      Object.values(draft.gear).map(
+        (selection) =>
+          (selection as unknown as Record<string, unknown>).talentTier,
+      ),
+    ).toEqual(Array(6).fill(1));
+    expect(
+      draft.weapons.map((selection) => {
+        const weapon = selection as unknown as Record<string, unknown>;
+        return [
+          weapon.talent1Tier,
+          weapon.talent2Tier,
+          weapon.exoticTalentTier,
+        ];
+      }),
+    ).toEqual([
+      [1, 1, 1],
+      [1, 1, 1],
+    ]);
+  });
+
+  it('accepts Tier II for every equipment Talent selection', () => {
+    const draft = copyDraft();
+    for (const [, select, key] of talentTierFields) select(draft)[key] = 2;
+
+    expect(parseLoadoutDraft(draft)).toEqual(draft);
+  });
+
   it('rejects the retired version 1 three-chip shape', () => {
     const retired = copyDraft() as unknown as Record<string, unknown>;
     retired.version = 1;
@@ -42,13 +101,77 @@ describe('parseLoadoutDraft', () => {
     expect(parseLoadoutDraft(retired)).toBeNull();
   });
 
-  it('rejects a version 5 draft that does not contain exactly nine chips', () => {
+  it('rejects the retired version 5 schema', () => {
+    const retired = copyDraft() as unknown as Record<string, unknown>;
+    retired.version = 5;
+
+    expect(parseLoadoutDraft(retired)).toBeNull();
+  });
+
+  it('migrates version 5 equipment-derived Talent tiers once', () => {
+    const legacy = copyDraft() as unknown as Record<string, any>;
+    legacy.version = 5;
+    for (const selection of Object.values(legacy.gear) as Record<
+      string,
+      any
+    >[]) {
+      delete selection.talentTier;
+    }
+    for (const selection of legacy.weapons as Record<string, any>[]) {
+      delete selection.talent1Tier;
+      delete selection.talent2Tier;
+      delete selection.exoticTalentTier;
+    }
+    legacy.gear.Holster.itemId = 'tier-two-gear';
+    legacy.weapons[0].itemId = 'exotic-weapon';
+    legacy.weapons[0].tier = 2;
+
+    const migrated = migrateLoadoutDraftV5(legacy, {
+      gear: [{ id: 'tier-two-gear', tier: 2 }],
+      weapons: [{ id: 'exotic-weapon', exotic_talent_id: 'exotic-talent' }],
+      talents: [
+        {
+          id: 'exotic-talent',
+          tiers: [{ tier: 'I' }, { tier: 'II' }],
+        },
+      ],
+    });
+
+    expect(migrated?.version).toBe(6);
+    expect(migrated?.gear.Holster.talentTier).toBe(2);
+    expect(migrated?.gear.Gloves.talentTier).toBe(1);
+    expect(migrated?.weapons[0]).toMatchObject({
+      talent1Tier: 2,
+      talent2Tier: 2,
+      exoticTalentTier: 2,
+    });
+  });
+
+  it('rejects a current draft that does not contain exactly nine chips', () => {
     const draft = copyDraft();
     draft.chips.pop();
 
     expect(parseLoadoutDraft(draft)).toBeNull();
   });
 
+  it.each(talentTierFields)('rejects a draft missing %s', (_, select, key) => {
+    const draft = copyDraft();
+    delete select(draft)[key];
+
+    expect(parseLoadoutDraft(draft)).toBeNull();
+  });
+
+  it.each(
+    talentTierFields.flatMap(([name, select, key]) =>
+      [0, 1.5, 3].map((value) => [name, value, select, key] as const),
+    ),
+  )('rejects %s value %s', (_, value, select, key) => {
+    const draft = copyDraft();
+    select(draft)[key] = value;
+
+    expect(parseLoadoutDraft(draft)).toBeNull();
+  });
+
   it.each([
     ['Standard', 0],
     ['Specialized', 1],

src/lib/builder/loadout.ts

@@ -1,4 +1,5 @@
 export type Roll = { statId: string; value: number };
+export type TalentTier = 1 | 2;
 export const skillChipQualities = [
   'Standard',
   'Specialized',
@@ -17,6 +18,7 @@ export type GearSelection = {
   level: number;
   brandId: string;
   talentId: string;
+  talentTier: TalentTier;
   health: number;
   armor: number;
   firepower: number;
@@ -34,7 +36,10 @@ export type WeaponSelection = {
   toughness: number;
   engineering: number;
   talent1Id: string;
+  talent1Tier: TalentTier;
   talent2Id: string;
+  talent2Tier: TalentTier;
+  exoticTalentTier: TalentTier;
   rolls: [Roll, Roll];
 };
 export type ChipSelection = {
@@ -81,7 +86,7 @@ export type SpecializationSelection = {
   nodeRanks: Record<string, number>;
 };
 export type LoadoutDraft = {
-  version: 5;
+  version: 6;
   buildName: string;
   calculationMode: CalculationMode;
   gear: Record<string, GearSelection>;
@@ -118,6 +123,7 @@ export const blankGear = (): GearSelection => ({
   level: 50,
   brandId: '',
   talentId: '',
+  talentTier: 1,
   health: 0,
   armor: 0,
   firepower: 0,
@@ -135,7 +141,10 @@ export const blankWeapon = (): WeaponSelection => ({
   toughness: 0,
   engineering: 0,
   talent1Id: '',
+  talent1Tier: 1,
   talent2Id: '',
+  talent2Tier: 1,
+  exoticTalentTier: 1,
   rolls: [blankRoll(), blankRoll()],
 });
 export const blankChip = (): ChipSelection => ({
@@ -161,7 +170,7 @@ export const defaultCombatProfile = (): CombatProfile => ({
   extraHealthActive: false,
 });
 export const createDraft = (): LoadoutDraft => ({
-  version: 5,
+  version: 6,
   buildName: 'Untitled loadout',
   calculationMode: 'maximum',
   gear: Object.fromEntries(gearSlots.map((slot) => [slot, blankGear()])),
@@ -187,6 +196,39 @@ export const createDraft = (): LoadoutDraft => ({
   },
 });
 
+export function migrateLoadoutDraftV5(
+  value: unknown,
+  catalog: { gear: any[]; weapons: any[]; talents: any[] },
+): LoadoutDraft | null {
+  if (!isRecord(value) || value.version !== 5) return null;
+  const migrated = structuredClone(value);
+  if (!isRecord(migrated.gear) || !Array.isArray(migrated.weapons)) return null;
+
+  for (const slot of gearSlots) {
+    const selection = migrated.gear[slot];
+    if (!isRecord(selection)) return null;
+    const item = catalog.gear.find((entry) => entry.id === selection.itemId);
+    selection.talentTier = Number(item?.tier) >= 2 ? 2 : 1;
+  }
+  for (const selection of migrated.weapons) {
+    if (!isRecord(selection)) return null;
+    const inheritedTier: TalentTier = Number(selection.tier) >= 2 ? 2 : 1;
+    selection.talent1Tier = inheritedTier;
+    selection.talent2Tier = inheritedTier;
+    const item = catalog.weapons.find((entry) => entry.id === selection.itemId);
+    const exoticTalent = catalog.talents.find(
+      (entry) => entry.id === item?.exotic_talent_id,
+    );
+    selection.exoticTalentTier =
+      inheritedTier === 2 &&
+      exoticTalent?.tiers?.some((entry: any) => entry.tier === 'II')
+        ? 2
+        : 1;
+  }
+  migrated.version = 6;
+  return parseLoadoutDraft(migrated);
+}
+
 const isRecord = (value: unknown): value is Record<string, unknown> =>
   Boolean(value) && typeof value === 'object' && !Array.isArray(value);
 const hasExactKeys = (value: Record<string, unknown>, keys: string[]) =>
@@ -194,6 +236,8 @@ const hasExactKeys = (value: Record<string, unknown>, keys: string[]) =>
   keys.every((key) => key in value);
 const isFiniteNumber = (value: unknown): value is number =>
   typeof value === 'number' && Number.isFinite(value);
+const isTalentTier = (value: unknown): value is TalentTier =>
+  value === 1 || value === 2;
 const isNumberRecord = (value: unknown) =>
   isRecord(value) &&
   Object.values(value).every(
@@ -213,6 +257,7 @@ const isGearSelection = (value: unknown): value is GearSelection =>
     'level',
     'brandId',
     'talentId',
+    'talentTier',
     'health',
     'armor',
     'firepower',
@@ -224,6 +269,7 @@ const isGearSelection = (value: unknown): value is GearSelection =>
   ['itemId', 'brandId', 'talentId'].every(
     (key) => typeof value[key] === 'string',
   ) &&
+  isTalentTier(value.talentTier) &&
   ['level', 'health', 'armor', 'firepower', 'toughness', 'engineering'].every(
     (key) => isFiniteNumber(value[key]),
   ) &&
@@ -241,12 +287,18 @@ const isWeaponSelection = (value: unknown): value is WeaponSelection =>
     'toughness',
     'engineering',
     'talent1Id',
+    'talent1Tier',
     'talent2Id',
+    'talent2Tier',
+    'exoticTalentTier',
     'rolls',
   ]) &&
   ['itemId', 'talent1Id', 'talent2Id'].every(
     (key) => typeof value[key] === 'string',
   ) &&
+  isTalentTier(value.talent1Tier) &&
+  isTalentTier(value.talent2Tier) &&
+  isTalentTier(value.exoticTalentTier) &&
   ['level', 'tier', 'damage', 'firepower', 'toughness', 'engineering'].every(
     (key) => isFiniteNumber(value[key]),
   ) &&
@@ -369,7 +421,7 @@ export function parseLoadoutDraft(value: unknown): LoadoutDraft | null {
       'skillActivations',
       'specialization',
     ]) ||
-    value.version !== 5 ||
+    value.version !== 6 ||
     typeof value.buildName !== 'string' ||
     !['maximum', 'custom'].includes(String(value.calculationMode))
   )

src/lib/calculations/mechanic-editor.test.ts

@@ -791,9 +791,9 @@ describe('conditional mechanic authoring payload', () => {
     });
   });
 
-  it('rejects invalid pre-event timing for current Health percentage references', () => {
-    const invalid = draft();
-    invalid.clauses[0].if = {
+  it('preserves pre-event timing for current Health percentage references', () => {
+    const value = draft();
+    value.clauses[0].if = {
       kind: 'compare',
       left: {
         source: 'combat',
@@ -803,11 +803,13 @@ describe('conditional mechanic authoring payload', () => {
       operator: 'lt',
       right: 50,
     };
-    const result = parseConditionalMechanicDraft(invalid, {
+    const result = parseConditionalMechanicDraft(value, {
       variantKeys: ['I', 'II'],
       allowedAttributeIds: new Set(['weapon-damage']),
     });
-    expect(result.ok).toBe(false);
+    expect(result.ok).toBe(true);
+    if (!result.ok) return;
+    expect(result.value.draft.clauses[0].if).toEqual(value.clauses[0].if);
   });
 
   it('accepts compatible radius targeting and rejects incompatible scopes', () => {

src/lib/calculations/mechanic-editor.ts

@@ -426,8 +426,7 @@ function isReference(value: unknown): value is ValueReference {
         Boolean(value.path.trim()) &&
         (value.timing === undefined ||
           value.timing === 'pre_event' ||
-          value.timing === 'current') &&
-        !(value.path === 'currentHealthPercent' && value.timing === 'pre_event')
+          value.timing === 'current')
       );
     case 'equipment':
       return typeof value.path === 'string' && Boolean(value.path.trim());

src/lib/calculations/mechanic-persistence.test.ts

@@ -850,7 +850,7 @@ describe('conditional-effect persistence adapter', () => {
       left: {
         source: 'combat',
         path: 'currentHealthPercent',
-        timing: 'current',
+        timing: 'pre_event',
       },
       operator: 'lt',
       right: 25,

src/lib/calculations/mechanic-persistence.ts

@@ -216,8 +216,7 @@ function isValueReference(value: unknown) {
       Boolean(value.path.trim()) &&
       (value.timing === undefined ||
         value.timing === 'pre_event' ||
-        value.timing === 'current') &&
-      !(value.path === 'currentHealthPercent' && value.timing === 'pre_event')
+        value.timing === 'current')
     );
   }
   if (value.source === 'attribute') {

src/lib/calculations/mechanic.test.ts

@@ -2834,13 +2834,13 @@ describe('mechanic validation and pseudo-script', () => {
     ]);
   });
 
-  it('rejects pre-event timing for the derived current Health percentage', () => {
-    const invalid: MechanicProgram = {
-      id: 'invalid-health-percent',
-      name: 'Invalid Health Percent',
+  it('evaluates pre-event timing for the derived current Health percentage', () => {
+    const program: MechanicProgram = {
+      id: 'pre-event-health-percent',
+      name: 'Pre-event Health Percent',
       clauses: [
         {
-          id: 'invalid',
+          id: 'full-health-before-event',
           when: 'tick',
           if: {
             kind: 'compare',
@@ -2849,25 +2849,32 @@ describe('mechanic validation and pseudo-script', () => {
               path: 'currentHealthPercent',
               timing: 'pre_event',
             },
-            operator: 'lt',
-            right: 50,
+            operator: 'gte',
+            right: 100,
           },
           reducer: { kind: 'none' },
           mutations: [],
+          outcomes: [
+            {
+              id: 'matched',
+              label: 'Matched',
+              phase: 'on_event',
+              kind: 'marker',
+              scope: 'self',
+              basis: 'flat',
+              value: 1,
+            },
+          ],
         },
       ],
     };
-    const result = validateMechanicProgram(invalid);
-    expect(result.ok).toBe(false);
-    if (!result.ok) {
-      expect(result.errors).toEqual(
-        expect.arrayContaining([
-          expect.stringContaining(
-            'current Health percentage must use current timing',
-          ),
-        ]),
-      );
-    }
+    expect(validateMechanicProgram(program)).toMatchObject({ ok: true });
+    expect(
+      evaluateMechanicProgram(program, [{ kind: 'tick', at: 0 }], custom(1), {
+        maxHealth: 100,
+        currentHealth: 100,
+      }).outcomes.map((outcome) => outcome.outcomeId),
+    ).toEqual(['matched']);
   });
 
   it('formats nested conditions and state operations deterministically', () => {
@@ -3104,6 +3111,42 @@ describe('mechanic validation and pseudo-script', () => {
     expect(
       maximum.outcomes.every((outcome) => outcome.probabilityRoll === 0),
     ).toBe(true);
+
+    const skillProgram: MechanicProgram = {
+      ...program,
+      id: 'skill-hit-explosion',
+      clauses: program.clauses.map((clause) => ({
+        ...clause,
+        when: 'skill_hit',
+        if: undefined,
+      })),
+    };
+    expect(validateMechanicProgram(skillProgram)).toMatchObject({ ok: true });
+    expect(
+      evaluateMechanicProgram(
+        skillProgram,
+        [
+          {
+            kind: 'skill_hit',
+            at: 1,
+            targetId: 'enemy-b',
+            areaTargetSample: {
+              center: 'event_target',
+              validTargets: [
+                { entityId: 'enemy-b', population: 'enemy', distanceMeters: 0 },
+                { entityId: 'enemy-a', population: 'enemy', distanceMeters: 5 },
+              ],
+            },
+          },
+        ],
+        custom(5),
+        {
+          maxHealth: 1000,
+          currentHealth: 1000,
+          attributes: { firepower: 100 },
+        },
+      ).outcomes.map((outcome) => outcome.targetId),
+    ).toEqual(['enemy-a', 'enemy-b']);
   });
 
   it('requires authoritative area evidence only when an area outcome activates', () => {

src/lib/calculations/mechanic.ts

@@ -97,6 +97,11 @@ export const MECHANIC_EVENT_REGISTRY: Readonly<
     description:
       'The Agent deploys or activates a specialization ability. An assigned-ability deployment may supply its active duration.',
     fields: [
+      {
+        path: 'values.abilityId',
+        label: 'Deployed ability ID',
+        type: 'string',
+      },
       {
         path: 'values.assignedAbilityDurationSeconds',
         label: 'Assigned ability duration',
@@ -123,8 +128,9 @@ export const MECHANIC_EVENT_REGISTRY: Readonly<
     key: 'skill_hit',
     label: 'Skill hit',
     description:
-      'A deployed skill connects with a target. Critical and distance details belong in event values.',
+      'A deployed skill connects with a target. Critical and distance details belong in event values. An optional area-target sample lists valid entities by distance from the hit target.',
     fields: [
+      { path: 'values.abilityId', label: 'Source ability ID', type: 'string' },
       { path: 'values.critical', label: 'Critical hit', type: 'boolean' },
       {
         path: 'values.assignedAbilityActive',
@@ -1892,15 +1898,8 @@ function validateReference(
   }
   if (reference.source === 'event' && !reference.path.trim())
     errors.push(`${path} requires an event path.`);
-  if (reference.source === 'combat') {
-    if (!reference.path.trim()) errors.push(`${path} requires a combat path.`);
-    if (
-      reference.path === 'currentHealthPercent' &&
-      reference.timing === 'pre_event'
-    ) {
-      errors.push(`${path} current Health percentage must use current timing.`);
-    }
-  }
+  if (reference.source === 'combat' && !reference.path.trim())
+    errors.push(`${path} requires a combat path.`);
   if (reference.source === 'attribute' && !reference.attributeId.trim())
     errors.push(`${path} requires an Attribute ID.`);
   if (reference.source === 'equipment' && !reference.path.trim())
@@ -2067,7 +2066,7 @@ function validateMechanicEvents(events: MechanicEvent[]) {
     if (sample === undefined) continue;
     const samplePath = `Event ${index + 1} (${definition.label}) area-target sample`;
     if (
-      event.kind !== 'weapon_hit' ||
+      !['weapon_hit', 'skill_hit'].includes(event.kind) ||
       !objectValue(sample) ||
       sample.center !== 'event_target' ||
       !Array.isArray(sample.validTargets) ||
@@ -2075,7 +2074,7 @@ function validateMechanicEvents(events: MechanicEvent[]) {
       !event.targetId.trim()
     ) {
       errors.push(
-        `${samplePath} requires a weapon-hit event target and event-target-centered valid targets.`,
+        `${samplePath} requires a weapon-hit or skill-hit event target and event-target-centered valid targets.`,
       );
       continue;
     }
@@ -2769,10 +2768,10 @@ export function validateMechanicProgram(
       if (targetingError) errors.push(`${outcomePath} ${targetingError}`);
       if (
         outcome.targeting?.kind === 'event_target_area' &&
-        clause.when !== 'weapon_hit'
+        !['weapon_hit', 'skill_hit'].includes(clause.when)
       ) {
         errors.push(
-          `${outcomePath} event-target area damage requires a weapon-hit clause.`,
+          `${outcomePath} event-target area damage requires a weapon-hit or skill-hit clause.`,
         );
       }
       if (

src/lib/components/BuilderRadioGrid.svelte

@@ -24,6 +24,8 @@
 	} = $props();
 
 	let query = $state('');
+	let open = $state(false);
+	const selected = $derived(items.find((item) => item.id === value));
 	const visible = $derived(items.filter((item) =>
 		!query.trim() || `${item.name} ${item.category ?? ''}`.toLocaleLowerCase().includes(query.trim().toLocaleLowerCase())
 	));
@@ -31,26 +33,33 @@
 	function choose(id: string) {
 		value = id;
 		onchange?.(id);
+		if (searchable) {
+			open = false;
+			query = '';
+		}
 	}
 </script>
 
 <fieldset class="builder-radio-grid" class:icon-only={iconOnly} style={`--builder-radio-columns:${Math.max(1, columns)}`}>
 	<legend>{label}</legend>
-	{#if searchable}
+	{#if searchable}<button type="button" class="builder-radio-toggle" aria-expanded={open} onclick={() => open = !open}><ItemIcon src={selected?.iconUrl} alt=""/><span><b>{selected?.name ?? 'SELECT OPTION'}</b><small>{selected?.category ?? 'NOT CONFIGURED'}</small></span><em>{open ? 'CLOSE' : 'CHANGE'}</em></button>{/if}
+	{#if searchable && open}
 		<input class="builder-radio-search" type="search" bind:value={query} placeholder="SEARCH AVAILABLE OPTIONS" aria-label={`Search ${label.toLocaleLowerCase()}`}/>
 	{/if}
-	<div>
-		{#each visible as item}
-			<label title={item.name}>
-				<input type="radio" {name} value={item.id} checked={value === item.id} {required} aria-label={item.name} onchange={() => choose(item.id)}/>
-				<span>
-					<ItemIcon src={item.iconUrl} alt=""/>
-					<b>{item.name}</b>
-					{#if item.category}<small>{item.category}</small>{/if}
-				</span>
-			</label>
-		{:else}
-			<p>NO MATCHING OPTIONS</p>
-		{/each}
-	</div>
+	{#if !searchable || open}
+		<div>
+			{#each visible as item}
+				<label title={item.name}>
+					<input type="radio" {name} value={item.id} checked={value === item.id} {required} aria-label={item.name} onchange={() => choose(item.id)}/>
+					<span>
+						<ItemIcon src={item.iconUrl} alt=""/>
+						<b>{item.name}</b>
+						{#if item.category}<small>{item.category}</small>{/if}
+					</span>
+				</label>
+			{:else}
+				<p>NO MATCHING OPTIONS</p>
+			{/each}
+		</div>
+	{/if}
 </fieldset>

src/lib/components/builder/LoadoutMatrix.svelte

@@ -37,9 +37,9 @@
 			&& Math.floor(Number(active.split(':')[1]) / 3) === Number(cell.id.split(':')[1]));
 
 	const issueLabel = (issue: string) => {
-		if (/not configured|required/i.test(issue)) return 'ACTION REQUIRED';
-		if (/incomplete/i.test(issue)) return 'DATA INCOMPLETE';
-		return 'CHECK CONFIGURATION';
+		if (/not configured|required/i.test(issue)) return 'REQUIRED';
+		if (/incomplete/i.test(issue)) return 'INCOMPLETE';
+		return 'CHECK';
 	};
 </script>
 
@@ -60,7 +60,7 @@
 			onclick={() => onselect(doctrine.id)}
 		>
 			<ItemIcon src={doctrine.iconUrl} alt="" className="matrix-icon" />
-			<span><small>{doctrine.label}</small><strong>{doctrine.name}</strong><em>{doctrine.summary}</em>{#if doctrine.issue}<mark title={doctrine.issue} aria-hidden="true">{issueLabel(doctrine.issue)}</mark><span class="sr-only">{doctrine.issue}</span>{/if}</span>
+			<span><small>{doctrine.label}</small><strong>{doctrine.name}</strong><em class:visible={selected(doctrine)}>{doctrine.summary}</em>{#if doctrine.issue}<mark title={doctrine.issue} aria-hidden="true">{issueLabel(doctrine.issue)}</mark><span class="sr-only">{doctrine.issue}</span>{/if}</span>
 			<i aria-hidden="true"></i>
 		</button>
 		<div class="supply-line"><span>SUPPLIES 3 ABILITIES</span></div>
@@ -68,7 +68,7 @@
 			{#each abilities as cell}
 				<button type="button" class:active={selected(cell)} class:needs-attention={Boolean(cell.issue)} aria-pressed={selected(cell)} onclick={() => onselect(cell.id)}>
 					<ItemIcon src={cell.iconUrl} alt="" className="matrix-icon" />
-					<span><small>{cell.label}</small><strong>{cell.name}</strong><em>{cell.summary}</em>{#if cell.issue}<mark title={cell.issue} aria-hidden="true">{issueLabel(cell.issue)}</mark><span class="sr-only">{cell.issue}</span>{/if}</span>
+					<span><small>{cell.label}</small><strong>{cell.name}</strong><em class:visible={selected(cell)}>{cell.summary}</em>{#if cell.issue}<mark title={cell.issue} aria-hidden="true">{issueLabel(cell.issue)}</mark><span class="sr-only">{cell.issue}</span>{/if}</span>
 				</button>
 			{/each}
 		</div>
@@ -80,7 +80,7 @@
 			{#each weapons as cell}
 				<button type="button" class:active={selected(cell)} class:needs-attention={Boolean(cell.issue)} aria-pressed={selected(cell)} onclick={() => onselect(cell.id)}>
 					<ItemIcon src={cell.iconUrl} alt="" className="matrix-icon" />
-					<span><small>{cell.label}</small><strong>{cell.name}</strong><em>{cell.summary}</em>{#if cell.issue}<mark title={cell.issue} aria-hidden="true">{issueLabel(cell.issue)}</mark><span class="sr-only">{cell.issue}</span>{/if}</span>
+					<span><small>{cell.label}</small><strong>{cell.name}</strong><em class:visible={selected(cell)}>{cell.summary}</em>{#if cell.issue}<mark title={cell.issue} aria-hidden="true">{issueLabel(cell.issue)}</mark><span class="sr-only">{cell.issue}</span>{/if}</span>
 					<i aria-hidden="true"></i>
 				</button>
 			{/each}
@@ -93,7 +93,7 @@
 			{#each gear as cell}
 				<button type="button" class:active={selected(cell)} class:needs-attention={Boolean(cell.issue)} aria-pressed={selected(cell)} onclick={() => onselect(cell.id)}>
 					<ItemIcon src={cell.iconUrl} alt="" className="matrix-icon" />
-					<span><small>{cell.label}</small><strong>{cell.name}</strong><em>{cell.summary}</em>{#if cell.issue}<mark title={cell.issue} aria-hidden="true">{issueLabel(cell.issue)}</mark><span class="sr-only">{cell.issue}</span>{/if}</span>
+					<span><small>{cell.label}</small><strong>{cell.name}</strong><em class:visible={selected(cell)}>{cell.summary}</em>{#if cell.issue}<mark title={cell.issue} aria-hidden="true">{issueLabel(cell.issue)}</mark><span class="sr-only">{cell.issue}</span>{/if}</span>
 					<i aria-hidden="true"></i>
 				</button>
 			{/each}
@@ -104,7 +104,7 @@
 		<small class="section-label">AGENT SYSTEM · ONE OS PROTOCOL</small>
 		<button type="button" class:active={selected(protocol)} class:needs-attention={Boolean(protocol.issue)} aria-pressed={selected(protocol)} onclick={() => onselect(protocol.id)}>
 			<ItemIcon src={protocol.iconUrl} alt="" className="matrix-icon" />
-			<span><small>{protocol.label}</small><strong>{protocol.name}</strong><em>{protocol.summary}</em>{#if protocol.issue}<mark title={protocol.issue} aria-hidden="true">{issueLabel(protocol.issue)}</mark><span class="sr-only">{protocol.issue}</span>{/if}</span>
+			<span><small>{protocol.label}</small><strong>{protocol.name}</strong><em class:visible={selected(protocol)}>{protocol.summary}</em>{#if protocol.issue}<mark title={protocol.issue} aria-hidden="true">{issueLabel(protocol.issue)}</mark><span class="sr-only">{protocol.issue}</span>{/if}</span>
 			<i aria-hidden="true"></i>
 		</button>
 	</div>
@@ -112,21 +112,20 @@
 
 <style>
 	.loadout-matrix{min-width:0;border:1px solid var(--shd-border);background:var(--shd-surface)}
-	.loadout-matrix>header{min-height:40px;display:flex;align-items:center;justify-content:space-between;gap:8px;padding:0 10px;border-bottom:1px solid var(--shd-border);background:#0c0f10;color:var(--shd-text-muted);font-size:var(--shd-type-telemetry);font-weight:900;letter-spacing:.08em}
+	.loadout-matrix>header{height:auto;min-height:40px;position:static;display:flex;align-items:center;justify-content:space-between;gap:8px;padding:0 10px;border-bottom:1px solid var(--shd-border);background:#0c0f10;color:var(--shd-text-muted);font-size:var(--shd-type-telemetry);font-weight:900;letter-spacing:.08em}
 	.loadout-matrix>header b{color:var(--shd-warning);font-size:9px;text-align:right}.loadout-matrix>header b.ready{color:var(--shd-success)}
 	.matrix-section{padding:5px;border-bottom:1px solid var(--shd-border)}.matrix-section:last-child{border-bottom:0}
 	.section-label{display:block;padding:2px 3px 5px;color:var(--shd-text-dim);font-size:9px;font-weight:900;letter-spacing:.09em}
 	.doctrine-cell,.equipment-cells button,.ability-cells button,.protocol-section>button{min-width:0;display:grid;grid-template-columns:34px minmax(0,1fr) 3px;align-items:center;gap:7px;padding:7px;border:1px solid var(--shd-border-soft);background:var(--shd-builder-canvas);color:var(--shd-text);text-align:left}
 	.doctrine-cell{width:100%;min-height:76px;grid-template-columns:42px minmax(0,1fr) 3px}.doctrine-cell :global(.matrix-icon){width:40px;height:40px}
 	:global(.matrix-icon){width:30px;height:30px;object-fit:contain}
-	button>span{min-width:0;display:grid;gap:2px}button small,button em{overflow:hidden;color:var(--shd-text-dim);font-size:9px;font-style:normal;letter-spacing:.04em;text-overflow:ellipsis;white-space:nowrap}button strong{overflow:hidden;font-size:11px;text-overflow:ellipsis;white-space:nowrap}button>i{align-self:stretch;background:var(--quality-high-end)}
+	button>span{min-width:0;display:grid;gap:2px}button small,button em{overflow:hidden;color:var(--shd-text-dim);font-size:9px;font-style:normal;letter-spacing:.04em;text-overflow:ellipsis;white-space:nowrap}button em{display:none}button em.visible{display:block}button strong{overflow:hidden;font-size:11px;text-overflow:ellipsis;white-space:nowrap}button>i{align-self:stretch;background:var(--quality-high-end)}
 	button:hover,button:focus-visible{border-color:var(--shd-border-strong);background:var(--shd-surface-active);outline:none}button.active{border-color:var(--shd-builder-selection-border);background:var(--shd-builder-selection);box-shadow:inset 2px 0 var(--shd-orange)}
 	button.needs-attention{border-bottom-color:color-mix(in srgb,var(--shd-danger) 68%,var(--shd-border-soft))}button.needs-attention>i{background:var(--shd-danger)}button mark{width:fit-content;max-width:100%;overflow:hidden;margin-top:2px;padding:2px 4px;border:1px solid color-mix(in srgb,var(--shd-danger) 58%,transparent);background:#1d1212;color:var(--shd-danger);font-size:8px;font-weight:900;letter-spacing:.07em;line-height:1.2;text-overflow:ellipsis;text-transform:uppercase;white-space:nowrap}
 	.supply-line{height:22px;display:grid;place-items:center;background:linear-gradient(90deg,transparent 49.7%,var(--shd-orange) 49.7% 50.3%,transparent 50.3%)}.supply-line span{padding:0 6px;background:var(--shd-surface);color:var(--shd-orange);font-size:8px;font-weight:900;letter-spacing:.08em}
-	.ability-cells{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:3px}.ability-cells button{min-height:68px;grid-template-columns:25px minmax(0,1fr);padding:6px}.ability-cells :global(.matrix-icon){width:24px;height:24px}
+	.ability-cells{display:grid;grid-template-columns:1fr;gap:3px}.ability-cells button{min-height:48px;grid-template-columns:25px minmax(0,1fr);padding:6px}.ability-cells :global(.matrix-icon){width:24px;height:24px}
 	.equipment-cells{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:3px}.equipment-cells button{min-height:69px}.protocol-section>button{width:100%;min-height:68px}
 	button:focus-visible{outline:2px solid var(--shd-focus-ring);outline-offset:2px}
-	@media(max-width:1240px){.ability-cells{grid-template-columns:1fr}.ability-cells button{min-height:48px}}
-	@media(max-width:800px){.ability-cells{grid-template-columns:repeat(3,minmax(0,1fr))}}
+	@media(max-width:800px) and (min-width:651px){.ability-cells{grid-template-columns:repeat(3,minmax(0,1fr))}.ability-cells button{min-height:68px}}
 	@media(max-width:520px){.ability-cells{grid-template-columns:1fr}.equipment-cells{grid-template-columns:1fr 1fr}}
 </style>

src/lib/components/builder/LoadoutStatsSummary.svelte

@@ -40,7 +40,6 @@
 			<p class="eyebrow"><span></span> KNOWN EQUIPMENT TOTALS</p>
 			<h2 id={headingId}>Agent stats</h2>
 		</div>
-		<b>{summary.stats.length}</b>
 	</div>
 	<div class="summary-core">
 		{#each ['Firepower', 'Toughness', 'Engineering'] as name}
@@ -78,24 +77,32 @@
 			<header><span>EQUIPPED TALENTS</span><b>{summary.equippedTalents.length}</b></header>
 			{#each summary.equippedTalents as equipped}
 				<div class="summary-talent">
-					<span>
-						<b>{equipped.custom?.name ?? talent(equipped.id)?.name ?? 'Talent'}</b>
-						<small>{equipped.source} · CONDITIONAL EFFECT NOT INCLUDED</small>
-						<em>{equipped.description}</em>
+					<details open={layout === 'page'}>
+						<summary><b>{equipped.custom?.name ?? talent(equipped.id)?.name ?? 'Talent'}</b><small>{equipped.source}{equipped.tierLabel ? ` · ${equipped.tierLabel}` : ''}</small></summary>
+						<p>{equipped.description}</p>
 						{#if equipped.id && talentCooldown(equipped.id)}<i class="talent-cooldown">{talentCooldown(equipped.id)}</i>{/if}
-					</span>
+					</details>
 				</div>
 			{:else}
 				<p>Selected equipment Talents appear here.</p>
 			{/each}
 		</div>
 	</div>
-	<p class="known-stats-note">Totals reflect this saved loadout and the current canonical item definitions. They include fixed values, rolls, inherited profiles, enabled augments, set bonuses, Protocol effects, and static Specialization rank effects. Conditional Talent outcomes are reserved for the advanced combat model.</p>
+	<p class="known-stats-note">Includes deterministic equipment values only. Conditional Talent effects remain outside current totals.</p>
 </section>
 
 <style>
 	.loadout-known-stats{background:var(--shd-surface)}
 	.summary-talent{grid-template-columns:1fr;cursor:default}
+	.summary-talent details,.summary-talent summary{min-width:0}
+	.summary-talent summary{display:grid;grid-template-columns:minmax(0,1fr) auto;gap:8px;align-items:center;cursor:pointer;list-style:none}
+	.summary-talent summary::-webkit-details-marker{display:none}
+	.summary-talent summary:after{content:'+';grid-column:2;grid-row:1/3;color:var(--shd-orange);font-size:14px}
+	.summary-talent details[open] summary:after{content:'-'}
+	.summary-talent summary b,.summary-talent summary small{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+	.summary-talent summary small{grid-column:1;color:var(--shd-text-muted);font-size:var(--shd-type-telemetry)}
+	.summary-talent details>p{margin:8px 0 0;color:var(--shd-text-muted);font:var(--shd-type-telemetry)/1.45 var(--shd-font-editorial)}
+	.summary-talent summary:focus-visible{outline:2px solid var(--shd-focus-ring);outline-offset:3px}
 	.known-stats-note{margin:0;padding:11px;border-top:1px solid var(--shd-border);color:var(--shd-text-muted);font-size:var(--shd-type-telemetry);line-height:1.45}
 	.page{border:1px solid var(--shd-border);border-top:2px solid var(--shd-success)}
 	.page .summary-scroll{max-height:none;display:grid;grid-template-columns:repeat(3,minmax(0,1fr))}

src/lib/components/builder/TalentTierChoice.svelte

@@ -0,0 +1,61 @@
+<script lang="ts">
+	import ItemIcon from '$lib/components/ItemIcon.svelte';
+	import type { TalentTier } from '$lib/builder/loadout';
+
+	let {
+		label = 'TALENT TIER',
+		name,
+		talent,
+		value = $bindable(1),
+		onchange
+	}: {
+		label?: string;
+		name: string;
+		talent: { name: string; iconUrl?: string; tiers?: Array<{ tier: string }> };
+		value?: TalentTier;
+		onchange?: (tier: TalentTier) => void;
+	} = $props();
+
+	const available = (tier: TalentTier) => talent.tiers?.some((entry) => entry.tier === (tier === 2 ? 'II' : 'I')) ?? false;
+	const choose = (tier: TalentTier) => {
+		value = tier;
+		onchange?.(tier);
+	};
+</script>
+
+<fieldset class="talent-tier-choice">
+	<legend>{label}</legend>
+	<div>
+		{#each [1, 2] as tier}
+			<label class:tier-two={tier === 2}>
+				<input type="radio" {name} value={tier} checked={value === tier} disabled={!available(tier as TalentTier)} onchange={() => choose(tier as TalentTier)}/>
+				<span>
+					<ItemIcon src={talent.iconUrl} alt="" className="talent-tier-icon"/>
+					<small>TIER {tier === 2 ? 'II' : 'I'}</small>
+					<b>T{tier}</b>
+					<em>{available(tier as TalentTier) ? value === tier ? 'SELECTED' : 'SELECT' : 'UNAVAILABLE'}</em>
+				</span>
+			</label>
+		{/each}
+	</div>
+</fieldset>
+
+<style>
+	.talent-tier-choice{min-width:0;margin:8px 0 0;padding:0;border:0}
+	.talent-tier-choice legend{margin-bottom:5px;color:var(--shd-text-muted);font-size:var(--shd-type-telemetry);font-weight:900;letter-spacing:.07em}
+	.talent-tier-choice>div{display:grid;grid-template-columns:1fr 1fr;gap:5px}
+	.talent-tier-choice label{min-width:0;cursor:pointer}
+	.talent-tier-choice input{position:absolute;width:1px;height:1px;margin:0;opacity:0;pointer-events:none}
+	.talent-tier-choice span{min-height:64px;display:grid;grid-template-columns:42px minmax(0,1fr) auto;grid-template-rows:auto auto;align-items:center;gap:1px 8px;padding:7px;border:1px solid var(--shd-border);background:var(--shd-builder-canvas);color:var(--shd-text);transition:var(--shd-transition)}
+	.talent-tier-choice :global(.talent-tier-icon){grid-row:1/3;width:40px;height:40px;object-fit:contain}
+	.talent-tier-choice .tier-two :global(.talent-tier-icon){filter:sepia(.3) saturate(1.45) hue-rotate(335deg) brightness(1.12)}
+	.talent-tier-choice small{align-self:end;color:var(--shd-text-muted);font-size:var(--shd-type-telemetry);font-weight:900;letter-spacing:.06em}
+	.talent-tier-choice b{grid-column:3;grid-row:1/3;color:var(--shd-text-muted);font-size:18px}
+	.talent-tier-choice em{align-self:start;color:var(--shd-text-dim);font-size:var(--shd-type-telemetry);font-style:normal;font-weight:900}
+	.talent-tier-choice label:hover span{border-color:var(--shd-border-strong);background:var(--shd-surface-active)}
+	.talent-tier-choice input:checked+span{border-color:var(--shd-builder-selection-border);background:var(--shd-builder-selection);box-shadow:inset 0 -2px var(--shd-orange)}
+	.talent-tier-choice input:checked+span b,.talent-tier-choice input:checked+span em{color:var(--shd-orange)}
+	.talent-tier-choice input:focus-visible+span{outline:2px solid var(--shd-focus-ring);outline-offset:2px}
+	.talent-tier-choice input:disabled+span{opacity:.38;cursor:not-allowed;filter:saturate(.35)}
+	@media(max-width:430px){.talent-tier-choice span{grid-template-columns:36px minmax(0,1fr);}.talent-tier-choice :global(.talent-tier-icon){width:34px;height:34px}.talent-tier-choice b{display:none}}
+</style>

src/lib/server/articles.ts

@@ -77,7 +77,7 @@ export async function syncArticleTags(database: Database) {
       `specialization-${item.id}`,
       'specialization',
       String(item.name),
-      `specialization-${slugify(String(item.name))}`,
+      `specialization-${slugify(String(item.name))}-${item.id}`,
       'specialization',
       item.id,
       Number(item.active) ? 1 : 0,
@@ -93,7 +93,7 @@ export async function syncArticleTags(database: Database) {
       `focus-${item.id}`,
       'focus',
       name,
-      `focus-${slugify(name)}`,
+      `focus-${slugify(name)}-${item.id}`,
       'focus',
       item.id,
       Number(item.active) ? 1 : 0,

src/lib/server/shared-build.ts

@@ -59,7 +59,7 @@ export async function loadSharedBuildProjection(
       ).all(),
       (
         await database.prepare(
-          'SELECT id,name,category,is_exotic,rpm,magazine,reload_speed,damage_type FROM weapons',
+          'SELECT id,name,category,is_exotic,rpm,magazine,reload_speed,damage_type,exotic_talent_id FROM weapons',
         )
       ).all(),
       (await database.prepare('SELECT id,name FROM skill_chip_sets')).all(),