@terrafirmagreg-team/recipe 0.1.0 → 1.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +16 -16
- package/src/components/button-copy.tsx +1 -0
- package/src/components/cards/card/index.tsx +5 -3
- package/src/components/cards/card/scene.tsx +4 -2
- package/src/components/cards/card/strip.tsx +4 -2
- package/src/components/cards/card/text.tsx +2 -1
- package/src/components/cards/card/tips.tsx +1 -0
- package/src/components/cards/default-item.tsx +6 -2
- package/src/components/cards/glare-filter.tsx +1 -0
- package/src/components/cards/paged-card.tsx +1 -0
- package/src/components/cards/slot-hitbox.tsx +4 -2
- package/src/components/cards/strip-card/buttons.tsx +7 -2
- package/src/components/cards/strip-card/index.tsx +3 -1
- package/src/components/cards/strip-card/member-cell.tsx +4 -2
- package/src/components/cards/strip-card/sprite.tsx +1 -0
- package/src/components/embed-card.tsx +44 -0
- package/src/components/mdx/recipe.tsx +34 -16
- package/src/components/tool-list.tsx +1 -0
- package/src/{lib/tree.ts → components/tree.tsx} +20 -12
- package/src/components/views/alloy/index.tsx +14 -7
- package/src/components/views/alloy/list.tsx +3 -2
- package/src/components/views/alloy/mix/index.tsx +1 -0
- package/src/components/views/alloy/mix/ratio.tsx +7 -6
- package/src/components/views/alloy/mix/rows.tsx +6 -7
- package/src/components/views/alloy/mix/status.tsx +8 -7
- package/src/components/views/alloy/mix/total.tsx +13 -12
- package/src/components/views/alloy/range-bar.tsx +2 -1
- package/src/components/views/alloy/stack-bar.tsx +4 -2
- package/src/components/views/browser/axis-switcher.tsx +13 -12
- package/src/components/views/browser/card-grid.tsx +2 -1
- package/src/components/views/browser/favorite-button.tsx +2 -1
- package/src/components/views/browser/frame.tsx +3 -2
- package/src/components/views/browser/index.tsx +20 -2
- package/src/components/views/browser/item-panel/index.tsx +11 -9
- package/src/components/views/browser/item-panel/skeleton.tsx +1 -0
- package/src/components/views/browser/item-panel-grid/cell.tsx +5 -3
- package/src/components/views/browser/item-panel-grid/favorite-cell.tsx +4 -2
- package/src/components/views/browser/item-panel-grid/index.tsx +4 -2
- package/src/components/views/browser/item-view/index.tsx +7 -12
- package/src/components/views/browser/item-view/tags.tsx +7 -5
- package/src/components/views/browser/item-view-header.tsx +10 -9
- package/src/components/views/browser/pane-tabs.tsx +1 -0
- package/src/components/views/browser/place-header.tsx +4 -3
- package/src/components/views/browser/query-controls.tsx +3 -1
- package/src/components/views/browser/recipe-item-header.tsx +5 -4
- package/src/components/views/browser/settings.tsx +4 -3
- package/src/components/views/browser/toolbar.tsx +3 -2
- package/src/components/views/browser/type-tabs.tsx +5 -3
- package/src/components/views/browser/type-view.tsx +7 -12
- package/src/components/views/browser/workstation-rail.tsx +4 -3
- package/src/components/views/calc/calculator/actions.tsx +4 -14
- package/src/components/views/calc/calculator/help.tsx +69 -28
- package/src/components/views/calc/calculator/index.tsx +34 -82
- package/src/components/views/calc/dot-overlay.tsx +1 -0
- package/src/components/views/calc/edge.tsx +134 -32
- package/src/components/views/calc/flow/index.tsx +92 -54
- package/src/components/views/calc/flow/picker-dialogs.tsx +84 -6
- package/src/components/views/calc/flow/toolbar.tsx +9 -21
- package/src/components/views/calc/flow/view-menu.tsx +16 -120
- package/src/components/views/calc/member-picker.tsx +8 -6
- package/src/components/views/calc/node-card/actions.tsx +28 -106
- package/src/components/views/calc/node-card/badges.tsx +10 -28
- package/src/components/views/calc/node-card/chips.tsx +8 -40
- package/src/components/views/calc/node-card/far.tsx +13 -65
- package/src/components/views/calc/node-card/full.tsx +133 -83
- package/src/components/views/calc/node-card/index.tsx +1 -0
- package/src/components/views/calc/node-card/menu.tsx +93 -22
- package/src/components/views/calc/node-card/port-cells.tsx +186 -0
- package/src/components/views/calc/node-card/port-rails.tsx +251 -0
- package/src/components/views/calc/node-card/ports.tsx +86 -0
- package/src/components/views/calc/recipe-picker/body.tsx +17 -14
- package/src/components/views/calc/recipe-picker/footer.tsx +5 -3
- package/src/components/views/calc/recipe-picker/index.tsx +5 -0
- package/src/components/views/calc/sidebar.tsx +19 -10
- package/src/components/views/calc/trees/icon-picker.tsx +3 -2
- package/src/components/views/calc/trees/index.tsx +5 -4
- package/src/components/views/calc/trees/label.tsx +6 -4
- package/src/components/views/calc/trees/rows.tsx +6 -5
- package/src/components/views/forge/gui.tsx +2 -1
- package/src/components/views/forge/index.tsx +14 -7
- package/src/components/views/forge/list.tsx +3 -2
- package/src/components/views/forge/workbench/controls.tsx +13 -6
- package/src/components/views/forge/workbench/index.tsx +3 -2
- package/src/components/views/forge/workbench/panel.tsx +1 -0
- package/src/components/views/forge/workbench/ruler.tsx +5 -4
- package/src/components/views/forge/workbench/status.tsx +6 -5
- package/src/components/views/forge/workbench/tape.tsx +5 -4
- package/src/hooks/alloy/use-fluid-colors.ts +12 -9
- package/src/hooks/alloy/use-mix-state.ts +3 -2
- package/src/hooks/calc/flow/use-engage.ts +129 -0
- package/src/hooks/calc/flow/use-handlers.ts +192 -0
- package/src/hooks/calc/flow/use-layout.ts +105 -0
- package/src/hooks/calc/flow/{mount.ts → use-mount.ts} +1 -0
- package/src/hooks/calc/flow/{nodes.ts → use-nodes.ts} +46 -37
- package/src/hooks/calc/flow/use-pickers.ts +57 -0
- package/src/hooks/calc/flow/{viewport.ts → use-viewport.ts} +13 -26
- package/src/hooks/calc/flow/{window.ts → use-window.ts} +1 -0
- package/src/hooks/calc/use-actions.ts +208 -229
- package/src/hooks/calc/use-amounts.ts +23 -60
- package/src/hooks/calc/use-data.ts +106 -192
- package/src/hooks/calc/use-defaults.ts +4 -2
- package/src/hooks/calc/use-far-mode.ts +1 -0
- package/src/hooks/calc/use-focus.ts +8 -7
- package/src/hooks/calc/use-maps.ts +1 -0
- package/src/hooks/calc/use-reset.ts +1 -0
- package/src/hooks/calc/use-resolver.ts +32 -196
- package/src/hooks/calc/use-session.ts +1 -0
- package/src/hooks/calc/use-share.ts +5 -2
- package/src/hooks/calc/use-storage.ts +5 -4
- package/src/hooks/calc/use-tier.ts +1 -0
- package/src/hooks/calc/use-view-mode.ts +1 -0
- package/src/hooks/calc/use-worker.ts +56 -121
- package/src/hooks/forge/use-anvil-gui.ts +4 -2
- package/src/hooks/forge/use-forge-state.ts +1 -0
- package/src/hooks/forge/use-ruler.ts +1 -0
- package/src/hooks/use-add-to-calc.ts +23 -19
- package/src/hooks/use-categories-by-id.ts +18 -0
- package/src/hooks/use-favorite-hotkey.ts +1 -0
- package/src/hooks/use-favorites.ts +1 -0
- package/src/hooks/use-group-outlines.ts +1 -0
- package/src/hooks/use-hide-unused.ts +2 -1
- package/src/hooks/use-index.ts +6 -2
- package/src/hooks/use-item-feeds.ts +3 -1
- package/src/hooks/use-item-pane.ts +6 -4
- package/src/hooks/use-item-press.ts +27 -23
- package/src/hooks/use-item-tag-groups.ts +4 -2
- package/src/hooks/use-item-tooltips.ts +3 -1
- package/src/hooks/use-left-sidebar-tree.ts +11 -3
- package/src/hooks/use-mod-names.ts +4 -2
- package/src/hooks/use-mount-limit.ts +1 -0
- package/src/hooks/use-panel-cells.ts +3 -1
- package/src/hooks/use-panel-page.ts +9 -6
- package/src/hooks/use-panel-tabs.ts +2 -1
- package/src/hooks/use-query.ts +8 -6
- package/src/hooks/use-session.ts +6 -2
- package/src/hooks/use-sidebar-group.ts +3 -7
- package/src/hooks/use-tag-members.ts +3 -1
- package/src/hooks/use-tool-recipes.ts +1 -0
- package/src/hooks/use-type-filter.ts +1 -0
- package/src/lib/alloy/mix.ts +1 -0
- package/src/lib/alloy/parse.ts +1 -0
- package/src/lib/calc/defaults.ts +6 -4
- package/src/lib/calc/flow.ts +143 -107
- package/src/lib/calc/focus.ts +1 -0
- package/src/lib/calc/meta.ts +3 -1
- package/src/lib/calc/pack.ts +47 -154
- package/src/lib/calc/ports.ts +43 -0
- package/src/lib/calc/resolve.ts +6 -38
- package/src/lib/calc/route/buckets.ts +1 -0
- package/src/lib/calc/route/geometry.ts +13 -24
- package/src/lib/calc/route/index.ts +1 -0
- package/src/lib/calc/route/polyline.ts +3 -3
- package/src/lib/calc/route/router.ts +181 -57
- package/src/lib/calc/scheme.ts +226 -0
- package/src/lib/calc/storage/entry.ts +27 -19
- package/src/lib/calc/storage/index.ts +2 -0
- package/src/lib/calc/storage/keys.ts +4 -8
- package/src/lib/calc/storage/store.ts +11 -36
- package/src/lib/calc/tree/index.ts +2 -16
- package/src/lib/calc/tree/materials.ts +1 -0
- package/src/lib/calc/tree/recipe.ts +1 -0
- package/src/lib/calc/tree/share.ts +86 -149
- package/src/lib/calc/worker/api.ts +3 -11
- package/src/lib/calc/worker/fetch.ts +1 -0
- package/src/lib/calc/worker/flush.ts +7 -20
- package/src/lib/calc/worker/index.ts +1 -1
- package/src/lib/calc/worker/protocol.ts +16 -13
- package/src/lib/calc/worker/resolve.ts +32 -84
- package/src/lib/calc/worker/state.ts +5 -6
- package/src/{components/cards/card/model.ts → lib/card-model.ts} +1 -0
- package/src/lib/client/recipe-categories.ts +11 -93
- package/src/lib/client/recipe.ts +13 -11
- package/src/lib/client-index/catalog.ts +33 -27
- package/src/lib/client-index/chrome.ts +30 -30
- package/src/lib/client-index/index.ts +1 -0
- package/src/lib/client-index/registry.ts +70 -59
- package/src/lib/client-index/rows.ts +63 -57
- package/src/lib/client-index/tooltips.ts +28 -34
- package/src/lib/config.ts +2 -1
- package/src/lib/data/category/dto.ts +4 -3
- package/src/lib/data/category/load.ts +9 -8
- package/src/lib/data/category/parse.ts +4 -3
- package/src/lib/data/dto.ts +4 -3
- package/src/lib/data/grid.ts +2 -1
- package/src/lib/data/parse/entry.ts +3 -2
- package/src/lib/data/parse/index.ts +1 -0
- package/src/lib/data/parse/layout.ts +5 -2
- package/src/lib/data/parse/slots.ts +3 -2
- package/src/lib/data/parse/widgets.ts +3 -2
- package/src/lib/data/scene.ts +1 -1
- package/src/lib/data/slot-io.ts +1 -0
- package/src/lib/dump.ts +4 -3
- package/src/lib/embed.ts +22 -0
- package/src/lib/favorite-hover.ts +1 -0
- package/src/lib/fluid-outputs.ts +10 -12
- package/src/lib/forge/actions.ts +2 -1
- package/src/lib/forge/data.ts +2 -1
- package/src/lib/forge/solve.ts +1 -0
- package/src/lib/group.ts +1 -0
- package/src/lib/index-store.ts +15 -9
- package/src/lib/links.ts +15 -9
- package/src/lib/lookup.ts +10 -8
- package/src/lib/panel-outline.ts +1 -0
- package/src/lib/panel.ts +3 -2
- package/src/lib/preview.ts +12 -8
- package/src/lib/recipe-slots.ts +1 -0
- package/src/lib/search.ts +1 -0
- package/src/lib/sidebar.ts +1 -0
- package/src/lib/used-items.ts +1 -0
- package/src/locales/en_us.json +170 -226
- package/src/locales/ru_ru.json +170 -226
- package/src/locales.ts +1 -0
- package/src/types/alloy.ts +1 -0
- package/src/{hooks/calc/flow/props.ts → types/calc-flow-props.ts} +18 -14
- package/src/types/calc.ts +41 -44
- package/src/types/forge.ts +1 -0
- package/src/types/index.ts +4 -2
- package/styles/calc.css +308 -47
- package/src/components/cards/fit-card.tsx +0 -26
- package/src/components/views/calc/target.tsx +0 -271
- package/src/hooks/calc/flow/engage.ts +0 -89
- package/src/hooks/calc/flow/handlers.ts +0 -115
- package/src/hooks/calc/flow/layout.ts +0 -149
- package/src/hooks/calc/flow/pickers.ts +0 -50
- package/src/hooks/calc/use-calc-fill.ts +0 -91
- package/src/hooks/calc/use-density.ts +0 -28
- package/src/hooks/calc/use-derived.ts +0 -258
- package/src/hooks/calc/use-direction.ts +0 -23
- package/src/hooks/calc/use-edge-style.ts +0 -40
- package/src/hooks/calc/use-fill.ts +0 -213
- package/src/lib/alloy/alloy.test.ts +0 -186
- package/src/lib/calc/tree/build.ts +0 -196
- package/src/lib/calc/tree/context.ts +0 -42
- package/src/lib/calc/tree/goal.ts +0 -64
- package/src/lib/calc/tree/ideal.ts +0 -36
- package/src/lib/calc/tree/pick.ts +0 -68
- package/src/lib/calc/tree/tree.test.ts +0 -169
- package/src/lib/calc/worker/fill.ts +0 -123
- package/src/lib/client-index/cache.ts +0 -13
- package/src/lib/forge/forge.test.ts +0 -123
|
@@ -1,169 +0,0 @@
|
|
|
1
|
-
import assert from 'node:assert/strict';
|
|
2
|
-
import { test } from 'node:test';
|
|
3
|
-
import type {
|
|
4
|
-
CalcRecipe,
|
|
5
|
-
CalcRecipeInput,
|
|
6
|
-
CalcRecipeSummary,
|
|
7
|
-
CalcMaterial,
|
|
8
|
-
} from '@terrafirmagreg-team/recipe/types/calc';
|
|
9
|
-
import type { RecipeCompactRow } from '@terrafirmagreg-team/recipe/types';
|
|
10
|
-
import type { BuildContext } from './context';
|
|
11
|
-
import { buildGoal } from './goal';
|
|
12
|
-
import { idealBatchMultiplier } from './ideal';
|
|
13
|
-
|
|
14
|
-
const input = (
|
|
15
|
-
id: string,
|
|
16
|
-
amount: number,
|
|
17
|
-
extra?: Partial<CalcRecipeInput>,
|
|
18
|
-
): CalcRecipeInput => ({
|
|
19
|
-
id,
|
|
20
|
-
kind: 'item',
|
|
21
|
-
amount,
|
|
22
|
-
catalyst: false,
|
|
23
|
-
...extra,
|
|
24
|
-
});
|
|
25
|
-
|
|
26
|
-
const output = (id: string, amount: number, chance?: number): CalcMaterial => ({
|
|
27
|
-
id,
|
|
28
|
-
kind: 'item',
|
|
29
|
-
amount,
|
|
30
|
-
...(chance !== undefined ? { chance } : {}),
|
|
31
|
-
});
|
|
32
|
-
|
|
33
|
-
const recipe = (
|
|
34
|
-
recipeId: string,
|
|
35
|
-
inputs: CalcRecipeInput[],
|
|
36
|
-
outputs: CalcMaterial[],
|
|
37
|
-
): CalcRecipe => ({ recipeId, category: 'test', inputs, outputs });
|
|
38
|
-
|
|
39
|
-
const summary = (
|
|
40
|
-
recipe: CalcRecipe,
|
|
41
|
-
): CalcRecipeSummary => ({
|
|
42
|
-
recipeId: recipe.recipeId,
|
|
43
|
-
category: 'test',
|
|
44
|
-
outputAmount: recipe.outputs[0]?.amount ?? 1,
|
|
45
|
-
row: {
|
|
46
|
-
id: recipe.recipeId,
|
|
47
|
-
type: 0,
|
|
48
|
-
in: recipe.inputs.map((row) => row.id),
|
|
49
|
-
out: recipe.outputs.map((row) => row.id),
|
|
50
|
-
} satisfies RecipeCompactRow,
|
|
51
|
-
});
|
|
52
|
-
|
|
53
|
-
const ctx = (
|
|
54
|
-
recipes: CalcRecipe[],
|
|
55
|
-
): Omit<BuildContext, 'pool' | 'used' | 'usedMaterials'> => {
|
|
56
|
-
const outs = new Map<string, CalcRecipeSummary[]>();
|
|
57
|
-
for (const r of recipes) {
|
|
58
|
-
for (const out of r.outputs) {
|
|
59
|
-
const key = `${out.kind}:${out.id}`;
|
|
60
|
-
outs.set(key, [...(outs.get(key) ?? []), summary(r)]);
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
return {
|
|
64
|
-
recipeMap: new Map(recipes.map((r) => [r.recipeId, r])),
|
|
65
|
-
getRecipesForItem: (id, kind) => outs.get(`${kind}:${id}`) ?? [],
|
|
66
|
-
selections: {},
|
|
67
|
-
tagSelections: {},
|
|
68
|
-
tagMembers: () => undefined,
|
|
69
|
-
|
|
70
|
-
autoRoots: ['g0'],
|
|
71
|
-
};
|
|
72
|
-
};
|
|
73
|
-
|
|
74
|
-
const stock = (id: string, amount: number): CalcMaterial => ({
|
|
75
|
-
id,
|
|
76
|
-
kind: 'item',
|
|
77
|
-
amount,
|
|
78
|
-
});
|
|
79
|
-
|
|
80
|
-
test('inventory seeds the pool and covers the goal demand first', () => {
|
|
81
|
-
|
|
82
|
-
const r = recipe('r1', [input('a', 1)], [output('t', 1)]);
|
|
83
|
-
const goal = buildGoal(
|
|
84
|
-
{ id: 't', kind: 'item', amount: 2 },
|
|
85
|
-
ctx([r]),
|
|
86
|
-
'g0',
|
|
87
|
-
[stock('a', 2)],
|
|
88
|
-
);
|
|
89
|
-
const child = goal.node.children[0]!;
|
|
90
|
-
assert.equal(goal.node.need, 2);
|
|
91
|
-
assert.equal(goal.node.batches, 2);
|
|
92
|
-
assert.equal(child.satisfied, 2);
|
|
93
|
-
assert.equal(child.need, 0);
|
|
94
|
-
});
|
|
95
|
-
|
|
96
|
-
test('goal demand eats inventory directly when the pool holds the target', () => {
|
|
97
|
-
const goal = buildGoal(
|
|
98
|
-
{ id: 't', kind: 'item', amount: 5 },
|
|
99
|
-
ctx([]),
|
|
100
|
-
'g0',
|
|
101
|
-
[stock('t', 2)],
|
|
102
|
-
);
|
|
103
|
-
assert.equal(goal.node.satisfied, 2);
|
|
104
|
-
assert.equal(goal.node.need, 3);
|
|
105
|
-
});
|
|
106
|
-
|
|
107
|
-
test('consume chance scales the expected child demand', () => {
|
|
108
|
-
|
|
109
|
-
const r = recipe(
|
|
110
|
-
'r1',
|
|
111
|
-
[input('a', 2, { chance: 0.5 })],
|
|
112
|
-
[output('t', 1)],
|
|
113
|
-
);
|
|
114
|
-
const goal = buildGoal(
|
|
115
|
-
{ id: 't', kind: 'item', amount: 1 },
|
|
116
|
-
ctx([r]),
|
|
117
|
-
'g0',
|
|
118
|
-
);
|
|
119
|
-
const child = goal.node.children[0]!;
|
|
120
|
-
assert.equal(child.amount, 1);
|
|
121
|
-
assert.equal(child.consumeChance, 0.5);
|
|
122
|
-
});
|
|
123
|
-
|
|
124
|
-
test('chance-weighted secondary outputs feed the remainder pool', () => {
|
|
125
|
-
|
|
126
|
-
const r = recipe(
|
|
127
|
-
'r1',
|
|
128
|
-
[input('a', 1)],
|
|
129
|
-
[output('t', 1), output('s', 1, 0.25)],
|
|
130
|
-
);
|
|
131
|
-
const goal = buildGoal(
|
|
132
|
-
{ id: 't', kind: 'item', amount: 2 },
|
|
133
|
-
ctx([r]),
|
|
134
|
-
'g0',
|
|
135
|
-
);
|
|
136
|
-
const side = goal.remainders.find((row) => row.id === 's');
|
|
137
|
-
assert.ok(side);
|
|
138
|
-
assert.equal(side.amount, 0.5);
|
|
139
|
-
});
|
|
140
|
-
|
|
141
|
-
test('ideal batch is the LCM of divisibility constraints', () => {
|
|
142
|
-
|
|
143
|
-
const ore = recipe('ore', [input('rock', 1)], [output('ingot', 2)]);
|
|
144
|
-
const plate = recipe('plate', [input('ingot', 3)], [output('plate', 1)]);
|
|
145
|
-
const goal = buildGoal(
|
|
146
|
-
{ id: 'plate', kind: 'item', amount: 1 },
|
|
147
|
-
ctx([ore, plate]),
|
|
148
|
-
'g0',
|
|
149
|
-
);
|
|
150
|
-
assert.equal(idealBatchMultiplier(goal.node), 2);
|
|
151
|
-
});
|
|
152
|
-
|
|
153
|
-
test('ideal batch uses the post-pool need, not the raw demand', () => {
|
|
154
|
-
|
|
155
|
-
const r = recipe('r1', [input('a', 1)], [output('t', 2)]);
|
|
156
|
-
const withStock = buildGoal(
|
|
157
|
-
{ id: 't', kind: 'item', amount: 3 },
|
|
158
|
-
ctx([r]),
|
|
159
|
-
'g0',
|
|
160
|
-
[stock('t', 1)],
|
|
161
|
-
);
|
|
162
|
-
assert.equal(idealBatchMultiplier(withStock.node), 1);
|
|
163
|
-
const bare = buildGoal(
|
|
164
|
-
{ id: 't', kind: 'item', amount: 3 },
|
|
165
|
-
ctx([r]),
|
|
166
|
-
'g0',
|
|
167
|
-
);
|
|
168
|
-
assert.equal(idealBatchMultiplier(bare.node), 2);
|
|
169
|
-
});
|
|
@@ -1,123 +0,0 @@
|
|
|
1
|
-
import type { CalcNode, CalcRecipe } from '@terrafirmagreg-team/recipe/types/calc';
|
|
2
|
-
import { pickAutoRecipe } from '@terrafirmagreg-team/recipe/lib/calc/resolve';
|
|
3
|
-
import {
|
|
4
|
-
AUTO_NODE_BUDGET,
|
|
5
|
-
buildGoal,
|
|
6
|
-
type BuildContext,
|
|
7
|
-
type CalcGoal,
|
|
8
|
-
} from '@terrafirmagreg-team/recipe/lib/calc/tree';
|
|
9
|
-
import { createWorkerSummaries, fetchWanted } from './fetch';
|
|
10
|
-
import { createFlush, postFlush } from './flush';
|
|
11
|
-
import type { ResolveInput } from './protocol';
|
|
12
|
-
import { state } from './state';
|
|
13
|
-
|
|
14
|
-
export async function runFill(
|
|
15
|
-
input: ResolveInput & { roots: string[] },
|
|
16
|
-
): Promise<Record<string, string>> {
|
|
17
|
-
const gen = state.fillGen;
|
|
18
|
-
const picks: Record<string, string> = {};
|
|
19
|
-
const openCollapsed = new Set<string>();
|
|
20
|
-
const localRecipes = new Map<string, CalcRecipe>(state.recipeMap);
|
|
21
|
-
const summaries = createWorkerSummaries(localRecipes);
|
|
22
|
-
const pending = createFlush();
|
|
23
|
-
const merged = { ...input.selections };
|
|
24
|
-
let latestGoals: CalcGoal[] | undefined;
|
|
25
|
-
for (let iter = 0; iter < 200 && input.roots.length; iter += 1) {
|
|
26
|
-
if (gen !== state.fillGen) return {};
|
|
27
|
-
Object.assign(merged, picks);
|
|
28
|
-
const ctxAuto = (
|
|
29
|
-
budget: number,
|
|
30
|
-
): Omit<BuildContext, 'pool' | 'used' | 'usedMaterials'> => ({
|
|
31
|
-
recipeMap: localRecipes,
|
|
32
|
-
getRecipesForItem: summaries.get,
|
|
33
|
-
selections: merged,
|
|
34
|
-
tagSelections: input.tagSelections,
|
|
35
|
-
tagMembers: (id) => state.tagMap.get(id),
|
|
36
|
-
collapsed: openCollapsed,
|
|
37
|
-
autoRoots: input.roots,
|
|
38
|
-
autoBudget: { left: budget },
|
|
39
|
-
recipesResolved: (id) => state.outMap.has(id),
|
|
40
|
-
deadIds: state.deadIds,
|
|
41
|
-
});
|
|
42
|
-
const wanted = new Set<string>();
|
|
43
|
-
const wantedOut = new Set<string>();
|
|
44
|
-
const wantedTag = new Set<string>();
|
|
45
|
-
const built: CalcGoal[] = [];
|
|
46
|
-
if (input.target) {
|
|
47
|
-
const goalCtx = ctxAuto(AUTO_NODE_BUDGET);
|
|
48
|
-
const goal = buildGoal(input.target, goalCtx, 'g0', input.inventory);
|
|
49
|
-
built.push(goal);
|
|
50
|
-
const walk = (n: CalcNode, ancestors: Set<string>): void => {
|
|
51
|
-
const next =
|
|
52
|
-
n.recipe && n.need > 0
|
|
53
|
-
? new Set(ancestors).add(`${n.kind}:${n.materialId}`)
|
|
54
|
-
: ancestors;
|
|
55
|
-
if (n.path) {
|
|
56
|
-
if (n.recipe) picks[n.path] = n.recipe.recipeId;
|
|
57
|
-
else if (n.auto && !n.catalyst && n.availableRecipes.length) {
|
|
58
|
-
const autoPick = pickAutoRecipe(n, merged, ancestors, goalCtx);
|
|
59
|
-
if (
|
|
60
|
-
autoPick.pick &&
|
|
61
|
-
!localRecipes.has(autoPick.pick) &&
|
|
62
|
-
!state.deadIds.has(autoPick.pick)
|
|
63
|
-
)
|
|
64
|
-
wanted.add(autoPick.pick);
|
|
65
|
-
for (const id of autoPick.wantRecipes) {
|
|
66
|
-
if (!localRecipes.has(id) && !state.deadIds.has(id)) wanted.add(id);
|
|
67
|
-
}
|
|
68
|
-
for (const id of autoPick.wantOut) {
|
|
69
|
-
if (!state.outMap.has(id)) wantedOut.add(id);
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
if (n.tagId && !state.tagMap.has(n.tagId)) {
|
|
74
|
-
wantedTag.add(n.tagId);
|
|
75
|
-
} else if (!state.outMap.has(n.materialId)) {
|
|
76
|
-
wantedOut.add(n.materialId);
|
|
77
|
-
}
|
|
78
|
-
for (const child of n.children) walk(child, next);
|
|
79
|
-
};
|
|
80
|
-
walk(goal.node, new Set());
|
|
81
|
-
}
|
|
82
|
-
for (const id of Object.values(merged)) {
|
|
83
|
-
if (id && !localRecipes.has(id) && !state.deadIds.has(id)) wanted.add(id);
|
|
84
|
-
}
|
|
85
|
-
latestGoals = built;
|
|
86
|
-
if (!wanted.size && !wantedOut.size && !wantedTag.size) break;
|
|
87
|
-
const progressed = await fetchWanted(
|
|
88
|
-
pending,
|
|
89
|
-
wanted,
|
|
90
|
-
wantedOut,
|
|
91
|
-
wantedTag,
|
|
92
|
-
localRecipes,
|
|
93
|
-
);
|
|
94
|
-
if (gen !== state.fillGen) return {};
|
|
95
|
-
if (!progressed) break;
|
|
96
|
-
summaries.clear();
|
|
97
|
-
if (iter % 5 === 4) postFlush(pending, latestGoals);
|
|
98
|
-
}
|
|
99
|
-
for (const [id, recipe] of localRecipes) {
|
|
100
|
-
if (!state.recipeMap.has(id)) {
|
|
101
|
-
state.recipeMap.set(id, recipe);
|
|
102
|
-
pending.recipes.set(id, recipe);
|
|
103
|
-
pending.dirty = true;
|
|
104
|
-
}
|
|
105
|
-
}
|
|
106
|
-
postFlush(pending, latestGoals);
|
|
107
|
-
|
|
108
|
-
const out: Record<string, string> = {};
|
|
109
|
-
const collect = (n: CalcNode): void => {
|
|
110
|
-
if (
|
|
111
|
-
n.path &&
|
|
112
|
-
n.recipe &&
|
|
113
|
-
input.roots.some(
|
|
114
|
-
(root) => n.path === root || n.path!.startsWith(`${root}/`),
|
|
115
|
-
)
|
|
116
|
-
) {
|
|
117
|
-
out[n.path] = n.recipe.recipeId;
|
|
118
|
-
}
|
|
119
|
-
for (const child of n.children) collect(child);
|
|
120
|
-
};
|
|
121
|
-
for (const goal of latestGoals ?? []) collect(goal.node);
|
|
122
|
-
return out;
|
|
123
|
-
}
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
|
|
2
|
-
export function memoPending<V>(
|
|
3
|
-
cache: Map<string, Promise<V>>,
|
|
4
|
-
key: string,
|
|
5
|
-
pending: Promise<V>,
|
|
6
|
-
): Promise<V> {
|
|
7
|
-
const live = pending.catch((err: unknown) => {
|
|
8
|
-
cache.delete(key);
|
|
9
|
-
throw err;
|
|
10
|
-
});
|
|
11
|
-
cache.set(key, live);
|
|
12
|
-
return live;
|
|
13
|
-
}
|
|
@@ -1,123 +0,0 @@
|
|
|
1
|
-
import assert from 'node:assert/strict';
|
|
2
|
-
import { test } from 'node:test';
|
|
3
|
-
import {
|
|
4
|
-
FORGE_ACTIONS,
|
|
5
|
-
forgeRulesMatch,
|
|
6
|
-
parseForgeRuleTooltip,
|
|
7
|
-
} from './actions';
|
|
8
|
-
import { solveForgeSteps } from './solve';
|
|
9
|
-
import type { ForgeRule, ForgeRuleAction } from '@terrafirmagreg-team/recipe/types/forge';
|
|
10
|
-
|
|
11
|
-
const fresh = { work: 0, last: [] as ForgeRuleAction[] };
|
|
12
|
-
|
|
13
|
-
test('parses dump tooltips and all rule positions', () => {
|
|
14
|
-
assert.deepEqual(parseForgeRuleTooltip('§aHit Second Last'), {
|
|
15
|
-
action: 'hit',
|
|
16
|
-
order: 'second_last',
|
|
17
|
-
});
|
|
18
|
-
assert.equal(parseForgeRuleTooltip('Unknown Last'), undefined);
|
|
19
|
-
for (const order of [
|
|
20
|
-
'last',
|
|
21
|
-
'second_last',
|
|
22
|
-
'third_last',
|
|
23
|
-
'not_last',
|
|
24
|
-
'any',
|
|
25
|
-
] as const) {
|
|
26
|
-
const last: ForgeRuleAction[] = ['hit', 'bend', 'punch'];
|
|
27
|
-
assert.equal(
|
|
28
|
-
forgeRulesMatch([{ action: 'hit', order }], last),
|
|
29
|
-
order === 'last' || order === 'any',
|
|
30
|
-
);
|
|
31
|
-
}
|
|
32
|
-
assert.equal(
|
|
33
|
-
forgeRulesMatch([{ action: 'hit', order: 'not_last' }], ['hit']),
|
|
34
|
-
false,
|
|
35
|
-
);
|
|
36
|
-
});
|
|
37
|
-
|
|
38
|
-
test('finds shortest unconstrained paths and rejects invalid targets', () => {
|
|
39
|
-
assert.deepEqual(solveForgeSteps(fresh, 0, []), []);
|
|
40
|
-
assert.deepEqual(solveForgeSteps(fresh, 16, []), [7]);
|
|
41
|
-
for (const value of [-1, 150, NaN, 12.5]) {
|
|
42
|
-
assert.equal(solveForgeSteps(fresh, value, []), null);
|
|
43
|
-
}
|
|
44
|
-
const distance = new Int32Array(150).fill(-1);
|
|
45
|
-
distance[0] = 0;
|
|
46
|
-
const queue = [0];
|
|
47
|
-
for (const work of queue) {
|
|
48
|
-
for (const { delta } of FORGE_ACTIONS) {
|
|
49
|
-
const next = work + delta;
|
|
50
|
-
if (next < 0 || next >= 150 || distance[next] !== -1) continue;
|
|
51
|
-
distance[next] = distance[work] + 1;
|
|
52
|
-
queue.push(next);
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
for (let target = 0; target < 150; target++) {
|
|
56
|
-
assert.equal(
|
|
57
|
-
solveForgeSteps(fresh, target, [])?.length,
|
|
58
|
-
distance[target],
|
|
59
|
-
);
|
|
60
|
-
}
|
|
61
|
-
});
|
|
62
|
-
|
|
63
|
-
test('solutions respect work bounds and dumped finishing rules', () => {
|
|
64
|
-
const rules = ['Upset Last', 'Bend Not Last', 'Punch Not Last'].map(
|
|
65
|
-
(text) => parseForgeRuleTooltip(text)!,
|
|
66
|
-
);
|
|
67
|
-
for (const target of [40, 70, 100, 113, 149]) {
|
|
68
|
-
const steps = solveForgeSteps(fresh, target, rules);
|
|
69
|
-
assert.ok(steps);
|
|
70
|
-
let work = 0;
|
|
71
|
-
for (const step of steps) {
|
|
72
|
-
work += FORGE_ACTIONS[step].delta;
|
|
73
|
-
assert.ok(work >= 0 && work < 150);
|
|
74
|
-
}
|
|
75
|
-
assert.equal(work, target);
|
|
76
|
-
assert.ok(
|
|
77
|
-
forgeRulesMatch(
|
|
78
|
-
rules,
|
|
79
|
-
steps
|
|
80
|
-
.slice(-3)
|
|
81
|
-
.reverse()
|
|
82
|
-
.map((step) => FORGE_ACTIONS[step].action),
|
|
83
|
-
),
|
|
84
|
-
);
|
|
85
|
-
}
|
|
86
|
-
assert.equal(
|
|
87
|
-
solveForgeSteps(fresh, 80, [
|
|
88
|
-
{ action: 'hit', order: 'last' },
|
|
89
|
-
{ action: 'bend', order: 'last' },
|
|
90
|
-
]),
|
|
91
|
-
null,
|
|
92
|
-
);
|
|
93
|
-
});
|
|
94
|
-
|
|
95
|
-
test('solves from a mid-work state and respects existing history', () => {
|
|
96
|
-
const rules: ForgeRule[] = [{ action: 'punch', order: 'last' }];
|
|
97
|
-
const start = { work: 58, last: ['bend', 'upset'] as ForgeRuleAction[] };
|
|
98
|
-
const steps = solveForgeSteps(start, 70, rules);
|
|
99
|
-
assert.ok(steps);
|
|
100
|
-
let work = start.work;
|
|
101
|
-
for (const step of steps) work += FORGE_ACTIONS[step].delta;
|
|
102
|
-
assert.equal(work, 70);
|
|
103
|
-
const last = [...start.last, ...steps.map((i) => FORGE_ACTIONS[i].action)]
|
|
104
|
-
.slice(-3)
|
|
105
|
-
.reverse();
|
|
106
|
-
assert.ok(forgeRulesMatch(rules, last));
|
|
107
|
-
|
|
108
|
-
const solved = solveForgeSteps(
|
|
109
|
-
{ work: 70, last: ['bend'] as ForgeRuleAction[] },
|
|
110
|
-
70,
|
|
111
|
-
rules,
|
|
112
|
-
);
|
|
113
|
-
assert.ok(solved && solved.length > 0);
|
|
114
|
-
assert.equal(FORGE_ACTIONS[solved.at(-1)!].action, 'punch');
|
|
115
|
-
assert.equal(
|
|
116
|
-
solveForgeSteps(
|
|
117
|
-
{ work: 70, last: ['punch'] as ForgeRuleAction[] },
|
|
118
|
-
70,
|
|
119
|
-
rules,
|
|
120
|
-
)?.length,
|
|
121
|
-
0,
|
|
122
|
-
);
|
|
123
|
-
});
|