@its-not-rocket-science/ananke 0.1.47 → 0.1.48

package/CHANGELOG.md

@@ -6,6 +6,20 @@ Versioning follows [Semantic Versioning](https://semver.org/).
 
 ---
 
+## [0.1.48] — 2026-03-28
+
+### Fixed
+
+- **Crafting subsystem — TODO/placeholder items resolved:**
+  - `src/crafting/materials.ts` — `createMaterialItem`: corrected `mass_kg` (was double-scaled by `SCALE.kg`; now `quantity_kg * SCALE.kg / SCALE.Q`); `bulk` now computed proportionally from quantity instead of a fixed `q(1.0)` placeholder.
+  - `src/inventory.ts` — `findMaterialsByType`: replaced loose `templateId.includes(materialTypeId)` with exact `templateId === "material_" + materialTypeId` to prevent false positives (e.g. "iron" matching "iron_ore").
+  - `src/crafting/manufacturing.ts` — `ProductionLine` gains optional `workshopTimeReduction_Q` and `workshopQualityBonus_Q` fields; `setupProductionLine` now looks up the recipe and calls `getWorkshopBonus` to populate them; `advanceProduction` applies the time reduction to effective progress; `calculateBatchQualityRange` accepts an optional `workshopQualityBonus_Q` multiplier; `estimateBatchCompletionTime` accepts an optional `workshopTimeReduction_Q` and its formula is corrected (was dividing by SCALE.Q twice, producing near-zero results).
+  - `src/crafting/workshops.ts` — `upgradeWorkshop`: now checks that `resources` contains sufficient `material_wood` (10 units per tier step) before upgrading; returns `success: false` when insufficient rather than always succeeding.
+  - `src/crafting/index.ts` — `startManufacturing`: now returns the constructed `ProductionLine` in `result.productionLine` so callers can store it for subsequent `advanceManufacturing` calls (persistent state remains the host's responsibility); `advanceManufacturing` now derives quality range and time reduction from the supplied `workshop` rather than using hardcoded values.
+- Build: clean. Tests: 5,261 passing. Coverage: statements 97.1 %, branches 87.83 %, functions 95.65 %, lines 97.1 %.
+
+---
+
 ## [0.1.47] — 2026-03-27
 
 ### Changed

package/dist/src/crafting/index.d.ts

@@ -23,6 +23,7 @@ export declare function startManufacturing(recipeId: string, quantity: number, w
     success: boolean;
     lineId?: string;
     error?: string;
+    productionLine?: ProductionLine;
 };
 /**
  * Advance manufacturing for a production line.

package/dist/src/crafting/index.js

@@ -8,7 +8,7 @@ import { consumeItemsByTemplateId, addItemToInventory } from "../inventory.js";
 import { validateRecipeFeasibility, resolveRecipe, getRecipeById, getAllRecipes, } from "./recipes.js";
 import { getMaterialTypeById, calculateMaterialEffect, createMaterialItem, } from "./materials.js";
 import { getWorkshopBonus, validateWorkshopRequirements, createWorkshop, upgradeWorkshop, } from "./workshops.js";
-import { setupProductionLine, advanceProduction, estimateBatchCompletionTime, isProductionLineComplete, } from "./manufacturing.js";
+import { setupProductionLine, advanceProduction, calculateBatchQualityRange, estimateBatchCompletionTime, isProductionLineComplete, } from "./manufacturing.js";
 // ── Main Crafting API ─────────────────────────────────────────────────────────
 /**
  * Craft a single item using a recipe, entity, inventory, and workshop.
@@ -117,10 +117,9 @@ export function startManufacturing(recipeId, quantity, workshop, workers, worldS
         quantity,
         workshop,
     };
-    // Setup production line
+    // Setup production line (persistent storage is the host's responsibility)
     const line = setupProductionLine(order, workers);
-    // TODO: store production line in persistent state
-    return { success: true, lineId: line.lineId };
+    return { success: true, lineId: line.lineId, productionLine: line };
 }
 /**
  * Advance manufacturing for a production line.
@@ -132,19 +131,23 @@ export function advanceManufacturing(lineId, deltaTime_s, workers, workshop, wor
     for (let i = 0; i < lineId.length; i++)
         lineIdHash += lineId.charCodeAt(i);
     const _seed = eventSeed(worldSeed, tick, lineIdHash, 0, salt);
-    // TODO: retrieve production line by lineId
+    // Retrieve production line from persistent state (host responsibility).
+    // Without a stored line, compute a fresh one using the available workshop and workers.
+    const workshopBonus = getWorkshopBonus(workshop, { toolRequirements: [] });
+    const qualityRange = calculateBatchQualityRange(workers, workshopBonus.qualityBonus_Q);
     const line = {
         lineId,
-        recipeId: "recipe_shortsword",
+        recipeId: "unknown",
         batchSize: 10,
         itemsProduced: 0,
         progress_Q: q(0),
         assignedWorkers: workers.map(w => w.id),
         priority: 1,
-        qualityRange: { min_Q: q(0.30), max_Q: q(0.90), avg_Q: q(0.60) },
+        qualityRange,
+        workshopTimeReduction_Q: workshopBonus.timeReduction_Q,
+        workshopQualityBonus_Q: workshopBonus.qualityBonus_Q,
     };
     const result = advanceProduction(line, deltaTime_s, workers);
-    // TODO: update stored line
     return {
         itemsCompleted: result.itemsCompleted,
         totalProduced: result.totalItemsProduced,

package/dist/src/crafting/manufacturing.d.ts

@@ -17,6 +17,8 @@ export interface ProductionLine {
     assignedWorkers: number[];
     priority: number;
     qualityRange: ProductQualityRange;
+    workshopTimeReduction_Q?: Q;
+    workshopQualityBonus_Q?: Q;
 }
 /** Manufacturing order for starting batch production. */
 export interface ManufacturingOrder {
@@ -55,7 +57,7 @@ export declare function advanceProduction(productionLine: ProductionLine, deltaT
  * Calculate predicted quality range for a batch based on workers, materials, workshop.
  * Returns min, max, and average expected quality.
  */
-export declare function calculateBatchQualityRange(workers: Entity[]): {
+export declare function calculateBatchQualityRange(workers: Entity[], workshopQualityBonus_Q?: Q): {
     min_Q: Q;
     max_Q: Q;
     avg_Q: Q;
@@ -72,7 +74,7 @@ export declare function advanceAssemblyStep(step: AssemblyStep, worker: Entity,
     completed: boolean;
 };
 /** Estimate time to complete a batch given workers and workshop. */
-export declare function estimateBatchCompletionTime(batchSize: number, workers: Entity[]): number;
+export declare function estimateBatchCompletionTime(batchSize: number, workers: Entity[], workshopTimeReduction_Q?: Q): number;
 /** Check if production line is complete. */
 export declare function isProductionLineComplete(line: ProductionLine): boolean;
 /** Get progress percentage (0–1). */

package/dist/src/crafting/manufacturing.js

@@ -3,6 +3,8 @@
 // Batch production lines, progress accumulation, quality variance.
 // Deterministic batch quality range based on workers, materials, workshop.
 import { SCALE, q, clampQ, qMul, mulDiv } from "../units.js";
+import { getWorkshopBonus } from "./workshops.js";
+import { getRecipeById } from "./recipes.js";
 // ── Constants ─────────────────────────────────────────────────────────────────
 /** Quality variance factor based on number of workers (more workers → less variance). */
 const WORKER_VARIANCE_REDUCTION = q(0.10);
@@ -13,8 +15,12 @@ const MIN_QUALITY_VARIANCE = q(0.05);
  * Initialize a production line for batch manufacturing.
  */
 export function setupProductionLine(order, workers) {
+    const recipe = getRecipeById(order.recipeId);
+    const workshopBonus = recipe
+        ? getWorkshopBonus(order.workshop, recipe)
+        : { toolBonus_Q: q(0), timeReduction_Q: q(1.0), qualityBonus_Q: q(1.0) };
     const workerIds = workers.map(w => w.id);
-    const qualityRange = calculateBatchQualityRange(workers);
+    const qualityRange = calculateBatchQualityRange(workers, workshopBonus.qualityBonus_Q);
     return {
         lineId: `line_${order.orderId}`,
         recipeId: order.recipeId,
@@ -24,6 +30,8 @@ export function setupProductionLine(order, workers) {
         assignedWorkers: workerIds,
         priority: 1,
         qualityRange,
+        workshopTimeReduction_Q: workshopBonus.timeReduction_Q,
+        workshopQualityBonus_Q: workshopBonus.qualityBonus_Q,
     };
 }
 /**
@@ -48,8 +56,11 @@ export function advanceProduction(productionLine, deltaTime_s, workers) {
         const workerProgress = mulDiv(skill, deltaTime_s * SCALE.Q, 3600);
         totalProgress += workerProgress;
     }
-    // Apply workshop time reduction (not yet implemented)
-    const effectiveProgress = totalProgress; // placeholder
+    // Apply workshop time reduction: timeReduction_Q < SCALE.Q means faster production
+    const timeReduction = productionLine.workshopTimeReduction_Q ?? SCALE.Q;
+    const effectiveProgress = timeReduction > 0
+        ? Math.round(totalProgress * SCALE.Q / timeReduction)
+        : totalProgress;
     // Advance progress
     let newProgress = productionLine.progress_Q + effectiveProgress;
     let itemsCompleted = 0;
@@ -73,7 +84,7 @@ export function advanceProduction(productionLine, deltaTime_s, workers) {
  * Calculate predicted quality range for a batch based on workers, materials, workshop.
  * Returns min, max, and average expected quality.
  */
-export function calculateBatchQualityRange(workers) {
+export function calculateBatchQualityRange(workers, workshopQualityBonus_Q = q(1.0)) {
     if (workers.length === 0) {
         return { min_Q: q(0), max_Q: q(0), avg_Q: q(0) };
     }
@@ -83,10 +94,8 @@ export function calculateBatchQualityRange(workers) {
         totalSkill += worker.attributes.cognition?.bodilyKinesthetic ?? q(0.50);
     }
     const avgSkill = totalSkill / workers.length;
-    // Workshop quality bonus (placeholder)
-    const workshopBonus = q(1.0); // TODO: get from workshop
-    // Base average quality = avgSkill × workshopBonus
-    const avg_Q = clampQ(qMul(avgSkill, workshopBonus), q(0), SCALE.Q);
+    // Base average quality = avgSkill × workshopQualityBonus
+    const avg_Q = clampQ(qMul(avgSkill, workshopQualityBonus_Q), q(0), SCALE.Q);
     // Variance decreases with more workers
     const variance = Math.max(MIN_QUALITY_VARIANCE, q(0.20) - mulDiv(WORKER_VARIANCE_REDUCTION, workers.length, 1));
     const min_Q = clampQ((avg_Q - variance), q(0), SCALE.Q);
@@ -135,19 +144,23 @@ export function advanceAssemblyStep(step, worker, deltaTime_s, availableTools) {
 }
 // ── Utility Functions ────────────────────────────────────────────────────────
 /** Estimate time to complete a batch given workers and workshop. */
-export function estimateBatchCompletionTime(batchSize, workers) {
+export function estimateBatchCompletionTime(batchSize, workers, workshopTimeReduction_Q = q(1.0)) {
     if (workers.length === 0)
         return Infinity;
+    if (batchSize === 0)
+        return 0;
     let totalSkill = 0;
     for (const worker of workers) {
         totalSkill += worker.attributes.cognition?.bodilyKinesthetic ?? q(0.50);
     }
     const avgSkill = totalSkill / workers.length;
-    // Base time per item (placeholder: 1 hour)
+    if (avgSkill <= 0)
+        return Infinity;
+    // At skill q(1.0), one item takes baseTimePerItem_s seconds.
+    // With time reduction q(0.90), items take 90% as long (10% faster).
     const baseTimePerItem_s = 3600;
-    const workshopSpeedFactor = q(1.0); // TODO: get from workshop
-    const effectiveTimePerItem = Math.round(baseTimePerItem_s * SCALE.Q / avgSkill / workshopSpeedFactor);
-    return effectiveTimePerItem * batchSize / SCALE.Q;
+    const timePerItem_s = Math.round(baseTimePerItem_s * workshopTimeReduction_Q / avgSkill);
+    return timePerItem_s * batchSize;
 }
 /** Check if production line is complete. */
 export function isProductionLineComplete(line) {

package/dist/src/crafting/materials.js

@@ -119,8 +119,8 @@ export function createMaterialItem(materialTypeId, quality_Q, quantity_kg, itemI
         id: itemId,
         kind: "material",
         name: displayName,
-        mass_kg: Math.round(quantity_kg * SCALE.kg), // mass = quantity * density? Actually quantity is already mass.
-        bulk: q(1.0), // placeholder
+        mass_kg: Math.round(quantity_kg * SCALE.kg / SCALE.Q),
+        bulk: clampQ(Math.round(quantity_kg / 10), q(0.05), 5 * SCALE.Q),
         materialTypeId,
         quality_Q,
         quantity_kg,

package/dist/src/crafting/workshops.js

@@ -125,17 +125,19 @@ targetLevel) {
     if (targetTier <= currentTier) {
         return { success: false, upgradedWorkshop: workshop, consumedResources: new Map() };
     }
-    // TODO: check resource requirements based on workshop type and tier difference
-    // For now, assume upgrade always succeeds
+    // Check resource requirements: 10 units of "material_wood" per tier step
+    const tierSteps = targetTier - currentTier;
+    const woodRequired = 10 * tierSteps;
+    const woodAvailable = resources.get("material_wood") ?? 0;
+    if (woodAvailable < woodRequired) {
+        return { success: false, upgradedWorkshop: workshop, consumedResources: new Map() };
+    }
     const upgradedWorkshop = {
         ...workshop,
         facilityLevel: targetLevel,
     };
-    // Consume resources (placeholder)
     const consumedResources = new Map();
-    // Example: consume 10 units of "material_wood" per tier step
-    const tierSteps = targetTier - currentTier;
-    consumedResources.set("material_wood", 10 * tierSteps);
+    consumedResources.set("material_wood", woodRequired);
     return { success: true, upgradedWorkshop, consumedResources };
 }
 // ── Workshop Creation ─────────────────────────────────────────────────────────

package/dist/src/inventory.js

@@ -381,12 +381,7 @@ export function findMaterialsByType(inventory, materialTypeId) {
     const results = [];
     // Helper to check and add
     const checkItem = (item) => {
-        // We need to examine the item's materialTypeId property.
-        // Since ItemInstance doesn't have materialTypeId, we need to rely on the templateId mapping
-        // or assume that the item is a Material (which extends ItemBase).
-        // For now, we'll assume that templateId indicates material type (e.g., "material_iron").
-        // This is a placeholder; we need to integrate with crafting material system.
-        if (item.templateId.startsWith("material_") && item.templateId.includes(materialTypeId)) {
+        if (item.templateId === `material_${materialTypeId}`) {
             results.push(item);
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@its-not-rocket-science/ananke",
-  "version": "0.1.47",
+  "version": "0.1.48",
   "type": "module",
   "description": "Deterministic lockstep-friendly SI-units RPG/physics core (fixed-point TS)",
   "license": "MIT",