From 694a3fffb47d0fc2570b4452a4baf6d6c6d24a67 Mon Sep 17 00:00:00 2001 From: Anton Vakhrushev Date: Fri, 3 Apr 2020 13:04:08 +0300 Subject: [PATCH] Fix errors --- src/Action/CheckBuildingRemainingTimeAction.ts | 1 + src/Action/UpgradeBuildingAction.ts | 6 +++++- src/Errors.ts | 6 ++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Action/CheckBuildingRemainingTimeAction.ts b/src/Action/CheckBuildingRemainingTimeAction.ts index b33d376..3db7549 100644 --- a/src/Action/CheckBuildingRemainingTimeAction.ts +++ b/src/Action/CheckBuildingRemainingTimeAction.ts @@ -11,6 +11,7 @@ export class CheckBuildingRemainingTimeAction extends ActionController { const remainingSeconds = Number(timer.attr('value')); if (remainingSeconds > 0) { throw new BuildingQueueFullError( + task.id, remainingSeconds + 1, 'Building queue is full' ); diff --git a/src/Action/UpgradeBuildingAction.ts b/src/Action/UpgradeBuildingAction.ts index 8eaff5c..81a39fd 100644 --- a/src/Action/UpgradeBuildingAction.ts +++ b/src/Action/UpgradeBuildingAction.ts @@ -11,7 +11,11 @@ export class UpgradeBuildingAction extends ActionController { ); if (btn.length !== 1) { - throw new TryLaterError(5 * 60, 'No upgrade button, try later'); + throw new TryLaterError( + task.id, + 15 * 60, + 'No upgrade button, try later' + ); } btn.trigger('click'); diff --git a/src/Errors.ts b/src/Errors.ts index 16974dc..1a26b36 100644 --- a/src/Errors.ts +++ b/src/Errors.ts @@ -21,7 +21,8 @@ export class AbortTaskError extends Error { export class TryLaterError extends Error { readonly seconds: number; readonly taskId: TaskId; - constructor(seconds: number, taskId: TaskId, msg: string = '') { + + constructor(taskId: TaskId, seconds: number, msg: string = '') { super(msg); this.taskId = taskId; this.seconds = seconds; @@ -32,7 +33,8 @@ export class TryLaterError extends Error { export class BuildingQueueFullError extends Error { readonly seconds: number; readonly taskId: TaskId; - constructor(seconds: number, taskId: TaskId, msg: string = '') { + + constructor(taskId: TaskId, seconds: number, msg: string = '') { super(msg); this.taskId = taskId; this.seconds = seconds;