From 9f6269f98bad514d1ab27cc3a045990bc09a27e7 Mon Sep 17 00:00:00 2001 From: Chomp Date: Sun, 5 Jan 2025 19:39:56 +0000 Subject: [PATCH] Fixed errors --- .../tools/HideoutCustomisation/HideoutCustomisationGen.ts | 8 ++++++-- .../HideoutCustomisation/HideoutCustomisationProgram.ts | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/project/src/tools/HideoutCustomisation/HideoutCustomisationGen.ts b/project/src/tools/HideoutCustomisation/HideoutCustomisationGen.ts index ceb99f57..026c04be 100644 --- a/project/src/tools/HideoutCustomisation/HideoutCustomisationGen.ts +++ b/project/src/tools/HideoutCustomisation/HideoutCustomisationGen.ts @@ -19,9 +19,9 @@ export class HideoutCustomisationGen { private achievementCustomisationReward: Record = {}; constructor( - @injectAll("OnLoad") protected onLoadComponents: OnLoad[], @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("PrimaryLogger") protected logger: ILogger, + @injectAll("OnLoad") protected onLoadComponents: OnLoad[], ) {} async run(): Promise { @@ -99,7 +99,11 @@ export class HideoutCustomisationGen { // Build a dictionary of all quests with a `CustomizationDirect` reward private buildQuestCustomisationList(): void { for (const quest of Object.values(this.databaseServer.getTables().templates.quests)) { - const allRewards: IQuestReward[] = Object.values(quest.rewards); + const allRewards: IQuestReward[] = [ + ...quest.rewards.Fail, + ...quest.rewards.Success, + ...quest.rewards.Started, + ]; const customisationDirectRewards = allRewards.filter((reward) => reward.type === "CustomizationDirect"); for (const directReward of customisationDirectRewards) { if (!this.questCustomisationReward[quest._id]) { diff --git a/project/src/tools/HideoutCustomisation/HideoutCustomisationProgram.ts b/project/src/tools/HideoutCustomisation/HideoutCustomisationProgram.ts index b919af0b..466408a9 100644 --- a/project/src/tools/HideoutCustomisation/HideoutCustomisationProgram.ts +++ b/project/src/tools/HideoutCustomisation/HideoutCustomisationProgram.ts @@ -26,9 +26,10 @@ export class HideoutCustomisationProgram { Container.registerListTypes(childContainer); Container.registerPostLoadTypes(container, childContainer); - childContainer.resolve("HideoutCustomisationGen").run(); + await childContainer.resolve("HideoutCustomisationGen").run(); } catch (err: unknown) { - new ErrorHandler().handleCriticalError(err instanceof Error ? err : new Error(String(err))); + console.log("HideoutCustomisationGen broke"); + //new ErrorHandler().handleCriticalError(err instanceof Error ? err : new Error(String(err))); } // Kill the process, something holds it open so we need to manually kill it