-CraftingComponentJson Interface +ComponentJson Interface
```typescript -interface CraftingComponentJson { - +interface ComponentJson { + /** * The UUID of the Item document for this component * */ @@ -326,18 +326,18 @@ CraftingSystem#mutateComponent ```typescript /** - * Modifies an existing component by applying the mutations defined in the supplied `CraftingComponentJson` - * - * @param id The ID of the component to modify - * @param the complete target state of the component to apply. Anything you omit is deleted - * @return a Promise that resolves to the updated crafting component - * - * @throws an Error if the ID is not for an existing component - * @throws an Error if the the component dictionary has not been loaded - * @throws an Error if the mutation contains an invalid item UUID - * @throws an Error if the mutation references essences or components that do not exist - * */ -mutateComponent(id: string, mutation: CraftingComponentJson): Promise
+
+{/if}
\ No newline at end of file
diff --git a/src/applications/common/CraftingComponentCarousel.svelte b/src/applications/common/CraftingComponentCarousel.svelte
deleted file mode 100644
index 7f2f84c4..00000000
--- a/src/applications/common/CraftingComponentCarousel.svelte
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
+
+
+
+
+ {selectedSalvageAttempt.optionName}
+ +
+
+ {#if selectedSalvageAttempt.requiresCatalysts}
+ {localization.localize(`${localizationPath}.hints.requiresCatalysts`)}
+
+
+ {/if}
+
- {#each craftingComponent.salvageOptions as option}
- {#if option.name === selectedOptionName}
-
\ No newline at end of file
diff --git a/src/applications/common/CraftingComponentGrid.svelte b/src/applications/common/CraftingComponentGrid.svelte
index 4e6267e3..ab106ed3 100644
--- a/src/applications/common/CraftingComponentGrid.svelte
+++ b/src/applications/common/CraftingComponentGrid.svelte
@@ -9,18 +9,22 @@
-
- {/if}
- {/each}
-
-
-
- {option.name}
- -
-
-
{#each componentCombination.units as unit}
- ;
- private readonly _allowedCraftingComponentsByItemUuid: Map;
+ private readonly _allowedCraftingComponentsById: Map;
+ private readonly _allowedCraftingComponentsByItemUuid: Map;
constructor({
localizationService,
@@ -54,7 +54,7 @@ class DropEventParser {
}: {
localizationService: LocalizationService;
partType: string;
- allowedCraftingComponents?: CraftingComponent[];
+ allowedCraftingComponents?: Component[];
documentManager: DocumentManager;
strict?: boolean;
}) {
@@ -86,7 +86,7 @@ class DropEventParser {
ui.notifications.warn(message);
return new DropData({});
}
- const itemData = await this._documentManager.getDocumentByUuid(dropData.uuid);
+ const itemData = await this._documentManager.loadItemDataByDocumentUuid(dropData.uuid);
if (this._strict && ! this._allowedCraftingComponentsByItemUuid.has(itemData.uuid)) {
const message = this._localizationService.format(
`${Properties.module.id}.DropEventParser.errors.unrecognisedComponent`,
@@ -145,7 +145,7 @@ class DropEventParser {
return new DropData({});
}
- public static serialiseComponentData(component: CraftingComponent): string {
+ public static serialiseComponentData(component: Component): string {
return JSON.stringify({ componentId: component.id });
}
diff --git a/src/applications/common/EventBus.ts b/src/applications/common/EventBus.ts
index 54827963..c5e7bb5c 100644
--- a/src/applications/common/EventBus.ts
+++ b/src/applications/common/EventBus.ts
@@ -1,6 +1,6 @@
import {CraftingSystem} from "../../scripts/system/CraftingSystem";
-import {CraftingComponent} from "../../scripts/common/CraftingComponent";
-import {Recipe} from "../../scripts/common/Recipe";
+import {Component} from "../../scripts/crafting/component/Component";
+import {Recipe} from "../../scripts/crafting/recipe/Recipe";
const registeredNodes: Map = new Map();
const eventBus = function(node: any, eventTypes: string[] | string) {
@@ -43,7 +43,7 @@ function craftingSystemUpdated(craftingSystem: CraftingSystem) {
dispatch(eventType, event);
}
-function componentUpdated(craftingComponent: CraftingComponent) {
+function componentUpdated(craftingComponent: Component) {
const eventType = "componentUpdated";
const event = new CustomEvent(eventType, { bubbles: true, detail: craftingComponent });
dispatch(eventType, event);
diff --git a/src/applications/common/LocalizationService.ts b/src/applications/common/LocalizationService.ts
index dac2d118..2b924068 100644
--- a/src/applications/common/LocalizationService.ts
+++ b/src/applications/common/LocalizationService.ts
@@ -4,9 +4,9 @@ interface LocalizationService {
localizeAll(basePath: string, childPaths: string[], lineBreak: boolean): string;
- localize(path: string): any;
+ localize(path: string): string;
- format(path: string, params: {}): any;
+ format(path: string, params: {}): string;
}
diff --git a/src/applications/common/OpenItemSheet.ts b/src/applications/common/OpenItemSheet.ts
index f31531f5..df78a6a2 100644
--- a/src/applications/common/OpenItemSheet.ts
+++ b/src/applications/common/OpenItemSheet.ts
@@ -2,7 +2,7 @@ import {DefaultDocumentManager} from "../../scripts/foundry/DocumentManager";
const openItemSheet = function openItemSheet(node: any, itemUuid: string) {
node.onclick = async () => {
- const document = await new DefaultDocumentManager().getDocumentByUuid(itemUuid);
+ const document = await new DefaultDocumentManager().loadItemDataByDocumentUuid(itemUuid);
await document.sourceDocument.sheet.render(true);
};
return {
diff --git a/src/applications/common/Tabs.svelte b/src/applications/common/Tabs.svelte
index 16e871eb..cc3e57b3 100644
--- a/src/applications/common/Tabs.svelte
+++ b/src/applications/common/Tabs.svelte
@@ -4,7 +4,7 @@
diff --git a/src/applications/common/TrackedCraftingComponentGrid.svelte b/src/applications/common/TrackedCraftingComponentGrid.svelte
new file mode 100644
index 00000000..63192f76
--- /dev/null
+++ b/src/applications/common/TrackedCraftingComponentGrid.svelte
@@ -0,0 +1,32 @@
+
+
+
-
\ No newline at end of file
diff --git a/src/applications/common/DropEventParser.ts b/src/applications/common/DropEventParser.ts
index 0dfaef29..c4d5864d 100644
--- a/src/applications/common/DropEventParser.ts
+++ b/src/applications/common/DropEventParser.ts
@@ -1,18 +1,18 @@
import {DocumentManager, FabricateItemData} from "../../scripts/foundry/DocumentManager";
import Properties from "../../scripts/Properties";
-import {CraftingComponent} from "../../scripts/common/CraftingComponent";
+import {Component} from "../../scripts/crafting/component/Component";
import {LocalizationService} from "./LocalizationService";
class DropData {
private readonly _itemData: FabricateItemData;
- private readonly _component: CraftingComponent;
+ private readonly _component: Component;
constructor({
itemData,
component
}: {
itemData?: FabricateItemData;
- component?: CraftingComponent;
+ component?: Component;
}) {
this._itemData = itemData;
this._component = component;
@@ -22,7 +22,7 @@ class DropData {
return this._itemData;
}
- get component(): CraftingComponent {
+ get component(): Component {
return this._component;
}
@@ -42,8 +42,8 @@ class DropEventParser {
private readonly _partType: string;
private readonly _strict: boolean;
private readonly _documentManager: DocumentManager;
- private readonly _allowedCraftingComponentsById: Map
-
- {truncate(unit.part.name, nameLength)}
-
-
+ {:catch error}
+ {/await}
{/each}
- 
- {#if unit.quantity > 1}
- {unit.quantity}
- {/if}
+ {#await unit.element.load()}
+ {:then nothing}
+
-
+
-
+
+ {truncate(unit.element.name, nameLength)}
+
+
+ 
+ {#if unit.quantity > 1}
+ {unit.quantity}
+ {/if}
+
+
+ {#each trackedCombination.units as unit}
+
\ No newline at end of file
diff --git a/src/applications/componentSalvageApp/ComponentSalvageApp.svelte b/src/applications/componentSalvageApp/ComponentSalvageApp.svelte
index 49aff381..a0247035 100644
--- a/src/applications/componentSalvageApp/ComponentSalvageApp.svelte
+++ b/src/applications/componentSalvageApp/ComponentSalvageApp.svelte
@@ -8,132 +8,161 @@
import eventBus from "../common/EventBus";
import { localizationKey } from "../common/LocalizationService";
import Properties from "../../scripts/Properties";
- import CraftingComponentCarousel from "../common/CraftingComponentCarousel.svelte";
- import {SuccessfulSalvageResult} from "../../scripts/crafting/result/SalvageResult";
- import {Combination} from "../../scripts/common/Combination";
+ import ComponentSalvageCarousel from "../common/ComponentSalvageCarousel.svelte";
+ import CraftingAttemptCarousel from "../recipeCraftingApp/CraftingAttemptCarousel.svelte";
+ import TrackedCraftingComponentGrid from "../common/TrackedCraftingComponentGrid.svelte";
const localizationPath = `${Properties.module.id}.ComponentSalvageApp`;
- export let craftingComponent;
- export let inventory;
- export let ownedComponentsOfType;
+ export let componentSalvageManager;
+
export let localization;
export let closeHook;
- let selectedOptionName = craftingComponent.firstOptionName;
- if (selectedOptionName) {
- craftingComponent.selectSalvageOption(selectedOptionName);
+ let salvageAttempts = [];
+ let selectedSalvageAttempt;
+
+ async function loadAppData() {
+ salvageAttempts = await componentSalvageManager.loadSalvageAttempts();
+ if (!selectedSalvageAttempt && salvageAttempts.length > 0) {
+ selectedSalvageAttempt = salvageAttempts[0];
+ }
+ if (selectedSalvageAttempt && salvageAttempts.length > 0) {
+ selectedSalvageAttempt = salvageAttempts.find((attempt) => attempt.optionId === selectedSalvageAttempt.optionId);
+ }
}
+ onMount(loadAppData);
+
+ function selectNextSalvageOption() {
+ const currentIndex = salvageAttempts.findIndex((attempt) => attempt.optionId === selectedSalvageAttempt.optionId);
+ if (currentIndex === salvageAttempts.length - 1) {
+ selectedSalvageAttempt = salvageAttempts[0];
+ } else {
+ selectedSalvageAttempt = salvageAttempts[currentIndex + 1];
+ }
+ }
+
+ function selectPreviousSalvageOption() {
+ const currentIndex = salvageAttempts.findIndex((attempt) => attempt.optionId === selectedSalvageAttempt.optionId);
+ if (currentIndex === 0) {
+ selectedSalvageAttempt = salvageAttempts[salvageAttempts.length - 1];
+ } else {
+ selectedSalvageAttempt = salvageAttempts[currentIndex - 1];
+ }
+ }
+
+
setContext(localizationKey, {
localization,
});
- onMount(async () => {
- return reIndex();
- });
-
async function doSalvage(event) {
const skipDialog = event.detail.skipDialog;
if (skipDialog) {
- return salvageComponent(craftingComponent);
+ return salvageComponent();
}
let confirm = false;
await Dialog.confirm({
title: localization.localize(`${localizationPath}.dialog.doSalvage.title`),
- content: `
+
+ {/each}
+
+
+ {truncate(unit.target.element.name, nameLength)}
+
+
+
+ 
+
+
+
+ {formatQuantity(unit.actual.quantity, unit.target.quantity)}
+${localization.format(`${localizationPath}.dialog.doSalvage.content`, { componentName: craftingComponent.name})}
`, + content: `${localization.format(`${localizationPath}.dialog.doSalvage.content`, { componentName: componentSalvageManager.componentToSalvage.name })}
`, yes: async () => { confirm = true; } }); if (confirm) { - return salvageComponent(craftingComponent); + return salvageComponent(); } } - async function salvageComponent(craftingComponent) { - const salvageResult = new SuccessfulSalvageResult({ - created: craftingComponent.selectedSalvage, - consumed: Combination.of(craftingComponent, 1) - }); - await inventory.acceptSalvageResult(salvageResult); + async function salvageComponent() { + await componentSalvageManager.doSalvage(selectedSalvageAttempt.optionId); + await loadAppData(); } - function handleComponentUpdated(event) { + async function handleComponentUpdated(event) { const updatedComponent = event.detail; - if (updatedComponent.id !== craftingComponent.id) { + if (updatedComponent.id !== componentSalvageManager.componentToSalvage.id) { return; } - craftingComponent = updatedComponent; - selectedOptionName = craftingComponent.firstOptionName; - craftingComponent.selectSalvageOption(selectedOptionName); - if (!craftingComponent.isSalvageable) { + if (!updatedComponent.isSalvageable) { closeHook(); return; } + await loadAppData(); } - async function handleItemUpdated(event) { - const { sourceId, actor } = event.detail; - // If the modified item is not owned, not owned by the actor who owns this crafting component, or is not associated with this component - if (!actor || !actor.id === inventory.actor.id || sourceId !== craftingComponent.itemUuid) { - // do nothing + async function reloadApplicableInventoryEvents(event) { + const actor = event.detail.actor; + const sourceId = event.detail.sourceId; + if (!actor) { + throw new Error("No actor provided in event detail"); + } + if (!sourceId) { + throw new Error("No sourceId provided in event detail"); + } + // If the modified item is not owned, or not owned by the actor who owns this crafting component + if (actor.id !== componentSalvageManager.actor.id) { return; } // if it is, we need to re-index the inventory - return reIndex(); + return loadAppData(); } - async function handleItemCreated(event) { - const {sourceId, actor} = event.detail; - if (!actor?.id === inventory.actor.id || sourceId !== craftingComponent.itemUuid) { - return; - } - return reIndex(); + async function handleItemUpdated(event) { + await reloadApplicableInventoryEvents(event); } - async function handleItemDeleted(event) { - const {sourceId, actor} = event.detail; - if (!actor?.id === inventory.actor.id || sourceId !== craftingComponent.itemUuid) { - return; - } - await reIndex(); - if (ownedComponentsOfType.isEmpty()) { - closeHook(); - } + async function handleItemCreated(event) { + await reloadApplicableInventoryEvents(event); } - async function reIndex() { - await inventory.index(); - const ownedComponents = inventory.ownedComponents; - ownedComponentsOfType = ownedComponents.just(craftingComponent); + async function handleItemDeleted(event) { + await reloadApplicableInventoryEvents(event); } -
-
handleComponentUpdated(e)}
- on:itemUpdated={(e) => handleItemUpdated(e)}
- on:itemCreated={(e) => handleItemCreated(e)}
- on:itemDeleted={(e) => handleItemDeleted(e)}>
- doSalvage(e)} />
- ;
+
+ load(actor: Actor, component: Component): Promise;
+
}
class DefaultComponentSalvageAppCatalog implements ComponentSalvageAppCatalog {
- private readonly _componentSalvageAppFactory: ComponentSalvageAppFactory;
- private readonly _systemRegistry: SystemRegistry;
-
private readonly _appIndex: Map = new Map();
+ private readonly _componentSalvageAppFactory: ComponentSalvageAppFactory;
constructor({
+ appIndex = new Map(),
componentSalvageAppFactory,
- systemRegistry,
- appIndex = new Map()
}: {
- componentSalvageAppFactory: ComponentSalvageAppFactory;
- systemRegistry: SystemRegistry;
appIndex?: Map;
+ componentSalvageAppFactory: ComponentSalvageAppFactory;
}) {
- this._componentSalvageAppFactory = componentSalvageAppFactory;
- this._systemRegistry = systemRegistry;
this._appIndex = appIndex;
+ this._componentSalvageAppFactory = componentSalvageAppFactory;
}
- async load(craftingComponent: CraftingComponent, craftingSystem: CraftingSystem, actor: Actor): Promise {
- const appId = `fabricate-component-salvage-app-${craftingComponent.id}`;
+ async load(actor: Actor, component: Component): Promise {
+ const appId = this.getAppId(actor, component);
if (this._appIndex.has(appId)) {
const svelteApplication = this._appIndex.get(appId);
if (svelteApplication.rendered) {
await svelteApplication.close();
}
this._appIndex.delete(appId);
- craftingSystem = await this._systemRegistry.getCraftingSystemById(craftingSystem.id);
- await craftingSystem.loadPartDictionary();
- craftingComponent = craftingSystem.getComponentById(craftingComponent.id);
}
-
- const app = this._componentSalvageAppFactory.make(craftingComponent, craftingSystem, actor, appId);
+ const app = this._componentSalvageAppFactory.make(component, actor, appId);
this._appIndex.set(appId, app);
return app;
}
+ private getAppId(actor: Actor, component: Component) {
+ //@ts-ignore
+ const actorId = actor.id;
+ return `fabricate-component-salvage-app-${component.id}-${actorId}`;
+ }
}
export { ComponentSalvageAppCatalog, DefaultComponentSalvageAppCatalog }
\ No newline at end of file
diff --git a/src/applications/componentSalvageApp/ComponentSalvageAppFactory.ts b/src/applications/componentSalvageApp/ComponentSalvageAppFactory.ts
index cd9ce458..370dea1f 100644
--- a/src/applications/componentSalvageApp/ComponentSalvageAppFactory.ts
+++ b/src/applications/componentSalvageApp/ComponentSalvageAppFactory.ts
@@ -1,45 +1,63 @@
import {SvelteApplication} from "../SvelteApplication";
-import {CraftingSystem} from "../../scripts/system/CraftingSystem";
-import {CraftingComponent} from "../../scripts/common/CraftingComponent";
-import {DefaultGameProvider} from "../../scripts/foundry/GameProvider";
+import {Component} from "../../scripts/crafting/component/Component";
import Properties from "../../scripts/Properties";
import ComponentSalvageApp from "./ComponentSalvageApp.svelte";
-import {Combination} from "../../scripts/common/Combination";
-import {DefaultLocalizationService} from "../common/LocalizationService";
-import {DefaultInventoryFactory} from "../../scripts/actor/InventoryFactory";
+import {LocalizationService} from "../common/LocalizationService";
+import {CraftingAPI} from "../../scripts/api/CraftingAPI";
+import {ComponentAPI} from "../../scripts/api/ComponentAPI";
+import {DefaultComponentSalvageManager} from "./ComponentSalvageManager";
interface ComponentSalvageAppFactory {
- make(craftingComponent: CraftingComponent, craftingSystem: CraftingSystem, actor: Actor, appId: string): SvelteApplication;
+ make(component: Component, actor: any, appId: string): SvelteApplication;
}
class DefaultComponentSalvageAppFactory implements ComponentSalvageAppFactory {
- make(craftingComponent: CraftingComponent, craftingSystem: CraftingSystem, actor: any, appId: string): SvelteApplication {
+ private readonly localizationService: LocalizationService;
+ private readonly craftingAPI: CraftingAPI;
+ private readonly componentAPI: ComponentAPI;
- const gameProvider = new DefaultGameProvider();
- const GAME = gameProvider.get();
+ constructor({
+ craftingAPI,
+ componentAPI,
+ localizationService,
+ }: {
+ craftingAPI: CraftingAPI;
+ componentAPI: ComponentAPI;
+ localizationService: LocalizationService;
+ }) {
+ this.craftingAPI = craftingAPI;
+ this.componentAPI = componentAPI;
+ this.localizationService = localizationService;
+ }
+
+ make(component: Component, actor: any, appId: string): SvelteApplication {
const applicationOptions = {
- title: GAME.i18n.format(`${Properties.module.id}.ComponentSalvageApp.title`, { actorName: actor.name }),
+ title: this.localizationService.format(`${Properties.module.id}.ComponentSalvageApp.title`, { actorName: actor.name }),
id: appId,
resizable: false,
width: 540,
height: 514
- }
+ };
- const inventory = new DefaultInventoryFactory(gameProvider).make(actor, craftingSystem);
+ const componentSalvageManager = new DefaultComponentSalvageManager({
+ actor,
+ craftingAPI: this.craftingAPI,
+ componentAPI: this.componentAPI,
+ componentToSalvage: component,
+ });
return new SvelteApplication({
applicationOptions,
svelteConfig: {
+ componentType: ComponentSalvageApp,
options: {
props: {
- craftingComponent,
- inventory,
- localization: new DefaultLocalizationService(gameProvider),
- ownedComponentsOfType: Combination.EMPTY(),
+ componentSalvageManager,
+ localization: this.localizationService,
closeHook: async () => {
const svelteApplication: SvelteApplication = Object.values(ui.windows)
.find(w => w.id == appId);
@@ -47,7 +65,6 @@ class DefaultComponentSalvageAppFactory implements ComponentSalvageAppFactory {
}
}
},
- componentType: ComponentSalvageApp
}
});
}
diff --git a/src/applications/componentSalvageApp/ComponentSalvageManager.ts b/src/applications/componentSalvageApp/ComponentSalvageManager.ts
new file mode 100644
index 00000000..1c4f9e02
--- /dev/null
+++ b/src/applications/componentSalvageApp/ComponentSalvageManager.ts
@@ -0,0 +1,198 @@
+import {CraftingAPI} from "../../scripts/api/CraftingAPI";
+import {BaseActor} from "@league-of-foundry-developers/foundry-vtt-types/src/foundry/common/documents.mjs";
+import {ComponentAPI} from "../../scripts/api/ComponentAPI";
+import {Component} from "../../scripts/crafting/component/Component";
+import {TrackedCombination} from "../../scripts/common/TrackedCombination";
+import {Combination} from "../../scripts/common/Combination";
+import {SalvageOption} from "../../scripts/crafting/component/SalvageOption";
+import {SalvageResult} from "../../scripts/crafting/result/SalvageResult";
+
+interface SalvageAttempt {
+
+ readonly optionId: string;
+ readonly optionName: string;
+ readonly amountOwned: number;
+ readonly isPossible: boolean;
+ readonly requiredCatalysts: TrackedCombination;
+ readonly requiresCatalysts: boolean;
+ readonly componentToSalvage: Component;
+ readonly producedComponents: Combination;
+
+}
+
+export { SalvageAttempt };
+
+class DefaultSalvageAttempt implements SalvageAttempt {
+
+ private readonly _optionId: string;
+ private readonly _optionName: string;
+ private readonly _amountOwned: number;
+ private readonly _possible: boolean;
+ private readonly _requiredCatalysts: TrackedCombination;
+ private readonly _componentToSalvage: Component;
+ private readonly _producedComponents: Combination;
+
+ constructor({
+ optionId,
+ optionName,
+ amountOwned,
+ isPossible,
+ requiredCatalysts,
+ componentToSalvage,
+ producedComponents,
+ }: {
+ optionId: string;
+ optionName: string;
+ amountOwned: number;
+ isPossible: boolean;
+ requiredCatalysts: TrackedCombination;
+ componentToSalvage: Component;
+ producedComponents: Combination;
+ } ) {
+ this._optionId = optionId;
+ this._optionName = optionName;
+ this._amountOwned = amountOwned;
+ this._possible = isPossible;
+ this._requiredCatalysts = requiredCatalysts;
+ this._componentToSalvage = componentToSalvage;
+ this._producedComponents = producedComponents;
+ }
+
+ get amountOwned(): number {
+ return this._amountOwned;
+ }
+
+ get isPossible(): boolean {
+ return this._possible;
+ }
+
+ get requiredCatalysts(): TrackedCombination {
+ return this._requiredCatalysts;
+ }
+
+ get requiresCatalysts(): boolean {
+ return !this._requiredCatalysts.isEmpty
+ }
+
+ get producedComponents(): Combination {
+ return this._producedComponents;
+ }
+
+ get optionId(): string {
+ return this._optionId;
+ }
+
+ get componentToSalvage(): Component {
+ return this._componentToSalvage;
+ }
+
+ get optionName(): string {
+ return this._optionName;
+ }
+
+}
+
+interface ComponentSalvageManager {
+
+ readonly actor: BaseActor;
+
+ readonly componentToSalvage: Component;
+
+ loadSalvageAttempts(): Promise;
+
+ doSalvage(salvageOptionId: string): Promise;
+
+}
+
+export { ComponentSalvageManager };
+
+class DefaultComponentSalvageManager implements ComponentSalvageManager {
+
+ private readonly _actor: BaseActor;
+ private readonly _craftingAPI: CraftingAPI;
+ private readonly _componentAPI: ComponentAPI;
+ private readonly _componentToSalvage: Component;
+
+ constructor({
+ actor,
+ craftingAPI,
+ componentAPI,
+ componentToSalvage,
+ }: {
+ actor: BaseActor;
+ craftingAPI: CraftingAPI;
+ componentAPI: ComponentAPI;
+ componentToSalvage: Component;
+ }) {
+ this._actor = actor;
+ this._craftingAPI = craftingAPI;
+ this._componentAPI = componentAPI;
+ this._componentToSalvage = componentToSalvage;
+ }
+
+ get actor(): BaseActor {
+ return this._actor;
+ }
+
+ async loadSalvageAttempts(): Promise {
+ const amountOwned = await this._craftingAPI.countOwnedComponentsOfType(this._actor.id, this._componentToSalvage.id);
+ const ownedComponents = await this._craftingAPI.getOwnedComponentsForCraftingSystem(this._actor.id, this._componentToSalvage.craftingSystemId);
+ const includedComponentIds = this._componentToSalvage.getUniqueReferencedComponents().map(referenceUnit => referenceUnit.id);
+ const includedComponentsById = await this._componentAPI.getAllById(includedComponentIds);
+ await Promise.all(Array.from(includedComponentsById.values())
+ .map(component => component.load())
+ .concat(this._componentToSalvage.load())
+ );
+ return this._componentToSalvage.salvageOptions.all.map((option) => this.buildSalvageAttempt(this._componentToSalvage, option, amountOwned, ownedComponents, includedComponentsById));
+ }
+
+ private buildSalvageAttempt(
+ componentToSalvage: Component,
+ option: SalvageOption,
+ amountOwned: number,
+ ownedComponents: Combination,
+ includedComponentsById: Map,
+ ): SalvageAttempt {
+
+ let requiredCatalysts: TrackedCombination = TrackedCombination.EMPTY();
+ if (option.requiresCatalysts) {
+ const targetCatalysts = option.catalysts.convertElements(reference => includedComponentsById.get(reference.id));
+ const actualCatalysts = ownedComponents.units
+ .filter(unit => targetCatalysts.has(unit.element))
+ .reduce((combination, unit) => combination.addUnit(unit), Combination.EMPTY());
+ requiredCatalysts = new TrackedCombination({
+ target: targetCatalysts,
+ actual: actualCatalysts
+ });
+ }
+
+ const isSalvageable = requiredCatalysts.isSufficient;
+ const producedComponents = option.results.convertElements(reference => includedComponentsById.get(reference.id));
+
+ return new DefaultSalvageAttempt({
+ optionId: option.id,
+ optionName: option.name,
+ amountOwned,
+ isPossible: isSalvageable,
+ requiredCatalysts,
+ componentToSalvage,
+ producedComponents
+ });
+
+ }
+
+ async doSalvage(salvageOptionId: string): Promise {
+ return this._craftingAPI.salvageComponent({
+ salvageOptionId,
+ sourceActorId: this._actor.id,
+ componentId: this._componentToSalvage.id,
+ });
+ }
+
+ get componentToSalvage(): Component {
+ return this._componentToSalvage;
+ }
+
+}
+
+export { DefaultComponentSalvageManager }
\ No newline at end of file
diff --git a/src/applications/componentSalvageApp/SalvageHeader.svelte b/src/applications/componentSalvageApp/SalvageHeader.svelte
index 8828a208..e26f5358 100644
--- a/src/applications/componentSalvageApp/SalvageHeader.svelte
+++ b/src/applications/componentSalvageApp/SalvageHeader.svelte
@@ -9,7 +9,7 @@
const dispatch = createEventDispatcher();
export let component;
- export let ownedComponentsOfType;
+ export let amountOwned;
const { localization } = getContext(localizationKey);
function salvageComponent(event) {
@@ -22,6 +22,6 @@
-
\ No newline at end of file
diff --git a/src/applications/craftingSystemManagerApp/CraftingSystemEditor.svelte b/src/applications/craftingSystemManagerApp/CraftingSystemEditor.svelte
index 3b98e2dc..3bccab3d 100644
--- a/src/applications/craftingSystemManagerApp/CraftingSystemEditor.svelte
+++ b/src/applications/craftingSystemManagerApp/CraftingSystemEditor.svelte
@@ -1,79 +1,80 @@
+
handleItemDeleted(e)} use:eventBus='{"itemDeleted"}'>
-
diff --git a/src/applications/craftingSystemManagerApp/CraftingSystemEditor.ts b/src/applications/craftingSystemManagerApp/CraftingSystemEditor.ts
index 91f3743b..b08e1dc8 100644
--- a/src/applications/craftingSystemManagerApp/CraftingSystemEditor.ts
+++ b/src/applications/craftingSystemManagerApp/CraftingSystemEditor.ts
@@ -1,78 +1,60 @@
import {Writable} from "svelte/store";
-import {CraftingSystem, CraftingSystemJson} from "../../scripts/system/CraftingSystem";
-import {SystemRegistry} from "../../scripts/registries/SystemRegistry";
+import {CraftingSystem} from "../../scripts/system/CraftingSystem";
import Properties from "../../scripts/Properties";
-import FabricateApplication from "../../scripts/interface/FabricateApplication";
import {LocalizationService} from "../common/LocalizationService";
+import {FabricateAPI} from "../../scripts/api/FabricateAPI";
+import {FabricateExportModel} from "../../scripts/repository/import/FabricateExportModel";
+import {Component} from "../../scripts/crafting/component/Component";
class CraftingSystemEditor {
private readonly _craftingSystems: Writable;
- private readonly _systemRegistry: SystemRegistry;
+ private readonly _components: Writable;
private readonly _localization: LocalizationService;
- private readonly _game: Game;
+ private readonly _fabricateAPI: FabricateAPI;
private static readonly _dialogLocalizationPath = `${Properties.module.id}.CraftingSystemManagerApp.dialog`;
constructor({
craftingSystems,
- systemRegistry,
+ components,
localization,
- game
+ fabricateAPI,
}: {
craftingSystems: Writable;
- systemRegistry: SystemRegistry;
+ components: Writable;
localization: LocalizationService;
- game: Game;
+ fabricateAPI: FabricateAPI;
}) {
+ this._fabricateAPI = fabricateAPI;
+ this._components = components;
this._craftingSystems = craftingSystems;
- this._systemRegistry = systemRegistry;
this._localization = localization;
- this._game = game;
}
public async createNewCraftingSystem(): Promise {
- const systemJson: CraftingSystemJson = {
- parts: {
- recipes: {},
- components: {},
- essences: {}
- },
- locked: false,
- details: {
- name: "(New!) My New Crafting System",
- author: this._game.user.name,
- summary: "A brand new Crafting System created with Fabricate",
- description: ""
- },
- enabled: true,
- id: randomID()
- };
- const createdSystem = await this._systemRegistry.createCraftingSystem(systemJson);
+ const result = await this._fabricateAPI.systems.create();
this._craftingSystems.update((craftingSystems) => {
- craftingSystems.push(createdSystem);
+ craftingSystems.push(result);
return craftingSystems;
});
- return createdSystem;
+ return result;
}
async deleteCraftingSystem(craftingSystemToDelete: CraftingSystem) {
await Dialog.confirm({
title: this._localization.localize(`${CraftingSystemEditor._dialogLocalizationPath}.deleteSystemConfirm.title`),
- content: ` {
+ async importCraftingSystem(targetCraftingSystem?: CraftingSystem): Promise {
const craftingSystemTypeName = this._localization.localize(`${Properties.module.id}.typeNames.craftingSystem.singular`);
const importActionHint = this._localization.localize(`${CraftingSystemEditor._dialogLocalizationPath}.importCraftingSystem.hint`);
const content = await renderTemplate("templates/apps/import-data.html", {
@@ -88,6 +70,7 @@ class CraftingSystemEditor {
icon: '',
label: this._localization.localize(`${CraftingSystemEditor._dialogLocalizationPath}.importCraftingSystem.buttons.import`),
callback: async (html) => {
+
// @ts-ignore
const form = html.find("form")[0];
if (!form.data.files.length) {
@@ -96,21 +79,41 @@ class CraftingSystemEditor {
throw new Error(message);
}
const fileData = await readTextFromFile(form.data.files[0]);
- let craftingSystemJson: CraftingSystemJson;
+
+ let dataToImport: FabricateExportModel;
try {
- craftingSystemJson = JSON.parse(fileData);
+ dataToImport = JSON.parse(fileData);
} catch (e: any) {
const message = this._localization.localize(`${CraftingSystemEditor._dialogLocalizationPath}.importCraftingSystem.errors.couldNotParseFile`);
ui.notifications.error(message);
throw new Error(message);
}
- if (targetSystem) {
- const updated = await this.overwriteCraftingSystem(craftingSystemJson, targetSystem);
- onSuccess(updated);
- } else {
- const created = await this.importNewCraftingSystem(craftingSystemJson);
- onSuccess(created);
+
+ if (targetCraftingSystem && (targetCraftingSystem.id !== dataToImport.craftingSystem.id)) {
+ const message = this._localization.format(`${CraftingSystemEditor._dialogLocalizationPath}.importCraftingSystem.errors.importIdMismatch`, {
+ systemName: targetCraftingSystem.details.name,
+ expectedId: targetCraftingSystem.id,
+ actualId: dataToImport.craftingSystem.id,
+ })
+ ui.notifications.error(message);
+ throw new Error(message);
+ }
+
+ const importResult = await this._fabricateAPI.import(dataToImport);
+ if (!importResult) {
+ return;
}
+ this._craftingSystems.update((craftingSystems) => {
+ const found = craftingSystems.find(craftingSystem => craftingSystem.id === importResult.craftingSystem.id);
+ if (!found) {
+ craftingSystems.push(importResult.craftingSystem);
+ return craftingSystems;
+ }
+ return craftingSystems
+ .filter(craftingSystem => craftingSystem.id !== importResult.craftingSystem.id)
+ .concat(importResult.craftingSystem);
+ });
+
}
},
no: {
@@ -123,80 +126,41 @@ class CraftingSystemEditor {
}).render(true);
}
- private async importNewCraftingSystem(craftingSystemJson: CraftingSystemJson): Promise {
- if (!craftingSystemJson.id) {
- craftingSystemJson.id = randomID();
- }
- const importedSystem = await FabricateApplication.systemRegistry.createCraftingSystem(craftingSystemJson);
+ public async exportCraftingSystem(craftingSystem: CraftingSystem) {
+ const exportData = await this._fabricateAPI.export(craftingSystem.id);
+ const fileContents = JSON.stringify(exportData, null, 2);
+ const fileName = `fabricate-crafting-system-${craftingSystem.details.name.slugify()}.json`;
+ saveDataToFile(fileContents, "application/json", fileName);
+ const message = this._localization.format(`${CraftingSystemEditor._dialogLocalizationPath}.exportCraftingSystem.success`, { systemName: craftingSystem.details.name, fileName });
+ ui.notifications.info(message);
+ }
+
+ async duplicateCraftingSystem(sourceCraftingSystem: CraftingSystem): Promise {
+
+ let duplicatedCraftingSystemData = await this._fabricateAPI.duplicateCraftingSystem(sourceCraftingSystem.id);
+
const message = this._localization.format(
- `${CraftingSystemEditor._dialogLocalizationPath}.importCraftingSystem.success`,
- { systemName: importedSystem.name}
+ `${CraftingSystemEditor._dialogLocalizationPath}.duplicateCraftingSystem.complete`,
+ {
+ sourceSystemName: sourceCraftingSystem.details.name,
+ duplicatedSystemName: duplicatedCraftingSystemData?.craftingSystem?.details?.name
+ }
);
- this._craftingSystems.update((craftingSystems) => {
- craftingSystems.push(importedSystem);
- return craftingSystems;
- });
ui.notifications.info(message);
- return importedSystem;
- }
- private async overwriteCraftingSystem(craftingSystemJson: CraftingSystemJson, targetSystem: CraftingSystem): Promise {
- const systemFound = await this._systemRegistry.hasCraftingSystem(targetSystem.id);
- if (!systemFound) {
- const message = this._localization.format(
- `${CraftingSystemEditor._dialogLocalizationPath}.importCraftingSystem.errors.targetSystemNotFound`,
- { systemName: targetSystem.name });
- ui.notifications.error(message);
- throw new Error(message);
+ if (duplicatedCraftingSystemData?.craftingSystem) {
+ this._craftingSystems.update((craftingSystems) => {
+ craftingSystems.push(duplicatedCraftingSystemData.craftingSystem);
+ return craftingSystems;
+ });
}
- if (targetSystem.id !== craftingSystemJson.id) {
- const message = this._localization.format(`${CraftingSystemEditor._dialogLocalizationPath}.importCraftingSystem.errors.importIdMismatch`, {
- systemName: targetSystem.name,
- expectedId: targetSystem.id,
- actualId: craftingSystemJson.id,
- })
- ui.notifications.error(message);
- throw new Error(message);
- }
- const updatedCraftingSystem = await FabricateApplication.systemRegistry.createCraftingSystem(craftingSystemJson);
- const message = this._localization.format(`${CraftingSystemEditor._dialogLocalizationPath}.importCraftingSystem.success`, { systemName: updatedCraftingSystem.name});
- this._craftingSystems.update((craftingSystems) => {
- const filtered = craftingSystems.filter(craftingSystem => craftingSystem.id !== updatedCraftingSystem.id);
- filtered.push(updatedCraftingSystem);
- ui.notifications.info(message);
- return filtered;
- });
- return updatedCraftingSystem;
- }
- public exportCraftingSystem(craftingSystem: CraftingSystem) {
- const exportData = JSON.stringify(craftingSystem.toJson(), null, 2);
- const fileName = `fabricate-crafting-system-${craftingSystem.name.slugify()}.json`;
- saveDataToFile(exportData, "application/json", fileName);
- const message = this._localization.format(`${CraftingSystemEditor._dialogLocalizationPath}.exportCraftingSystem.success`, { systemName: craftingSystem.name, fileName });
- ui.notifications.info(message);
- }
+ return duplicatedCraftingSystemData.craftingSystem;
- async duplicateCraftingSystem(sourceCraftingSystem: CraftingSystem): Promise {
- const clonedCraftingSystem = sourceCraftingSystem.clone({
- id: randomID(),
- name: `${sourceCraftingSystem.name} (copy)`,
- locked: false
- });
- const duplicationResult = await FabricateApplication.systemRegistry.saveCraftingSystem(clonedCraftingSystem);
- ui.notifications.info(this._localization.format(`${CraftingSystemEditor._dialogLocalizationPath}.duplicateCraftingSystem.success`, {
- sourceSystemName: sourceCraftingSystem.name,
- duplicatedSystemName: duplicationResult.name
- }));
- this._craftingSystems.update((craftingSystems) => {
- craftingSystems.push(duplicationResult);
- return craftingSystems;
- });
- return duplicationResult;
}
async saveCraftingSystem(craftingSystem: CraftingSystem): Promise {
- const updatedCraftingSystem = await this._systemRegistry.saveCraftingSystem(craftingSystem);
+ const updatedCraftingSystem = await this._fabricateAPI.systems.save(craftingSystem);
this._craftingSystems.update((craftingSystems) => {
const filtered = craftingSystems.filter(craftingSystem => craftingSystem.id !== updatedCraftingSystem.id);
filtered.push(updatedCraftingSystem);
@@ -205,6 +169,19 @@ class CraftingSystemEditor {
return updatedCraftingSystem;
}
+ async deleteComponent(component: Component): Promise {
+ return this._fabricateAPI.components.deleteById(component.id);
+ }
+
+ async saveComponent(craftingComponent: Component) {
+ const updatedComponent = await this._fabricateAPI.components.save(craftingComponent);
+ this._components.update((components) => {
+ const filtered = components.filter(component => component.id !== updatedComponent.id);
+ filtered.push(updatedComponent);
+ return filtered;
+ });
+ return updatedComponent;
+ }
}
export { CraftingSystemEditor }
\ No newline at end of file
diff --git a/src/applications/craftingSystemManagerApp/CraftingSystemNavbar.svelte b/src/applications/craftingSystemManagerApp/CraftingSystemNavbar.svelte
index 9704d039..10630b60 100644
--- a/src/applications/craftingSystemManagerApp/CraftingSystemNavbar.svelte
+++ b/src/applications/craftingSystemManagerApp/CraftingSystemNavbar.svelte
@@ -20,12 +20,8 @@
$loading = false;
}
- async function importCraftingSystem() {
- $loading = true;
- await craftingSystemEditor.importCraftingSystem((craftingSystem) => {
- $selectedCraftingSystem = craftingSystem;
- });
- $loading = false;
+ async function importCraftingSystem(targetCraftingSystemId) {
+ await craftingSystemEditor.importCraftingSystem(targetCraftingSystemId);
}
diff --git a/src/applications/craftingSystemManagerApp/CraftingSystemNavbarItem.svelte b/src/applications/craftingSystemManagerApp/CraftingSystemNavbarItem.svelte
index a786415d..6d269381 100644
--- a/src/applications/craftingSystemManagerApp/CraftingSystemNavbarItem.svelte
+++ b/src/applications/craftingSystemManagerApp/CraftingSystemNavbarItem.svelte
@@ -7,8 +7,7 @@
const {
craftingSystemEditor,
selectedCraftingSystem,
- localization,
- loading
+ localization
} = getContext(key);
const localizationPath = `${Properties.module.id}.CraftingSystemManagerApp.navbar`;
@@ -17,29 +16,19 @@
}
async function deleteSystem() {
- $loading = true;
await craftingSystemEditor.deleteCraftingSystem(craftingSystem);
- $loading = false;
}
- async function importCraftingSystem() {
- $loading = true;
- await craftingSystemEditor.importCraftingSystem((craftingSystem) => {
- $selectedCraftingSystem = craftingSystem;
- }, craftingSystem);
- $loading = false;
+ async function importCraftingSystem(craftingSystem) {
+ await craftingSystemEditor.importCraftingSystem(craftingSystem);
}
- function exportSystem() {
- $loading = true;
- craftingSystemEditor.exportCraftingSystem(craftingSystem);
- $loading = false;
+ async function exportSystem() {
+ await craftingSystemEditor.exportCraftingSystem(craftingSystem);
}
async function duplicateSystem() {
- $loading = true;
$selectedCraftingSystem = await craftingSystemEditor.duplicateCraftingSystem(craftingSystem);
- $loading = false;
}
@@ -47,15 +36,15 @@
diff --git a/src/applications/craftingSystemManagerApp/componentManager/ComponentsBrowser.svelte b/src/applications/craftingSystemManagerApp/componentManager/ComponentsBrowser.svelte
index 2b76493c..6ca827ed 100644
--- a/src/applications/craftingSystemManagerApp/componentManager/ComponentsBrowser.svelte
+++ b/src/applications/craftingSystemManagerApp/componentManager/ComponentsBrowser.svelte
@@ -6,16 +6,16 @@
import {ComponentSearchStore} from "../../stores/ComponentSearchStore";
const localizationPath = `${Properties.module.id}.CraftingSystemManagerApp.tabs.components`;
+
const {
selectedCraftingSystem,
- craftingComponents,
+ components,
localization,
- craftingComponentEditor,
- selectedComponent,
- loading
+ componentEditor,
+ selectedComponent
} = getContext(key);
- const componentSearchResults = new ComponentSearchStore({availableComponents: craftingComponents});
+ const componentSearchResults = new ComponentSearchStore({ components });
const searchTerms = componentSearchResults.searchTerms;
function clearSearch() {
@@ -23,9 +23,7 @@
}
async function importComponent(event) {
- $loading = true;
- await craftingComponentEditor.importComponent(event, $selectedCraftingSystem);
- $loading = false;
+ await componentEditor.importComponent(event, $selectedCraftingSystem);
}
function selectComponent(component) {
@@ -33,15 +31,12 @@
}
async function deleteComponent(event, component) {
- $loading = true;
- await craftingComponentEditor.deleteComponent(event, component, $selectedCraftingSystem);
- $loading = false;
+ await componentEditor.deleteComponent(event, component, $selectedCraftingSystem);
}
async function disableComponent(component) {
component.isDisabled = true;
- $loading = true;
- await craftingComponentEditor.saveComponent(component, $selectedCraftingSystem);
+ await componentEditor.saveComponent(component, $selectedCraftingSystem);
const message = localization.format(
`${localizationPath}.component.disabled`,
{
@@ -49,13 +44,11 @@
}
);
ui.notifications.info(message);
- $loading = false;
}
async function enableComponent(component) {
component.isDisabled = false;
- $loading = true;
- await craftingComponentEditor.saveComponent(component, $selectedCraftingSystem);
+ await componentEditor.saveComponent(component, $selectedCraftingSystem);
const message = localization.format(
`${localizationPath}.component.enabled`,
{
@@ -63,7 +56,6 @@
}
);
ui.notifications.info(message);
- $loading = false;
}
async function toggleComponentDisabled(component) {
@@ -71,13 +63,11 @@
}
async function duplicateComponent(component) {
- $loading = true;
- await craftingComponentEditor.duplicateComponent(component, $selectedCraftingSystem);
- $loading = false;
+ await componentEditor.duplicateComponent(component);
}
async function openItemSheet(component) {
- const document = await new DefaultDocumentManager().getDocumentByUuid(component.itemUuid);
+ const document = await new DefaultDocumentManager().loadItemDataByDocumentUuid(component.itemUuid);
await document.sourceDocument.sheet.render(true);
}
@@ -85,18 +75,18 @@
{#if $selectedCraftingSystem}
{/if}
- {#if $craftingComponents.length > 0}
+ {#if $components.length > 0}
- {#if craftingComponent.salvageOptions.length === 1}
-
+{#if selectedSalvageAttempt}
+
\ No newline at end of file
+{/if}
diff --git a/src/applications/componentSalvageApp/ComponentSalvageAppCatalog.ts b/src/applications/componentSalvageApp/ComponentSalvageAppCatalog.ts
index 5fc65cc8..52bb3460 100644
--- a/src/applications/componentSalvageApp/ComponentSalvageAppCatalog.ts
+++ b/src/applications/componentSalvageApp/ComponentSalvageAppCatalog.ts
@@ -1,52 +1,48 @@
import {ComponentSalvageAppFactory} from "./ComponentSalvageAppFactory";
-import {SystemRegistry} from "../../scripts/registries/SystemRegistry";
-import {CraftingSystem} from "../../scripts/system/CraftingSystem";
-import {CraftingComponent} from "../../scripts/common/CraftingComponent";
import {SvelteApplication} from "../SvelteApplication";
+import {Component} from "../../scripts/crafting/component/Component";
interface ComponentSalvageAppCatalog {
- load(craftingComponent: CraftingComponent, craftingSystem: CraftingSystem, actor: Actor): Promise{localization.localize(`${localizationPath}.hints.doSalvage`)}:
-
-
- {:else if craftingComponent.salvageOptions.length > 1}
-
+
+{:else}
+ handleComponentUpdated(e)}
+ on:itemUpdated={(e) => handleItemUpdated(e)}
+ on:itemCreated={(e) => handleItemCreated(e)}
+ on:itemDeleted={(e) => handleItemDeleted(e)}>
+ doSalvage(e)} />
+
+
+ {#if salvageAttempts.length === 1}
+
+ {:else}
+
+ {localization.localize(`${localizationPath}.hints.doSalvage`)}:
+
+
+ {:else if salvageAttempts.length > 1}
+ {localization.localize(`${localizationPath}.hints.requiresCatalysts`)}
+{localization.localize(`${localizationPath}.hints.doSalvage`)}:
- - {:else} -
-
- {/if}
+ {localization.localize(`${localizationPath}.errors.notSalvageable`)}
-
+
+ {/if}
+ {localization.localize(`${localizationPath}.errors.notSalvageable`)}
+
+
-
+
+
{localization.localize(`${localizationPath}.errors.notSalvageable`)}
+{component.name} ({ownedComponentsOfType.size})
+{component.name} ({amountOwned})
${this._localization.format(`${CraftingSystemEditor._dialogLocalizationPath}.deleteSystemConfirm.content`, {systemName: craftingSystemToDelete.name})}
`, + content: `${this._localization.format(`${CraftingSystemEditor._dialogLocalizationPath}.deleteSystemConfirm.content`, {systemName: craftingSystemToDelete.details.name})}
`, yes: async () => { - await this._systemRegistry.deleteCraftingSystemById(craftingSystemToDelete.id); - const message = this._localization.format(`${CraftingSystemEditor._dialogLocalizationPath}.deleteCraftingSystem.success`, { systemName: craftingSystemToDelete.name}); + await this._fabricateAPI.deleteAllByCraftingSystemId(craftingSystemToDelete.id); this._craftingSystems.update((craftingSystems) => { - const filtered = craftingSystems.filter(craftingSystem => craftingSystem.id !== craftingSystemToDelete.id); - ui.notifications.info(message); - return filtered; + return craftingSystems.filter(craftingSystem => craftingSystem.id !== craftingSystemToDelete.id); }); } }); } - async importCraftingSystem(onSuccess?: (craftingSystem: CraftingSystem) => void, targetSystem?: CraftingSystem): Promise
{#if $selectedCraftingSystem !== craftingSystem}
{/if} {#if $selectedCraftingSystem === craftingSystem}
{/if} {#if $selectedCraftingSystem === craftingSystem}
-
{#if $selectedComponent.isSalvageable}
-
@@ -276,26 +352,26 @@
{craftingSystem.summary}
+{craftingSystem.details.summary}
{#if $selectedComponent.isSalvageable}
-
+
- {#each $selectedComponent.salvageOptions as salvageOption}
+ {#each $selectedComponent.salvageOptions.all as salvageOption}
{salvageOption.name}
{/each}
{localization.localize(`${localizationPath}.component.labels.newSalvageOption`)}
- {#each $selectedComponent.salvageOptions as salvageOption}
+ {#each $selectedComponent.salvageOptions.all as salvageOption}
-
{/each}
@@ -202,35 +222,91 @@
addComponentToSalvageOption(e, salvageOption)}>
- {#each salvageOption.salvage.units as salvageUnit}
-
+ incrementSalvageOptionComponent(salvageOption, salvageUnit.part, e)} on:auxclick={decrementSalvageOptionComponent(salvageOption, salvageUnit.part)}>
-
- {/each}
-
-
- {truncate(salvageUnit.part.name, 9)}
-
-
-
- 
- {#if salvageUnit.quantity > 1}
- {salvageUnit.quantity}
- {/if}
-
- {localization.localize(`${localizationPath}.component.labels.salvageHeading`)}
+ {#if salvageOption.hasResults} + addComponentToSalvageOption(e, salvageOption)}>
+ {#each dereferenceComponentCombination(salvageOption.results) as resultUnit}
+ {#await resultUnit.element.load()}
+ {:then nothing}
+
+ {:else}
+ incrementSalvageOptionComponent(salvageOption, resultUnit.element, e)} on:auxclick={decrementSalvageOptionComponent(salvageOption, resultUnit.element)}>
+
+ {:catch error}
+ {/await}
+ {/each}
+
+
+ {truncate(resultUnit.element.name, 9)}
+
+
+
+ 
+ {#if resultUnit.quantity > 1}
+ {resultUnit.quantity}
+ {/if}
+
+ addComponentToSalvageOption(e, salvageOption, false)}>
+
+
+ {/if}
+ {localization.localize(`${localizationPath}.component.labels.catalystsHeading`)}
+ {#if salvageOption.requiresCatalysts} + addComponentToSalvageOption(e, salvageOption, true)}>
+ {#each dereferenceComponentCombination(salvageOption.catalysts) as catalystUnit}
+ {#await catalystUnit.element.load()}
+ {:then nothing}
+
+ {:else}
+ incrementSalvageOptionComponent(salvageOption, catalystUnit.element, e)} on:auxclick={decrementSalvageOptionComponent(salvageOption, catalystUnit.element, true)}>
+
+ {:catch error}
+ {/await}
+ {/each}
+
+
+ {truncate(catalystUnit.element.name, 9)}
+
+
+
+ 
+ {#if catalystUnit.quantity > 1}
+ {catalystUnit.quantity}
+ {/if}
+
+ addComponentToSalvageOption(e, salvageOption, true)}>
+
+
+ {/if}
addSalvageOption(e)}>
-
+
{:else}
-
+
+
+ {localization.localize(`${localizationPath}.component.labels.resultsHeading`)}
+ addSalvageOption(e, false)}>
+
+
+
+
+ {localization.localize(`${localizationPath}.component.labels.catalystsHeading`)}
+ addSalvageOption(e, true)}>
+
+
addSalvageOption(e)}>
+
{:else}
-
+
{/if}
addSalvageOption(e, false)}>
+
+
+
+
+ {localization.localize(`${localizationPath}.component.labels.catalystsHeading`)}
+ addSalvageOption(e, true)}>
{/if}
@@ -265,7 +341,7 @@
{:else if $searchTerms.name}
{localization.localize(`${localizationPath}.component.info.noMatchingSalvage`)}
{localization.format(`${localizationPath}.component.info.noAvailableSalvage`, { systemName: $selectedCraftingSystem.name, componentName: selectedComponent.name })}
{localization.format(`${localizationPath}.component.info.noAvailableSalvage`, { systemName: $selectedCraftingSystem.details.name, componentName: selectedComponent.name })}
- {#if $selectedCraftingSystem.hasEssences}
+ {#if $essences.length > 0}
{#each $componentEssences as essenceUnit}
+
{/if}
-
+
{/each}
{:else}
-
{essenceUnit.quantity}
- {essenceUnit.part.name}
+ {essenceUnit.element.name}
-
+
{localization.format(`${localizationPath}.component.info.noAvailableEssences`, { systemName: $selectedCraftingSystem.name, componentName: selectedComponent.name })}
{localization.format(`${localizationPath}.component.info.noAvailableEssences`, { systemName: $selectedCraftingSystem.details.name, componentName: $selectedComponent.name })}
- 
+
- {#if !$selectedCraftingSystem.isLocked}
+ {#if !$selectedCraftingSystem.isEmbedded}
-
{localization.format(`${localizationPath}.addNew`, { systemName: $selectedCraftingSystem?.name })}
+{localization.format(`${localizationPath}.addNew`, { systemName: $selectedCraftingSystem?.details.name })}
-
{localization.format(`${localizationPath}.search.title`, { systemName: $selectedCraftingSystem?.name })}
+{localization.format(`${localizationPath}.search.title`, { systemName: $selectedCraftingSystem?.details.name })}
@@ -113,34 +103,48 @@
{#each $componentSearchResults as component}
@@ -67,42 +64,42 @@
\ No newline at end of file
diff --git a/src/applications/craftingSystemManagerApp/essenceManager/EssenceEditor.ts b/src/applications/craftingSystemManagerApp/essenceManager/EssenceEditor.ts
new file mode 100644
index 00000000..79e5766b
--- /dev/null
+++ b/src/applications/craftingSystemManagerApp/essenceManager/EssenceEditor.ts
@@ -0,0 +1,96 @@
+import {LocalizationService} from "../../common/LocalizationService";
+import {Essence} from "../../../scripts/crafting/essence/Essence";
+import {CraftingSystem} from "../../../scripts/system/CraftingSystem";
+import {DropEventParser} from "../../common/DropEventParser";
+import {DefaultDocumentManager} from "../../../scripts/foundry/DocumentManager";
+import Properties from "../../../scripts/Properties";
+import {FabricateAPI} from "../../../scripts/api/FabricateAPI";
+import {EssencesStore} from "../../stores/EssenceStore";
+
+class EssenceEditor {
+
+ private readonly _essences: EssencesStore;
+ private readonly _fabricateAPI: FabricateAPI;
+ private readonly _localization: LocalizationService;
+
+ private readonly _localizationPath = `${Properties.module.id}.CraftingSystemManagerApp.tabs.essences`;
+
+ constructor({
+ essences,
+ fabricateAPI,
+ localization,
+ }: {
+ essences: EssencesStore;
+ fabricateAPI: FabricateAPI;
+ localization: LocalizationService;
+ }) {
+ this._essences = essences;
+ this._fabricateAPI = fabricateAPI;
+ this._localization = localization;
+ }
+
+ public async create(selectedCraftingSystem: CraftingSystem) {
+ const essence = await this._fabricateAPI.essences.create({
+ craftingSystemId: selectedCraftingSystem.id
+ });
+ this._essences.insert(essence);
+ }
+
+ public async deleteEssence(event: any, essence: Essence, selectedCraftingSystem: CraftingSystem) {
+ let doDelete;
+ if (event.shiftKey) {
+ doDelete = true;
+ } else {
+ doDelete = await Dialog.confirm({
+ title: this._localization.format(
+ `${this._localizationPath}.prompts.delete.title`,
+ {
+ essenceName: essence.name
+ }
+ ),
+ content: this._localization.format(
+ `${this._localizationPath}.prompts.delete.content`,
+ {
+ essenceName: essence.name,
+ systemName: selectedCraftingSystem.details.name
+ }
+ )
+ });
+ }
+ if (!doDelete) {
+ return;
+ }
+ await this._fabricateAPI.essences.deleteById(essence.id);
+ this._essences.remove(essence);
+ }
+
+ public async setActiveEffectSource(event: any, essence: Essence) {
+ const dropEventParser = new DropEventParser({
+ localizationService: this._localization,
+ documentManager: new DefaultDocumentManager(),
+ partType: this._localization.localize(`${Properties.module.id}.typeNames.activeEffectSource.singular`)
+ })
+ const dropData = await dropEventParser.parse(event);
+ essence.activeEffectSource = dropData.itemData;
+ await this._fabricateAPI.essences.save(essence);
+ this._essences.insert(essence);
+ return essence;
+ }
+
+ public async removeActiveEffectSource(essence: Essence) {
+ essence.activeEffectSource = null;
+ await this._fabricateAPI.essences.save(essence);
+ this._essences.insert(essence);
+ return essence;
+ }
+
+ public async setIconCode(essence: Essence, iconCode: string) {
+ essence.iconCode = iconCode;
+ await this._fabricateAPI.essences.save(essence);
+ this._essences.insert(essence);
+ return essence;
+ }
+
+}
+
+export { EssenceEditor }
\ No newline at end of file
diff --git a/src/applications/craftingSystemManagerApp/essenceManager/EssenceEditor.svelte b/src/applications/craftingSystemManagerApp/essenceManager/EssenceEditorComponent.svelte
similarity index 75%
rename from src/applications/craftingSystemManagerApp/essenceManager/EssenceEditor.svelte
rename to src/applications/craftingSystemManagerApp/essenceManager/EssenceEditorComponent.svelte
index 3065675b..df0ef197 100644
--- a/src/applications/craftingSystemManagerApp/essenceManager/EssenceEditor.svelte
+++ b/src/applications/craftingSystemManagerApp/essenceManager/EssenceEditorComponent.svelte
@@ -1,74 +1,52 @@
-
+
{#if $selectedRecipe}
- {
+ const component = await this._fabricateAPI.components.create({
+ craftingSystemId: selectedSystem.id,
+ itemUuid: itemData.uuid
+ });
+ this._components.insert(component);
+ return component;
+ }
+
+ public async deleteComponent(event: any, component: Component, selectedSystem: CraftingSystem): Promise {
+ let doDelete;
+ if (event.shiftKey) {
+ doDelete = true;
+ } else {
+ doDelete = await Dialog.confirm({
+ title: this._localization.format(
+ `${this._localizationPath}.prompts.delete.title`,
+ {
+ componentName: component.name
+ }
+ ),
+ content: this._localization.format(
+ `${this._localizationPath}.prompts.delete.content`,
+ {
+ componentName: component.name,
+ systemName: selectedSystem.details.name
+ }
+ )
+ });
+ }
+ if (!doDelete) {
+ return undefined;
+ }
+ const deletedComponent = await this._fabricateAPI.components.deleteById(component.id);
+ this._components.remove(deletedComponent);
+ }
+
+ public async saveComponent(craftingComponent: Component): Promise {
+ const savedComponent = await this._fabricateAPI.components.save(craftingComponent);
+ this._components.insert(savedComponent);
+ return savedComponent;
+ }
+
+ public async duplicateComponent(craftingComponent: Component): Promise {
+ const duplicatedComponent = await this._fabricateAPI.components.cloneById(craftingComponent.id);
+ this._components.insert(duplicatedComponent);
+ return duplicatedComponent;
+ }
+
+ public async replaceItem(event: any, selectedComponent: Component): Promise {
+ const dropEventParser = new DropEventParser({
+ localizationService: this._localization,
+ documentManager: new DefaultDocumentManager(),
+ partType: this._localization.localize(`${Properties.module.id}.typeNames.component.singular`)
+ })
+ const dropData = await dropEventParser.parse(event);
+ selectedComponent.itemData = dropData.itemData;
+ const updatedComponent = await this._fabricateAPI.components.save(selectedComponent);
+ this._components.insert(updatedComponent);
+ return updatedComponent;
+ }
+
+ public async addSalvageOptionComponentAsCatalyst(event: any, selectedComponent: Component): Promise {
+ const component = await this.getComponentFromDropEvent(event);
+ selectedComponent.setSalvageOption({
+ name: this.generateOptionName(selectedComponent),
+ catalysts: { [ component.id ]: 1 },
+ results: {}
+ });
+ await this.saveComponent(selectedComponent);
+ return selectedComponent;
+ }
+
+ public async addSalvageOptionComponentAsSalvageResult(event: any, selectedComponent: Component): Promise {
+ const component = await this.getComponentFromDropEvent(event);
+ selectedComponent.setSalvageOption({
+ name: this.generateOptionName(selectedComponent),
+ catalysts: {},
+ results: { [ component.id ]: 1 }
+ });
+ await this.saveComponent(selectedComponent);
+ return selectedComponent;
+ }
+
+ // todo: prompt to import unknown items as components
+ private async getComponentFromDropEvent(event: any): Promise {
+ const dropEventParser = new DropEventParser({
+ localizationService: this._localization,
+ documentManager: new DefaultDocumentManager(),
+ partType: this._localization.localize(`${Properties.module.id}.typeNames.component.singular`),
+ allowedCraftingComponents: this._components.get(),
+ });
+ const component = (await dropEventParser.parse(event)).component;
+ if (!component) {
+ throw new Error("No component found in drop data.");
+ }
+ return component;
+ }
+
+ private generateOptionName(component: Component) {
+ if (!component.isSalvageable) {
+ return this._localization.format(`${Properties.module.id}.typeNames.component.salvageOption.name`, { number: 1 });
+ }
+ const existingNames = component.salvageOptions.all.map(salvageOption => salvageOption.name);
+ let nextOptionNumber = 2;
+ let nextOptionName;
+ do {
+ nextOptionName = this._localization.format(`${Properties.module.id}.typeNames.component.salvageOption.name`, { number: nextOptionNumber });
+ nextOptionNumber++;
+ } while (existingNames.includes(nextOptionName));
+ return nextOptionName;
+ }
+
+}
+
+export { CraftingComponentEditor }
\ No newline at end of file
diff --git a/src/applications/craftingSystemManagerApp/componentManager/CraftingComponentManager.ts b/src/applications/craftingSystemManagerApp/componentManager/CraftingComponentManager.ts
deleted file mode 100644
index dbf51bd4..00000000
--- a/src/applications/craftingSystemManagerApp/componentManager/CraftingComponentManager.ts
+++ /dev/null
@@ -1,175 +0,0 @@
-import {CraftingSystemEditor} from "../CraftingSystemEditor";
-import {DropEventParser} from "../../common/DropEventParser";
-import {DefaultDocumentManager, FabricateItemData} from "../../../scripts/foundry/DocumentManager";
-import Properties from "../../../scripts/Properties";
-import {CraftingComponent} from "../../../scripts/common/CraftingComponent";
-import {LocalizationService} from "../../common/LocalizationService";
-import {CraftingSystem} from "../../../scripts/system/CraftingSystem";
-
-class CraftingComponentManager {
-
- private readonly _craftingSystemEditor: CraftingSystemEditor;
- private readonly _localization: LocalizationService;
- private readonly _localizationPath = `${Properties.module.id}.CraftingSystemManagerApp.tabs.components`;
-
- constructor({
- craftingSystemEditor,
- localization
- }: {
- craftingSystemEditor: CraftingSystemEditor;
- localization: LocalizationService;
- }) {
- this._craftingSystemEditor = craftingSystemEditor;
- this._localization = localization;
- }
-
- public async importComponent(event: any, selectedSystem: CraftingSystem) {
- const dropEventParser = new DropEventParser({
- localizationService: this._localization,
- documentManager: new DefaultDocumentManager(),
- partType: this._localization.localize(`${Properties.module.id}.typeNames.component.singular`)
- })
- const dropData = await dropEventParser.parse(event);
- if (!dropData.hasItemData) {
- return;
- }
- await this.createComponent(dropData.itemData, selectedSystem);
- }
-
- public async createComponent(itemData: FabricateItemData, selectedSystem: CraftingSystem): Promise {
- if (selectedSystem.includesComponentByItemUuid(itemData.uuid)) {
- const existingComponent = selectedSystem.getComponentByItemUuid(itemData.uuid);
- const message = this._localization.format(
- `${this._localizationPath}.errors.import.itemAlreadyIncluded`,
- {
- itemUuid: itemData.uuid,
- componentName: existingComponent.name,
- systemName: selectedSystem.name
- }
- );
- ui.notifications.warn(message);
- return;
- }
- const craftingComponent = new CraftingComponent({
- id: randomID(),
- itemData: itemData
- });
- selectedSystem.editComponent(craftingComponent);
- await this._craftingSystemEditor.saveCraftingSystem(selectedSystem);
- const message = this._localization.format(
- `${this._localizationPath}.component.imported`,
- {
- componentName: craftingComponent.name,
- systemName: selectedSystem.name
- }
- );
- ui.notifications.info(message);
- return craftingComponent;
- }
-
- public async deleteComponent(event: any, component: CraftingComponent, selectedSystem: CraftingSystem) {
- let doDelete;
- if (event.shiftKey) {
- doDelete = true;
- } else {
- doDelete = await Dialog.confirm({
- title: this._localization.format(
- `${this._localizationPath}.prompts.delete.title`,
- {
- componentName: component.name
- }
- ),
- content: this._localization.format(
- `${this._localizationPath}.prompts.delete.content`,
- {
- componentName: component.name,
- systemName: selectedSystem.name
- }
- )
- });
- }
- if (!doDelete) {
- return;
- }
- selectedSystem.deleteComponentById(component.id);
- await this._craftingSystemEditor.saveCraftingSystem(selectedSystem);
- const message = this._localization.format(
- `${this._localizationPath}.component.deleted`,
- {
- componentName: component.name,
- systemName: selectedSystem.name
- }
- );
- ui.notifications.info(message);
- }
-
- public async saveComponent(craftingComponent: CraftingComponent, selectedSystem: CraftingSystem) {
- if (this.validateOptionNames(craftingComponent)) {
- selectedSystem.editComponent(craftingComponent);
- await this._craftingSystemEditor.saveCraftingSystem(selectedSystem);
- return;
- }
- const message = this._localization.format(`${this._localizationPath}.component.errors.optionNotUnique`, { componentName: craftingComponent.name });
- ui.notifications.error(message);
- }
-
- private validateOptionNames(component: CraftingComponent) {
- let valid = true;
- component.salvageOptions
- .map(salvageOption => salvageOption.name)
- .forEach((value, index, array) => {
- if (array.indexOf(value) !== index) {
- valid = false;
- console.error(`The salvage option name ${value} is not unique.`);
- }
- });
- return valid;
- }
-
- public async duplicateComponent(craftingComponent: CraftingComponent, selectedSystem: CraftingSystem): Promise {
- const clonedComponent = craftingComponent.clone(randomID());
- selectedSystem.editComponent(clonedComponent);
- await this._craftingSystemEditor.saveCraftingSystem(selectedSystem);
- return clonedComponent;
- }
-
- public async replaceItem(event: any, selectedSystem: CraftingSystem, selectedComponent: CraftingComponent) {
- const dropEventParser = new DropEventParser({
- localizationService: this._localization,
- documentManager: new DefaultDocumentManager(),
- partType: this._localization.localize(`${Properties.module.id}.typeNames.component.singular`)
- })
- const dropData = await dropEventParser.parse(event);
- const itemData = dropData.itemData;
- if (selectedSystem.includesComponentByItemUuid(itemData.uuid)) {
- const existingComponent = selectedSystem.getComponentByItemUuid(itemData.uuid);
- const message = this._localization.format(
- `${this._localizationPath}.errors.import.itemAlreadyIncluded`,
- {
- itemUuid: itemData.uuid,
- componentName: existingComponent.name,
- systemName: selectedSystem.name
- }
- );
- ui.notifications.error(message);
- return;
- }
- const previousItemName = selectedComponent.name;
- selectedComponent.itemData = itemData;
- selectedSystem.editComponent(selectedComponent);
- await this._craftingSystemEditor.saveCraftingSystem(selectedSystem);
- const message = this._localization.format(
- `${this._localizationPath}.component.replaced`,
- {
- previousItemName,
- itemName: selectedComponent.name,
- systemName: selectedSystem.name
- }
- );
- ui.notifications.info(message);
- return;
- }
-
-}
-
-export { CraftingComponentManager }
\ No newline at end of file
diff --git a/src/applications/craftingSystemManagerApp/detailsManager/CraftingSystemDetails.svelte b/src/applications/craftingSystemManagerApp/detailsManager/CraftingSystemDetails.svelte
index b838b7b3..9b157a5f 100644
--- a/src/applications/craftingSystemManagerApp/detailsManager/CraftingSystemDetails.svelte
+++ b/src/applications/craftingSystemManagerApp/detailsManager/CraftingSystemDetails.svelte
@@ -8,17 +8,14 @@
const {
selectedCraftingSystem,
craftingSystemEditor,
- localization,
- loading
+ localization
} = getContext(key);
let scheduledSave;
function scheduleSave() {
clearTimeout(scheduledSave);
scheduledSave = setTimeout(async () => {
- $loading = true;
await craftingSystemEditor.saveCraftingSystem($selectedCraftingSystem);
- $loading = false;
}, 1000);
}
@@ -29,36 +26,36 @@
-
- {component.name}
- {#if component.hasErrors}{/if} -
- {#if !component.hasErrors}
-
{/if}
diff --git a/src/applications/craftingSystemManagerApp/componentManager/CraftingComponentEditor.ts b/src/applications/craftingSystemManagerApp/componentManager/CraftingComponentEditor.ts
new file mode 100644
index 00000000..efebf2c5
--- /dev/null
+++ b/src/applications/craftingSystemManagerApp/componentManager/CraftingComponentEditor.ts
@@ -0,0 +1,159 @@
+import {DropEventParser} from "../../common/DropEventParser";
+import {DefaultDocumentManager, FabricateItemData} from "../../../scripts/foundry/DocumentManager";
+import Properties from "../../../scripts/Properties";
+import {Component} from "../../../scripts/crafting/component/Component";
+import {LocalizationService} from "../../common/LocalizationService";
+import {CraftingSystem} from "../../../scripts/system/CraftingSystem";
+import {FabricateAPI} from "../../../scripts/api/FabricateAPI";
+import {ComponentsStore} from "../../stores/ComponentsStore";
+
+class CraftingComponentEditor {
+
+ private readonly _fabricateAPI: FabricateAPI;
+ private readonly _components: ComponentsStore;
+ private readonly _localization: LocalizationService;
+ private readonly _localizationPath = `${Properties.module.id}.CraftingSystemManagerApp.tabs.components`;
+
+ constructor({
+ localization,
+ fabricateAPI,
+ components
+ }: {
+ localization: LocalizationService;
+ fabricateAPI: FabricateAPI;
+ components: ComponentsStore;
+ }) {
+ this._localization = localization;
+ this._fabricateAPI = fabricateAPI;
+ this._components = components;
+ }
+
+ public async importComponent(event: any, selectedSystem: CraftingSystem) {
+ const dropEventParser = new DropEventParser({
+ localizationService: this._localization,
+ documentManager: new DefaultDocumentManager(),
+ partType: this._localization.localize(`${Properties.module.id}.typeNames.component.singular`)
+ })
+ const dropData = await dropEventParser.parse(event);
+ if (!dropData.hasItemData) {
+ return;
+ }
+ await this.createComponent(dropData.itemData, selectedSystem);
+ }
+
+ public async createComponent(itemData: FabricateItemData, selectedSystem: CraftingSystem): Promise
-
+ {#await component.load()}
+ {:then nothing}
+
@@ -151,7 +155,7 @@
{:else}
+
+ {component.name}
+
+
- {:else}
-
+
+
+ {#if !$selectedCraftingSystem.isEmbedded}
+
+ {/if}
-
+ {:catch error}
+
{/each}
+
- {/if}
- {#if !$selectedCraftingSystem.isLocked}
- {component.name}
+
-
-
-
-
+
+ {/await}
+
- {/if}
-
+
+
+ {#if !$selectedCraftingSystem.isEmbedded}
+
+ {/if}
{localization.localize(`${localizationPath}.noneFound`)}
- {#if !$selectedCraftingSystem.isLocked}{localization.localize(`${localizationPath}.create`)}
{/if} + {#if !$selectedCraftingSystem.isEmbedded}{localization.localize(`${localizationPath}.create`)}
{/if}
-
{localization.format(`${localizationPath}.title`, { systemName: $selectedCraftingSystem?.name })}
+{localization.format(`${localizationPath}.title`, { systemName: $selectedCraftingSystem?.details.name })}
{localization.localize(`${localizationPath}.labels.name`)}:
- {#if !$selectedCraftingSystem?.isLocked} + {#if !$selectedCraftingSystem?.isEmbedded}
- {$selectedCraftingSystem.name}
+ {$selectedCraftingSystem.details.name}
{:else}
- {$selectedCraftingSystem.name}
+ {$selectedCraftingSystem.details.name}
{/if}
{localization.localize(`${localizationPath}.labels.summary`)}:
- {#if !$selectedCraftingSystem?.isLocked}
+ {#if !$selectedCraftingSystem?.isEmbedded}
- {$selectedCraftingSystem.summary}
+ {$selectedCraftingSystem.details.summary}
{:else}
- {$selectedCraftingSystem.summary}
+ {$selectedCraftingSystem.details.summary}
{/if}
{localization.localize(`${localizationPath}.labels.description`)}:
- {#if !$selectedCraftingSystem?.isLocked}
+ {#if !$selectedCraftingSystem?.isEmbedded}
- {$selectedCraftingSystem.description}
+ {$selectedCraftingSystem.details.description}
{:else}
- {$selectedCraftingSystem.description}
+ {$selectedCraftingSystem.details.description}
{/if}
{localization.localize(`${localizationPath}.settings.title`)}
-
{localization.localize(`${localizationPath}.settings.enabled.label`)}:
+{localization.localize(`${localizationPath}.settings.disabled.label`)}:
-
{localization.localize(`${localizationPath}.settings.enabled.description`)}
+{localization.localize(`${localizationPath}.settings.disabled.description`)}
- 
+
@@ -270,73 +274,130 @@
+ {#if $selectedRecipe.hasRequirements}
+
- {#each $selectedRecipe.ingredientOptions as ingredientOption}
+ {#each $selectedRecipe.requirementOptions.all as ingredientOption}
{ingredientOption.name}
{/each}
{localization.localize(`${localizationPath}.recipe.labels.newIngredientOption`)}
-
- {#each $selectedRecipe.ingredientOptions as ingredientOption}
+ {#each $selectedRecipe.requirementOptions.all as requirementOption}
-
+
-
- {#if $selectedRecipe.hasIngredients}
- {localization.localize(`${localizationPath}.recipe.labels.requirementsHeading`)}
+{localization.localize(`${localizationPath}.recipe.labels.ingredientsHeading`)}
{localization.localize(`${localizationPath}.recipe.labels.ingredientOptionName`)}
-{ingredientOption.name}
+ {requirementOption.name}
{localization.localize(`${localizationPath}.recipe.labels.ingredientsHeading`)}
- {#if ingredientOption.requiresIngredients} - addComponentToIngredientOption(e, ingredientOption, false)}>
- {#each ingredientOption.ingredients.units as ingredientUnit}
-
+ {#if requirementOption.requiresIngredients}
+ incrementIngredientOptionComponent(ingredientOption, ingredientUnit.part, e, false)} on:auxclick={decrementIngredientOptionComponent(ingredientOption, ingredientUnit.part, false)}>
-
- {/each}
-
-
- {truncate(ingredientUnit.part.name, 9)}
-
-
-
- 
- {#if ingredientUnit.quantity > 1}
- {ingredientUnit.quantity}
- {/if}
-
- addComponentToRequirementOption(e, requirementOption, false)}>
+ {#each dereferenceComponentCombination(requirementOption.ingredients) as ingredientUnit}
+ {#await ingredientUnit.element.load()}
+ {:then nothing}
+
{:else}
- incrementRequirementOptionComponent(requirementOption, ingredientUnit.element, e, false)}
+ on:auxclick={decrementRequirementOptionComponent(requirementOption, ingredientUnit.element, false)}>
+
+ {:catch error}
+ {/await}
+ {/each}
+
+
+ {truncate(ingredientUnit.element.name, 9)}
+
+
+
+ 
+ {#if ingredientUnit.quantity > 1}
+ {ingredientUnit.quantity}
+ {/if}
+
+ addComponentToIngredientOption(e, ingredientOption, false)}>
+
addComponentToRequirementOption(e, requirementOption, false)}>
{/if}
{localization.localize(`${localizationPath}.recipe.labels.catalystsHeading`)}
- {#if ingredientOption.requiresCatalysts} - addComponentToIngredientOption(e, ingredientOption, true)}>
- {#each ingredientOption.catalysts.units as catalystUnit}
-
+
- {#each $selectedRecipe.resultOptions as resultOption}
+ {#each $selectedRecipe.resultOptions.all as resultOption}
{resultOption.name}
{/each}
{localization.localize(`${localizationPath}.recipe.labels.newResultOption`)}
- {#each $selectedRecipe.resultOptions as resultOption}
+ {#each $selectedRecipe.resultOptions.all as resultOption}
-
+
-
diff --git a/src/applications/craftingSystemManagerApp/recipeManager/RecipeEditor.ts b/src/applications/craftingSystemManagerApp/recipeManager/RecipeEditor.ts
new file mode 100644
index 00000000..a8b33944
--- /dev/null
+++ b/src/applications/craftingSystemManagerApp/recipeManager/RecipeEditor.ts
@@ -0,0 +1,188 @@
+import {DropEventParser} from "../../common/DropEventParser";
+import {DefaultDocumentManager, FabricateItemData} from "../../../scripts/foundry/DocumentManager";
+import Properties from "../../../scripts/Properties";
+import {LocalizationService} from "../../common/LocalizationService";
+import {CraftingSystem} from "../../../scripts/system/CraftingSystem";
+import {Recipe} from "../../../scripts/crafting/recipe/Recipe";
+import {FabricateAPI} from "../../../scripts/api/FabricateAPI";
+import {RecipesStore} from "../../stores/RecipesStore";
+import {ComponentsStore} from "../../stores/ComponentsStore";
+import {RequirementOption} from "../../../scripts/crafting/recipe/RequirementOption";
+import {ResultOption} from "../../../scripts/crafting/recipe/ResultOption";
+import {Essence} from "../../../scripts/crafting/essence/Essence";
+
+class RecipeEditor {
+
+ private readonly _recipes: RecipesStore;
+ private readonly _components: ComponentsStore;
+ private readonly _fabricateAPI: FabricateAPI;
+ private readonly _localization: LocalizationService;
+
+ private readonly _localizationPath = `${Properties.module.id}.CraftingSystemManagerApp.tabs.recipes`;
+
+ constructor({
+ recipes,
+ components,
+ fabricateAPI,
+ localization,
+ }: {
+ recipes: RecipesStore;
+ components: ComponentsStore;
+ fabricateAPI: FabricateAPI;
+ localization: LocalizationService;
+ }) {
+ this._recipes = recipes;
+ this._components = components;
+ this._fabricateAPI = fabricateAPI;
+ this._localization = localization;
+ }
+
+ public async importRecipe(event: any, selectedSystem: CraftingSystem) {
+ const dropEventParser = new DropEventParser({
+ localizationService: this._localization,
+ documentManager: new DefaultDocumentManager(),
+ partType: this._localization.localize(`${Properties.module.id}.typeNames.recipe.singular`)
+ })
+ const dropData = await dropEventParser.parse(event);
+ if (!dropData.hasItemData) {
+ return;
+ }
+ await this.createRecipe(dropData.itemData, selectedSystem);
+ }
+
+ public async createRecipe(itemData: FabricateItemData, selectedSystem: CraftingSystem): Promise {
+ const recipe = await this._fabricateAPI.recipes.create({
+ craftingSystemId: selectedSystem.id,
+ itemUuid: itemData.uuid
+ });
+ this._recipes.insert(recipe);
+ return recipe;
+ }
+
+ public async deleteRecipe(event: any, recipe: Recipe, selectedSystem: CraftingSystem) {
+ let doDelete;
+ if (event.shiftKey) {
+ doDelete = true;
+ } else {
+ doDelete = await Dialog.confirm({
+ title: this._localization.format(
+ `${this._localizationPath}.prompts.delete.title`,
+ {
+ recipeName: recipe.name
+ }
+ ),
+ content: this._localization.format(
+ `${this._localizationPath}.prompts.delete.content`,
+ {
+ recipeName: recipe.name,
+ systemName: selectedSystem.details.name
+ }
+ )
+ });
+ }
+ if (!doDelete) {
+ return;
+ }
+ const deletedRecipe = await this._fabricateAPI.recipes.deleteById(recipe.id);
+ this._recipes.remove(deletedRecipe);
+ }
+
+ public async saveRecipe(recipe: Recipe) {
+ const savedRecipe = await this._fabricateAPI.recipes.save(recipe);
+ this._recipes.insert(savedRecipe);
+ return savedRecipe;
+ }
+
+ public async duplicateRecipe(recipe: Recipe): Promise {
+ const duplicatedRecipe = await this._fabricateAPI.recipes.cloneById(recipe.id);
+ this._recipes.insert(duplicatedRecipe);
+ return duplicatedRecipe;
+ }
+
+ public async replaceItem(event: any, selectedRecipe: Recipe) {
+ const dropEventParser = new DropEventParser({
+ localizationService: this._localization,
+ documentManager: new DefaultDocumentManager(),
+ partType: this._localization.localize(`${Properties.module.id}.typeNames.recipe.singular`)
+ })
+ const dropData = await dropEventParser.parse(event);
+ selectedRecipe.itemData = dropData.itemData;
+ return this.saveRecipe(selectedRecipe);
+ }
+
+ public async addRequirementOptionComponentAsCatalyst(event: any, selectedRecipe: Recipe) {
+ const component = await this.getComponentFromDropEvent(event);
+ selectedRecipe.setRequirementOption({
+ name: this.generateOptionName(selectedRecipe.requirementOptions.all.map(requirementOption => requirementOption.name)),
+ catalysts: { [ component.id ]: 1 }
+ });
+ await this.saveRecipe(selectedRecipe);
+ }
+
+ public async addRequirementOptionComponentAsIngredient(event: any, selectedRecipe: Recipe) {
+ const component = await this.getComponentFromDropEvent(event);
+ selectedRecipe.setRequirementOption({
+ name: this.generateOptionName(selectedRecipe.requirementOptions.all.map(requirementOption => requirementOption.name)),
+ ingredients: { [ component.id ]: 1 }
+ });
+ await this.saveRecipe(selectedRecipe);
+ }
+
+ public async addResultOptionComponent(event: any, selectedRecipe: Recipe) {
+ const component = await this.getComponentFromDropEvent(event);
+ selectedRecipe.setResultOption({
+ name: this.generateOptionName(selectedRecipe.resultOptions.all.map(resultOption => resultOption.name)),
+ results: { [ component.id ]: 1 }
+ });
+ await this.saveRecipe(selectedRecipe);
+ }
+
+ // todo: prompt to import unknown items as components
+ private async getComponentFromDropEvent(event: any, rejectUnknownItems: boolean = true) {
+ const dropEventParser = new DropEventParser({
+ strict: rejectUnknownItems,
+ localizationService: this._localization,
+ documentManager: new DefaultDocumentManager(),
+ partType: this._localization.localize(`${Properties.module.id}.typeNames.component.singular`),
+ allowedCraftingComponents: this._components.get(),
+ });
+ const component = (await dropEventParser.parse(event)).component;
+ if (!component) {
+ throw new Error("No component found in drop data.");
+ }
+ return component;
+ }
+
+ private generateOptionName(existingNames: string[]) {
+ let nextOptionNumber = 1;
+ let nextOptionName;
+ do {
+ nextOptionName = this._localization.format(`${Properties.module.id}.typeNames.recipe.option.name`, { number: nextOptionNumber });
+ nextOptionNumber++;
+ } while (existingNames.includes(nextOptionName));
+ return nextOptionName;
+ }
+
+ public async deleteRequirementOption(selectedRecipe: Recipe, requirementOption: RequirementOption) {
+ selectedRecipe.deleteRequirementOptionById(requirementOption.id);
+ const updatedRecipe = await this._fabricateAPI.recipes.save(selectedRecipe);
+ this._recipes.insert(updatedRecipe);
+ return updatedRecipe;
+ }
+
+ public async deleteResultOption(selectedRecipe: Recipe, resultOption: ResultOption) {
+ selectedRecipe.deleteResultOptionById(resultOption.id);
+ await this.saveRecipe(selectedRecipe);
+ }
+
+ public async createEssenceRequirementOption(selectedRecipe: Recipe, essence: Essence) {
+ selectedRecipe.setRequirementOption({
+ name: this.generateOptionName(selectedRecipe.requirementOptions.all.map(requirementOption => requirementOption.name)),
+ essences: { [ essence.id ]: 1 }
+ });
+ await this.saveRecipe(selectedRecipe);
+ }
+
+}
+
+export { RecipeEditor }
\ No newline at end of file
diff --git a/src/applications/craftingSystemManagerApp/recipeManager/RecipeManager.ts b/src/applications/craftingSystemManagerApp/recipeManager/RecipeManager.ts
deleted file mode 100644
index 0f5608f1..00000000
--- a/src/applications/craftingSystemManagerApp/recipeManager/RecipeManager.ts
+++ /dev/null
@@ -1,251 +0,0 @@
-import {CraftingSystemEditor} from "../CraftingSystemEditor";
-import {DropEventParser} from "../../common/DropEventParser";
-import {DefaultDocumentManager} from "../../../scripts/foundry/DocumentManager";
-import Properties from "../../../scripts/Properties";
-import {LocalizationService} from "../../common/LocalizationService";
-import {CraftingSystem} from "../../../scripts/system/CraftingSystem";
-import {RequirementOption, Recipe, ResultOption} from "../../../scripts/common/Recipe";
-import {Combination} from "../../../scripts/common/Combination";
-
-class RecipeManager {
-
- private readonly _craftingSystemEditor: CraftingSystemEditor;
- private readonly _localization: LocalizationService;
- private readonly _localizationPath = `${Properties.module.id}.CraftingSystemManagerApp.tabs.recipes`;
-
- constructor({
- craftingSystemEditor,
- localization
- }: {
- craftingSystemEditor: CraftingSystemEditor;
- localization: LocalizationService;
- }) {
- this._craftingSystemEditor = craftingSystemEditor;
- this._localization = localization;
- }
-
- public async importRecipe(event: any, selectedSystem: CraftingSystem) {
- const dropEventParser = new DropEventParser({
- localizationService: this._localization,
- documentManager: new DefaultDocumentManager(),
- partType: this._localization.localize(`${Properties.module.id}.typeNames.recipe.singular`)
- })
- const dropData = await dropEventParser.parse(event);
- if (!dropData.hasItemData) {
- return;
- }
- const itemData = dropData.itemData;
- if (selectedSystem.includesRecipeByItemUuid(itemData.uuid)) {
- const existingRecipe = selectedSystem.getRecipeByItemUuid(itemData.uuid);
- const message = this._localization.format(
- `${this._localizationPath}.errors.import.itemAlreadyIncluded`,
- {
- itemUuid: itemData.uuid,
- recipeName: existingRecipe.name,
- systemName: selectedSystem.name
- }
- );
- ui.notifications.warn(message);
- return;
- }
- const recipe = new Recipe({
- id: randomID(),
- itemData: itemData
- });
- selectedSystem.editRecipe(recipe);
- await this._craftingSystemEditor.saveCraftingSystem(selectedSystem);
- const message = this._localization.format(
- `${this._localizationPath}.recipe.imported`,
- {
- recipeName: recipe.name,
- systemName: selectedSystem.name
- }
- );
- ui.notifications.info(message);
- }
-
- public async deleteRecipe(event: any, recipe: Recipe, selectedSystem: CraftingSystem) {
- let doDelete;
- if (event.shiftKey) {
- doDelete = true;
- } else {
- doDelete = await Dialog.confirm({
- title: this._localization.format(
- `${this._localizationPath}.prompts.delete.title`,
- {
- recipeName: recipe.name
- }
- ),
- content: this._localization.format(
- `${this._localizationPath}.prompts.delete.content`,
- {
- recipeName: recipe.name,
- systemName: selectedSystem.name
- }
- )
- });
- }
- if (!doDelete) {
- return;
- }
- selectedSystem.deleteRecipeById(recipe.id);
- await this._craftingSystemEditor.saveCraftingSystem(selectedSystem);
- const message = this._localization.format(
- `${this._localizationPath}.recipe.deleted`,
- {
- recipeName: recipe.name,
- systemName: selectedSystem.name
- }
- );
- ui.notifications.info(message);
- }
-
- public async saveRecipe(recipe: Recipe, selectedSystem: CraftingSystem) {
- if (this.validateOptionNames(recipe)) {
- selectedSystem.editRecipe(recipe);
- await this._craftingSystemEditor.saveCraftingSystem(selectedSystem);
- return;
- }
- const message = this._localization.format(`${this._localizationPath}.recipe.errors.optionNotUnique`, { recipeName: recipe.name });
- ui.notifications.error(message);
- }
-
- private validateOptionNames(recipe: Recipe) {
- let valid = true;
- recipe.ingredientOptions
- .map(ingredientOption => ingredientOption.name)
- .forEach((value, index, array) => {
- if (array.indexOf(value) !== index) {
- valid = false;
- console.error(`The ingredient option name ${value} is not unique.`);
- }
- });
- recipe.resultOptions
- .map(ingredientOption => ingredientOption.name)
- .forEach((value, index, array) => {
- if (array.indexOf(value) !== index) {
- valid = false;
- console.error(`The result option name ${value} is not unique.`);
- }
- });
- return valid;
- }
-
- public async duplicateRecipe(recipe: Recipe, selectedSystem: CraftingSystem): Promise {
- const clonedRecipe = recipe.clone(randomID());
- selectedSystem.editRecipe(clonedRecipe);
- await this._craftingSystemEditor.saveCraftingSystem(selectedSystem);
- return clonedRecipe;
- }
-
- public async replaceItem(event: any, selectedSystem: CraftingSystem, selectedRecipe: Recipe) {
- const dropEventParser = new DropEventParser({
- localizationService: this._localization,
- documentManager: new DefaultDocumentManager(),
- partType: this._localization.localize(`${Properties.module.id}.typeNames.recipe.singular`)
- })
- const dropData = await dropEventParser.parse(event);
- const itemData = dropData.itemData;
- if (selectedSystem.includesRecipeByItemUuid(itemData.uuid)) {
- const existingRecipe = selectedSystem.getRecipeByItemUuid(itemData.uuid);
- const message = this._localization.format(
- `${this._localizationPath}.errors.import.itemAlreadyIncluded`,
- {
- itemUuid: itemData.uuid,
- recipeName: existingRecipe.name,
- systemName: selectedSystem.name
- }
- );
- ui.notifications.error(message);
- return;
- }
- const previousItemName = selectedRecipe.name;
- selectedRecipe.itemData = itemData;
- selectedSystem.editRecipe(selectedRecipe);
- await this._craftingSystemEditor.saveCraftingSystem(selectedSystem);
- const message = this._localization.format(
- `${this._localizationPath}.recipe.replaced`,
- {
- previousItemName,
- itemName: selectedRecipe.name,
- systemName: selectedSystem.name
- }
- );
- ui.notifications.info(message);
- return;
- }
-
- public async addIngredientOption(event: any, addAsCatalyst: boolean, selectedRecipe: Recipe, selectedCraftingSystem: CraftingSystem) {
- const dropEventParser = new DropEventParser({
- strict: true,
- localizationService: this._localization,
- documentManager: new DefaultDocumentManager(),
- partType: this._localization.localize(`${Properties.module.id}.typeNames.component.singular`),
- allowedCraftingComponents: selectedCraftingSystem.craftingComponents
- });
- const component = (await dropEventParser.parse(event)).component;
- if (!component) {
- return;
- }
- const name = this.generateIngredientOptionName(selectedRecipe);
- let ingredientOption;
- if (addAsCatalyst) {
- ingredientOption = new RequirementOption({name, catalysts: Combination.of(component, 1)});
- } else {
- ingredientOption = new RequirementOption({name, ingredients: Combination.of(component, 1)});
- }
- selectedRecipe.addIngredientOption(ingredientOption);
- selectedCraftingSystem.editRecipe(selectedRecipe);
- await this._craftingSystemEditor.saveCraftingSystem(selectedCraftingSystem);
- }
-
- public async addResultOption(event: any, selectedRecipe: Recipe, selectedCraftingSystem: CraftingSystem) {
- const dropEventParser = new DropEventParser({
- strict: true,
- localizationService: this._localization,
- documentManager: new DefaultDocumentManager(),
- partType: this._localization.localize(`${Properties.module.id}.typeNames.component.singular`),
- allowedCraftingComponents: selectedCraftingSystem.craftingComponents
- });
- const component = (await dropEventParser.parse(event)).component;
- if (!component) {
- return;
- }
- const name = this.generateResultOptionName(selectedRecipe);
- let resultOption = new ResultOption({name, results: Combination.of(component, 1)});
- selectedRecipe.addResultOption(resultOption);
- selectedCraftingSystem.editRecipe(selectedRecipe);
- await this._craftingSystemEditor.saveCraftingSystem(selectedCraftingSystem);
- }
-
- public generateIngredientOptionName(recipe: Recipe) {
- if (!recipe.hasIngredients) {
- return this._localization.format(`${Properties.module.id}.typeNames.recipe.ingredientOption.name`, { number: 1 });
- }
- const existingNames = recipe.ingredientOptions.map(ingredientOption => ingredientOption.name);
- let nextOptionNumber = 2;
- let nextOptionName;
- do {
- nextOptionName = this._localization.format(`${Properties.module.id}.typeNames.recipe.ingredientOption.name`, { number: nextOptionNumber });
- nextOptionNumber++;
- } while (existingNames.includes(nextOptionName));
- return nextOptionName;
- }
-
- public generateResultOptionName(recipe: Recipe) {
- if (!recipe.hasResults) {
- return this._localization.format(`${Properties.module.id}.typeNames.recipe.resultOption.name`, { number: 1 });
- }
- const existingNames = recipe.resultOptions.map(ingredientOption => ingredientOption.name);
- let nextOptionNumber = 2;
- let nextOptionName;
- do {
- nextOptionName = this._localization.format(`${Properties.module.id}.typeNames.recipe.resultOption.name`, { number: nextOptionNumber });
- nextOptionNumber++;
- } while (existingNames.includes(nextOptionName));
- return nextOptionName;
- }
-
-}
-
-export { RecipeManager }
\ No newline at end of file
diff --git a/src/applications/recipeCraftingApp/CraftingAttemptCarousel.svelte b/src/applications/recipeCraftingApp/CraftingAttemptCarousel.svelte
index d19f7971..0247f309 100644
--- a/src/applications/recipeCraftingApp/CraftingAttemptCarousel.svelte
+++ b/src/applications/recipeCraftingApp/CraftingAttemptCarousel.svelte
@@ -12,14 +12,13 @@
export let columns;
export let craftingAttempt;
- export let selectedIngredientOptionName;
function selectNextOption() {
- dispatch("nextIngredientOptionSelected", {});
+ dispatch("nextRequirementOptionSelected", {});
}
function selectPreviousOption() {
- dispatch("previousIngredientOptionSelected", {});
+ dispatch("previousRequirementOptionSelected", {});
}
@@ -28,14 +27,14 @@
\ No newline at end of file
diff --git a/src/applications/recipeCraftingApp/CraftingAttemptGrid.svelte b/src/applications/recipeCraftingApp/CraftingAttemptGrid.svelte
index 10450cfa..afef6db0 100644
--- a/src/applications/recipeCraftingApp/CraftingAttemptGrid.svelte
+++ b/src/applications/recipeCraftingApp/CraftingAttemptGrid.svelte
@@ -26,19 +26,23 @@
incrementIngredientOptionComponent(ingredientOption, catalystUnit.part, e, true)} on:auxclick={decrementIngredientOptionComponent(ingredientOption, catalystUnit.part, true)}>
-
{#if $selectedRecipe.hasResults}
-
-
- {truncate(catalystUnit.part.name, 9)}
-
-
@@ -451,38 +536,52 @@
- 
- {#if catalystUnit.quantity > 1}
- {catalystUnit.quantity}
- {/if}
+ {#if requirementOption.requiresCatalysts}
+
-
- addComponentToRequirementOption(e, requirementOption, true)}>
+ {#each dereferenceComponentCombination(requirementOption.catalysts) as catalystUnit}
+ {#await catalystUnit.element.load()}
+ {:then nothing}
+
+ {:else}
+ incrementRequirementOptionComponent(requirementOption, catalystUnit.element, e, true)} on:auxclick={decrementRequirementOptionComponent(requirementOption, catalystUnit.element, true)}>
+
+ {:catch error}
+ {/await}
+ {/each}
+
+
+ {truncate(catalystUnit.element.name, 9)}
+
+
+
+ {#if catalystUnit.quantity > 1}
+ {catalystUnit.quantity}
+ {/if}
+
+ addComponentToRequirementOption(e, requirementOption, true)}>
+
+
+ {/if}
+ {localization.localize(`${localizationPath}.recipe.labels.essencesHeading`)}
+ {#if requirementOption.requiresEssences} +
+ {#each $requirementOptionEssences.get(requirementOption.id) as essenceUnit}
+
{:else}
-
+
+
{/each}
+
+ {essenceUnit.quantity}
+
+
+
+ {essenceUnit.element.name}
+
+
addComponentToIngredientOption(e, ingredientOption, true)}>
-
+
@@ -348,29 +409,81 @@
+
{/if}
+ {#each $essences as essence}
+
+
+
+ {/each}
+
+ 0
+
+
+ {essence.name}
+
+
+ {localization.localize(`${localizationPath}.recipe.labels.ingredientsHeading`)}
addIngredientOption(e, false)}>
+
-
addRequirementOption(e, false)}>
{localization.localize(`${localizationPath}.recipe.labels.catalystsHeading`)}
addIngredientOption(e, true)}>
+
{:else}
- addRequirementOption(e, true)}>
+
+
+ {localization.localize(`${localizationPath}.recipe.labels.essencesHeading`)}
+
+
+ {#each $essences as essence}
+
+
+
+
+ {/each}
+
+ 0
+
+
+ {essence.name}
+
+
+ addIngredientOption(e, false)}>
+
-
@@ -388,58 +501,30 @@
{#if $componentSearchResults.length > 0}
addRequirementOption(e, false)}>
{localization.localize(`${localizationPath}.recipe.labels.catalystsHeading`)}
addIngredientOption(e, true)}>
+
+ {/if}
{/if}
addRequirementOption(e, true)}>
+ {#if $essences.length > 0}
+
+
+ {localization.localize(`${localizationPath}.recipe.labels.essencesHeading`)}
+
+
+ {:else}
+
+ {#each $essences as essence}
+
+
+
+
+ {/each}
+
+ 0
+
+
+ {essence.name}
+
+
+ {localization.format(`${localizationPath}.recipe.info.noAvailableEssences`, { systemName: $selectedCraftingSystem.details.name, recipeName: selectedRecipe.name })}
{#each $componentSearchResults as component}
-
{:else}
-
+
{/if}
dragStart(event, component)}>
-
{:else if $searchTerms.name}
-
- {truncate(component.name, 9)}
-
-
+ {:catch error}
+ {/await}
{/each}
-
+ {#await component.load()}
+ {:then nothing}
+
- dragStart(event, component)}>
+
-
+
+ {truncate(component.name, 9)}
+
+
+
+
+ {localization.localize(`${localizationPath}.recipe.info.noMatchingComponents`)}
{localization.format(`${localizationPath}.recipe.info.noAvailableComponents`, { systemName: $selectedCraftingSystem.name, recipeName: $selectedRecipe.name })}
{localization.format(`${localizationPath}.recipe.info.noAvailableComponents`, { systemName: $selectedCraftingSystem.details.name, recipeName: $selectedRecipe.name })}
-
-
-
-
- {localization.localize(`${localizationPath}.recipe.labels.essencesHeading`)}
-
-
-
- {#if $selectedCraftingSystem.hasEssences}
- {#each $recipeEssences as essenceUnit}
-
- {/if}
-
-
-
-
- {/each}
- {:else}
-
-
- {essenceUnit.quantity}
-
-
-
- {essenceUnit.part.name}
-
-
-
- {localization.format(`${localizationPath}.recipe.info.noAvailableEssences`, { systemName: $selectedCraftingSystem.name, recipeName: selectedRecipe.name })}
{localization.localize(`${localizationPath}.recipe.labels.resultsHeading`)}
{localization.localize(`${localizationPath}.recipe.labels.resultOptionName`)}
-{resultOption.name}
+
+ {resultOption.name}
+
addComponentToResultOption(e, resultOption)}>
- {#each resultOption.results.units as resultUnit}
-
{:else}
-
+
{/if}
incrementResultOptionComponent(resultOption, resultUnit.part, e)} on:auxclick={decrementResultOptionComponent(resultOption, resultUnit.part)}>
-
@@ -530,7 +629,7 @@
{:else if $searchTerms.name}
-
- {truncate(resultUnit.part.name, 9)}
-
-
- 
- {#if resultUnit.quantity > 1}
- {resultUnit.quantity}
- {/if}
+
+ {:catch error}
+ {/await}
{/each}
addComponentToResultOption(e, resultOption)}>
+ {#each dereferenceComponentCombination(resultOption.results) as resultUnit}
+ {#await resultUnit.element.load()}
+ {:then nothing}
+
- incrementResultOptionComponent(resultOption, resultUnit.element, e)}
+ on:auxclick={decrementResultOptionComponent(resultOption, resultUnit.element)}>
+
-
+
+ {truncate(resultUnit.element.name, 9)}
+
+
+
+ {#if resultUnit.quantity > 1}
+ {resultUnit.quantity}
+ {/if}
+
+ {localization.localize(`${localizationPath}.recipe.info.noMatchingComponents`)}
{localization.format(`${localizationPath}.recipe.info.noAvailableComponents`, { systemName: $selectedCraftingSystem.name, recipeName: $selectedRecipe.name })}
{localization.format(`${localizationPath}.recipe.info.noAvailableComponents`, { systemName: $selectedCraftingSystem.details.name, recipeName: $selectedRecipe.name })}
-
{selectedIngredientOptionName}
+{craftingAttempt.requirementOption.name}
{localization.localize(`${Properties.module.id}.typeNames.ingredient.plural`)}
{#each ingredients.units as unit}
-
-
{/if}
@@ -46,19 +50,23 @@
-
- {truncate(unit.target.part.name, nameLength)}
-
-
+ {:catch error}
+ {/await}
{/each}
- 
+ {#await Promise.all([unit.target.element.load(), unit.actual.element.load()])}
+ {:then nothing}
+
-
+
-
+
+ {truncate(unit.target.element.name, nameLength)}
+
+
+
+
+
+
+
{formatQuantity(unit.actual.quantity, unit.target.quantity)}
+
-
- {formatQuantity(unit.actual.quantity, unit.target.quantity)}
-{localization.localize(`${Properties.module.id}.typeNames.catalyst.plural`)}
{#each catalysts.units as unit}
-
-
{/if}
@@ -66,19 +74,23 @@
-
- {truncate(unit.target.part.name, nameLength)}
-
-
+ {:catch error}
+ {/await}
{/each}
-
+ {#await Promise.all([unit.target.element.load(), unit.actual.element.load()])}
+ {:then nothing}
+
-
+
-
+
+ {truncate(unit.target.element.name, nameLength)}
+
+
+
+
+
+
+
{formatQuantity(unit.actual.quantity, unit.target.quantity)}
+
-
- {formatQuantity(unit.actual.quantity, unit.target.quantity)}
-{localization.localize(`${Properties.module.id}.typeNames.essence.plural`)}
{#each essences.units as unit}
-
{/if}
\ No newline at end of file
diff --git a/src/applications/recipeCraftingApp/CraftingResultCarousel.svelte b/src/applications/recipeCraftingApp/CraftingResultCarousel.svelte
index f6716f84..eaaba326 100644
--- a/src/applications/recipeCraftingApp/CraftingResultCarousel.svelte
+++ b/src/applications/recipeCraftingApp/CraftingResultCarousel.svelte
@@ -1,43 +1,37 @@
-
+
-
+ {#await Promise.all([unit.target.element.load(), unit.actual.element.load()])}
+ {:then nothing}
+
-
- {formatQuantity(unit.actual.quantity, unit.target.quantity)}
-
-
-
- {unit.target.part.name}
-
-
-
+
+ {:catch error}
+ {/await}
{/each}
+
+ {formatQuantity(unit.actual.quantity, unit.target.quantity)}
+
+
+
+ {unit.target.element.name}
+
+
+
- {#each recipe.resultOptions as option}
- {#if option.name === selectedOptionName}
-
\ No newline at end of file
diff --git a/src/applications/recipeCraftingApp/RecipeCraftingApp.svelte b/src/applications/recipeCraftingApp/RecipeCraftingApp.svelte
index 68fbc47a..d254ffc5 100644
--- a/src/applications/recipeCraftingApp/RecipeCraftingApp.svelte
+++ b/src/applications/recipeCraftingApp/RecipeCraftingApp.svelte
@@ -1,4 +1,4 @@
-
+[
-
-
- {/if}
- {/each}
+
-
-
- {option.name}
- -
-
-
+
+
+
+ {craftingAttempt.resultOption.name}
+ +
+
+ handleRecipeUpdated(e)}
- on:itemUpdated={(e) => handleItemUpdated(e)}
- on:itemCreated={(e) => handleItemCreated(e)}
- on:itemDeleted={(e) => handleItemDeleted(e)}>
- ;
+
+ load(recipe: Recipe, actor: Actor): Promise;
+
}
class DefaultRecipeCraftingAppCatalog implements RecipeCraftingAppCatalog {
private readonly _recipeCraftingAppFactory: RecipeCraftingAppFactory;
- private readonly _systemRegistry: SystemRegistry;
private readonly _appIndex: Map = new Map();
constructor({
recipeCraftingAppFactory,
- systemRegistry,
appIndex = new Map()
}: {
recipeCraftingAppFactory: RecipeCraftingAppFactory;
- systemRegistry: SystemRegistry;
appIndex?: Map;
}) {
this._recipeCraftingAppFactory = recipeCraftingAppFactory;
- this._systemRegistry = systemRegistry;
this._appIndex = appIndex;
}
- async load(recipe: Recipe, craftingSystem: CraftingSystem, actor: Actor): Promise {
- const appId = `fabricate-recipe-crafting-app-${recipe.id}`;
+ async load(recipe: Recipe, actor: Actor): Promise {
+ const appId = this.getAppId(actor, recipe);
if (this._appIndex.has(appId)) {
const svelteApplication = this._appIndex.get(appId);
if (svelteApplication.rendered) {
await svelteApplication.close();
}
this._appIndex.delete(appId);
- craftingSystem = await this._systemRegistry.getCraftingSystemById(craftingSystem.id);
- await craftingSystem.loadPartDictionary();
- recipe = craftingSystem.getRecipeById(recipe.id);
+ await recipe.load();
}
- const app = this._recipeCraftingAppFactory.make(recipe, craftingSystem, actor, appId);
+ const app = await this._recipeCraftingAppFactory.make(recipe, actor, appId);
this._appIndex.set(appId, app);
return app;
}
+ private getAppId(actor: Actor, recipe: Recipe) {
+ // @ts-ignore
+ const actorId = actor.id;
+ return `fabricate-recipe-crafting-app-${recipe.id}-${actorId}`;
+ }
}
export { RecipeCraftingAppCatalog, DefaultRecipeCraftingAppCatalog }
\ No newline at end of file
diff --git a/src/applications/recipeCraftingApp/RecipeCraftingAppFactory.ts b/src/applications/recipeCraftingApp/RecipeCraftingAppFactory.ts
index 64f8884f..93b9d926 100644
--- a/src/applications/recipeCraftingApp/RecipeCraftingAppFactory.ts
+++ b/src/applications/recipeCraftingApp/RecipeCraftingAppFactory.ts
@@ -1,43 +1,65 @@
import {SvelteApplication} from "../SvelteApplication";
-import {CraftingSystem} from "../../scripts/system/CraftingSystem";
-import {DefaultGameProvider} from "../../scripts/foundry/GameProvider";
import Properties from "../../scripts/Properties";
import {DefaultLocalizationService} from "../common/LocalizationService";
import RecipeCraftingApp from "./RecipeCraftingApp.svelte";
-import {Recipe} from "../../scripts/common/Recipe";
-import {DefaultInventoryFactory} from "../../scripts/actor/InventoryFactory";
+import {Recipe} from "../../scripts/crafting/recipe/Recipe";
+import {CraftingAPI} from "../../scripts/api/CraftingAPI";
+import {DefaultRecipeCraftingManager} from "./RecipeCraftingManager";
+import {ComponentAPI} from "../../scripts/api/ComponentAPI";
interface RecipeCraftingAppFactory {
- make(recipe: Recipe, craftingSystem: CraftingSystem, actor: Actor, appId: string): SvelteApplication;
+ make(recipe: Recipe, actor: Actor, appId: string): Promise;
}
class DefaultRecipeCraftingAppFactory implements RecipeCraftingAppFactory {
- make(recipe: Recipe, craftingSystem: CraftingSystem, actor: any, appId: string): SvelteApplication {
+ private readonly localizationService: DefaultLocalizationService;
+ private readonly craftingAPI: CraftingAPI;
+ private readonly _componentAPI: ComponentAPI;
- const gameProvider = new DefaultGameProvider();
- const GAME = gameProvider.get();
+ constructor({
+ craftingAPI,
+ componentAPI,
+ localizationService,
+ }: {
+ craftingAPI: CraftingAPI;
+ componentAPI: ComponentAPI;
+ localizationService: DefaultLocalizationService;
+ }) {
+ this.craftingAPI = craftingAPI;
+ this._componentAPI = componentAPI;
+ this.localizationService = localizationService;
+ }
+
+ async make(recipe: Recipe, actor: any, appId: string): Promise {
const applicationOptions = {
- title: GAME.i18n.format(`${Properties.module.id}.RecipeCraftingApp.title`, { actorName: actor.name }),
+ title: this.localizationService.format(`${Properties.module.id}.RecipeCraftingApp.title`, { actorName: actor.name }),
id: appId,
resizable: false,
width: 680,
height: 620
}
- const inventory = new DefaultInventoryFactory(gameProvider).make(actor, craftingSystem);
+ const allCraftingSystemComponentsById = await this._componentAPI.getAllByCraftingSystemId(recipe.craftingSystemId);
+
+ const recipeCraftingManager = new DefaultRecipeCraftingManager({
+ recipeToCraft: recipe,
+ craftingAPI: this.craftingAPI,
+ sourceActor: actor,
+ targetActor: actor,
+ allCraftingSystemComponentsById
+ });
return new SvelteApplication({
applicationOptions,
svelteConfig: {
options: {
props: {
- recipe,
- inventory,
- localization: new DefaultLocalizationService(gameProvider),
+ recipeCraftingManager,
+ localization: this.localizationService,
closeHook: async () => {
const svelteApplication: SvelteApplication = Object.values(ui.windows)
.find(w => w.id == appId);
diff --git a/src/applications/recipeCraftingApp/RecipeCraftingManager.ts b/src/applications/recipeCraftingApp/RecipeCraftingManager.ts
new file mode 100644
index 00000000..2b5444dd
--- /dev/null
+++ b/src/applications/recipeCraftingApp/RecipeCraftingManager.ts
@@ -0,0 +1,232 @@
+import {BaseActor} from "@league-of-foundry-developers/foundry-vtt-types/src/foundry/common/documents.mjs";
+import {Recipe} from "../../scripts/crafting/recipe/Recipe";
+import {CraftingResult} from "../../scripts/crafting/result/CraftingResult";
+import {Component} from "../../scripts/crafting/component/Component";
+import {Combination} from "../../scripts/common/Combination";
+import {ComponentSelection} from "../../scripts/component/ComponentSelection";
+import {CraftingAPI} from "../../scripts/api/CraftingAPI";
+
+interface OptionDetails {
+ name: string;
+ id: string;
+}
+
+export { OptionDetails };
+
+interface CraftingAttempt {
+
+ readonly requirementOption: OptionDetails;
+ readonly resultOption: OptionDetails;
+ readonly isPossible: boolean;
+ readonly recipeToCraft: Recipe;
+ readonly requiresCatalysts: boolean;
+ readonly requiresEssences: boolean;
+ readonly requiresIngredients: boolean;
+ readonly producedComponents: Combination;
+ readonly selectedComponents: ComponentSelection;
+
+}
+
+export { CraftingAttempt };
+
+class DefaultCraftingAttempt implements CraftingAttempt {
+
+ private readonly _resultOption: OptionDetails;
+ private readonly _recipeToCraft: Recipe;
+ private readonly _requirementOption: OptionDetails;
+ private readonly _producedComponents: Combination;
+ private readonly _selectedComponents: ComponentSelection;
+
+ constructor({
+ resultOption,
+ recipeToCraft,
+ requirementOption,
+ producedComponents,
+ selectedComponents,
+ } : {
+ resultOption: OptionDetails;
+ recipeToCraft: Recipe;
+ requirementOption: OptionDetails;
+ producedComponents: Combination;
+ selectedComponents: ComponentSelection;
+ }) {
+ this._resultOption = resultOption;
+ this._recipeToCraft = recipeToCraft;
+ this._requirementOption = requirementOption;
+ this._producedComponents = producedComponents;
+ this._selectedComponents = selectedComponents;
+ }
+
+ get resultOption(): OptionDetails {
+ return this._resultOption;
+ }
+
+ get recipeToCraft(): Recipe {
+ return this._recipeToCraft;
+ }
+
+ get requirementOption(): OptionDetails {
+ return this._requirementOption;
+ }
+
+ get producedComponents(): Combination {
+ return this._producedComponents;
+ }
+
+ get selectedComponents(): ComponentSelection {
+ return this._selectedComponents;
+ }
+
+ get isPossible(): boolean {
+ return this._selectedComponents.isSufficient;
+ }
+
+ get requiresCatalysts(): boolean {
+ return !this._selectedComponents.catalysts.target.isEmpty();
+ }
+
+ get requiresEssences(): boolean {
+ return !this._selectedComponents.essences.target.isEmpty();
+ }
+
+ get requiresIngredients(): boolean {
+ return !this._selectedComponents.ingredients.target.isEmpty();
+ }
+
+}
+
+export { DefaultCraftingAttempt }
+
+interface RecipeCraftingManager {
+
+ readonly recipeToCraft: Recipe;
+
+ readonly sourceActor: BaseActor;
+
+ readonly targetActor: BaseActor;
+
+ readonly hasRequirementChoices: boolean;
+
+ readonly hasResultChoices: boolean;
+
+ selectNextRequirementOption(): Promise;
+
+ selectNextResultOption(): Promise;
+
+ selectPreviousRequirementOption(): Promise;
+
+ selectPreviousResultOption(): Promise;
+
+ getCraftingAttempt(): Promise;
+
+ doCrafting(craftingAttempt: CraftingAttempt): Promise;
+
+}
+
+export { RecipeCraftingManager };
+
+class DefaultRecipeCraftingManager implements RecipeCraftingManager {
+
+ private readonly _sourceActor: BaseActor;
+ private readonly _targetActor: BaseActor;
+ private readonly _craftingAPI: CraftingAPI;
+ private readonly _recipeToCraft: Recipe;
+ private readonly _allCraftingSystemComponentsById: Map;
+
+ constructor({
+ sourceActor,
+ targetActor,
+ craftingAPI,
+ recipeToCraft,
+ allCraftingSystemComponentsById,
+ }: {
+ sourceActor: BaseActor;
+ targetActor: BaseActor;
+ craftingAPI: CraftingAPI;
+ recipeToCraft: Recipe;
+ allCraftingSystemComponentsById: Map;
+ }) {
+ this._sourceActor = sourceActor;
+ this._targetActor = targetActor;
+ this._craftingAPI = craftingAPI;
+ this._recipeToCraft = recipeToCraft;
+ this._allCraftingSystemComponentsById = allCraftingSystemComponentsById;
+ }
+
+ get recipeToCraft(): Recipe {
+ return this._recipeToCraft;
+ }
+
+ get sourceActor(): BaseActor {
+ return this._sourceActor;
+ }
+
+ get targetActor(): BaseActor {
+ return this._targetActor;
+ }
+
+ get hasRequirementChoices(): boolean {
+ return this._recipeToCraft.hasRequirementChoices;
+ }
+
+ get hasResultChoices(): boolean {
+ return this._recipeToCraft.hasResultChoices;
+ }
+
+ async doCrafting(craftingAttempt: CraftingAttempt): Promise {
+ return this._craftingAPI.craftRecipe({
+ recipeId: this._recipeToCraft.id,
+ sourceActorId: this._sourceActor.id,
+ targetActorId: this._targetActor.id,
+ resultOptionId: this.recipeToCraft.selectedResultOption.id,
+ requirementOptionId: this.recipeToCraft.selectedRequirementOption.id,
+ userSelectedComponents: {
+ catalysts: craftingAttempt.selectedComponents.catalysts.actual.toJson(),
+ essenceSources: craftingAttempt.selectedComponents.essenceSources.toJson(),
+ ingredients: craftingAttempt.selectedComponents.ingredients.actual.toJson(),
+ }
+ });
+ }
+
+ async getCraftingAttempt(): Promise {
+ const producedComponents = this._recipeToCraft.selectedResultOption.results
+ .convertElements(reference => this._allCraftingSystemComponentsById.get(reference.id));
+ const selectedComponents = await this._craftingAPI.selectComponents({
+ recipeId: this._recipeToCraft.id,
+ sourceActorId: this._sourceActor.id,
+ requirementOptionId: this._recipeToCraft.selectedRequirementOption.id,
+ });
+ return new DefaultCraftingAttempt({
+ resultOption: {
+ id: this._recipeToCraft.selectedResultOption.id,
+ name: this._recipeToCraft.selectedResultOption.name,
+ },
+ requirementOption: {
+ id: this._recipeToCraft.selectedRequirementOption.id,
+ name: this._recipeToCraft.selectedRequirementOption.name,
+ },
+ recipeToCraft: this._recipeToCraft,
+ producedComponents,
+ selectedComponents,
+ });
+ }
+
+ selectNextRequirementOption(): Promise {
+ return Promise.resolve(undefined);
+ }
+
+ selectNextResultOption(): Promise {
+ return Promise.resolve(undefined);
+ }
+
+ selectPreviousRequirementOption(): Promise {
+ return Promise.resolve(undefined);
+ }
+
+ selectPreviousResultOption(): Promise {
+ return Promise.resolve(undefined);
+ }
+
+}
+
+export { DefaultRecipeCraftingManager };
\ No newline at end of file
diff --git a/src/applications/stores/ComponentEssenceStore.ts b/src/applications/stores/ComponentEssenceStore.ts
index d7617b53..f59ea012 100644
--- a/src/applications/stores/ComponentEssenceStore.ts
+++ b/src/applications/stores/ComponentEssenceStore.ts
@@ -1,37 +1,47 @@
import {derived, Readable, Subscriber} from "svelte/store";
-import {Essence} from "../../scripts/common/Essence";
-import {Unit} from "../../scripts/common/Combination";
-import {CraftingSystem} from "../../scripts/system/CraftingSystem";
-import {CraftingComponent} from "../../scripts/common/CraftingComponent";
+import {Essence} from "../../scripts/crafting/essence/Essence";
+import {Component} from "../../scripts/crafting/component/Component";
+import {Unit} from "../../scripts/common/Unit";
-class ComponentEssenceStore {
+/**
+ * This store provides the current and available essences for the selected component by combining the essences of the
+ * selected crafting system with the essences of the selected component.
+ */
+class ComponentEssenceStore implements Readable[]> {
- private readonly _essences: Readable[]>;
+ /**
+ * The essences for the selected component, including essences that are available in the selected crafting system
+ * but not yet included in the selected component.
+ * @private
+ */
+ private readonly _componentEssences: Readable[]>;
constructor({
- selectedCraftingSystem,
+ allEssences,
selectedComponent
}: {
- selectedCraftingSystem: Readable;
- selectedComponent: Readable;
+ allEssences: Readable;
+ selectedComponent: Readable;
}) {
- this._essences = derived(
- [selectedCraftingSystem, selectedComponent],
- ([$selectedSystem, $selectedCraftingComponent], set) => {
- if (!$selectedSystem || !$selectedSystem.hasEssences || !$selectedCraftingComponent) {
+ this._componentEssences = derived(
+ [allEssences, selectedComponent],
+ ([$allEssences, $selectedComponent], set) => {
+ if ($allEssences.length === 0 || !$selectedComponent) {
set([]);
return;
}
- const essences = $selectedSystem.getEssences().map(essence => {
- return new Unit(essence, $selectedCraftingComponent.essences.amountFor(essence.id));
- });
+ const essences = $allEssences
+ .map(essence => {
+ return new Unit(essence, $selectedComponent.essences.amountFor(essence.id));
+ });
set(essences);
});
}
public subscribe(subscriber: Subscriber[]>) {
- return this._essences.subscribe(subscriber);
+ return this._componentEssences.subscribe(subscriber);
}
+
}
export {ComponentEssenceStore }
\ No newline at end of file
diff --git a/src/applications/stores/ComponentSearchStore.ts b/src/applications/stores/ComponentSearchStore.ts
index bb3e4c9d..2a6a03a7 100644
--- a/src/applications/stores/ComponentSearchStore.ts
+++ b/src/applications/stores/ComponentSearchStore.ts
@@ -1,5 +1,5 @@
import {writable, Writable, Readable, derived, Subscriber} from "svelte/store";
-import {CraftingComponent} from "../../scripts/common/CraftingComponent";
+import {Component} from "../../scripts/crafting/component/Component";
interface ComponentSearchTerms {
name?: string;
@@ -9,18 +9,18 @@ interface ComponentSearchTerms {
class ComponentSearchStore {
- private readonly _availableComponents: Readable;
- private readonly _searchResults: Readable;
+ private readonly _availableComponents: Readable;
+ private readonly _searchResults: Readable;
private readonly _searchTerms: Writable;
constructor({
- availableComponents,
+ components,
searchTerms = {}
}: {
- availableComponents: Readable;
+ components: Readable;
searchTerms?: ComponentSearchTerms;
}) {
- this._availableComponents = availableComponents;
+ this._availableComponents = components;
this._searchTerms = writable(searchTerms);
this._searchResults = derived(
[this._availableComponents, this._searchTerms],
@@ -31,11 +31,11 @@ class ComponentSearchStore {
this.clearOnSystemSelection(this._availableComponents);
}
- private clearOnSystemSelection(availableComponents: Readable) {
+ private clearOnSystemSelection(availableComponents: Readable) {
availableComponents.subscribe(() => this.clear());
}
- private searchComponents(craftingComponents: CraftingComponent[], searchTerms: ComponentSearchTerms) {
+ private searchComponents(craftingComponents: Component[], searchTerms: ComponentSearchTerms) {
return craftingComponents.filter((component) => {
if (searchTerms.hasEssences && !component.hasEssences) {
return false;
@@ -50,7 +50,7 @@ class ComponentSearchStore {
});
}
- public subscribe(subscriber: Subscriber) {
+ public subscribe(subscriber: Subscriber) {
return this._searchResults.subscribe(subscriber);
}
diff --git a/src/applications/stores/ComponentsStore.ts b/src/applications/stores/ComponentsStore.ts
new file mode 100644
index 00000000..b0f352f6
--- /dev/null
+++ b/src/applications/stores/ComponentsStore.ts
@@ -0,0 +1,79 @@
+import {CraftingSystem} from "../../scripts/system/CraftingSystem";
+import {Readable, Subscriber, Updater, writable, Writable, get} from "svelte/store";
+import {Component} from "../../scripts/crafting/component/Component";
+import {FabricateAPI} from "../../scripts/api/FabricateAPI";
+
+class ComponentsStore implements Writable {
+
+ private readonly _craftingComponents: Writable;
+ private readonly _fabricateAPI: FabricateAPI;
+
+ constructor({
+ fabricateAPI,
+ selectedCraftingSystem,
+ initialValue = [],
+ }: {
+ fabricateAPI: FabricateAPI;
+ selectedCraftingSystem: Readable;
+ initialValue?: Component[];
+ }) {
+ this._fabricateAPI = fabricateAPI;
+ this._craftingComponents = writable(initialValue);
+ this.watchSelectedCraftingSystem(selectedCraftingSystem);
+ }
+
+ private watchSelectedCraftingSystem(selectedCraftingSystem: Readable) {
+ selectedCraftingSystem.subscribe((craftingSystem) => {
+ if (!craftingSystem) {
+ this._craftingComponents.set([]);
+ return;
+ }
+ this._fabricateAPI.components.getAllByCraftingSystemId(craftingSystem.id)
+ .then((components) => {
+ this._craftingComponents.set(Array.from(components.values()));
+ });
+ });
+ }
+
+ public get(): Component[] {
+ return get(this._craftingComponents);
+ }
+
+ public subscribe(subscriber: Subscriber) {
+ return this._craftingComponents.subscribe(subscriber);
+ }
+
+ set(value: Component[]): void {
+ this._craftingComponents.set(value);
+ }
+
+ update(updater: Updater): void {
+ this._craftingComponents.update(updater);
+ }
+
+ insert(component: Component) {
+ this._craftingComponents.update((components) => {
+ const index = components.findIndex((candidate) => candidate.id === component.id);
+ if (index === -1) {
+ components.push(component);
+ return components;
+ }
+ components[index] = component;
+ return components;
+ });
+ }
+
+ remove(component: Component) {
+ this._craftingComponents.update((components) => {
+ const index = components.findIndex((candidate) => candidate.id === component.id);
+ if (index === -1) {
+ return components;
+ }
+ components.splice(index, 1);
+ return components;
+ });
+ }
+
+}
+
+export { ComponentsStore }
\ No newline at end of file
diff --git a/src/applications/stores/CraftingComponentsStore.ts b/src/applications/stores/CraftingComponentsStore.ts
deleted file mode 100644
index 1b1e2743..00000000
--- a/src/applications/stores/CraftingComponentsStore.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import {CraftingSystem} from "../../scripts/system/CraftingSystem";
-import {derived, Readable, Subscriber} from "svelte/store";
-import {CraftingComponent} from "../../scripts/common/CraftingComponent";
-
-class CraftingComponentsStore {
-
- private readonly _craftingComponents: Readable;
-
- constructor({
- selectedCraftingSystem
- }: {
- selectedCraftingSystem: Readable;
- }) {
- this._craftingComponents = derived(
- selectedCraftingSystem,
- ($selectedCraftingSystem, set) => set($selectedCraftingSystem?.craftingComponents ?? [])
- );
- }
-
- public subscribe(subscriber: Subscriber) {
- return this._craftingComponents.subscribe(subscriber);
- }
-
-}
-
-export { CraftingComponentsStore }
\ No newline at end of file
diff --git a/src/applications/stores/CraftingSystemsStore.ts b/src/applications/stores/CraftingSystemsStore.ts
index 5dda3499..1becc807 100644
--- a/src/applications/stores/CraftingSystemsStore.ts
+++ b/src/applications/stores/CraftingSystemsStore.ts
@@ -33,13 +33,13 @@ class CraftingSystemsStore {
private sort(craftingSystems: CraftingSystem[]): CraftingSystem[] {
return craftingSystems.sort((left, right) => {
- if (left.isLocked && !right.isLocked) {
+ if (left.isEmbedded && !right.isEmbedded) {
return -1;
}
- if (right.isLocked && !left.isLocked) {
+ if (right.isEmbedded && !left.isEmbedded) {
return 1;
}
- return left.name.localeCompare(right.name);
+ return left.details.name.localeCompare(right.details.name);
});
}
diff --git a/src/applications/stores/EssenceStore.ts b/src/applications/stores/EssenceStore.ts
new file mode 100644
index 00000000..3a4e007f
--- /dev/null
+++ b/src/applications/stores/EssenceStore.ts
@@ -0,0 +1,79 @@
+import {CraftingSystem} from "../../scripts/system/CraftingSystem";
+import {Readable, Subscriber, Updater, writable, Writable, get} from "svelte/store";
+import {FabricateAPI} from "../../scripts/api/FabricateAPI";
+import {Essence} from "../../scripts/crafting/essence/Essence";
+
+class EssencesStore implements Writable {
+
+ private readonly _essences: Writable;
+ private readonly _fabricateAPI: FabricateAPI;
+
+ constructor({
+ fabricateAPI,
+ selectedCraftingSystem,
+ initialValue = [],
+ }: {
+ fabricateAPI: FabricateAPI;
+ selectedCraftingSystem: Readable;
+ initialValue?: Essence[];
+ }) {
+ this._fabricateAPI = fabricateAPI;
+ this._essences = writable(initialValue);
+ this.watchSelectedCraftingSystem(selectedCraftingSystem);
+ }
+
+ private watchSelectedCraftingSystem(selectedCraftingSystem: Readable) {
+ selectedCraftingSystem.subscribe((craftingSystem) => {
+ if (!craftingSystem) {
+ this._essences.set([]);
+ return;
+ }
+ this._fabricateAPI.essences.getAllByCraftingSystemId(craftingSystem.id)
+ .then((essences) => {
+ this._essences.set(Array.from(essences.values()));
+ });
+ });
+ }
+
+ public get(): Essence[] {
+ return get(this._essences);
+ }
+
+ public subscribe(subscriber: Subscriber) {
+ return this._essences.subscribe(subscriber);
+ }
+
+ set(value: Essence[]): void {
+ this._essences.set(value);
+ }
+
+ update(updater: Updater): void {
+ this._essences.update(updater);
+ }
+
+ insert(essence: Essence) {
+ this._essences.update((essences) => {
+ const index = essences.findIndex((candidate) => candidate.id === essence.id);
+ if (index === -1) {
+ essences.push(essence);
+ return essences;
+ }
+ essences[index] = essence;
+ return essences;
+ });
+ }
+
+ remove(essence: Essence) {
+ this._essences.update((components) => {
+ const index = components.findIndex((candidate) => candidate.id === essence.id);
+ if (index === -1) {
+ return components;
+ }
+ components.splice(index, 1);
+ return components;
+ });
+ }
+
+}
+
+export { EssencesStore }
\ No newline at end of file
diff --git a/src/applications/stores/RecipeEssenceStore.ts b/src/applications/stores/RecipeEssenceStore.ts
deleted file mode 100644
index f90b0d37..00000000
--- a/src/applications/stores/RecipeEssenceStore.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import {derived, Readable, Subscriber} from "svelte/store";
-import {Essence} from "../../scripts/common/Essence";
-import {Unit} from "../../scripts/common/Combination";
-import {CraftingSystem} from "../../scripts/system/CraftingSystem";
-import {Recipe} from "../../scripts/common/Recipe";
-
-class RecipeEssenceStore {
-
- private readonly _essences: Readable[]>;
-
- constructor({
- selectedCraftingSystem,
- selectedRecipe
- }: {
- selectedCraftingSystem: Readable;
- selectedRecipe: Readable;
- }) {
- this._essences = derived(
- [selectedCraftingSystem, selectedRecipe],
- ([$selectedSystem, $selectedCraftingComponent], set) => {
- if (!$selectedSystem || !$selectedSystem.hasEssences || !$selectedCraftingComponent) {
- set([]);
- return;
- }
- const essences = $selectedSystem.getEssences().map(essence => {
- return new Unit(essence, $selectedCraftingComponent.essences.amountFor(essence.id));
- });
- set(essences);
- });
- }
-
- public subscribe(subscriber: Subscriber[]>) {
- return this._essences.subscribe(subscriber);
- }
-}
-
-export {RecipeEssenceStore }
\ No newline at end of file
diff --git a/src/applications/stores/RecipeRequirementOptionEssenceStore.ts b/src/applications/stores/RecipeRequirementOptionEssenceStore.ts
new file mode 100644
index 00000000..7899bd82
--- /dev/null
+++ b/src/applications/stores/RecipeRequirementOptionEssenceStore.ts
@@ -0,0 +1,58 @@
+import {derived, Readable, Subscriber} from "svelte/store";
+import {Essence} from "../../scripts/crafting/essence/Essence";
+import {Unit} from "../../scripts/common/Unit";
+import {Recipe} from "../../scripts/crafting/recipe/Recipe";
+
+/**
+ * This store provides the current and available essences for each requirement option by combining the essences of the
+ * selected crafting system with the essences of the selected recipe's requirement options.
+ */
+class RecipeRequirementOptionEssenceStore implements Readable[]>> {
+
+ /**
+ * The essences for each requirement option by id, including essences that are available in the selected crafting
+ * system but not yet included in the selected component.
+ * @private
+ */
+ private readonly _recipeRequirementOptionEssences: Readable[]>>;
+
+ constructor({
+ allEssences,
+ selectedRecipe,
+ }: {
+ allEssences: Readable;
+ selectedRecipe: Readable;
+ }) {
+ this._recipeRequirementOptionEssences = derived(
+ [allEssences, selectedRecipe],
+ ([$allEssences, $selectedRecipe], set) => {
+ if ($allEssences.length === 0 || !$selectedRecipe) {
+ set(new Map());
+ return;
+ }
+ const result = $selectedRecipe.requirementOptions.all
+ .map(requirementOption => {
+ const essences = $allEssences
+ .map(essence => {
+ return new Unit(essence, requirementOption.essences.amountFor(essence.id));
+ });
+ return {
+ requirementOption,
+ essences
+ }
+ })
+ .reduce((map, {requirementOption, essences}) => {
+ map.set(requirementOption.id, essences);
+ return map;
+ }, new Map[]>());
+ set(result);
+ });
+ }
+
+ public subscribe(subscriber: Subscriber[]>>) {
+ return this._recipeRequirementOptionEssences.subscribe(subscriber);
+ }
+
+}
+
+export {RecipeRequirementOptionEssenceStore }
\ No newline at end of file
diff --git a/src/applications/stores/RecipeSearchStore.ts b/src/applications/stores/RecipeSearchStore.ts
index 2d821326..1e0ffc92 100644
--- a/src/applications/stores/RecipeSearchStore.ts
+++ b/src/applications/stores/RecipeSearchStore.ts
@@ -1,5 +1,5 @@
import {writable, Writable, Readable, derived, Subscriber} from "svelte/store";
-import {Recipe} from "../../scripts/common/Recipe";
+import {Recipe} from "../../scripts/crafting/recipe/Recipe";
interface RecipeSearchTerms {
name?: string;
@@ -37,10 +37,10 @@ class RecipeSearchStore {
private searchRecipes(recipes: Recipe[], searchTerms: RecipeSearchTerms) {
return recipes.filter((recipe) => {
- if (searchTerms.requiresEssences && !recipe.requiresEssences) {
+ if (searchTerms.requiresEssences && !recipe.hasEssenceRequirementOption()) {
return false;
}
- if (searchTerms.requiresNamedIngredients && !recipe.hasIngredients) {
+ if (searchTerms.requiresNamedIngredients && !recipe.hasRequirements) {
return false;
}
if (!searchTerms.name) {
diff --git a/src/applications/stores/RecipesStore.ts b/src/applications/stores/RecipesStore.ts
index e7216a67..a4afa5e2 100644
--- a/src/applications/stores/RecipesStore.ts
+++ b/src/applications/stores/RecipesStore.ts
@@ -1,26 +1,75 @@
+import {get, Readable, Subscriber, Updater, writable, Writable} from "svelte/store";
+import {Recipe} from "../../scripts/crafting/recipe/Recipe";
+import {FabricateAPI} from "../../scripts/api/FabricateAPI";
import {CraftingSystem} from "../../scripts/system/CraftingSystem";
-import {derived, Readable, Subscriber} from "svelte/store";
-import {Recipe} from "../../scripts/common/Recipe";
class RecipesStore {
- private readonly _recipes: Readable;
+ private readonly _recipes: Writable;
+ private readonly _fabricateAPI: FabricateAPI;
constructor({
- selectedCraftingSystem
+ fabricateAPI,
+ selectedCraftingSystem,
+ initialValue = [],
}: {
+ fabricateAPI: FabricateAPI;
selectedCraftingSystem: Readable;
+ initialValue?: Recipe[];
}) {
- this._recipes = derived(
- selectedCraftingSystem,
- ($selectedCraftingSystem, set) => set($selectedCraftingSystem?.recipes ?? [])
- );
+ this._fabricateAPI = fabricateAPI;
+ this._recipes = writable(initialValue);
+ this.watchSelectedCraftingSystem(selectedCraftingSystem);
+ }
+
+ private watchSelectedCraftingSystem(selectedCraftingSystem: Readable) {
+ selectedCraftingSystem.subscribe((craftingSystem) => {
+ if (!craftingSystem) {
+ this._recipes.set([]);
+ return;
+ }
+ this._fabricateAPI.recipes.getAllByCraftingSystemId(craftingSystem.id)
+ .then((recipes) => {
+ this._recipes.set(Array.from(recipes.values()));
+ });
+ });
+ }
+
+ public get(): Recipe[] {
+ return get(this._recipes);
}
public subscribe(subscriber: Subscriber) {
return this._recipes.subscribe(subscriber);
}
+ update(updater: Updater): void {
+ this._recipes.update(updater);
+ }
+
+ insert(recipe: Recipe) {
+ this._recipes.update((recipes) => {
+ const index = recipes.findIndex((candidate) => candidate.id === recipe.id);
+ if (index === -1) {
+ recipes.push(recipe);
+ return recipes;
+ }
+ recipes.splice(index, 1, recipe);
+ return recipes;
+ });
+ }
+
+ remove(recipe: Recipe) {
+ this._recipes.update((recipes) => {
+ const index = recipes.findIndex((candidate) => candidate.id === recipe.id);
+ if (index === -1) {
+ return recipes;
+ }
+ recipes.splice(index, 1);
+ return recipes;
+ });
+ }
+
}
export { RecipesStore }
\ No newline at end of file
diff --git a/src/applications/stores/SalvageSearchStore.ts b/src/applications/stores/SalvageSearchStore.ts
index a134f621..48c63231 100644
--- a/src/applications/stores/SalvageSearchStore.ts
+++ b/src/applications/stores/SalvageSearchStore.ts
@@ -1,5 +1,5 @@
import {writable, Writable, Readable, derived, Subscriber} from "svelte/store";
-import {CraftingComponent} from "../../scripts/common/CraftingComponent";
+import {Component} from "../../scripts/crafting/component/Component";
interface SalvageSearchTerms {
name?: string;
@@ -7,21 +7,21 @@ interface SalvageSearchTerms {
class SalvageSearchStore {
- private readonly _availableComponents: Readable;
- private readonly _selectedComponent: Readable;
- private readonly _searchResults: Readable;
+ private readonly _availableComponents: Readable;
+ private readonly _selectedComponent: Readable;
+ private readonly _searchResults: Readable;
private readonly _searchTerms: Writable;
constructor({
- availableComponents,
+ components,
selectedComponent,
searchTerms = {}
}: {
- availableComponents: Readable;
- selectedComponent: Readable;
+ components: Readable;
+ selectedComponent: Readable;
searchTerms?: SalvageSearchTerms;
}) {
- this._availableComponents = availableComponents;
+ this._availableComponents = components;
this._selectedComponent = selectedComponent;
this._searchTerms = writable(searchTerms);
this._searchResults = derived(
@@ -34,15 +34,15 @@ class SalvageSearchStore {
this.clearOnComponentSelection(this._selectedComponent);
}
- private clearOnSystemSelection(availableComponents: Readable) {
+ private clearOnSystemSelection(availableComponents: Readable) {
availableComponents.subscribe(() => this.clear());
}
- private clearOnComponentSelection(selectedComponent: Readable) {
+ private clearOnComponentSelection(selectedComponent: Readable) {
selectedComponent.subscribe(() => this.clear());
}
- private searchComponents(craftingComponents: CraftingComponent[], selectedComponent: CraftingComponent, searchTerms: SalvageSearchTerms) {
+ private searchComponents(craftingComponents: Component[], selectedComponent: Component, searchTerms: SalvageSearchTerms) {
return craftingComponents
.filter(component => component !== selectedComponent)
.filter((component) => {
@@ -53,7 +53,7 @@ class SalvageSearchStore {
});
}
- public subscribe(subscriber: Subscriber) {
+ public subscribe(subscriber: Subscriber) {
return this._searchResults.subscribe(subscriber);
}
diff --git a/src/applications/stores/SelectedCraftingComponentStore.ts b/src/applications/stores/SelectedCraftingComponentStore.ts
index 1be311d9..9d603cee 100644
--- a/src/applications/stores/SelectedCraftingComponentStore.ts
+++ b/src/applications/stores/SelectedCraftingComponentStore.ts
@@ -1,22 +1,22 @@
import {get, Readable, Subscriber, Updater, writable, Writable} from "svelte/store";
-import {CraftingComponent} from "../../scripts/common/CraftingComponent";
+import {Component} from "../../scripts/crafting/component/Component";
class SelectedCraftingComponentStore {
- private readonly _selectedCraftingComponent: Writable;
+ private readonly _selectedCraftingComponent: Writable;
constructor({
craftingComponents,
selectedComponent
}: {
- craftingComponents: Readable;
- selectedComponent?: CraftingComponent;
+ craftingComponents: Readable;
+ selectedComponent?: Component;
}) {
this._selectedCraftingComponent = writable(selectedComponent);
this.deselectOrUpdateWhenAvailableComponentsChange(craftingComponents);
}
- private deselectOrUpdateWhenAvailableComponentsChange(craftingComponents: Readable) {
+ private deselectOrUpdateWhenAvailableComponentsChange(craftingComponents: Readable) {
craftingComponents.subscribe(value => {
if (!value) {
throw new Error("Components may not be null");
@@ -33,15 +33,15 @@ class SelectedCraftingComponentStore {
});
}
- public subscribe(subscriber: Subscriber) {
+ public subscribe(subscriber: Subscriber) {
return this._selectedCraftingComponent.subscribe(subscriber);
}
- public set(value: CraftingComponent) {
+ public set(value: Component) {
return this._selectedCraftingComponent.set(value);
}
- public update(updater: Updater) {
+ public update(updater: Updater) {
this._selectedCraftingComponent.update(updater);
}
diff --git a/src/applications/stores/SelectedCraftingSystemStore.ts b/src/applications/stores/SelectedCraftingSystemStore.ts
index f286b3b5..cc8f03fb 100644
--- a/src/applications/stores/SelectedCraftingSystemStore.ts
+++ b/src/applications/stores/SelectedCraftingSystemStore.ts
@@ -13,20 +13,9 @@ class SelectedCraftingSystemStore {
selectedSystem?: CraftingSystem;
}) {
this._selectedCraftingSystem = writable(selectedSystem);
- this.loadWhenSelected(this._selectedCraftingSystem);
this.shadowCraftingSystemUpdates(craftingSystems);
}
- public async reload() {
- const selectedSystem = get(this._selectedCraftingSystem);
- if (!selectedSystem) {
- return;
- }
- await selectedSystem.reload();
- this._selectedCraftingSystem.set(selectedSystem);
- return selectedSystem;
- }
-
private shadowCraftingSystemUpdates(craftingSystems: Readable) {
craftingSystems.subscribe(value => {
if (!value) {
@@ -36,26 +25,12 @@ class SelectedCraftingSystemStore {
this._selectedCraftingSystem.set(null);
}
const selectedSystem = get(this._selectedCraftingSystem);
- const found = value.find(system => system === selectedSystem);
+ const found = value.find(system => system.id === selectedSystem?.id);
if (!found) {
this._selectedCraftingSystem.set(value[0]);
return;
}
- Promise.resolve(this.reload())
- .catch(e => console.error(`Unable to reload crafting system. ${e instanceof Error ? e.stack : e}`));
- });
- }
-
- private loadWhenSelected(selectedCraftingSystem: Writable) {
- selectedCraftingSystem.subscribe((value) => {
- if (!value) {
- return;
- }
- if (!value.isLoaded) {
- Promise
- .resolve(value.loadPartDictionary())
- .then(() => selectedCraftingSystem.set(value));
- }
+ this._selectedCraftingSystem.set(found);
});
}
diff --git a/src/applications/stores/SelectedRecipeStore.ts b/src/applications/stores/SelectedRecipeStore.ts
index 48f54ec9..42c33e84 100644
--- a/src/applications/stores/SelectedRecipeStore.ts
+++ b/src/applications/stores/SelectedRecipeStore.ts
@@ -1,5 +1,5 @@
import {get, Readable, Subscriber, Updater, writable, Writable} from "svelte/store";
-import {Recipe} from "../../scripts/common/Recipe";
+import {Recipe} from "../../scripts/crafting/recipe/Recipe";
class SelectedRecipeStore {
diff --git a/src/public/lang/en.json b/src/public/lang/en.json
index ac7a1eb0..bd42a68a 100644
--- a/src/public/lang/en.json
+++ b/src/public/lang/en.json
@@ -8,10 +8,7 @@
"recipe": {
"singular": "Recipe",
"plural": "Recipes",
- "ingredientOption": {
- "name": "Option {number}"
- },
- "resultOption": {
+ "option": {
"name": "Option {number}"
}
},
@@ -43,12 +40,138 @@
"plural": "Active Effect Sources"
}
},
+ "settings": {
+ "settingDeleted": "The setting {settingPath} was deleted. ",
+ "craftingSystem": {
+ "deleted": "Deleted crafting system \"{systemName}\"",
+ "created": "Created crafting system \"{systemName}\"",
+ "updated": "Updated crafting system \"{systemName}\"",
+ "import": {
+ "invalidData": {
+ "summary": "The provided crafting system import data is not valid. Correct the following errors and try again: {errors}",
+ "invalidJson": "Invalid JSON. ",
+ "noData": "No data was provided to import. ",
+ "noVersion": "Missing required property \"version: string\". ",
+ "noSystem": "Missing required property \"system: CraftingSystemExportModel\". ",
+ "noEssences": "Missing required property \"essences: EssenceExportModel[]\". ",
+ "noComponents": "Missing required property \"components: ComponentExportModel[]\". ",
+ "noRecipes": "Missing required property \"recipes: RecipeExportModel[]\". "
+ },
+ "failure": "Failed to import crafting system \"{systemName}\"",
+ "success": "Successfully imported crafting system \"{systemName}\", with {essenceCount} essences, {componentCount} components, and {recipeCount} recipes. "
+ },
+ "duplicate": {
+ "failure": "Failed to duplicate crafting system with ID \"{systemId}\". Caused by: {cause}",
+ "success": "Successfully duplicated crafting system with \"{systemId}\". The clone's ID is \"{cloneId}\". "
+ },
+ "export": {
+ "craftingSystemNotFound": "The crafting system with ID {craftingSystemId} does not exist. "
+ }
+ },
+ "errors": {
+ "invalidRead": "The stored value for the setting {settingPath} is not valid, and could not be read. {errors}",
+ "invalidWrite": "The provided value for the setting {settingPath} is not valid, and could not be saved. {errors}",
+ "craftingSystem": {
+ "doesNotExist": "The crafting system with ID {craftingSystemId} does not exist. ",
+ "invalid": "The crafting system with ID {craftingSystemId} is not valid. Errors: {errors}. ",
+ "missingCraftingSystems": "The crafting systems with the IDs {craftingSystemIds} could not be found. ",
+ "cannotModifyEmbedded": "The crafting system {craftingSystemName} is an embedded system and cannot be modified. ",
+ "cannotDeleteEmbedded": "The crafting system {craftingSystemName} is an embedded system and cannot be deleted. "
+ },
+ "document": {
+ "notFound": "The document with UUID {documentUuid} could not be found. "
+ },
+ "recipe": {
+ "doesNotExist": "The recipe with ID {recipeId} does not exist. ",
+ "invalid": "The recipe with ID {recipeId} is not valid. Errors: {errors}. ",
+ "missingRecipes": "The recipes with the IDs {recipeIds} could not be found. ",
+ "noneSaved": "A problem occurred saving one or more recipes. No recipes were saved. "
+ },
+ "component": {
+ "doesNotExist": "The component with ID {componentId} does not exist. ",
+ "invalid": "The component with ID {componentId} is not valid. Errors: {errors}. ",
+ "missingComponents": "The components with the IDs {componentIds} could not be found. ",
+ "noneSaved": "A problem occurred saving one or more components. No components were saved."
+ },
+ "essence": {
+ "doesNotExist": "The essence with ID {essenceId} does not exist. ",
+ "invalid": "The essence with ID {essenceId} is not valid. Errors: {errors}. ",
+ "missingEssences": "The essences with the IDs {essenceIds} could not be found. ",
+ "noneSaved": "A problem occurred saving one or more essences. No essences were saved."
+ }
+ },
+ "migration": {
+ "notNeeded": "Fabricate settings are already up to date and don't not need to be migrated. ",
+ "started": "Fabricate is migrating your crafting system settings. Please do close your browser or shut down the game world. ",
+ "failed": "Fabricate was unable to migrate your crafting system settings. Please report this error to the module author. ",
+ "success": "Fabricate has finished migrating your crafting system settings!"
+ },
+ "recipe": {
+ "updated": "Updated recipe \"{recipeName}\"",
+ "created": "Created recipe \"{recipeName}\"",
+ "savedAll": "Saved {count} recipes"
+ },
+ "component": {
+ "updated": "Updated component \"{componentName}\"",
+ "created": "Created component \"{componentName}\"",
+ "savedAll": "Saved {count} components"
+ },
+ "essence": {
+ "updated": "Updated essence \"{essenceName}\"",
+ "created": "Created essence \"{essenceName}\"",
+ "savedAll": "Saved {count} essences"
+ }
+ },
+ "crafting": {
+ "actorNotFound": "The Actor with id {actorId} could not be found. ",
+ "disabledCraftingSystem": "The component {componentName} belongs to the crafting system {craftingSystemName}, which is disabled and cannot be used.",
+ "salvage": {
+ "componentNotFound": "The component with id {componentId} could not be found. ",
+ "componentNotOwned": "The component with name {componentName} is not owned by the Actor {actorName}. ",
+ "disabledComponent": "The component {componentName} is disabled and cannot be salvaged.",
+ "unsalvageableComponent": "The component {componentName} has no usable salvage options.",
+ "invalidItemData": "The component with ID \"{componentId}\" has a problem with its item data. Caused by: {cause}",
+ "multipleCraftingSystems": "This Salvage Result has components from multiple Crafting Systems. This is not supported, and possibly a bug. The crafting system IDs are: {craftingSystemIds}. ",
+ "success": "Salvaged {componentName} in {craftingSystemName}.",
+ "salvageOptionIdRequired": "The component {componentName} has {salvageOptionCount} salvage options, but no salvage option ID was provided. The available salvage option ids are: {salvageOptionIds}. ",
+ "missingCatalysts": "Unable to salvage the component {componentName}. Missing required catalysts: {missingCatalystNames}. "
+ },
+ "recipe": {
+ "recipeNotFound": "The recipe with id {recipeId} could not be found. ",
+ "invalidItemData": "The recipe with ID \"{recipeId}\" has a problem with its item data. Caused by: {cause}",
+ "disabledRecipe": "The recipe {recipeName} is disabled and cannot be crafted.",
+ "requirementOptionIdRequired": "The recipe {recipeName} has {requirementOptionCount} requirement options, but no requirement option ID was provided. The available requirement option ids are: {requirementOptionIds}. ",
+ "resultOptionIdRequired": "The recipe {recipeName} has {resultOptionCount} result options, but no result option ID was provided. The available result option ids are: {resultOptionIds}. ",
+ "multipleCraftingSystems": "The recipe {recipeName} has components from multiple Crafting Systems. This is not supported, and possibly a bug. The crafting system IDs are: {craftingSystemIds}. ",
+ "invalidComponentItemData": "The recipe {recipeName} has a problem with its component item data. The invalid component IDs are {invalidComponentIds}. ",
+ "multipleEssenceCraftingSystems": "The recipe {recipeName} has essences from multiple Crafting Systems. This is not supported, and possibly a bug. The crafting system IDs are: {craftingSystemIds}. ",
+ "invalidEssenceItemData": "The recipe {recipeName} has a problem with its essence item data. The invalid essence IDs are {essenceIds}. ",
+ "insufficientUserComponents": "The selected components for crafting {recipeName} are not all owned by the Actor {actorName}. The missing components are {missingComponentNames}. ",
+ "insufficientComponents": "The Actor {actorName} does not have enough of the required components to craft {recipeName}. ",
+ "success": "Crafted {recipeName} in {craftingSystemName}."
+ },
+ "inventory": {
+ "error": {
+ "invalidActor": "The Actor this inventory was configured for is not valid.",
+ "componentNotFound": "The component with ID {componentId} could not be found."
+ }
+ }
+ },
"CraftingComponentCarousel": {
"buttons": {
"next": "Next option",
"previous": "Previous option"
}
},
+ "ComponentSalvageCarousel": {
+ "buttons": {
+ "next": "Next option",
+ "previous": "Previous option"
+ },
+ "hints": {
+ "requiresCatalysts": "This component requires these catalysts to salvaged."
+ }
+ },
"CraftingResultCarousel": {
"buttons": {
"next": "Next",
@@ -80,7 +203,8 @@
"notSalvageable": "Something has gone wrong, and this component has zero salvage options."
},
"hints": {
- "doSalvage": "Salvaging this component will add these items to your inventory"
+ "doSalvage": "Salvaging this component will add these items to your inventory",
+ "requiresCatalysts": "This component requires these catalysts to salvaged."
},
"dialog": {
"doSalvage": {
@@ -124,8 +248,8 @@
},
"settings": {
"title": "Settings",
- "enabled": {
- "label": "Enabled",
+ "disabled": {
+ "label": "Disabled",
"description": "Disabled systems cannot be used. Their components cannot be salvaged. Their recipes cannot be crafted."
}
}
@@ -174,6 +298,8 @@
"labels": {
"salvageName": "Option name",
"salvageHeading": "Salvage",
+ "resultsHeading": "Results",
+ "catalystsHeading": "Catalysts",
"availableComponentsHeading": "Available Components",
"essencesHeading": "Essences",
"replaceItem": "Drop an item to replace",
@@ -235,7 +361,7 @@
"catalystsHeading": "Catalysts",
"resultsHeading": "Results",
"availableComponentsHeading": "Available Components",
- "essencesHeading": "Required essences",
+ "essencesHeading": "Essences",
"replaceItem": "Drop an item to replace",
"newIngredientOption": "New",
"newResultOption": "New",
@@ -306,9 +432,6 @@
"title": "Delete Crafting System",
"content": "Are you sure you want to delete {systemName}? This action cannot be undone. "
},
- "deleteCraftingSystem": {
- "success": "The Crafting System {systemName} was successfully deleted."
- },
"saveCraftingSystem": {
"success": "The Crafting System {systemName} was successfully updated."
},
@@ -316,7 +439,7 @@
"success": "The Crafting System {systemName} was successfully exported to {fileName}."
},
"duplicateCraftingSystem": {
- "success": "Duplicated {sourceSystemName} as {duplicatedSystemName}."
+ "complete": "Duplicated {sourceSystemName} as {duplicatedSystemName}."
},
"importCraftingSystem": {
"title": "Import Crafting System",
@@ -349,24 +472,6 @@
}
},
"ui": {
- "notifications": {
- "submissionError": {
- "prefix": "There were some problems with your form"
- },
- "settings": {
- "migration": {
- "started": "Fabricate is migrating your crafting system settings. Please do close your browser or shut down the game world. ",
- "finished": "Fabricate has finished migrating your crafting system settings!"
- },
- "errors": {
- "summary": "Fabricate was unable to read the setting for the key {settingKey}. Caused by:",
- "noValue": "Expected a non-null, non-empty setting value.",
- "noVersion": "Expected a non-null, non-empty setting version.",
- "notFound": "No Setting was registered for the provided setting key.",
- "migration": "Unable to migrate the setting for the key {settingKey}."
- }
- }
- },
"sidebar": {
"buttons": {
"openCraftingSystemManager": "Crafting Systems"
diff --git a/src/public/module.json b/src/public/module.json
index e88c1507..0d6ae5ff 100644
--- a/src/public/module.json
+++ b/src/public/module.json
@@ -1,7 +1,7 @@
{
"id": "fabricate",
"title": "Fabricate",
- "version": "0.8.9",
+ "version": "0.9.0",
"description": "A system-agnostic, flexible crafting module for FoundryVTT",
"authors": [
{
diff --git a/src/scripts/5e/RollProvider5E.ts b/src/scripts/5e/RollProvider5E.ts
index b8924c81..98eb49dc 100644
--- a/src/scripts/5e/RollProvider5E.ts
+++ b/src/scripts/5e/RollProvider5E.ts
@@ -5,7 +5,7 @@ import PatchActor5e = PatchTypes5e.PatchActor5e;
import CharacterAbility = PatchTypes5e.CharacterAbility;
import OwnedItemPatch5e = PatchTypes5e.OwnedItemPatch5e;
import PatchAttributes5e = PatchTypes5e.PatchAttributes5e;
-import {DnD5ECraftingCheckSpec} from "../system/bundled/DnD5e";
+import {DnD5ECraftingCheckSpec} from "../system/embedded/DnD5e";
class ToolProficiencyModifierCalculator implements ModifierCalculator {
diff --git a/src/scripts/Properties.ts b/src/scripts/Properties.ts
index 79f357ba..511c4b79 100644
--- a/src/scripts/Properties.ts
+++ b/src/scripts/Properties.ts
@@ -1,3 +1,5 @@
+import {SettingVersion} from "./repository/migration/SettingVersion";
+
const Properties = {
module: {
id: "fabricate",
@@ -7,15 +9,31 @@ const Properties = {
},
documents: {
supportedTypes: ["Item"]
- }
+ },
},
ui: {
defaults: {
- essenceIconCode: "fa-solid fa-mortar-pestle",
+ essence: {
+ name: "My new essence",
+ tooltip: "A new essence",
+ iconCode: "fa-solid fa-mortar-pestle",
+ description: "A magical essence that can be used to craft items",
+ },
itemImageUrl: "icons/containers/bags/pack-simple-leather-tan.webp",
noItemImageUrl: "modules/fabricate/assets/no-item-icon-4.webp",
erroredItemImageUrl: "modules/fabricate/assets/item-loading-error-icon.webp",
- recipeImageUrl: "icons/sundries/scrolls/scroll-runed-brown-black.webp"
+ recipeImageUrl: "icons/sundries/scrolls/scroll-runed-brown-black.webp",
+ craftingSystem: {
+ name: "My New Crafting System",
+ description: "This crafting system is a collection of recipes and components that can be used to craft items.",
+ author: (user?: string) => {
+ if (!user) {
+ return "Author";
+ }
+ return user
+ },
+ summary: "Summary"
+ }
},
banners: {
componentEditor: "modules/fabricate/assets/components-hero-banner.webp",
@@ -36,24 +54,30 @@ const Properties = {
}
},
flags: {
- keys: {
- actor: {
- hopperForSystem: (systemId: string) => `craftingSystems.${systemId}.hopper`,
- knownRecipesForSystem: (systemId: string) => `craftingSystems.${systemId}.knownRecipes`,
- },
- item: {
- id: "id",
- type: (systemId: string) => `craftingSystemData.${systemId}.type`,
- recipe: (systemId: string) => `craftingSystemData.${systemId}.recipeData`,
- componentData: (systemId: string) => `craftingSystemData.${systemId}.componentData`,
- }
- }
+
},
settings: {
+ collectionNames: {
+ craftingSystem: "CraftingSystem",
+ item: "Item",
+ gameSystem: "Game System"
+ },
craftingSystems: {
key: "craftingSystems",
- targetVersion: "2"
- }
+ },
+ essences: {
+ key: "essences",
+ },
+ components: {
+ key: "components",
+ },
+ recipes: {
+ key: "recipes",
+ },
+ modelVersion: {
+ key: "modelVersion",
+ targetValue: SettingVersion.V3
+ },
}
};
diff --git a/src/scripts/actor/ComponentCombinationGenerator.ts b/src/scripts/actor/ComponentCombinationGenerator.ts
index a89cd95b..9d14b182 100644
--- a/src/scripts/actor/ComponentCombinationGenerator.ts
+++ b/src/scripts/actor/ComponentCombinationGenerator.ts
@@ -1,12 +1,13 @@
import {ComponentCombinationNode} from "./ComponentCombinationNode";
-import {Combination, Unit} from "../common/Combination";
-import {CraftingComponent} from "../common/CraftingComponent";
-import {Essence} from "../common/Essence";
+import {Combination} from "../common/Combination";
+import {Component} from "../crafting/component/Component";
+import {Unit} from "../common/Unit";
+import {EssenceReference} from "../crafting/essence/EssenceReference";
interface ComponentEssenceCombination {
- components: Combination;
- essences: Combination;
- isSufficientFor(requiredEssences: Combination): boolean;
+ components: Combination;
+ essences: Combination;
+ isSufficientFor(requiredEssences: Combination): boolean;
}
interface CombinationGenerationResult {
@@ -69,23 +70,23 @@ class SuccessfulCombinationGenerationResult implements CombinationGenerationResu
class DefaultComponentEssenceCombination implements ComponentEssenceCombination {
- private readonly _components: Combination;
- private readonly _essences: Combination;
+ private readonly _components: Combination;
+ private readonly _essences: Combination;
- constructor(components: Combination, essences: Combination) {
+ constructor(components: Combination, essences: Combination) {
this._components = components;
this._essences = essences;
}
- get components(): Combination {
+ get components(): Combination {
return this._components;
}
- get essences(): Combination {
+ get essences(): Combination {
return this._essences;
}
- public isSufficientFor(requiredEssences: Combination): boolean {
+ public isSufficientFor(requiredEssences: Combination): boolean {
return this._essences.size >= requiredEssences.size
&& requiredEssences.isIn(this._essences);
}
@@ -95,9 +96,9 @@ class DefaultComponentEssenceCombination implements ComponentEssenceCombination
class ComponentCombinationGenerator {
private readonly _roots: ComponentCombinationNode[];
- private readonly _requiredEssences: Combination;
+ private readonly _requiredEssences: Combination;
- constructor(availableComponents: Combination, requiredEssences: Combination) {
+ constructor(availableComponents: Combination, requiredEssences: Combination) {
this._requiredEssences = requiredEssences;
this._roots = availableComponents.members
.map((component) => Combination.ofUnit(new Unit(component, 1)))
diff --git a/src/scripts/actor/ComponentCombinationNode.ts b/src/scripts/actor/ComponentCombinationNode.ts
index d3a54073..802325b5 100644
--- a/src/scripts/actor/ComponentCombinationNode.ts
+++ b/src/scripts/actor/ComponentCombinationNode.ts
@@ -1,40 +1,41 @@
-import {Combination, Unit} from "../common/Combination";
-import {CraftingComponent} from "../common/CraftingComponent";
-import {Essence} from "../common/Essence";
+import {Combination} from "../common/Combination";
+import {Component} from "../crafting/component/Component";
+import {Unit} from "../common/Unit";
+import {EssenceReference} from "../crafting/essence/EssenceReference";
export class ComponentCombinationNode {
- private readonly _requiredEssences: Combination;
- private readonly _componentCombination: Combination;
- private readonly _essenceCombination: Combination;
- private readonly _remainingPicks: Combination;
+ private readonly _requiredEssences: Combination;
+ private readonly _componentCombination: Combination;
+ private readonly _essenceCombination: Combination;
+ private readonly _remainingPicks: Combination;
private _children: ComponentCombinationNode[];
- constructor(requiredEssences: Combination, nodeCombination: Combination, remainingPicks: Combination) {
+ constructor(requiredEssences: Combination, nodeCombination: Combination, remainingPicks: Combination) {
this._requiredEssences = requiredEssences;
this._componentCombination = nodeCombination;
this._remainingPicks = remainingPicks;
- this._essenceCombination = nodeCombination.explode((component: CraftingComponent) => component.essences);
+ this._essenceCombination = nodeCombination.explode((component: Component) => component.essences);
}
public populate(): void {
if (this._requiredEssences.isIn(this._essenceCombination)) {
return;
}
- this._children = this._remainingPicks.members.map((component: CraftingComponent) => {
+ this._children = this._remainingPicks.members.map((component: Component) => {
const deltaUnit = new Unit(component, 1);
- const childComponentCombination: Combination = this._componentCombination.add(deltaUnit);
- const remainingPicksForChild: Combination = this._remainingPicks.subtract(Combination.ofUnit(deltaUnit));
+ const childComponentCombination: Combination = this._componentCombination.addUnit(deltaUnit);
+ const remainingPicksForChild: Combination = this._remainingPicks.subtract(Combination.ofUnit(deltaUnit));
return new ComponentCombinationNode(this._requiredEssences, childComponentCombination, remainingPicksForChild);
});
this._children.forEach((child: ComponentCombinationNode) => child.populate());
}
- get componentCombination(): Combination {
+ get componentCombination(): Combination {
return this._componentCombination;
}
- get essenceCombination(): Combination {
+ get essenceCombination(): Combination {
return this._essenceCombination;
}
diff --git a/src/scripts/actor/EssenceSelection.ts b/src/scripts/actor/EssenceSelection.ts
index 478c4d4c..d8b50be7 100644
--- a/src/scripts/actor/EssenceSelection.ts
+++ b/src/scripts/actor/EssenceSelection.ts
@@ -1,23 +1,23 @@
import {Combination} from "../common/Combination";
-import {CraftingComponent} from "../common/CraftingComponent";
+import {Component} from "../crafting/component/Component";
import {ComponentCombinationGenerator, ComponentEssenceCombination} from "./ComponentCombinationGenerator";
-import {Essence} from "../common/Essence";
import {TrackedCombination} from "../common/TrackedCombination";
+import {EssenceReference} from "../crafting/essence/EssenceReference";
export class EssenceSelection {
- private readonly _essences: Combination;
+ private readonly _essences: Combination;
- constructor(essences: Combination) {
+ constructor(essences: Combination) {
this._essences = essences;
}
- perform(contents: Combination): Combination {
+ perform(contents: Combination): Combination {
if (this._essences.isEmpty()) {
return Combination.EMPTY();
}
let availableComponents = contents.clone();
- contents.members.forEach(((thisComponent: CraftingComponent) => {
+ contents.members.forEach(((thisComponent: Component) => {
if (thisComponent.essences.isEmpty() || !thisComponent.essences.intersects(this._essences)) {
availableComponents = availableComponents.subtract(availableComponents.just(thisComponent));
}
@@ -30,7 +30,7 @@ export class EssenceSelection {
return this.selectClosestMatch(generationResult.insufficientCombinations, this._essences);
}
- private selectBestMatch(combinations: ComponentEssenceCombination[]): Combination {
+ private selectBestMatch(combinations: ComponentEssenceCombination[]): Combination {
if (combinations.length === 0) {
return Combination.EMPTY();
}
@@ -45,7 +45,7 @@ export class EssenceSelection {
return sortedCombinations[0].components;
}
- private selectClosestMatch(combinations: ComponentEssenceCombination[], requiredEssences: Combination): Combination {
+ private selectClosestMatch(combinations: ComponentEssenceCombination[], requiredEssences: Combination): Combination {
if (combinations.length === 0) {
return Combination.EMPTY();
}
diff --git a/src/scripts/actor/Inventory.ts b/src/scripts/actor/Inventory.ts
index b095e97d..b818104f 100644
--- a/src/scripts/actor/Inventory.ts
+++ b/src/scripts/actor/Inventory.ts
@@ -1,258 +1,193 @@
-import {CraftingComponent} from "../common/CraftingComponent";
-import {Combination, Unit} from "../common/Combination";
-import {ObjectUtility} from "../foundry/ObjectUtility";
-import {CraftingResult} from "../crafting/result/CraftingResult";
-import {InventoryContentsNotFoundError} from "../error/InventoryContentsNotFoundError";
-import {AlchemyResult} from "../crafting/alchemy/AlchemyResult";
-import {GameProvider} from "../foundry/GameProvider";
-import {DocumentManager, FabricateItemData} from "../foundry/DocumentManager";
+import {Component} from "../crafting/component/Component";
+import {Combination} from "../common/Combination";
+import {Unit} from "../common/Unit";
+import {InventoryAction} from "./InventoryAction";
import EmbeddedCollection
from "@league-of-foundry-developers/foundry-vtt-types/src/foundry/common/abstract/embedded-collection.mjs";
-import {BaseItem} from "@league-of-foundry-developers/foundry-vtt-types/src/foundry/common/documents.mjs";
+import {BaseActor, BaseItem} from "@league-of-foundry-developers/foundry-vtt-types/src/foundry/common/documents.mjs";
import {ActorData} from "@league-of-foundry-developers/foundry-vtt-types/src/foundry/common/data/data.mjs";
-import {
- AlwaysOneItemQuantityReader,
- ItemQuantityReader,
- ItemQuantityWriter,
- NoItemQuantityWriter
-} from "./ItemQuantity";
-import {SalvageResult} from "../crafting/result/SalvageResult";
+import {LocalizationService} from "../../applications/common/LocalizationService";
+import Properties from "../Properties";
+import {Essence} from "../crafting/essence/Essence";
+import {ItemDataManager, SingletonItemDataManager} from "./ItemDataManager";
interface Inventory {
- actor: any;
- ownedComponents: Combination;
- acceptCraftingResult(craftingResult: CraftingResult): Promise;
- acceptSalvageResult(salvageResult: SalvageResult): Promise;
- acceptAlchemyResult(alchemyResult: AlchemyResult): Promise;
- index(): Promise;
- contains(craftingComponent: CraftingComponent, quantity: number): boolean;
- size: number
- amountFor(craftingComponent: CraftingComponent): number;
-}
-interface InventoryActions {
- additions: Combination;
- removals: Combination;
-}
+ /**
+ * The actor to which this inventory belongs.
+ */
+ readonly actor: BaseActor;
+
+ /**
+ * The components in this inventory.
+ *
+ * @returns A Promise that resolves with the components in this inventory.
+ * @throws Error if the actor does not exist.
+ */
+ getContents(): Combination;
+
+ /**
+ * Perform the specified action on this inventory, adding and removing components as necessary. Additions and
+ * removals are performed separately. If one fails, the other will be rolled back, or aborted. They are reconciled
+ * before being applied.
+ *
+ * @param action - The action to perform.
+ * @returns A Promise that resolves with the new contents of this inventory.
+ * @throws Error if the inventory does not contain the required components, or if the actor does not exist.
+ */
+ perform(action: InventoryAction): Promise>;
+
+ /**
+ * Determines whether this inventory contains the specified component in the specified quantity.
+ *
+ * @param craftingComponent - The component to check for.
+ * @param quantity - The quantity of the component to check for. Defaults to 1.
+ * @returns A Promise that resolves with true if the inventory contains the specified component in the specified
+ * quantity, false otherwise.
+ * @throws Error if the actor does not exist.
+ */
+ contains(craftingComponent: Component, quantity?: number): boolean;
-interface InventoryRecord {
- item: any;
- quantity: number;
}
class CraftingInventory implements Inventory {
- private readonly _documentManager: DocumentManager;
- private readonly _objectUtils: ObjectUtility;
- private readonly _actor: any;
- private readonly _knownComponentsByItemUuid: Map;
- private _managedItems: Map;
- private readonly _itemQuantityReader: ItemQuantityReader;
- private readonly _itemQuantityWriter: ItemQuantityWriter;
+ private readonly _actor: BaseActor;
+ private readonly _localization: LocalizationService;
+ private readonly _itemDataManager: ItemDataManager;
+
+ /**
+ * A Map of source item UUIDs to the Component that uses it. An inventory expects to be initialised with a complete
+ * set of components for a single crafting system. Item UUIDs must therefore map to a single component.
+ * @private
+ */
+ private readonly _knownComponentsByItemUuid: Map;
+ private readonly _knownComponentsById: Map;
constructor({
actor,
- documentManager,
- objectUtils,
- managedItems = new Map(),
- knownComponentsByItemUuid = new Map(),
- itemQuantityReader = new AlwaysOneItemQuantityReader(),
- itemQuantityWriter = new NoItemQuantityWriter()
+ localization,
+ itemDataManager = new SingletonItemDataManager(),
+ knownComponents = [],
}: {
- actor: any;
- gameProvider: GameProvider;
- documentManager: DocumentManager;
- objectUtils: ObjectUtility;
- knownComponentsByItemUuid?: Map;
- ownedComponents?: Combination;
- managedItems?: Map;
- itemQuantityReader?: ItemQuantityReader;
- itemQuantityWriter?: ItemQuantityWriter;
+ actor: BaseActor;
+ localization: LocalizationService;
+ knownEssencesById?: Map;
+ itemDataManager?: ItemDataManager;
+ knownComponents?: Component[];
}) {
this._actor = actor;
- this._knownComponentsByItemUuid = knownComponentsByItemUuid;
- this._documentManager = documentManager;
- this._objectUtils = objectUtils;
- this._managedItems = managedItems;
- this._itemQuantityReader = itemQuantityReader;
- this._itemQuantityWriter = itemQuantityWriter;
+ this._localization = localization;
+ this._itemDataManager = itemDataManager;
- }
+ this._knownComponentsByItemUuid = new Map();
+ this._knownComponentsById = new Map();
- get actor(): any {
- return this._actor;
+ knownComponents.forEach(component => {
+ this._knownComponentsByItemUuid.set(component.itemUuid, component);
+ this._knownComponentsById.set(component.id, component);
+ });
}
- contains(craftingComponent: CraftingComponent, quantity: number = 1): boolean {
- if (!this._managedItems.has(craftingComponent)) {
- return false;
+ get actor(): BaseActor {
+ if (!this._actor) {
+ throw new Error(this._localization.localize(`${Properties.module.id}.inventory.error.invalidActor`));
}
- return quantity <= this.amountFor(craftingComponent);
+ return this._actor;
}
- amountFor(craftingComponent: CraftingComponent) {
- if (!this._managedItems.has(craftingComponent)) {
- return 0;
- }
- return this._managedItems.get(craftingComponent).reduce((previousValue, currentValue) => {
- return previousValue + currentValue.quantity;
- }, 0);
+ contains(craftingComponent: Component, quantity: number = 1): boolean {
+ const contents = this.getContents();
+ return contents.has(craftingComponent, quantity);
}
- async removeAll(components: Combination
- doCraftRecipe(e)} />
- {#if loaded}
+{#if craftingAttempt}
+
+{/if}
\ No newline at end of file
diff --git a/src/applications/recipeCraftingApp/RecipeCraftingAppCatalog.ts b/src/applications/recipeCraftingApp/RecipeCraftingAppCatalog.ts
index a1079571..b3688bdd 100644
--- a/src/applications/recipeCraftingApp/RecipeCraftingAppCatalog.ts
+++ b/src/applications/recipeCraftingApp/RecipeCraftingAppCatalog.ts
@@ -1,51 +1,50 @@
import {RecipeCraftingAppFactory} from "./RecipeCraftingAppFactory";
-import {SystemRegistry} from "../../scripts/registries/SystemRegistry";
-import {CraftingSystem} from "../../scripts/system/CraftingSystem";
import {SvelteApplication} from "../SvelteApplication";
-import {Recipe} from "../../scripts/common/Recipe";
+import {Recipe} from "../../scripts/crafting/recipe/Recipe";
interface RecipeCraftingAppCatalog {
- load(recipe: Recipe, craftingSystem: CraftingSystem, actor: Actor): Promise handleRecipeUpdated(e)}
+ on:itemUpdated={(e) => handleItemUpdated(e)}
+ on:itemCreated={(e) => handleItemCreated(e)}
+ on:itemDeleted={(e) => handleItemDeleted(e)}>
+
-
+ doCraftRecipe(e)} />
- {/if}
+
{localization.localize(`${localizationPath}.hints.doCrafting`)}
- {#if !craftingPrep.isSingleton}
+ {#if recipeCraftingManager.hasRequirementChoices}
- {#if recipe.hasResultOptions}
-
+ {#if recipeCraftingManager.hasResultChoices}
+
{:else}