eve-fit-engine 0.1.34 → 0.2.0

package/dist/node.cjs

@@ -494,6 +494,32 @@ var LEGACY_EFFECT_IDS = [
   // Frigate MJD sig bloom.
   { id: 12126, name: null, handler: "modifierEngine::applyLegacyMjdSigBloom (Frigate MJD)" }
 ];
+var BOOSTER_SIDE_EFFECT_IDS = /* @__PURE__ */ new Set([
+  2735,
+  // boosterArmorHpPenalty
+  2736,
+  // boosterArmorRepairAmountPenalty
+  2737,
+  // boosterShieldCapacityPenalty
+  2739,
+  // boosterTurretOptimalRangePenalty
+  2741,
+  // boosterTurretFalloffPenalty
+  2745,
+  // boosterCapacitorCapacityPenalty
+  2746,
+  // boosterMaxVelocityPenalty
+  2747,
+  // boosterTurretTrackingPenalty
+  2748,
+  // boosterMissileVelocityPenalty
+  2749,
+  // boosterMissileExplosionVelocityPenalty
+  2791,
+  // boosterMissileExplosionCloudPenaltyFixed
+  4970
+  // boosterShieldBoostAmountPenaltyShieldSkills
+]);
 var OUT_OF_SCOPE_EFFECT_IDS = [
   // ---- Hardpoint / slot dispatch markers consumed via fitChecks (not a modifier dispatch path). ----
   { id: 40, name: null, handler: "fitChecks::isMissileLauncher (hardpoint marker)" },
@@ -581,7 +607,204 @@ function verifyLegacyEffectIds(effects) {
   return complaints;
 }
 
+// src/fitChecks.ts
+function readAttr(t, id) {
+  return t.attributes.find((a) => a.id === id)?.v;
+}
+function typeFitsSlotType(t, slot) {
+  for (const e of t.effects) {
+    const mapped = SLOT_EFFECT_TO_SLOT_TYPE[e.id];
+    if (mapped === slot) return true;
+  }
+  return false;
+}
+function isTurretWeapon(t) {
+  return t.effects.some((e) => WEAPON_EFFECT_KIND[e.id] === "TURRET");
+}
+function isMissileLauncher(t) {
+  return t.effects.some((e) => WEAPON_EFFECT_KIND[e.id] === "MISSILE");
+}
+function isSmartBomb(t) {
+  return t.effects.some((e) => WEAPON_EFFECT_KIND[e.id] === "SMARTBOMB");
+}
+function shipGroupRestrictions(t) {
+  const out = [];
+  for (const id of CAN_FIT_SHIP_GROUP_ATTRS) {
+    const v = readAttr(t, id);
+    if (v != null && v > 0) out.push(Math.round(v));
+  }
+  return out;
+}
+function shipTypeRestrictions(t) {
+  const out = [];
+  for (const id of CAN_FIT_SHIP_TYPE_ATTRS) {
+    const v = readAttr(t, id);
+    if (v != null && v > 0) out.push(Math.round(v));
+  }
+  return out;
+}
+function maxGroupFittedFor(mod) {
+  const v = readAttr(mod, ATTR.MAX_GROUP_FITTED);
+  return v != null && v > 0 ? Math.round(v) : void 0;
+}
+function maxTypeFittedFor(mod) {
+  const v = readAttr(mod, ATTR.MAX_TYPE_FITTED);
+  return v != null && v > 0 ? Math.round(v) : void 0;
+}
+function freeFitGroupSlotsFor(mod, fittedModules, dataset) {
+  const groupCap = maxGroupFittedFor(mod);
+  const typeCap = maxTypeFittedFor(mod);
+  if (groupCap === void 0 && typeCap === void 0) return Number.POSITIVE_INFINITY;
+  let groupCount = 0;
+  let typeCount = 0;
+  for (const fm of fittedModules) {
+    if (typeCap !== void 0 && fm.typeID === mod.id) typeCount++;
+    if (groupCap !== void 0) {
+      const t = dataset.getType(fm.typeID);
+      if (t && t.groupID === mod.groupID) groupCount++;
+    }
+  }
+  let free = Number.POSITIVE_INFINITY;
+  if (groupCap !== void 0) free = Math.min(free, groupCap - groupCount);
+  if (typeCap !== void 0) free = Math.min(free, typeCap - typeCount);
+  return Math.max(0, free);
+}
+function canFitModuleOnShip(mod, ship, slot, fitContext) {
+  if (!typeFitsSlotType(mod, slot)) {
+    return { ok: false, reason: `Module does not declare a ${slot} slot effect` };
+  }
+  if (!ship) return { ok: true };
+  const allowedGroups = shipGroupRestrictions(mod);
+  const allowedTypes = shipTypeRestrictions(mod);
+  if (allowedGroups.length > 0 || allowedTypes.length > 0) {
+    const groupOk = allowedGroups.includes(ship.groupID);
+    const typeOk = allowedTypes.includes(ship.id);
+    if (!groupOk && !typeOk) {
+      return { ok: false, reason: "Ship hull/group not allowed by this module" };
+    }
+  }
+  if (slot === "RIG") {
+    const modSize = readAttr(mod, ATTR.RIG_SIZE);
+    const shipSize = readAttr(ship, ATTR.RIG_SIZE);
+    if (modSize != null && shipSize != null && Math.round(modSize) !== Math.round(shipSize)) {
+      return { ok: false, reason: "Rig size mismatch" };
+    }
+  }
+  if (slot === "SUBSYSTEM") {
+    const fitsTo = readAttr(mod, 1380);
+    if (fitsTo != null && fitsTo > 0 && Math.round(fitsTo) !== ship.id) {
+      return { ok: false, reason: "Subsystem locked to a different T3C hull" };
+    }
+  }
+  if (slot === "HI") {
+    if (isTurretWeapon(mod)) {
+      const turrets = readAttr(ship, ATTR.TURRET_HARDPOINTS) ?? 0;
+      if (turrets <= 0) {
+        return { ok: false, reason: "Ship has no turret hardpoints" };
+      }
+    } else if (isMissileLauncher(mod)) {
+      const launchers = readAttr(ship, ATTR.LAUNCHER_HARDPOINTS) ?? 0;
+      if (launchers <= 0) {
+        return { ok: false, reason: "Ship has no launcher hardpoints" };
+      }
+    }
+  }
+  if (fitContext) {
+    const free = freeFitGroupSlotsFor(mod, fitContext.fittedModules, fitContext.dataset);
+    if (free <= 0) {
+      const cap = maxTypeFittedFor(mod) ?? maxGroupFittedFor(mod);
+      return { ok: false, reason: `Only ${cap} of this module type can be fitted to a ship` };
+    }
+  }
+  return { ok: true };
+}
+function chargeGroupsForModule(mod) {
+  const out = [];
+  for (const attrID of CHARGE_GROUP_ATTRS) {
+    const v = readAttr(mod, attrID);
+    if (v != null && v > 0) out.push(Math.round(v));
+  }
+  return out;
+}
+function moduleAcceptsAnyCharge(mod) {
+  return chargeGroupsForModule(mod).length > 0;
+}
+function moduleAcceptsChargeType(mod, charge) {
+  const allowedGroups = chargeGroupsForModule(mod);
+  if (allowedGroups.length === 0) return false;
+  if (!allowedGroups.includes(charge.groupID)) return false;
+  const modSize = readAttr(mod, ATTR.CHARGE_SIZE);
+  const chargeSize = readAttr(charge, ATTR.CHARGE_SIZE);
+  if (modSize != null && chargeSize != null && Math.round(chargeSize) > Math.round(modSize)) {
+    return false;
+  }
+  return true;
+}
+var ACTIVE_EFFECT_CATEGORIES = /* @__PURE__ */ new Set([1, 2, 3]);
+function isActivatableModule(mod, effects) {
+  for (const e of mod.effects) {
+    const eff = effects.get(e.id);
+    if (eff && eff.effectCategoryID !== void 0 && ACTIVE_EFFECT_CATEGORIES.has(eff.effectCategoryID)) {
+      return true;
+    }
+  }
+  return false;
+}
+var DEFAULT_OFFLINE_ACTIVATION_GROUPS = /* @__PURE__ */ new Set([
+  330,
+  4117
+]);
+function defaultStateForModule(mod, effects) {
+  if (DEFAULT_OFFLINE_ACTIVATION_GROUPS.has(mod.groupID)) return "ONLINE";
+  return isActivatableModule(mod, effects) ? "ACTIVE" : "ONLINE";
+}
+function freeHardpointsFor(mod, ship, fittedHiModules, dataset) {
+  const turretCap = readAttr(ship, ATTR.TURRET_HARDPOINTS) ?? 0;
+  const launcherCap = readAttr(ship, ATTR.LAUNCHER_HARDPOINTS) ?? 0;
+  let turretUsed = 0;
+  let launcherUsed = 0;
+  for (const m of fittedHiModules) {
+    const t = dataset.getType(m.typeID);
+    if (!t) continue;
+    if (isTurretWeapon(t)) turretUsed++;
+    else if (isMissileLauncher(t)) launcherUsed++;
+  }
+  let hardpointFree;
+  if (isTurretWeapon(mod)) hardpointFree = Math.max(0, turretCap - turretUsed);
+  else if (isMissileLauncher(mod)) hardpointFree = Math.max(0, launcherCap - launcherUsed);
+  else hardpointFree = Number.POSITIVE_INFINITY;
+  const groupFree = freeFitGroupSlotsFor(mod, fittedHiModules, dataset);
+  return Math.min(hardpointFree, groupFree);
+}
+var TACTICAL_DESTROYER_GROUP = 1305;
+var MODED_HULL_NAMES = /* @__PURE__ */ new Set(["Anhinga"]);
+var SHIP_MODIFIERS_GROUP = 1306;
+function defaultModeTypeIDFor(ship, dataset) {
+  if (ship.groupID !== TACTICAL_DESTROYER_GROUP && !MODED_HULL_NAMES.has(ship.name ?? "")) return void 0;
+  const prefix = (ship.name ?? "").toLowerCase();
+  if (!prefix) return void 0;
+  let best;
+  for (const t of dataset.typesByBucket.modules?.values() ?? []) {
+    if (t.groupID !== SHIP_MODIFIERS_GROUP) continue;
+    if (!(t.name ?? "").toLowerCase().startsWith(prefix)) continue;
+    if (best === void 0 || t.id < best.id) best = t;
+  }
+  return best?.id;
+}
+
 // src/fitContext.ts
+var MISSILE_BOOST_SKILLS = [
+  3319,
+  // Missile Launcher Operation
+  3323
+  // Defender Missiles
+];
+var PYFA_GROUP_FILTERED_EFFECTS = /* @__PURE__ */ new Map([
+  // 3495 shipCapPropulsionJamming — the Interceptor / Interdictor role bonus
+  // to Warp Scrambler + Stasis Web capacitor need. pyfa:
+  // `mod.item.group.name in ('Stasis Web', 'Warp Scrambler')`.
+  [3495, /* @__PURE__ */ new Set([52, 65])]
+]);
 var FitContext = class {
   constructor(init) {
     /** Projected hostile sources currently in scope. Populated by the
@@ -689,14 +912,19 @@ var FitContext = class {
    * - EffectStopper: handled outside this resolver (stops other effects
    *   rather than applying a modifier).
    */
-  targetsForModifier(modifier, source) {
+  targetsForModifier(modifier, source, effectID) {
     const root = this.resolveDomain(modifier.domain, source);
     switch (modifier.func) {
       case "ItemModifier":
+        if (modifier.domain === "charID" && modifier.modifiedAttributeID === ATTR.DRONE_CONTROL_RANGE) {
+          return this.ship ? [this.ship] : [];
+        }
         if (modifier.domain === "charID" && source.kind === "module" && modifier.modifiedAttributeID === 212) {
           const out = [];
           for (const m of this.modules) {
-            if (m.charge) out.push(m.charge);
+            if (!m.charge) continue;
+            if (!MISSILE_BOOST_SKILLS.some((sid) => itemRequiresSkill(m.charge, sid))) continue;
+            out.push(m.charge);
           }
           return out;
         }
@@ -708,7 +936,10 @@ var FitContext = class {
         return this.itemsInLocation(root).filter((it) => it.groupID === modifier.groupID);
       }
       case "LocationRequiredSkillModifier": {
-        if (!root || modifier.skillTypeID === void 0) return [];
+        if (!root) return [];
+        const groups = effectID === void 0 ? void 0 : PYFA_GROUP_FILTERED_EFFECTS.get(effectID);
+        if (groups) return this.itemsInLocation(root).filter((it) => groups.has(it.groupID));
+        if (modifier.skillTypeID === void 0) return [];
         const sid = modifier.skillTypeID;
         return this.itemsInLocation(root).filter((it) => itemRequiresSkill(it, sid));
       }
@@ -884,15 +1115,11 @@ var ModifiedAttribute = class {
     for (const a of byOp.get("PostDiv") ?? []) {
       postMulEntries.push({ value: 1 / a.value, stackingGroup: a.stackingGroup });
     }
-    if (postMulEntries.length > 0) {
-      value *= combineMultiplicative(postMulEntries);
-    }
-    const postPercentEntries = [];
     for (const a of byOp.get("PostPercent") ?? []) {
-      postPercentEntries.push({ value: 1 + a.value, stackingGroup: a.stackingGroup });
+      postMulEntries.push({ value: 1 + a.value, stackingGroup: a.stackingGroup });
     }
-    if (postPercentEntries.length > 0) {
-      value *= combineMultiplicative(postPercentEntries);
+    if (postMulEntries.length > 0) {
+      value *= combineMultiplicative(postMulEntries);
     }
     const postAssign = byOp.get("PostAssign");
     if (postAssign && postAssign.length > 0) {
@@ -925,6 +1152,13 @@ var VOLUME_ATTR_ID = 161;
 var CAPACITY_ATTR_ID = 38;
 var ItemState = class {
   constructor(init) {
+    /**
+     * Attribute schema, needed to honour the SDE's attribute CAPS
+     * (`maxAttributeID` / `minAttributeID`). Assigned by `computeFit` once for
+     * every item in the fit; when absent, `getFinal` simply doesn't clamp — the
+     * behaviour before caps existed.
+     */
+    this.attrSchema = null;
     this.attrs = /* @__PURE__ */ new Map();
     this.kind = init.kind;
     this.id = init.id;
@@ -934,6 +1168,7 @@ var ItemState = class {
     this.categoryID = init.type.categoryID;
     this.state = init.state ?? "ONLINE";
     this.charge = init.charge ?? null;
+    this.activeSideEffects = new Set(init.activeSideEffects ?? []);
     for (const a of init.type.attributes) {
       const base = init.attributeOverrides?.[a.id] ?? a.v;
       this.attrs.set(a.id, new ModifiedAttribute(a.id, base));
@@ -977,7 +1212,47 @@ var ItemState = class {
   getFinal(id, fallback = 0) {
     const ma = this.attrs.get(id);
     if (!ma) return fallback;
-    return ma.compute();
+    return this.clampToCaps(id, ma.compute());
+  }
+  /**
+   * Clamp a computed value to the ceiling / floor the SDE declares for that
+   * attribute, mirroring pyfa's `__calculateValue` (which applies the same
+   * bounds to forced values AND to normally-calculated ones).
+   *
+   * An attribute may name another attribute as its bound — resonances are
+   * capped by `<layer>MaxDamageResonance` (1.0), `maxVelocity` by
+   * `speedLimit`, the `*Bonus` attributes floored by `ConstantMinusNinetyNine`
+   * — and the bound is read off THIS item, so a hull that raises its own
+   * ceiling is honoured.
+   *
+   * Without it a Polarized weapon, which force-assigns every resonance to
+   * `resistanceKiller` = 100, read as -9900% resistance instead of the 0% the
+   * game shows: the cap is what turns "assign 100" into "resistances removed".
+   * Measured on real published fits — five hulls, forty stats.
+   */
+  clampToCaps(id, value) {
+    const schema = this.attrSchema?.get(id);
+    if (!schema) return value;
+    let out = value;
+    if (schema.minAttributeID !== void 0) {
+      const floor = this.capValue(schema.minAttributeID);
+      if (floor !== void 0) out = Math.max(out, floor);
+    }
+    if (schema.maxAttributeID !== void 0) {
+      const ceil = this.capValue(schema.maxAttributeID);
+      if (ceil !== void 0) out = Math.min(out, ceil);
+    }
+    return out;
+  }
+  /** Value of a bounding attribute on this item, falling back to the SDE
+   *  default when the item doesn't carry it (pyfa's `getOriginal(key,
+   *  default)`). Bounds never declare bounds of their own, so this recurses
+   *  exactly one level. */
+  capValue(capAttrID) {
+    const ma = this.attrs.get(capAttrID);
+    if (ma) return ma.compute();
+    const def = this.attrSchema?.get(capAttrID)?.defaultValue;
+    return def;
   }
   /** `defaultBase` is the seed base value when the target attribute isn't
    *  in the item's typeDogma — needed for SDE attrs whose `defaultValue`
@@ -1095,7 +1370,13 @@ function makeImplantState(fi, type) {
   return new ItemState({ kind: "implant", id: fi.id, type, state: "ONLINE" });
 }
 function makeBoosterState(fb, type) {
-  return new ItemState({ kind: "booster", id: fb.id, type, state: "ONLINE" });
+  return new ItemState({
+    kind: "booster",
+    id: fb.id,
+    type,
+    state: "ONLINE",
+    activeSideEffects: fb.activeSideEffects ?? []
+  });
 }
 function makeSubsystemState(fs2, type) {
   return new ItemState({ kind: "subsystem", id: fs2.id, type, state: "ONLINE" });
@@ -1104,312 +1385,347 @@ function makeModeState(modeTypeID, type) {
   return new ItemState({ kind: "mode", id: `mode:${modeTypeID}`, type, state: "ACTIVE" });
 }
 
-// src/stackingGroups.ts
-var STACKING_PENALTY_GROUPS = /* @__PURE__ */ new Map([
-  [89, "default"],
-  [91, "default"],
-  [92, "default"],
-  [93, "default"],
-  [95, "default"],
-  [96, "default"],
-  [394, "default"],
-  [395, "default"],
-  [494, "default"],
-  [607, "postMul"],
-  [657, "default"],
-  [699, "default"],
-  [763, "default"],
-  [784, "default"],
-  [854, "cloakingScanResolutionMultiplier"],
-  [856, "default"],
-  [889, "default"],
-  [891, "default"],
-  [892, "default"],
-  [1024, "default"],
-  [1230, "default"],
-  [1281, "default"],
-  [1318, "default"],
-  [1445, "default"],
-  [1446, "default"],
-  [1448, "default"],
-  [1452, "default"],
-  [1472, "default"],
-  [1590, "default"],
-  [1617, "default"],
-  [1720, "default"],
-  [1764, "default"],
-  [1885, "postPerc"],
-  [1886, "postPerc"],
-  [2013, "default"],
-  [2014, "default"],
-  [2019, "default"],
-  [2020, "default"],
-  [2041, "default"],
-  [2052, "default"],
-  [2152, "default"],
-  [2232, "default"],
-  [2302, "preMul"],
-  [2644, "default"],
-  [2645, "default"],
-  [2646, "default"],
-  [2670, "default"],
-  [2693, "default"],
-  [2694, "default"],
-  [2695, "default"],
-  [2696, "default"],
-  [2697, "default"],
-  [2698, "default"],
-  [2716, "default"],
-  [2717, "default"],
-  [2792, "default"],
-  [2795, "default"],
-  [2796, "default"],
-  [2797, "default"],
-  [2798, "default"],
-  [2799, "default"],
-  [2801, "default"],
-  [2802, "default"],
-  [2803, "default"],
-  [2804, "default"],
-  [2851, "default"],
-  [2858, "default"],
-  [2865, "default"],
-  [2867, "default"],
-  [2868, "default"],
-  [3001, "postPerc"],
-  [3046, "default"],
-  [3174, "default"],
-  [3175, "default"],
-  [3182, "default"],
-  [3200, "default"],
-  [3201, "default"],
-  [3586, "default"],
-  [3655, "default"],
-  [3656, "default"],
-  [3657, "default"],
-  [3659, "default"],
-  [3674, "default"],
-  [3726, "default"],
-  [3727, "default"],
-  [3993, "postMul"],
-  [3995, "postMul"],
-  [3996, "default"],
-  [3997, "default"],
-  [3998, "default"],
-  [3999, "default"],
-  [4002, "postMul"],
-  [4003, "postMul"],
-  [4016, "default"],
-  [4017, "postMul"],
-  [4018, "postMul"],
-  [4019, "postMul"],
-  [4020, "postMul"],
-  [4021, "postMul"],
-  [4022, "postMul"],
-  [4023, "postMul"],
-  [4054, "default"],
-  [4055, "default"],
-  [4056, "default"],
-  [4057, "postMul"],
-  [4058, "postMul"],
-  [4059, "postMul"],
-  [4060, "postMul"],
-  [4061, "postMul"],
-  [4062, "postMul"],
-  [4063, "postMul"],
-  [4086, "postMul"],
-  [4088, "postMul"],
-  [4089, "postMul"],
-  [4135, "default"],
-  [4136, "default"],
-  [4137, "default"],
-  [4138, "default"],
-  [4162, "default"],
-  [4280, "default"],
-  [4358, "default"],
-  [4464, "default"],
-  [4489, "default"],
-  [4490, "default"],
-  [4491, "default"],
-  [4492, "default"],
-  [4527, "default"],
-  [4559, "default"],
-  [4575, "default"],
-  [4809, "default"],
-  [4810, "default"],
-  [4811, "default"],
-  [4812, "default"],
-  [4906, "postMul"],
-  [4928, "preMul"],
-  [4961, "postMul"],
-  [5081, "default"],
-  [5188, "default"],
-  [5189, "default"],
-  [5190, "default"],
-  [5213, "default"],
-  [5214, "default"],
-  [5230, "default"],
-  [5231, "default"],
-  [5397, "default"],
-  [5399, "default"],
-  [5440, "postMul"],
-  [5468, "default"],
-  [5560, "default"],
-  [5618, "postPerc"],
-  [5757, "default"],
-  [5867, "default"],
-  [5911, "default"],
-  [5912, "postMul"],
-  [5914, "postMul"],
-  [5915, "postMul"],
-  [5916, "postMul"],
-  [5917, "postMul"],
-  [5918, "postMul"],
-  [5919, "postMul"],
-  [5920, "postMul"],
-  [5921, "postMul"],
-  [5922, "postMul"],
-  [5923, "postMul"],
-  [5924, "postMul"],
-  [5925, "postMul"],
-  [5926, "postMul"],
-  [5927, "postMul"],
-  [5929, "postMul"],
-  [5951, "default"],
-  [5998, "default"],
-  [6010, "postDiv"],
-  [6011, "postDiv"],
-  [6012, "postDiv"],
-  [6014, "postDiv"],
-  [6015, "postDiv"],
-  [6016, "postDiv"],
-  [6017, "postDiv"],
-  [6039, "postDiv"],
-  [6040, "postDiv"],
-  [6041, "postDiv"],
-  [6063, "default"],
-  [6076, "postDiv"],
-  [6110, "default"],
-  [6111, "default"],
-  [6112, "default"],
-  [6113, "default"],
-  [6135, "default"],
-  [6152, "postDiv"],
-  [6154, "postDiv"],
-  [6164, "default"],
-  [6201, "default"],
-  [6208, "default"],
-  [6402, "default"],
-  [6403, "default"],
-  [6404, "default"],
-  [6405, "default"],
-  [6406, "default"],
-  [6409, "default"],
-  [6410, "default"],
-  [6411, "default"],
-  [6412, "default"],
-  [6422, "default"],
-  [6423, "default"],
-  [6424, "default"],
-  [6425, "default"],
-  [6426, "default"],
-  [6427, "default"],
-  [6428, "default"],
-  [6435, "default"],
-  [6439, "default"],
-  [6440, "default"],
-  [6441, "default"],
-  [6448, "default"],
-  [6449, "default"],
-  [6472, "default"],
-  [6473, "default"],
-  [6474, "default"],
-  [6476, "default"],
-  [6478, "default"],
-  [6479, "default"],
-  [6481, "default"],
-  [6484, "postMul"],
-  [6487, "default"],
-  [6555, "default"],
-  [6556, "default"],
-  [6557, "default"],
-  [6559, "default"],
-  [6566, "postMul"],
-  [6567, "default"],
-  [6581, "default"],
-  [6582, "postPercent"],
-  [6658, "preMul"],
-  [6670, "default"],
-  [6671, "default"],
-  [6682, "default"],
-  [6683, "default"],
-  [6684, "default"],
-  [6686, "default"],
-  [6690, "default"],
-  [6692, "default"],
-  [6693, "default"],
-  [6694, "default"],
-  [6727, "default"],
-  [6730, "postMul"],
-  [6731, "postMul"],
-  [6796, "postDiv"],
-  [6797, "postDiv"],
-  [6798, "postDiv"],
-  [6799, "postDiv"],
-  [6801, "postDiv"],
-  [6877, "default"],
-  [7029, "default"],
-  [7077, "default"],
-  [7078, "default"],
-  [7098, "default"],
-  [7111, "default"],
-  [7142, "default"],
-  [7202, "default"],
-  [7203, "default"],
-  [7223, "default"],
-  [7237, "default"],
-  [8033, "default"],
-  [8057, "default"],
-  [8076, "default"],
-  [8082, "default"],
-  [8108, "postMul"],
-  [8109, "postMul"],
-  [8111, "default"],
-  [8112, "default"],
-  [8113, "postMul"],
-  [8114, "postMul"],
-  [8119, "default"],
-  [11445, "default"],
-  [11691, "default"],
-  [11946, "default"],
-  [11947, "postMul"],
-  [11948, "postMul"],
-  [11953, "postMul"],
-  [12126, "default"],
-  [12597, "default"],
-  [12761, "default"],
-  [12794, "postDiv"],
-  [12795, "postDiv"],
-  [12796, "postDiv"],
-  [12798, "postDiv"],
-  [12799, "postDiv"],
-  [12838, "postMul"],
-  [12839, "postMul"]
+// src/stackingPenalised.ts
+var STACKING_PENALISED = /* @__PURE__ */ new Map([
+  [89, ["51#default"]],
+  [91, ["64#default"]],
+  [92, ["64#default"]],
+  [93, ["64#default"]],
+  [95, ["51#default"]],
+  [96, ["51#default"]],
+  [394, ["37#default!booster+implant+skill"]],
+  [395, ["70#default!booster+implant+skill"]],
+  [607, ["37#postMul"]],
+  [657, ["70#default"]],
+  [699, ["564#default!booster+implant+skill"]],
+  [763, ["*#default"]],
+  [784, ["281#default!booster+implant+skill"]],
+  [854, ["564#cloakingScanResolutionMultiplier"]],
+  [856, ["600#default!booster+implant+skill"]],
+  [889, ["51#default"]],
+  [891, ["37#default!ship"]],
+  [892, ["37#default!ship"]],
+  [1024, ["37#default!ship"]],
+  [1230, ["37#default!ship"]],
+  [1281, ["84#default!implant"]],
+  [1445, ["54#default!booster+skill"]],
+  [1446, ["54#default!booster+skill"]],
+  [1448, ["54#default!booster+skill"]],
+  [1472, ["654#default!booster+implant+skill"]],
+  [1590, ["653#default!booster+implant+skill"]],
+  [1617, ["70#default"]],
+  [1720, ["68#default"]],
+  [1764, ["37#default!booster+implant+skill"]],
+  [1885, ["51#default!ship"]],
+  [1886, ["51#default!ship"]],
+  [2013, ["37#default!booster+implant"]],
+  [2014, ["54#default!skill"]],
+  [2019, ["68#default!implant+skill"]],
+  [2020, ["84#default!implant+skill"]],
+  [2041, ["*#default"]],
+  [2052, ["*#default"]],
+  [2152, ["37#default"]],
+  [2232, ["*#default"]],
+  [2302, ["*#preMul"]],
+  [2644, ["552#default"]],
+  [2645, ["564#default"]],
+  [2646, ["76#default"]],
+  [2670, ["*#default", "564#default", "76#default"]],
+  [2693, ["158#default!booster"]],
+  [2694, ["158#default!booster"]],
+  [2695, ["158#default!booster"]],
+  [2696, ["54#default!booster"]],
+  [2697, ["54#default!booster"]],
+  [2698, ["54#default!booster"]],
+  [2716, ["552#default"]],
+  [2717, ["70#default"]],
+  [2792, ["*#default"]],
+  [2795, ["*#default"]],
+  [2796, ["4#default"]],
+  [2797, ["51#default"]],
+  [2798, ["64#default!booster"]],
+  [2799, ["51#default"]],
+  [2801, ["51#default"]],
+  [2802, ["64#default!booster"]],
+  [2803, ["64#default!booster"]],
+  [2804, ["51#default"]],
+  [2851, ["*#default!booster"]],
+  [2858, ["37#default"]],
+  [2865, ["37#default"]],
+  [2867, ["64#default"]],
+  [2868, ["84#default"]],
+  [3001, ["51#postPerc"]],
+  [3046, ["37#default"]],
+  [3174, ["54#default"]],
+  [3175, ["20#default"]],
+  [3182, ["*#default"]],
+  [3200, ["84#default"]],
+  [3201, ["68#default"]],
+  [3586, ["566#default!skill"]],
+  [3655, ["54#default"]],
+  [3656, ["160#default"]],
+  [3657, ["564#default"]],
+  [3659, ["76#default"]],
+  [3674, ["37#default"]],
+  [3726, ["70#default"]],
+  [3727, ["37#default"]],
+  [3993, ["76#postMul"]],
+  [3995, ["552#postMul"]],
+  [3996, ["267#default"]],
+  [3997, ["268#default"]],
+  [3998, ["269#default"]],
+  [3999, ["270#default"]],
+  [4002, ["37#postMul"]],
+  [4003, ["37#postMul"]],
+  [4016, ["64#default"]],
+  [4017, ["118#postMul"]],
+  [4018, ["114#postMul"]],
+  [4019, ["116#postMul"]],
+  [4020, ["117#postMul"]],
+  [4021, ["64#postMul"]],
+  [4022, ["160#postMul"]],
+  [4023, ["653#postMul"]],
+  [4054, ["64#default"]],
+  [4055, ["64#default"]],
+  [4056, ["64#default"]],
+  [4057, ["114#postMul"]],
+  [4058, ["116#postMul"]],
+  [4059, ["117#postMul"]],
+  [4060, ["118#postMul"]],
+  [4061, ["118#postMul"]],
+  [4062, ["114#postMul"]],
+  [4063, ["116#postMul"]],
+  [4086, ["84#postMul"]],
+  [4088, ["84#postMul"]],
+  [4089, ["68#postMul"]],
+  [4135, ["271#default"]],
+  [4136, ["272#default"]],
+  [4137, ["273#default"]],
+  [4138, ["274#default"]],
+  [4162, ["1371#default!booster+implant+skill"]],
+  [4280, ["70#default"]],
+  [4358, ["54#default"]],
+  [4464, ["51#default"]],
+  [4489, ["37#default"]],
+  [4490, ["37#default"]],
+  [4491, ["37#default"]],
+  [4492, ["37#default"]],
+  [4527, ["158#default"]],
+  [4559, ["*#default"]],
+  [4575, ["2044#default", "37#default", "54#default", "564#default", "64#default", "68#default"]],
+  [4809, ["238#default"]],
+  [4810, ["239#default"]],
+  [4811, ["240#default"]],
+  [4812, ["241#default"]],
+  [4906, ["64#postMul"]],
+  [4928, ["*#preMul"]],
+  [4961, ["68#postMul"]],
+  [5081, ["76#default"]],
+  [5188, ["160#default!booster"]],
+  [5189, ["160#default!booster"]],
+  [5190, ["160#default!booster"]],
+  [5213, ["37#default!ship"]],
+  [5214, ["37#default!ship"]],
+  [5230, ["*#default"]],
+  [5231, ["*#default"]],
+  [5397, ["1372#default"]],
+  [5399, ["1371#default"]],
+  [5440, ["117#postMul"]],
+  [5468, ["70#default!ship"]],
+  [5560, ["669#default!ship"]],
+  [5618, ["51#default!ship"]],
+  [5757, ["*#default", "566#default"]],
+  [5867, ["281#default!ship"]],
+  [5911, ["868#default"]],
+  [5912, ["90#postMul"]],
+  [5914, ["97#postMul"]],
+  [5915, ["90#postMul"]],
+  [5916, ["116#postMul"]],
+  [5917, ["117#postMul"]],
+  [5918, ["118#postMul"]],
+  [5919, ["114#postMul"]],
+  [5920, ["654#postMul"]],
+  [5921, ["554#postMul"]],
+  [5922, ["20#postMul"]],
+  [5923, ["97#postMul"]],
+  [5924, ["238#postMul"]],
+  [5925, ["239#postMul"]],
+  [5926, ["240#postMul"]],
+  [5927, ["241#postMul"]],
+  [5929, ["160#postMul"]],
+  [5951, ["600#default"]],
+  [5998, ["70#default"]],
+  [6001, ["70#default"]],
+  [6010, ["76#postDiv"]],
+  [6011, ["54#postDiv"]],
+  [6012, ["*#postDiv"]],
+  [6014, ["552#postDiv"]],
+  [6015, ["*#postDiv"]],
+  [6016, ["70#postDiv"]],
+  [6017, ["37#postDiv"]],
+  [6039, ["160#postDiv"]],
+  [6040, ["554#postDiv"]],
+  [6041, ["*#postDiv"]],
+  [6063, ["*#default"]],
+  [6076, ["37#postDiv"]],
+  [6110, ["37#default"]],
+  [6111, ["281#default"]],
+  [6112, ["654#default"]],
+  [6113, ["653#default"]],
+  [6135, ["*#default"]],
+  [6152, ["54#postDiv"]],
+  [6154, ["20#postDiv"]],
+  [6164, ["37#default"]],
+  [6201, ["37#default"]],
+  [6208, ["552#default"]],
+  [6402, ["653#default"]],
+  [6403, ["37#default"]],
+  [6404, ["2044#default", "54#default"]],
+  [6405, ["6#default"]],
+  [6406, ["158#default", "2044#default", "54#default"]],
+  [6409, ["564#default"]],
+  [6410, ["654#default"]],
+  [6411, ["37#default"]],
+  [6412, ["99#default"]],
+  [6422, ["564#default", "76#default"]],
+  [6423, ["*#default"]],
+  [6424, ["*#default"]],
+  [6425, ["552#default"]],
+  [6426, ["37#default"]],
+  [6427, ["*#default"]],
+  [6428, ["*#default"]],
+  [6435, ["37#default"]],
+  [6439, ["271#default", "272#default", "273#default", "274#default", "37#default", "552#default"]],
+  [6440, ["37#default"]],
+  [6441, ["37#default", "552#default"]],
+  [6448, ["*#default"]],
+  [6449, ["*#default", "51#default"]],
+  [6472, ["37#default"]],
+  [6473, ["37#default"]],
+  [6474, ["37#default"]],
+  [6476, ["37#default"]],
+  [6478, ["552#default"]],
+  [6479, ["*#default"]],
+  [6481, ["564#default", "76#default"]],
+  [6484, ["*#postMul"]],
+  [6487, ["2045#default"]],
+  [6555, ["37#default"]],
+  [6556, ["2130#default", "2178#default", "2226#default", "64#default"]],
+  [6557, ["158#default", "160#default", "2125#default", "2126#default", "2149#default", "2175#default", "2176#default", "2180#default", "2234#default", "2235#default", "2236#default", "2237#default", "54#default"]],
+  [6559, ["158#default", "160#default", "2125#default", "2126#default", "2149#default", "2175#default", "2176#default", "2180#default", "2234#default", "2235#default", "2236#default", "2237#default", "54#default"]],
+  [6566, ["2177#postMul", "2182#postMul", "2233#postMul", "37#postMul"]],
+  [6567, ["*#default", "564#default"]],
+  [6581, ["*#default", "2044#default", "37#default", "4#default", "54#default", "564#default", "64#default"]],
+  [6582, ["4#postMul", "68#default", "84#default", "charge:37#default", "module:51#postPercent"]],
+  [6658, ["158#default", "51#postPerc", "54#default", "68#default", "84#default", "charge:37#default", "ship:*#default", "ship:*#preMul"]],
+  [6670, ["2149#default", "2175#default", "2236#default", "54#default"]],
+  [6671, ["37#default"]],
+  [6682, ["37#default"]],
+  [6683, ["552#default"]],
+  [6684, ["564#default", "76#default"]],
+  [6686, ["*#default"]],
+  [6690, ["37#default"]],
+  [6692, ["552#default"]],
+  [6693, ["564#default", "76#default"]],
+  [6694, ["*#default"]],
+  [6727, ["2044#default"]],
+  [6730, ["37#postMul", "552#default"]],
+  [6731, ["37#postMul"]],
+  [6796, ["64#postDiv"]],
+  [6797, ["64#postDiv"]],
+  [6798, ["64#postDiv"]],
+  [6799, ["*#postDiv"]],
+  [6801, ["20#postDiv"]],
+  [6877, ["600#default"]],
+  [7029, ["2751#default"]],
+  [7077, ["64#default"]],
+  [7078, ["51#default"]],
+  [7098, ["564#default", "76#default"]],
+  [7111, ["64#default"]],
+  [7142, ["20#default", "37#default", "4#default"]],
+  [7202, ["37#default"]],
+  [7203, ["64#default"]],
+  [7223, ["70#default"]],
+  [7237, ["600#default"]],
+  [8033, ["54#default"]],
+  [8057, ["51#default", "64#default"]],
+  [8076, ["110#default"]],
+  [8082, ["564#default"]],
+  [8108, ["552#postMul"]],
+  [8109, ["552#postMul"]],
+  [8111, ["113#default", "1371#default", "267#default", "271#default"]],
+  [8112, ["109#default", "269#default", "273#default", "564#default", "600#default"]],
+  [8113, ["111#default", "268#default", "272#default", "552#postMul", "68#postMul", "84#postMul"]],
+  [8114, ["*#postMul", "110#default", "160#postMul", "270#default", "274#default", "654#postMul", "drone:64#postMul", "fighter:64#postMul", "module:64#default"]],
+  [8119, ["37#default", "54#default", "64#default", "68#default"]],
+  [11445, ["*#default"]],
+  [11691, ["37#default"]],
+  [11946, ["64#default"]],
+  [11947, ["654#postMul"]],
+  [11948, ["64#postMul"]],
+  [11953, ["653#postMul"]],
+  [12126, ["552#default"]],
+  [12597, ["*#default", "564#default", "76#default"]],
+  [12761, ["3154#default"]],
+  [12794, ["37#postDiv"]],
+  [12795, ["37#postDiv"]],
+  [12796, ["281#postDiv"]],
+  [12798, ["37#postDiv"]],
+  [12799, ["51#postDiv"]],
+  [12838, ["1371#postMul"]],
+  [12839, ["1372#postMul"]]
 ]);
+var CONTEXT_KIND = {
+  skill: ["skill", "character"],
+  ship: ["ship"],
+  implant: ["implant"],
+  booster: ["booster"],
+  module: ["module"],
+  drone: ["drone"],
+  fighter: ["fighter"],
+  subsystem: ["subsystem"],
+  mode: ["mode"]
+};
+function stackPenaltyGroup(effectID, attributeID, receiver, sourceKind) {
+  const keys = STACKING_PENALISED.get(effectID);
+  if (!keys) return null;
+  const id = attributeID === void 0 ? null : String(attributeID);
+  for (const key of keys) {
+    const bang = key.indexOf("!");
+    const exempt = bang < 0 ? [] : key.slice(bang + 1).split("+");
+    const head = bang < 0 ? key : key.slice(0, bang);
+    const hash = head.lastIndexOf("#");
+    const group = head.slice(hash + 1);
+    const target = head.slice(0, hash);
+    const colon = target.indexOf(":");
+    const recv = colon < 0 ? null : target.slice(0, colon);
+    const attr = colon < 0 ? target : target.slice(colon + 1);
+    if (recv !== null && recv !== receiver) continue;
+    if (attr !== "*" && (id === null || attr !== id)) continue;
+    if (exempt.some((c) => (CONTEXT_KIND[c] ?? []).includes(sourceKind))) return null;
+    return group;
+  }
+  return null;
+}
 
 // src/modifierEngine.ts
 var NO_PENALTY_KINDS = /* @__PURE__ */ new Set([
   "skill",
-  "ship",
-  "mode",
-  "subsystem",
-  "character"
+  "character",
+  "implant",
+  "booster"
 ]);
 function scaleForPipeline(rawValue, _unitID, op) {
   if (op === "PostPercent") return rawValue / 100;
   return rawValue;
 }
-function applySourceItem(source, ctx, dataset) {
+function isPeerModifier(source, mi, ctx, effectID) {
+  for (const t of ctx.targetsForModifier(mi, source, effectID)) {
+    if (t.kind === "implant" || t.kind === "booster") return true;
+  }
+  return false;
+}
+function applySourceItem(source, ctx, dataset, pass = "all") {
   const isLocalModule = source.kind === "module";
   const selfMods = [];
   const outMods = [];
@@ -1417,10 +1733,15 @@ function applySourceItem(source, ctx, dataset) {
     if (LEGACY_HANDLED_EFFECT_IDS.has(eid)) continue;
     if (SEC_STATUS_SCALED_EFFECT_IDS.has(eid)) continue;
     if (isLocalModule && ctx.stoppedLocalEffectIDs.has(eid)) continue;
+    if (source.kind === "booster" && BOOSTER_SIDE_EFFECT_IDS.has(eid) && !source.activeSideEffects.has(eid)) continue;
     const effect = dataset.effects.get(eid);
     if (!effect) continue;
     if (!source.appliesAtState(effect)) continue;
     for (const mi of effect.modifierInfo) {
+      if (pass !== "all") {
+        const peer = isPeerModifier(source, mi, ctx, effect.id);
+        if (pass === "peer" ? !peer : peer) continue;
+      }
       (mi.domain === "itemID" ? selfMods : outMods).push({ effect, mi });
     }
   }
@@ -1463,7 +1784,7 @@ function applyLegacyFighterProjection(fighter, ctx) {
         sourceID: fighter.id,
         operation: "PostPercent",
         value: pen / 100,
-        stackingGroup: `attr:${ATTR_MAX_VEL}`
+        stackingGroup: `default:${ATTR_MAX_VEL}`
       });
     }
   }
@@ -1489,9 +1810,8 @@ function applyOneModifier(source, effect, mi, ctx, dataset) {
   if (mi.modifiedAttributeID === void 0) return;
   const computed = computeModifierValue(source, mi, ctx, dataset, op);
   if (computed === null) return;
-  const targets = ctx.targetsForModifier(mi, source);
+  const targets = ctx.targetsForModifier(mi, source, effect.id);
   if (targets.length === 0) return;
-  const stackingGroup = computeStackingGroup(source, mi, dataset, effect);
   const isMul = op === "PreMul" || op === "PostMul" || op === "PreDiv" || op === "PostDiv";
   const value = isMul && computed.scaled ? 1 + computed.value : computed.value;
   const sdeDefault = isMul ? dataset.attributes.get(mi.modifiedAttributeID)?.defaultValue ?? 0 : 0;
@@ -1501,7 +1821,7 @@ function applyOneModifier(source, effect, mi, ctx, dataset) {
       sourceID: source.id,
       operation: op,
       value,
-      stackingGroup,
+      stackingGroup: computeStackingGroup(source, mi, dataset, effect, target, ctx),
       resistanceAttributeID: effect.resistanceAttributeID
     };
     target.addAffliction(mi.modifiedAttributeID, affliction, sdeDefault);
@@ -2008,8 +2328,17 @@ var SHIP_BONUS_SCALING_SKILL = /* @__PURE__ */ new Map([
   // Notable: Exhumer/Barge shield+armor resist role bonuses (Hulk/Skiff/
   // Mackinaw shield resist 4 %→20 %), Bhaalgorn drone+laser (492), industrial
   // command (Orca/Rorqual), Marauder/pirate/expedition hull bonuses.
+  // NB: attr 310 (`cpuNeedBonus`) is deliberately ABSENT. The auto-derivation
+  // proposed it because the Weapon Upgrades SKILL scales its own attr 310 per
+  // level (pyfa Effect3519 — a skill source, handled by the skill path), but
+  // no SHIP-side effect does: pyfa's Effect5901 (`roleBonusBulkheadCPU`,
+  // freighters + jump freighters) takes `ship.getModifiedItemAttr('cpuNeedBonus')`
+  // verbatim, and every one of the 18 hulls carrying the attribute holds a
+  // FULL-value role bonus (-99 % / -100 %), never a per-level one. Scaling it
+  // by Electronics Upgrades V turned an Obelisk's -100 % bulkhead CPU into
+  // -500 %, so three Reinforced Bulkheads reported -480 tf of CPU used
+  // instead of 0. Caught on real published freighter fits.
   [66, 89611],
-  [310, 3432],
   [349, 19760],
   [492, 3339],
   [1296, 21610],
@@ -2177,6 +2506,9 @@ function computeModifierValue(source, mi, ctx, dataset, op) {
     if (source.kind === "ship") {
       return { value: baseValue, scaled: false };
     }
+    if (source.kind === "implant" || source.kind === "booster") {
+      return { value: baseValue, scaled: false };
+    }
     if (itemRequiresSkill(source, skillID)) {
       return { value: baseValue, scaled: false };
     }
@@ -2184,19 +2516,42 @@ function computeModifierValue(source, mi, ctx, dataset, op) {
   }
   return { value: baseValue, scaled: false };
 }
-function computeStackingGroup(source, mi, dataset, effect) {
-  if (NO_PENALTY_KINDS.has(source.kind)) return null;
-  if (mi.modifiedAttributeID !== void 0) {
-    const attr = dataset.attributes.get(mi.modifiedAttributeID);
-    if (attr?.stackable) return null;
-  }
-  const group = STACKING_PENALTY_GROUPS.get(effect.id);
-  if (group !== void 0 && group !== "default" && CUSTOM_STACK_GROUPS_HONOURED.has(group)) {
-    return `${group}:${mi.modifiedAttributeID}`;
+function penaltyReceiver(target, source, ctx) {
+  if (target === ctx.ship) return "ship";
+  if (target === source) return "self";
+  switch (target.kind) {
+    case "charge":
+      return "charge";
+    case "drone":
+      return "drone";
+    case "fighter":
+      return "fighter";
+    case "character":
+      return "character";
+    case "module":
+    case "subsystem":
+      return "module";
+    default:
+      return "self";
   }
-  return `attr:${mi.modifiedAttributeID}`;
 }
-var CUSTOM_STACK_GROUPS_HONOURED = /* @__PURE__ */ new Set([
+function computeStackingGroup(source, mi, dataset, effect, target, ctx) {
+  if (NO_PENALTY_KINDS.has(source.kind)) return null;
+  const group = stackPenaltyGroup(
+    effect.id,
+    mi.modifiedAttributeID,
+    penaltyReceiver(target, source, ctx),
+    source.kind
+  );
+  if (group === null) return null;
+  if (!HONOURED_PENALTY_GROUPS.has(group)) return `default:${mi.modifiedAttributeID}`;
+  return `${group}:${mi.modifiedAttributeID}`;
+}
+var HONOURED_PENALTY_GROUPS = /* @__PURE__ */ new Set([
+  "postMul",
+  "postDiv",
+  "postPerc",
+  "postPercent",
   "cloakingScanResolutionMultiplier"
 ]);
 function mapSourceKind(kind) {
@@ -2260,7 +2615,7 @@ function applySkills(ctx, dataset) {
         const sourceAttrMeta = dataset.attributes.get(mi.modifyingAttributeID);
         const baseVal = scaleForPipeline(rawBase, sourceAttrMeta?.unitID, op);
         const value = isMul ? 1 + baseVal * level : baseVal * level;
-        const stackingGroup = NO_PENALTY_KINDS.has("character") ? null : `attr:${mi.modifiedAttributeID}`;
+        const stackingGroup = NO_PENALTY_KINDS.has("character") ? null : `default:${mi.modifiedAttributeID}`;
         const targets = resolveSkillTargets(mi, ctx);
         if (targets.length === 0) continue;
         const affliction = {
@@ -2472,7 +2827,7 @@ function applyLegacyPropMods(ctx) {
         sourceID: mod.id,
         operation: "PostPercent",
         value: sigBonus / 100,
-        stackingGroup: `attr:${ATTR_SIGNATURE_RADIUS}`
+        stackingGroup: `default:${ATTR_SIGNATURE_RADIUS}`
       });
     }
   }
@@ -2480,13 +2835,13 @@ function applyLegacyPropMods(ctx) {
 var ENTOSIS_LINK_EFFECT_ID = 6063;
 function applyLegacyEntosisLink(ctx) {
   for (const mod of ctx.modules) {
-    if (mod.state === "OFFLINE") continue;
+    if (mod.state !== "ACTIVE" && mod.state !== "OVERLOAD") continue;
     if (!mod.effectIDs.has(ENTOSIS_LINK_EFFECT_ID)) continue;
     const sensorPairs = [
-      [1027, ATTR_SCAN_RADAR],
+      [1027, ATTR_SCAN_GRAVIMETRIC],
       [1028, ATTR_SCAN_LADAR],
       [1029, ATTR_SCAN_MAGNETOMETRIC],
-      [1030, ATTR_SCAN_GRAVIMETRIC]
+      [1030, ATTR_SCAN_RADAR]
     ];
     for (const [srcAttr, tgtAttr] of sensorPairs) {
       const bonusPct = mod.getBase(srcAttr) ?? 0;
@@ -2520,7 +2875,7 @@ function applyLegacyCapitalEhe(ctx) {
         sourceID: mod.id,
         operation: "PostMul",
         value: factor,
-        stackingGroup: `attr:${tgtAttr}`
+        stackingGroup: `default:${tgtAttr}`
       });
     }
   }
@@ -2599,13 +2954,13 @@ function applyLegacyMjdSigBloom(ctx) {
     if (!isMjd) continue;
     const bonusPct = mod.getFinal(ATTR_SIGNATURE_RADIUS_BONUS_PERCENT, 0);
     if (bonusPct === 0) continue;
+    const penalised = [...LEGACY_MJD_EFFECT_IDS].some((eid) => mod.effectIDs.has(eid) && stackPenaltyGroup(eid, ATTR_SIGNATURE_RADIUS, "ship", "module") !== null);
     ctx.ship.addAffliction(ATTR_SIGNATURE_RADIUS, {
       sourceKind: "module",
       sourceID: mod.id,
       operation: "PostPercent",
       value: bonusPct / 100,
-      stackingGroup: `attr:${ATTR_SIGNATURE_RADIUS}`
-      // stack-penalised with MWD bloom
+      stackingGroup: penalised ? `default:${ATTR_SIGNATURE_RADIUS}` : null
     });
   }
 }
@@ -3008,7 +3363,7 @@ function applyLegacyBastion(ctx) {
         sourceID,
         operation: "PreMul",
         value: factor,
-        stackingGroup: HULL_RES_ATTRS.has(tgt) ? null : `attr:${tgt}`
+        stackingGroup: HULL_RES_ATTRS.has(tgt) ? null : `default:${tgt}`
       });
     }
     const maxRangeBonus = mod.getFinal(ATTR_MAX_RANGE_BONUS, 0);
@@ -3023,14 +3378,14 @@ function applyLegacyBastion(ctx) {
           sourceID,
           operation: "PostPercent",
           value: maxRangeBonus / 100,
-          stackingGroup: `attr:${ATTR_MAX_RANGE}`
+          stackingGroup: `default:${ATTR_MAX_RANGE}`
         });
         if (turretRofBonus !== 0) target.addAffliction(ATTR_SPEED, {
           sourceKind: "module",
           sourceID,
           operation: "PostPercent",
           value: turretRofBonus / 100,
-          stackingGroup: `attr:${ATTR_SPEED}`
+          stackingGroup: `default:${ATTR_SPEED}`
         });
       }
       if (matchTurretFalloff(target) && falloffBonusV !== 0) {
@@ -3039,7 +3394,7 @@ function applyLegacyBastion(ctx) {
           sourceID,
           operation: "PostPercent",
           value: falloffBonusV / 100,
-          stackingGroup: `attr:${ATTR_FALLOFF}`
+          stackingGroup: `default:${ATTR_FALLOFF}`
         });
       }
     }
@@ -3054,7 +3409,7 @@ function applyLegacyBastion(ctx) {
           sourceID,
           operation: "PostPercent",
           value: missileVelocityBonus / 100,
-          stackingGroup: `attr:${ATTR_MAX_VELOCITY}`
+          stackingGroup: `default:${ATTR_MAX_VELOCITY}`
         });
       }
       if (matchMissileLauncherROF(target) && missileRofBonus !== 0) {
@@ -3063,7 +3418,7 @@ function applyLegacyBastion(ctx) {
           sourceID,
           operation: "PostPercent",
           value: missileRofBonus / 100,
-          stackingGroup: `attr:${ATTR_SPEED}`
+          stackingGroup: `default:${ATTR_SPEED}`
         });
       }
     }
@@ -3079,7 +3434,7 @@ function applyLegacyBastion(ctx) {
           sourceID,
           operation: "PostPercent",
           value: armorRepBonus / 100,
-          stackingGroup: `attr:${ATTR_ARMOR_REP_AMOUNT}`
+          stackingGroup: `default:${ATTR_ARMOR_REP_AMOUNT}`
         });
       }
       if (isShield && shieldBoostBonus !== 0) {
@@ -3088,7 +3443,7 @@ function applyLegacyBastion(ctx) {
           sourceID,
           operation: "PostPercent",
           value: shieldBoostBonus / 100,
-          stackingGroup: `attr:${ATTR_SHIELD_REP_AMOUNT}`
+          stackingGroup: `default:${ATTR_SHIELD_REP_AMOUNT}`
         });
       }
       if ((isArmor || isShield) && repairDurationBonus !== 0) {
@@ -3132,7 +3487,7 @@ function applyLegacyBastion(ctx) {
         sourceID,
         operation: "PostPercent",
         value: v / 100,
-        stackingGroup: `attr:${tgt}`
+        stackingGroup: `default:${tgt}`
       });
     }
     const resistPairs = [
@@ -3231,7 +3586,7 @@ function applyLegacyDoomsdaySelfEffects(ctx) {
         sourceID: mod.id,
         operation: "PostPercent",
         value: speedFactor / 100,
-        stackingGroup: `attr:${ATTR_MAX_VELOCITY}`
+        stackingGroup: `default:${ATTR_MAX_VELOCITY}`
       });
     }
     const siegeStatus = mod.getFinal(ATTR_SIEGE_WARP_STATUS, 0);
@@ -3302,7 +3657,7 @@ function applyCommandBuff(buffID, value, sourceMod, ctx) {
     sourceID: sourceMod.id,
     operation,
     value: scaledValue,
-    stackingGroup: `attr:${attrID}`
+    stackingGroup: `default:${attrID}`
   });
   for (const mi of dbuff.itemModifiers) {
     ctx.ship.addAffliction(mi.dogmaAttributeID, affliction(op, mi.dogmaAttributeID));
@@ -3648,7 +4003,7 @@ function applyLegacyFighterAbilities(ctx) {
           sourceID: fighter.id,
           operation: "PostPercent",
           value: speedPct / 100,
-          stackingGroup: `attr:${ATTR_MAX_VELOCITY}`
+          stackingGroup: `default:${ATTR_MAX_VELOCITY}`
         });
       }
     }
@@ -3660,7 +4015,7 @@ function applyLegacyFighterAbilities(ctx) {
           sourceID: fighter.id,
           operation: "PostPercent",
           value: speedPct / 100,
-          stackingGroup: `attr:${ATTR_MAX_VELOCITY}`
+          stackingGroup: `default:${ATTR_MAX_VELOCITY}`
         });
       }
       const sigPct = fighter.getFinal(ATTR_FIGHTER_MWD_SIG_BONUS, 0);
@@ -3670,7 +4025,7 @@ function applyLegacyFighterAbilities(ctx) {
           sourceID: fighter.id,
           operation: "PostPercent",
           value: sigPct / 100,
-          stackingGroup: `attr:${ATTR_SIGNATURE_RADIUS}`
+          stackingGroup: `default:${ATTR_SIGNATURE_RADIUS}`
         });
       }
     }
