ed-mcp 0.3.0 → 0.3.1

package/dist/index.js

@@ -28692,7 +28692,7 @@ async function canonical(p) {
 }
 
 // src/version.ts
-var VERSION = "0.3.0";
+var VERSION = "0.3.1";
 
 // src/config.ts
 var ConfigError = class extends Error {
@@ -29666,8 +29666,10 @@ var Catalog = class {
     const same4 = m.trade_group ? this.d.materials.filter((x) => x.kind === m.kind && x.trade_group === m.trade_group).sort((a, b) => a.grade - b.grade) : [m];
     return { ...m, same_group: same4, trade_rules: TRADE_RULES };
   }
-  /** Coriolis feature ranges, [min, max], for a blueprint id at a grade, or null. */
-  blueprintFeatures(blueprintId2, grade) {
+  /** Coriolis feature ranges, [min, max], for a blueprint id at a grade on a module group, or null. */
+  blueprintFeatures(blueprintId2, grade, grp) {
+    const own2 = this.d.groups.find((g) => g.id === grp)?.features?.[blueprintId2];
+    if (own2) return own2[String(grade)] ?? null;
     const b = this.d.blueprints.find((x) => x.id === blueprintId2);
     return b?.features?.[String(grade)] ?? null;
   }
@@ -29806,11 +29808,15 @@ function buildCatalog(raw, statics, opts = {}) {
   const spJson = json2(raw.specials, "specials");
   const modJson = json2(raw.modifications, "modifications");
   const actJson = raw.actions === void 0 ? null : json2(raw.actions, "actions");
-  const blueprints = Object.entries(bpJson).map(([id, v]) => {
+  const warnings = [];
+  const idOf = /* @__PURE__ */ new Map();
+  const featuresOf = /* @__PURE__ */ new Map();
+  const byId = /* @__PURE__ */ new Map();
+  for (const [key, v] of Object.entries(bpJson)) {
     const b = v;
-    return {
-      id: b.fdname ?? id,
-      name: b.name ?? id,
+    const bp = {
+      id: b.fdname ?? key,
+      name: b.name ?? key,
       modules: b.modulename ?? [],
       grades: Object.fromEntries(
         Object.entries(b.grades ?? {}).map(([g, x]) => [g, counts(x.components)])
@@ -29819,7 +29825,22 @@ function buildCatalog(raw, statics, opts = {}) {
         Object.entries(b.grades ?? {}).map(([g, x]) => [g, ranges(x.features)])
       )
     };
-  });
+    idOf.set(key, bp.id);
+    featuresOf.set(key, bp.features);
+    const prev = byId.get(bp.id);
+    if (!prev) {
+      byId.set(bp.id, bp);
+      continue;
+    }
+    if (JSON.stringify(prev.grades) !== JSON.stringify(bp.grades)) {
+      warnings.push(
+        `Blueprints with the name ${bp.id} cost different materials; using one of them.`
+      );
+    }
+    const main2 = key === bp.id ? bp : prev;
+    byId.set(bp.id, { ...main2, modules: [.../* @__PURE__ */ new Set([...prev.modules, ...bp.modules])] });
+  }
+  const blueprints = [...byId.values()];
   const experimentals = Object.entries(spJson).map(([id, v]) => {
     const s = v;
     const edname = s.edname ?? id;
@@ -29833,12 +29854,12 @@ function buildCatalog(raw, statics, opts = {}) {
   });
   const groups = Object.entries(modJson).map(([id, v]) => {
     const g = v;
-    return {
+    const group = {
       id,
       names: statics.groups[id] ?? [],
       blueprints: Object.fromEntries(
-        Object.entries(g.blueprints ?? {}).map(([bp, x]) => [
-          bp,
+        Object.entries(g.blueprints ?? {}).map(([key, x]) => [
+          idOf.get(key) ?? key,
           Object.fromEntries(
             Object.entries(x.grades ?? {}).map(([grade, y]) => [grade, y.engineers ?? []])
           )
@@ -29846,6 +29867,8 @@ function buildCatalog(raw, statics, opts = {}) {
       ),
       experimentals: g.specials ?? []
     };
+    const features = Object.keys(g.blueprints ?? {}).filter((key) => idOf.has(key) && idOf.get(key) !== key).map((key) => [idOf.get(key), featuresOf.get(key)]);
+    return features.length ? { ...group, features: Object.fromEntries(features) } : group;
   });
   const materials = parseCsv(raw.materials).filter((r) => r.symbol && r.name && ["Raw", "Manufactured", "Encoded"].includes(r.type ?? "")).map((r) => ({
     symbol: r.symbol,
@@ -29881,7 +29904,6 @@ function buildCatalog(raw, statics, opts = {}) {
     outfitting,
     engineers: statics.engineers
   });
-  const warnings = [];
   if (!actJson)
     warnings.push("No modifierActions.json: experimental effects have no fixed values.");
   const known = new Set(materials.map((m) => normKey(m.name)));
@@ -41966,7 +41988,7 @@ function toJournalModifiers(module, modifiers) {
   return out;
 }
 function bestRoll(blueprint, grade, module, catalog) {
-  const features = catalog.blueprintFeatures(blueprint, grade);
+  const features = catalog.blueprintFeatures(blueprint, grade, module.grp);
   if (!features) {
     throw new UserError(`Blueprint ${blueprint} has no grade ${grade}.`);
   }