@@ -3682,7 +4037,7 @@ function applyLegacyFighterAbilities(ctx) {
           sourceID: fighter.id,
           operation: "PostPercent",
           value: speedPct / 100,
-          stackingGroup: `attr:${ATTR_MAX_VELOCITY}`
+          stackingGroup: `default:${ATTR_MAX_VELOCITY}`
         });
       }
       const sigPct = fighter.getFinal(ATTR_FIGHTER_EVASIVE_SIG_BONUS, 0);
@@ -3692,7 +4047,7 @@ function applyLegacyFighterAbilities(ctx) {
           sourceID: fighter.id,
           operation: "PostPercent",
           value: sigPct / 100,
-          stackingGroup: `attr:${ATTR_SIGNATURE_RADIUS}`
+          stackingGroup: `default:${ATTR_SIGNATURE_RADIUS}`
         });
       }
       const resonances = [
@@ -3709,7 +4064,7 @@ function applyLegacyFighterAbilities(ctx) {
           sourceID: fighter.id,
           operation: "PostMul",
           value: mul,
-          stackingGroup: `attr:${tgtAttr}`
+          stackingGroup: `default:${tgtAttr}`
         });
       }
     }
@@ -3829,7 +4184,7 @@ function applyLegacyRAH(ctx, damageProfile) {
         sourceID: mod.id,
         operation: "PreMul",
         value: factor,
-        stackingGroup: `attr:${tgtAttr}`
+        stackingGroup: `default:${tgtAttr}`
       });
     }
   }
@@ -3993,176 +4348,6 @@ function computeTotalEhp(shield, armor, hull, useProfile) {
   return Number.isFinite(total) ? total : Number.MAX_SAFE_INTEGER;
 }
 
-// src/fitChecks.ts
-function readAttr(t, id) {
-  return t.attributes.find((a) => a.id === id)?.v;
-}
-function typeFitsSlotType(t, slot) {
-  for (const e of t.effects) {
-    const mapped = SLOT_EFFECT_TO_SLOT_TYPE[e.id];
-    if (mapped === slot) return true;
-  }
-  return false;
-}
-function isTurretWeapon(t) {
-  return t.effects.some((e) => WEAPON_EFFECT_KIND[e.id] === "TURRET");
-}
-function isMissileLauncher(t) {
-  return t.effects.some((e) => WEAPON_EFFECT_KIND[e.id] === "MISSILE");
-}
-function isSmartBomb(t) {
-  return t.effects.some((e) => WEAPON_EFFECT_KIND[e.id] === "SMARTBOMB");
-}
-function shipGroupRestrictions(t) {
-  const out = [];
-  for (const id of CAN_FIT_SHIP_GROUP_ATTRS) {
-    const v = readAttr(t, id);
-    if (v != null && v > 0) out.push(Math.round(v));
-  }
-  return out;
-}
-function shipTypeRestrictions(t) {
-  const out = [];
-  for (const id of CAN_FIT_SHIP_TYPE_ATTRS) {
-    const v = readAttr(t, id);
-    if (v != null && v > 0) out.push(Math.round(v));
-  }
-  return out;
-}
-function maxGroupFittedFor(mod) {
-  const v = readAttr(mod, ATTR.MAX_GROUP_FITTED);
-  return v != null && v > 0 ? Math.round(v) : void 0;
-}
-function maxTypeFittedFor(mod) {
-  const v = readAttr(mod, ATTR.MAX_TYPE_FITTED);
-  return v != null && v > 0 ? Math.round(v) : void 0;
-}
-function freeFitGroupSlotsFor(mod, fittedModules, dataset) {
-  const groupCap = maxGroupFittedFor(mod);
-  const typeCap = maxTypeFittedFor(mod);
-  if (groupCap === void 0 && typeCap === void 0) return Number.POSITIVE_INFINITY;
-  let groupCount = 0;
-  let typeCount = 0;
-  for (const fm of fittedModules) {
-    if (typeCap !== void 0 && fm.typeID === mod.id) typeCount++;
-    if (groupCap !== void 0) {
-      const t = dataset.getType(fm.typeID);
-      if (t && t.groupID === mod.groupID) groupCount++;
-    }
-  }
-  let free = Number.POSITIVE_INFINITY;
-  if (groupCap !== void 0) free = Math.min(free, groupCap - groupCount);
-  if (typeCap !== void 0) free = Math.min(free, typeCap - typeCount);
-  return Math.max(0, free);
-}
-function canFitModuleOnShip(mod, ship, slot, fitContext) {
-  if (!typeFitsSlotType(mod, slot)) {
-    return { ok: false, reason: `Module does not declare a ${slot} slot effect` };
-  }
-  if (!ship) return { ok: true };
-  const allowedGroups = shipGroupRestrictions(mod);
-  const allowedTypes = shipTypeRestrictions(mod);
-  if (allowedGroups.length > 0 || allowedTypes.length > 0) {
-    const groupOk = allowedGroups.includes(ship.groupID);
-    const typeOk = allowedTypes.includes(ship.id);
-    if (!groupOk && !typeOk) {
-      return { ok: false, reason: "Ship hull/group not allowed by this module" };
-    }
-  }
-  if (slot === "RIG") {
-    const modSize = readAttr(mod, ATTR.RIG_SIZE);
-    const shipSize = readAttr(ship, ATTR.RIG_SIZE);
-    if (modSize != null && shipSize != null && Math.round(modSize) !== Math.round(shipSize)) {
-      return { ok: false, reason: "Rig size mismatch" };
-    }
-  }
-  if (slot === "SUBSYSTEM") {
-    const fitsTo = readAttr(mod, 1380);
-    if (fitsTo != null && fitsTo > 0 && Math.round(fitsTo) !== ship.id) {
-      return { ok: false, reason: "Subsystem locked to a different T3C hull" };
-    }
-  }
-  if (slot === "HI") {
-    if (isTurretWeapon(mod)) {
-      const turrets = readAttr(ship, ATTR.TURRET_HARDPOINTS) ?? 0;
-      if (turrets <= 0) {
-        return { ok: false, reason: "Ship has no turret hardpoints" };
-      }
-    } else if (isMissileLauncher(mod)) {
-      const launchers = readAttr(ship, ATTR.LAUNCHER_HARDPOINTS) ?? 0;
-      if (launchers <= 0) {
-        return { ok: false, reason: "Ship has no launcher hardpoints" };
-      }
-    }
-  }
-  if (fitContext) {
-    const free = freeFitGroupSlotsFor(mod, fitContext.fittedModules, fitContext.dataset);
-    if (free <= 0) {
-      const cap = maxTypeFittedFor(mod) ?? maxGroupFittedFor(mod);
-      return { ok: false, reason: `Only ${cap} of this module type can be fitted to a ship` };
-    }
-  }
-  return { ok: true };
-}
-function chargeGroupsForModule(mod) {
-  const out = [];
-  for (const attrID of CHARGE_GROUP_ATTRS) {
-    const v = readAttr(mod, attrID);
-    if (v != null && v > 0) out.push(Math.round(v));
-  }
-  return out;
-}
-function moduleAcceptsAnyCharge(mod) {
-  return chargeGroupsForModule(mod).length > 0;
-}
-function moduleAcceptsChargeType(mod, charge) {
-  const allowedGroups = chargeGroupsForModule(mod);
-  if (allowedGroups.length === 0) return false;
-  if (!allowedGroups.includes(charge.groupID)) return false;
-  const modSize = readAttr(mod, ATTR.CHARGE_SIZE);
-  const chargeSize = readAttr(charge, ATTR.CHARGE_SIZE);
-  if (modSize != null && chargeSize != null && Math.round(chargeSize) > Math.round(modSize)) {
-    return false;
-  }
-  return true;
-}
-var ACTIVE_EFFECT_CATEGORIES = /* @__PURE__ */ new Set([1, 2, 3]);
-function isActivatableModule(mod, effects) {
-  for (const e of mod.effects) {
-    const eff = effects.get(e.id);
-    if (eff && eff.effectCategoryID !== void 0 && ACTIVE_EFFECT_CATEGORIES.has(eff.effectCategoryID)) {
-      return true;
-    }
-  }
-  return false;
-}
-var DEFAULT_OFFLINE_ACTIVATION_GROUPS = /* @__PURE__ */ new Set([
-  330,
-  4117
-]);
-function defaultStateForModule(mod, effects) {
-  if (DEFAULT_OFFLINE_ACTIVATION_GROUPS.has(mod.groupID)) return "ONLINE";
-  return isActivatableModule(mod, effects) ? "ACTIVE" : "ONLINE";
-}
-function freeHardpointsFor(mod, ship, fittedHiModules, dataset) {
-  const turretCap = readAttr(ship, ATTR.TURRET_HARDPOINTS) ?? 0;
-  const launcherCap = readAttr(ship, ATTR.LAUNCHER_HARDPOINTS) ?? 0;
-  let turretUsed = 0;
-  let launcherUsed = 0;
-  for (const m of fittedHiModules) {
-    const t = dataset.getType(m.typeID);
-    if (!t) continue;
-    if (isTurretWeapon(t)) turretUsed++;
-    else if (isMissileLauncher(t)) launcherUsed++;
-  }
-  let hardpointFree;
-  if (isTurretWeapon(mod)) hardpointFree = Math.max(0, turretCap - turretUsed);
-  else if (isMissileLauncher(mod)) hardpointFree = Math.max(0, launcherCap - launcherUsed);
-  else hardpointFree = Number.POSITIVE_INFINITY;
-  const groupFree = freeFitGroupSlotsFor(mod, fittedHiModules, dataset);
-  return Math.min(hardpointFree, groupFree);
-}
-
 // src/derived/capacitor.ts
 function computeCapacitor(ctx, dataset) {
   const ship = ctx.ship;
@@ -5199,22 +5384,46 @@ function computeFit(fit, dataset, opts) {
     const t = dataset.getType(ff.typeID);
     return t ? [makeFighterState(ff, t)] : [];
   });
-  const implants = fit.implants.flatMap((fi) => {
-    const t = dataset.getType(fi.typeID);
-    return t ? [makeImplantState(fi, t)] : [];
-  });
-  const boosters = fit.boosters.flatMap((fb) => {
-    const t = dataset.getType(fb.typeID);
-    return t ? [makeBoosterState(fb, t)] : [];
-  });
+  const implants = dropSlotCollisions(
+    fit.implants.flatMap((fi) => {
+      const t = dataset.getType(fi.typeID);
+      return t ? [{ slot: t.attributes.find((a) => a.id === ATTR_IMPLANTNESS)?.v ?? fi.slot, item: makeImplantState(fi, t) }] : [];
+    })
+  );
+  const boosters = dropSlotCollisions(
+    fit.boosters.flatMap((fb) => {
+      const t = dataset.getType(fb.typeID);
+      return t ? [{ slot: t.attributes.find((a) => a.id === ATTR_BOOSTERNESS)?.v ?? fb.slot, item: makeBoosterState(fb, t) }] : [];
+    })
+  );
   const subsystems = fit.subsystems.flatMap((fs2) => {
     const t = dataset.getType(fs2.typeID);
     return t ? [makeSubsystemState(fs2, t)] : [];
   });
   let mode;
-  if (fit.modeTypeID !== void 0) {
-    const t = dataset.getType(fit.modeTypeID);
-    if (t) mode = makeModeState(fit.modeTypeID, t);
+  const modeTypeID = fit.modeTypeID ?? defaultModeTypeIDFor(shipType, dataset);
+  if (modeTypeID !== void 0) {
+    const t = dataset.getType(modeTypeID);
+    if (t) mode = makeModeState(modeTypeID, t);
+  }
+  ship.attr(
+    ATTR.DRONE_CONTROL_RANGE,
+    dataset.attributes.get(ATTR.DRONE_CONTROL_RANGE)?.defaultValue ?? 2e4
+  );
+  for (const it of [
+    ship,
+    character,
+    mode,
+    ...modules,
+    ...drones,
+    ...fighters,
+    ...implants,
+    ...boosters,
+    ...subsystems
+  ]) {
+    if (!it) continue;
+    it.attrSchema = dataset.attributes;
+    if (it.charge) it.charge.attrSchema = dataset.attributes;
   }
   const skillLevels = /* @__PURE__ */ new Map();
   for (const [k, v] of Object.entries(opts.skillProfile.skills)) {
@@ -5260,8 +5469,9 @@ function computeFit(fit, dataset, opts) {
   for (const m of modules) applySourceItem(m, ctx, dataset);
   for (const d of drones) applySourceItem(d, ctx, dataset);
   for (const f of fighters) applySourceItem(f, ctx, dataset);
-  for (const i of implants) applySourceItem(i, ctx, dataset);
-  for (const b of boosters) applySourceItem(b, ctx, dataset);
+  const charSide = [...implants, ...boosters];
+  for (const it of charSide) applySourceItem(it, ctx, dataset, "peer");
+  for (const it of charSide) applySourceItem(it, ctx, dataset, "outgoing");
   if (mode) applySourceItem(mode, ctx, dataset);
   applyLegacyOverload(ctx);
   applyLegacyPropMods(ctx);
@@ -5468,6 +5678,7 @@ function deriveStats(ctx, dataset, damageProfile, fit, projectionReports) {
   const cap = computeCapacitor(ctx, dataset);
   const tank = computeTank(ctx);
   const offense = computeOffense(ctx, dataset, fit);
+  const sensor = pickSensorStrength(ship);
   return {
     fitting: {
       cpuUsed,
@@ -5556,8 +5767,8 @@ function deriveStats(ctx, dataset, damageProfile, fit, projectionReports) {
       )),
       signatureRadius: ship.getFinal(ATTR.SIGNATURE_RADIUS, 0),
       scanResolution: ship.getFinal(ATTR.SCAN_RESOLUTION, 0),
-      sensorStrength: pickSensorStrength(ship).value,
-      sensorType: pickSensorStrength(ship).type
+      sensorStrength: sensor.value,
+      sensorType: sensor.type
     },
     drones: {
       bayUsed: droneBayUsed,
@@ -5568,13 +5779,12 @@ function deriveStats(ctx, dataset, damageProfile, fit, projectionReports) {
       // ItemState per FitDrone stack, so filtering by state counted five
       // active Ogre IIs as 1 — and this is the number bandwidth gates.
       active: fit.drones.reduce((n, d) => n + d.countActive, 0),
-      // Drone control range is the ship base (default 20 km, attr 458)
-      // PLUS the character's accumulated skill bonus on the same attr.
-      // Drone Avionics V + Advanced Drone Avionics V each ModAdd to
-      // char.attr_458 via effect 504 (`domain: charID`). Pyfa reads
-      // both and sums; ship.attr_458 alone misses 40 km of skills at
-      // All-V → produces 20 km instead of the in-game 60 km.
-      controlRange: ship.getFinal(ATTR.DRONE_CONTROL_RANGE, 2e4) + ctx.character.getFinal(ATTR.DRONE_CONTROL_RANGE, 0)
+      // ONE accumulator, on the ship (attr 458, SDE default 20 km) — the
+      // charID-domain modifiers that carry the skills and the hull bonus
+      // are re-routed there, see FitContext.targetsForModifier. Summing a
+      // ship half and a character half instead let a percentage bonus
+      // apply to only one of them.
+      controlRange: ship.getFinal(ATTR.DRONE_CONTROL_RANGE, 2e4)
     },
     projected: projectionReports,
     structure: computeStructureMeta(ctx),
@@ -5601,18 +5811,36 @@ function computeAlignTime(ship) {
   if (!mass || !agility) return 0;
   return Math.log(4) * mass * agility / 1e6;
 }
+var ATTR_IMPLANTNESS = 331;
+var ATTR_BOOSTERNESS = 1087;
+function dropSlotCollisions(entries) {
+  const taken = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const e of entries) {
+    if (taken.has(e.slot)) continue;
+    taken.add(e.slot);
+    out.push(e.item);
+  }
+  return out;
+}
 function pickSensorStrength(ship) {
   const candidates = [
-    { attr: ATTR.SCAN_RADAR_STRENGTH, type: "radar" },
-    { attr: ATTR.SCAN_LADAR_STRENGTH, type: "ladar" },
     { attr: ATTR.SCAN_MAGNETOMETRIC_STRENGTH, type: "magnetometric" },
+    { attr: ATTR.SCAN_LADAR_STRENGTH, type: "ladar" },
+    { attr: ATTR.SCAN_RADAR_STRENGTH, type: "radar" },
     { attr: ATTR.SCAN_GRAVIMETRIC_STRENGTH, type: "gravimetric" }
   ];
+  let best = -1;
+  let type = "unknown";
   for (const c of candidates) {
     const v = ship.getFinal(c.attr, 0);
-    if (v > 0) return { value: v, type: c.type };
+    if (v > best) {
+      best = v;
+      type = c.type;
+    } else if (v === best) type = "multispectral";
   }
-  return { value: 0, type: "unknown" };
+  if (best <= 0) return { value: Math.max(best, 0), type: best === 0 ? type : "unknown" };
+  return { value: best, type };
 }
 
 // src/eft/parser.ts
@@ -5715,6 +5943,20 @@ function parseEft(text, dataset) {
   return { fit, warnings };
 }
 function classifySection(entries, idx, _dataset) {
+  let sawImplant = false;
+  let allImplant = true;
+  for (const e of entries) {
+    const { name, quantity } = parseEntryName(e.text);
+    const typeID = idx.map.get(name.toLowerCase());
+    if (typeID === void 0) {
+      allImplant = false;
+      continue;
+    }
+    const t = idx.types.get(typeID);
+    if (quantity === null && isFittableImplant(t)) sawImplant = true;
+    else allImplant = false;
+  }
+  if (sawImplant && allImplant) return "implants";
   for (const e of entries) {
     const { name, quantity } = parseEntryName(e.text);
     const typeID = idx.map.get(name.toLowerCase());
@@ -5731,6 +5973,13 @@ function classifySection(entries, idx, _dataset) {
   }
   return "cargo";
 }
+var ATTR_IMPLANTNESS2 = 331;
+var ATTR_BOOSTERNESS2 = 1087;
+var attrValue = (t, id) => t.attributes?.find((a) => a.id === id)?.v;
+function isFittableImplant(t) {
+  if (t.categoryID !== CATEGORY.IMPLANT) return false;
+  return attrValue(t, ATTR_IMPLANTNESS2) !== void 0 || attrValue(t, ATTR_BOOSTERNESS2) !== void 0;
+}
 function parseEntryName(text) {
   const m = QUANTITY_RE.exec(text);
   if (m) {
@@ -5767,6 +6016,23 @@ function consumeEntry(entry, sectionKind, fit, slotCursor, idx, dataset, warning
     fit.drones.push(drone);
     return;
   }
+  if (sectionKind === "implants" && quantity === null && isFittableImplant(type)) {
+    const implantSlot = attrValue(type, ATTR_IMPLANTNESS2);
+    if (implantSlot !== void 0) {
+      fit.implants.push({ id: tempId(), typeID, slot: implantSlot });
+    } else {
+      fit.boosters.push({
+        id: tempId(),
+        typeID,
+        slot: attrValue(type, ATTR_BOOSTERNESS2) ?? 1,
+        // Side effects are opt-in and an EFT cannot express them, so an
+        // imported booster arrives with its drawbacks off — the same
+        // default pyfa gives it.
+        activeSideEffects: []
+      });
+    }
+    return;
+  }
   if (sectionKind === "cargo" || quantity !== null) {
     const cargo = { id: tempId(), typeID, count: quantity ?? 1 };
     fit.cargo.push(cargo);
@@ -6132,7 +6398,7 @@ var SUBSYSTEM_RANK_BY_TYPE_ID = /* @__PURE__ */ new Map([
   [45621, 3]
   // Loki Propulsion - Wake Limiter
 ]);
-function attrValue(t, id) {
+function attrValue2(t, id) {
   for (const a of t.attributes) if (a.id === id) return a.v;
   return void 0;
 }
@@ -6146,7 +6412,7 @@ function computeT3CVariantCode(shipTypeID, subsystems, dataset) {
   for (const fs2 of subsystems) {
     const t = subsBucket.get(fs2.typeID);
     if (!t) return null;
-    if (attrValue(t, PARENT_SHIP_ATTR) !== shipTypeID) return null;
+    if (attrValue2(t, PARENT_SHIP_ATTR) !== shipTypeID) return null;
     fittedByGroup.set(t.groupID, fs2.typeID);
   }
   let code = "";
@@ -6380,6 +6646,7 @@ async function computeFromEft(eft, options = {}) {
 
 exports.ACTIVATION_EFFECT_ID = ACTIVATION_EFFECT_ID;
 exports.ATTR = ATTR;
+exports.BOOSTER_SIDE_EFFECT_IDS = BOOSTER_SIDE_EFFECT_IDS;
 exports.BUNDLED_DATA_DIR = BUNDLED_DATA_DIR;
 exports.CATEGORY = CATEGORY;
 exports.DAMAGE_PROFILE_PRESETS = DAMAGE_PROFILE_PRESETS;
@@ -6420,6 +6687,7 @@ exports.computeStructureMeta = computeStructureMeta;
 exports.computeT3CVariantCode = computeT3CVariantCode;
 exports.computeTank = computeTank;
 exports.computeTotalEhp = computeTotalEhp;
+exports.defaultModeTypeIDFor = defaultModeTypeIDFor;
 exports.defaultStateForModule = defaultStateForModule;
 exports.disintegratorCyclesToFullSpool = disintegratorCyclesToFullSpool;
 exports.disintegratorSpoolBonus = disintegratorSpoolBonus;