From f69a6e629be4e7d21add409d659204c654791973 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Tue, 26 May 2020 22:29:41 +0300
Subject: [PATCH] Reformat code

---
 package.json                              |  8 +--
 src/Action/FindSendResourcesPath.ts       |  6 ++-
 src/Action/TrainTrooperAction.ts          |  6 ++-
 src/Action/UpgradeResourceToLevel.ts      | 14 ++++--
 src/Core/GatheringTimings.ts              | 13 ++++-
 src/Core/Resources.ts                     | 40 ++++++++++++---
 src/DashboardView/Header.vue              |  6 ++-
 src/DashboardView/Store.ts                |  9 ++--
 src/DashboardView/TaskList.vue            | 26 ++++++++--
 src/DashboardView/VillageStateList.vue    | 18 +++++--
 src/Executor.ts                           |  9 +++-
 src/Grabber/ForgePageGrabber.ts           |  5 +-
 src/Grabber/GuildHallPageGrabber.ts       |  5 +-
 src/Grabber/VillageOverviewPageGrabber.ts |  4 +-
 src/Page/BuildingPage/BuildingPage.ts     |  4 +-
 src/Page/BuildingPage/GuildHallPage.ts    |  6 ++-
 src/Page/BuildingPage/MarketPage.ts       |  5 +-
 src/Page/BuildingPage/TrooperPage.ts      |  4 +-
 src/Page/BuildingPageController.ts        | 29 ++++++++---
 src/Queue/TaskQueue.ts                    |  9 +++-
 src/ResourceTransfer.ts                   | 11 ++++-
 src/Scheduler.ts                          | 11 +++--
 src/Storage/VillageStorage.ts             |  4 +-
 src/Task/BuildBuildingTask.ts             |  6 ++-
 src/Task/CelebrationTask.ts               |  5 +-
 src/Task/ForgeImprovementTask.ts          |  5 +-
 src/Task/UpdateResourceContracts.ts       |  5 +-
 src/TaskQueueRenderer.ts                  |  4 +-
 src/VillageFactory.ts                     |  6 ++-
 src/VillageState.ts                       | 59 ++++++++++++++++++-----
 src/VillageTaskCollection.ts              | 11 +++--
 tests/Queue/StatisticsTest.js.ts          |  4 +-
 tests/Queue/TaskQueueTest.js.ts           |  5 +-
 33 files changed, 288 insertions(+), 74 deletions(-)

diff --git a/package.json b/package.json
index 22f2d3c..914bba4 100644
--- a/package.json
+++ b/package.json
@@ -15,10 +15,10 @@
     "coverage": "nyc mocha",
     "build:dev": "webpack",
     "build": "webpack --env.production",
-    "format": "prettier --tab-width=4 --print-width 120 --single-quote --trailing-comma es5 --quote-props consistent --write '{src,tests}/**/*.{ts,js}'",
-    "format-check": "prettier --tab-width=4 --print-width 120 --single-quote --trailing-comma es5 --quote-props consistent --check '{src,tests}/**/*.{ts,js}'",
-    "format-vue": "prettier --tab-width=2 --print-width 120 --single-quote --trailing-comma es5 --quote-props consistent --write '{src,tests}/**/*.vue'",
-    "format-wp": "prettier --tab-width=4 --print-width 120 --single-quote --trailing-comma es5 --quote-props consistent --write 'webpack.config.js'"
+    "format": "prettier --tab-width=4 --print-width 100 --single-quote --trailing-comma es5 --quote-props consistent --write '{src,tests}/**/*.{ts,js}'",
+    "format-check": "prettier --tab-width=4 --print-width 100 --single-quote --trailing-comma es5 --quote-props consistent --check '{src,tests}/**/*.{ts,js}'",
+    "format-vue": "prettier --tab-width=2 --print-width 100 --single-quote --trailing-comma es5 --quote-props consistent --write '{src,tests}/**/*.vue'",
+    "format-wp": "prettier --tab-width=4 --print-width 100 --single-quote --trailing-comma es5 --quote-props consistent --write 'webpack.config.js'"
   },
   "devDependencies": {
     "@types/chai": "^4.2.11",
diff --git a/src/Action/FindSendResourcesPath.ts b/src/Action/FindSendResourcesPath.ts
index 6428437..f0f895a 100644
--- a/src/Action/FindSendResourcesPath.ts
+++ b/src/Action/FindSendResourcesPath.ts
@@ -40,7 +40,11 @@ export class FindSendResourcesPath extends ActionController {
         const storage = new ResourceTransferStorage();
         storage.storeReport(bestReport);
 
-        const marketPath = path('/build.php', { newdid: bestReport.fromVillageId, gid: MARKET_ID, t: 5 });
+        const marketPath = path('/build.php', {
+            newdid: bestReport.fromVillageId,
+            gid: MARKET_ID,
+            t: 5,
+        });
         window.location.assign(marketPath);
     }
 }
diff --git a/src/Action/TrainTrooperAction.ts b/src/Action/TrainTrooperAction.ts
index f2fc8d7..e186265 100644
--- a/src/Action/TrainTrooperAction.ts
+++ b/src/Action/TrainTrooperAction.ts
@@ -3,7 +3,11 @@ import { taskError, TryLaterError } from '../Errors';
 import { aroundMinutes, randomInRange } from '../utils';
 import { Args } from '../Queue/Args';
 import { Task } from '../Queue/TaskProvider';
-import { clickTrainButton, fillTrainCount, getAvailableCount } from '../Page/BuildingPage/TrooperPage';
+import {
+    clickTrainButton,
+    fillTrainCount,
+    getAvailableCount,
+} from '../Page/BuildingPage/TrooperPage';
 import { TrainTroopTask } from '../Task/TrainTroopTask';
 import { Resources } from '../Core/Resources';
 
diff --git a/src/Action/UpgradeResourceToLevel.ts b/src/Action/UpgradeResourceToLevel.ts
index 09aa7e0..32c8195 100644
--- a/src/Action/UpgradeResourceToLevel.ts
+++ b/src/Action/UpgradeResourceToLevel.ts
@@ -19,7 +19,9 @@ export class UpgradeResourceToLevel extends ActionController {
 
         const requiredLevel = getNumber(args.level);
 
-        const notUpgraded = deposits.filter(dep => !dep.underConstruction && requiredLevel > dep.level);
+        const notUpgraded = deposits.filter(
+            dep => !dep.underConstruction && requiredLevel > dep.level
+        );
 
         if (notUpgraded.length === 0) {
             this.scheduler.removeTask(task.id);
@@ -34,11 +36,17 @@ export class UpgradeResourceToLevel extends ActionController {
         const secondNotUpgraded = notUpgraded.shift();
 
         if (firstNotUpgraded && this.isTaskNotInQueue(villageId, firstNotUpgraded)) {
-            this.scheduler.scheduleTask(UpgradeBuildingTask.name, { villageId, buildId: firstNotUpgraded.buildId });
+            this.scheduler.scheduleTask(UpgradeBuildingTask.name, {
+                villageId,
+                buildId: firstNotUpgraded.buildId,
+            });
         }
 
         if (secondNotUpgraded && this.isTaskNotInQueue(villageId, secondNotUpgraded)) {
-            this.scheduler.scheduleTask(UpgradeBuildingTask.name, { villageId, buildId: secondNotUpgraded.buildId });
+            this.scheduler.scheduleTask(UpgradeBuildingTask.name, {
+                villageId,
+                buildId: secondNotUpgraded.buildId,
+            });
         }
 
         throw new TryLaterError(aroundMinutes(10), 'Sleep for next round');
diff --git a/src/Core/GatheringTimings.ts b/src/Core/GatheringTimings.ts
index d7d5885..4125548 100644
--- a/src/Core/GatheringTimings.ts
+++ b/src/Core/GatheringTimings.ts
@@ -53,7 +53,12 @@ export class GatheringTimings {
         return new GatheringTimings(factory(lumber), factory(clay), factory(iron), factory(crop));
     }
 
-    constructor(lumber: GatheringTime, clay: GatheringTime, iron: GatheringTime, crop: GatheringTime) {
+    constructor(
+        lumber: GatheringTime,
+        clay: GatheringTime,
+        iron: GatheringTime,
+        crop: GatheringTime
+    ) {
         this.lumber = lumber;
         this.clay = clay;
         this.iron = iron;
@@ -97,7 +102,11 @@ function calcGatheringTime(val: number, desired: number, speed: number): Gatheri
     return GatheringTime.makeCounting((diff / speed) * 3600);
 }
 
-export function calcGatheringTimings(resources: Resources, desired: Resources, speed: Resources): GatheringTimings {
+export function calcGatheringTimings(
+    resources: Resources,
+    desired: Resources,
+    speed: Resources
+): GatheringTimings {
     return new GatheringTimings(
         calcGatheringTime(resources.lumber, desired.lumber, speed.lumber),
         calcGatheringTime(resources.clay, desired.clay, speed.clay),
diff --git a/src/Core/Resources.ts b/src/Core/Resources.ts
index 4a3fcd3..3463e07 100644
--- a/src/Core/Resources.ts
+++ b/src/Core/Resources.ts
@@ -26,7 +26,12 @@ export class Resources implements ResourcesInterface {
     }
 
     static fromStorage(storage: ResourceStorage): Resources {
-        return new Resources(storage.warehouse, storage.warehouse, storage.warehouse, storage.granary);
+        return new Resources(
+            storage.warehouse,
+            storage.warehouse,
+            storage.warehouse,
+            storage.granary
+        );
     }
 
     static zero(): Resources {
@@ -86,16 +91,29 @@ export class Resources implements ResourcesInterface {
     }
 
     anyLower(other: ResourcesInterface): boolean {
-        return this.lumber < other.lumber || this.clay < other.clay || this.iron < other.iron || this.crop < other.crop;
+        return (
+            this.lumber < other.lumber ||
+            this.clay < other.clay ||
+            this.iron < other.iron ||
+            this.crop < other.crop
+        );
     }
 
     allGreater(other: ResourcesInterface): boolean {
-        return this.lumber > other.lumber && this.clay > other.clay && this.iron > other.iron && this.crop > other.crop;
+        return (
+            this.lumber > other.lumber &&
+            this.clay > other.clay &&
+            this.iron > other.iron &&
+            this.crop > other.crop
+        );
     }
 
     allGreaterOrEqual(other: ResourcesInterface): boolean {
         return (
-            this.lumber >= other.lumber && this.clay >= other.clay && this.iron >= other.iron && this.crop >= other.crop
+            this.lumber >= other.lumber &&
+            this.clay >= other.clay &&
+            this.iron >= other.iron &&
+            this.crop >= other.crop
         );
     }
 
@@ -136,7 +154,12 @@ export class Resources implements ResourcesInterface {
             return (Math.floor(v / multiplier) + 1) * multiplier;
         };
 
-        return new Resources(upper(this.lumber), upper(this.clay), upper(this.iron), upper(this.crop));
+        return new Resources(
+            upper(this.lumber),
+            upper(this.clay),
+            upper(this.iron),
+            upper(this.crop)
+        );
     }
 
     downTo(multiplier: number): Resources {
@@ -151,6 +174,11 @@ export class Resources implements ResourcesInterface {
             return part * multiplier;
         };
 
-        return new Resources(lower(this.lumber), lower(this.clay), lower(this.iron), lower(this.crop));
+        return new Resources(
+            lower(this.lumber),
+            lower(this.clay),
+            lower(this.iron),
+            lower(this.crop)
+        );
     }
 }
diff --git a/src/DashboardView/Header.vue b/src/DashboardView/Header.vue
index 06cac6b..45202f4 100644
--- a/src/DashboardView/Header.vue
+++ b/src/DashboardView/Header.vue
@@ -6,7 +6,11 @@
     </h1>
     <p>
       <a href="#" v-on:click.prevent="pause">
-        pause <span v-if="shared.pauseSeconds && shared.pauseSeconds > 0" v-text="shared.pauseSeconds"></span>
+        pause
+        <span
+          v-if="shared.pauseSeconds && shared.pauseSeconds > 0"
+          v-text="shared.pauseSeconds"
+        ></span>
       </a>
       <a href="#" v-on:click.prevent="toggleLogs">logs</a>
     </p>
diff --git a/src/DashboardView/Store.ts b/src/DashboardView/Store.ts
index cccf914..ed6726a 100644
--- a/src/DashboardView/Store.ts
+++ b/src/DashboardView/Store.ts
@@ -57,7 +57,8 @@ export function createStore(villageFactory: VillageFactory) {
                 state.logs = logs;
             },
             [Mutations.ToggleVillageEditor](state, visible?: any) {
-                state.views.villageEditor = visible === undefined ? !state.views.villageEditor : !!visible;
+                state.views.villageEditor =
+                    visible === undefined ? !state.views.villageEditor : !!visible;
             },
             [Mutations.SetVillageSettings](state, settings) {
                 state.villageSettings = settings;
@@ -90,9 +91,11 @@ export function createStore(villageFactory: VillageFactory) {
                 const villageName = state.villageSettings.villageName;
                 const newSettings: VillageSettings = {
                     sendResourcesThreshold:
-                        state.villageSettings.sendResourcesThreshold || VillageSettingsDefaults.sendResourcesThreshold,
+                        state.villageSettings.sendResourcesThreshold ||
+                        VillageSettingsDefaults.sendResourcesThreshold,
                     sendResourcesTimeout:
-                        state.villageSettings.sendResourcesTimeout || VillageSettingsDefaults.sendResourcesTimeout,
+                        state.villageSettings.sendResourcesTimeout ||
+                        VillageSettingsDefaults.sendResourcesTimeout,
                     sendResourcesMultiplier:
                         state.villageSettings.sendResourcesMultiplier ||
                         VillageSettingsDefaults.sendResourcesMultiplier,
diff --git a/src/DashboardView/TaskList.vue b/src/DashboardView/TaskList.vue
index a4a79bb..6d4c52d 100644
--- a/src/DashboardView/TaskList.vue
+++ b/src/DashboardView/TaskList.vue
@@ -9,14 +9,32 @@
     </p>
     <div class="container">
       <table class="task-table">
-        <tr v-for="task in shared.taskList" class="task-item" :class="{ 'this-village': isThisVillageTask(task) }">
-          <td class="time-column" :title="formatDate(task.ts) + ', ' + task.id" v-text="formatDate(task.ts)"></td>
+        <tr
+          v-for="task in shared.taskList"
+          class="task-item"
+          :class="{ 'this-village': isThisVillageTask(task) }"
+        >
+          <td
+            class="time-column"
+            :title="formatDate(task.ts) + ', ' + task.id"
+            v-text="formatDate(task.ts)"
+          ></td>
           <td class="actions-column">
-            <a href="#" title="Remove task" class="remove-action" v-on:click.prevent="onRemove(task.id)">&times;</a>
+            <a
+              href="#"
+              title="Remove task"
+              class="remove-action"
+              v-on:click.prevent="onRemove(task.id)"
+              >&times;</a
+            >
           </td>
           <td class="village-column" v-text="task.args.villageId || ''"></td>
           <td class="name-column" :title="task.name" v-text="task.name"></td>
-          <td class="args-column" :title="JSON.stringify(task.args)" v-text="JSON.stringify(task.args)"></td>
+          <td
+            class="args-column"
+            :title="JSON.stringify(task.args)"
+            v-text="JSON.stringify(task.args)"
+          ></td>
         </tr>
       </table>
     </div>
diff --git a/src/DashboardView/VillageStateList.vue b/src/DashboardView/VillageStateList.vue
index 95b72de..1c5084e 100644
--- a/src/DashboardView/VillageStateList.vue
+++ b/src/DashboardView/VillageStateList.vue
@@ -15,7 +15,11 @@
       <tbody>
         <template v-for="villageState in shared.villageStates">
           <tr class="normal-line top-line">
-            <td class="right" :class="{ active: villageState.village.active }" :title="villageHint(villageState)">
+            <td
+              class="right"
+              :class="{ active: villageState.village.active }"
+              :title="villageHint(villageState)"
+            >
               {{ villageState.village.name }}
               [<a href="#" v-on:click.prevent="openEditor(villageState.id)">ред</a>]:
             </td>
@@ -146,12 +150,18 @@
                 v-if="s.id !== villageState.id"
                 class="village-quick-link"
                 :href="marketPath(villageState.village, s.village)"
-                :title="'Отправить ресурсы из ' + villageState.village.name + ' в ' + s.village.name"
+                :title="
+                  'Отправить ресурсы из ' + villageState.village.name + ' в ' + s.village.name
+                "
                 >$->{{ s.village.name }}</a
               >
               <a class="village-quick-link" :href="quartersPath(villageState.village)">Казармы</a>
-              <a class="village-quick-link" :href="horseStablePath(villageState.village)">Конюшни</a>
-              <a class="village-quick-link" :href="collectionPointPath(villageState.village)">Войска</a>
+              <a class="village-quick-link" :href="horseStablePath(villageState.village)"
+                >Конюшни</a
+              >
+              <a class="village-quick-link" :href="collectionPointPath(villageState.village)"
+                >Войска</a
+              >
             </td>
           </tr>
 
diff --git a/src/Executor.ts b/src/Executor.ts
index a9a0623..ff7435e 100644
--- a/src/Executor.ts
+++ b/src/Executor.ts
@@ -1,5 +1,12 @@
 import { markPage, sleepMicro, timestamp, waitForLoad } from './utils';
-import { AbortTaskError, ActionError, FailTaskError, GrabError, TryLaterError, VillageNotFound } from './Errors';
+import {
+    AbortTaskError,
+    ActionError,
+    FailTaskError,
+    GrabError,
+    TryLaterError,
+    VillageNotFound,
+} from './Errors';
 import { TaskQueueRenderer } from './TaskQueueRenderer';
 import { createActionHandler } from './Action/ActionController';
 import { Logger } from './Logger';
diff --git a/src/Grabber/ForgePageGrabber.ts b/src/Grabber/ForgePageGrabber.ts
index c5836a4..7e3c02a 100644
--- a/src/Grabber/ForgePageGrabber.ts
+++ b/src/Grabber/ForgePageGrabber.ts
@@ -30,6 +30,9 @@ export class ForgePageGrabber extends Grabber {
 
     private grabTimer(): void {
         const seconds = grabRemainingSeconds();
-        this.storage.storeQueueTaskEnding(ProductionQueue.UpgradeUnit, seconds ? seconds + timestamp() : 0);
+        this.storage.storeQueueTaskEnding(
+            ProductionQueue.UpgradeUnit,
+            seconds ? seconds + timestamp() : 0
+        );
     }
 }
diff --git a/src/Grabber/GuildHallPageGrabber.ts b/src/Grabber/GuildHallPageGrabber.ts
index 60663d8..e3a200e 100644
--- a/src/Grabber/GuildHallPageGrabber.ts
+++ b/src/Grabber/GuildHallPageGrabber.ts
@@ -11,6 +11,9 @@ export class GuildHallPageGrabber extends Grabber {
         }
 
         const seconds = grabRemainingSeconds();
-        this.storage.storeQueueTaskEnding(ProductionQueue.Celebration, seconds ? seconds + timestamp() : 0);
+        this.storage.storeQueueTaskEnding(
+            ProductionQueue.Celebration,
+            seconds ? seconds + timestamp() : 0
+        );
     }
 }
diff --git a/src/Grabber/VillageOverviewPageGrabber.ts b/src/Grabber/VillageOverviewPageGrabber.ts
index ee1ebb4..cce3509 100644
--- a/src/Grabber/VillageOverviewPageGrabber.ts
+++ b/src/Grabber/VillageOverviewPageGrabber.ts
@@ -16,7 +16,9 @@ export class VillageOverviewPageGrabber extends Grabber {
         this.storage.storeBuildingQueueInfo(this.grabBuildingQueueInfoOrDefault());
 
         const buildingQueueInfo = this.grabBuildingQueueInfoOrDefault();
-        const buildingEndTime = buildingQueueInfo.seconds ? buildingQueueInfo.seconds + timestamp() : 0;
+        const buildingEndTime = buildingQueueInfo.seconds
+            ? buildingQueueInfo.seconds + timestamp()
+            : 0;
         this.storage.storeQueueTaskEnding(ProductionQueue.Building, buildingEndTime);
     }
 
diff --git a/src/Page/BuildingPage/BuildingPage.ts b/src/Page/BuildingPage/BuildingPage.ts
index aed7863..76d3548 100644
--- a/src/Page/BuildingPage/BuildingPage.ts
+++ b/src/Page/BuildingPage/BuildingPage.ts
@@ -14,7 +14,9 @@ export function clickBuildButton(typeId: number) {
     btn.trigger('click');
 }
 
-export function createBuildButton(onClickHandler: (buildTypeId: number, resources: Resources) => void) {
+export function createBuildButton(
+    onClickHandler: (buildTypeId: number, resources: Resources) => void
+) {
     const $els = jQuery('[id^=contract_building]');
     $els.each((idx, el) => {
         const $el = jQuery(el);
diff --git a/src/Page/BuildingPage/GuildHallPage.ts b/src/Page/BuildingPage/GuildHallPage.ts
index 30e54f8..d7ab7f1 100644
--- a/src/Page/BuildingPage/GuildHallPage.ts
+++ b/src/Page/BuildingPage/GuildHallPage.ts
@@ -28,7 +28,11 @@ export function clickCelebrationButton() {
     $btn.trigger('click');
 }
 
-function createCelebrationButton($blockEl: JQuery, idx: number, onClickHandler: CelebrationClickHandler) {
+function createCelebrationButton(
+    $blockEl: JQuery,
+    idx: number,
+    onClickHandler: CelebrationClickHandler
+) {
     const resources = grabResources($blockEl);
 
     const id = uniqId();
diff --git a/src/Page/BuildingPage/MarketPage.ts b/src/Page/BuildingPage/MarketPage.ts
index 58c569e..ba5ec3f 100644
--- a/src/Page/BuildingPage/MarketPage.ts
+++ b/src/Page/BuildingPage/MarketPage.ts
@@ -24,7 +24,10 @@ export function createSendResourcesButton(onClickHandler: SendResourcesClickHand
             getNumber(sendSelect.find('#r3').val()),
             getNumber(sendSelect.find('#r4').val())
         );
-        const crd = new Coordinates(getNumber(jQuery('#xCoordInput').val()), getNumber(jQuery('#yCoordInput').val()));
+        const crd = new Coordinates(
+            getNumber(jQuery('#xCoordInput').val()),
+            getNumber(jQuery('#yCoordInput').val())
+        );
         onClickHandler(resources, crd);
     };
 
diff --git a/src/Page/BuildingPage/TrooperPage.ts b/src/Page/BuildingPage/TrooperPage.ts
index 149af4f..44dfb34 100644
--- a/src/Page/BuildingPage/TrooperPage.ts
+++ b/src/Page/BuildingPage/TrooperPage.ts
@@ -17,7 +17,9 @@ export function createTrainTroopButtons(
             return;
         }
         const id = uniqId();
-        $el.find('.details').append(`<div style="padding: 8px 0"><a id="${id}" href="#">Обучить</a></div>`);
+        $el.find('.details').append(
+            `<div style="padding: 8px 0"><a id="${id}" href="#">Обучить</a></div>`
+        );
         const resElement = $el.find('.resourceWrapper .resource');
         const resources = grabResourcesFromList(resElement);
         jQuery(`#${id}`).on('click', evt => {
diff --git a/src/Page/BuildingPageController.ts b/src/Page/BuildingPageController.ts
index 30b7d88..3e637d2 100644
--- a/src/Page/BuildingPageController.ts
+++ b/src/Page/BuildingPageController.ts
@@ -10,7 +10,12 @@ import { Resources } from '../Core/Resources';
 import { Coordinates } from '../Core/Village';
 import { SendResourcesTask } from '../Task/SendResourcesTask';
 import { EMBASSY_ID, HORSE_STABLE_ID, PALACE_ID, QUARTERS_ID } from '../Core/Buildings';
-import { BuildingPageAttributes, isForgePage, isGuildHallPage, isMarketSendResourcesPage } from './PageDetectors';
+import {
+    BuildingPageAttributes,
+    isForgePage,
+    isGuildHallPage,
+    isMarketSendResourcesPage,
+} from './PageDetectors';
 import { createTrainTroopButtons } from './BuildingPage/TrooperPage';
 import { createSendResourcesButton } from './BuildingPage/MarketPage';
 import { createResearchButtons } from './BuildingPage/ForgePage';
@@ -25,7 +30,11 @@ export class BuildingPageController {
     private villageController: VillageController;
     private readonly logger: Logger;
 
-    constructor(scheduler: Scheduler, attributes: BuildingPageAttributes, villageController: VillageController) {
+    constructor(
+        scheduler: Scheduler,
+        attributes: BuildingPageAttributes,
+        villageController: VillageController
+    ) {
         this.scheduler = scheduler;
         this.attributes = attributes;
         this.villageController = villageController;
@@ -43,19 +52,27 @@ export class BuildingPageController {
         }
 
         if (buildTypeId === QUARTERS_ID) {
-            createTrainTroopButtons((troopId, res, count) => this.onScheduleTrainTroopers(troopId, res, count));
+            createTrainTroopButtons((troopId, res, count) =>
+                this.onScheduleTrainTroopers(troopId, res, count)
+            );
         }
 
         if (buildTypeId === HORSE_STABLE_ID) {
-            createTrainTroopButtons((troopId, res, count) => this.onScheduleTrainTroopers(troopId, res, count));
+            createTrainTroopButtons((troopId, res, count) =>
+                this.onScheduleTrainTroopers(troopId, res, count)
+            );
         }
 
         if (buildTypeId === EMBASSY_ID && sheetId === 1) {
-            createTrainTroopButtons((troopId, res, count) => this.onScheduleTrainTroopers(troopId, res, count));
+            createTrainTroopButtons((troopId, res, count) =>
+                this.onScheduleTrainTroopers(troopId, res, count)
+            );
         }
 
         if (buildTypeId === PALACE_ID && sheetId === 1) {
-            createTrainTroopButtons((troopId, res, count) => this.onScheduleTrainTroopers(troopId, res, count));
+            createTrainTroopButtons((troopId, res, count) =>
+                this.onScheduleTrainTroopers(troopId, res, count)
+            );
         }
 
         if (isMarketSendResourcesPage()) {
diff --git a/src/Queue/TaskQueue.ts b/src/Queue/TaskQueue.ts
index bf00a58..d576906 100644
--- a/src/Queue/TaskQueue.ts
+++ b/src/Queue/TaskQueue.ts
@@ -1,6 +1,13 @@
 import { Logger } from '../Logger';
 import { Args } from './Args';
-import { ImmutableTaskList, Task, TaskId, TaskList, TaskProvider, uniqTaskId } from './TaskProvider';
+import {
+    ImmutableTaskList,
+    Task,
+    TaskId,
+    TaskList,
+    TaskProvider,
+    uniqTaskId,
+} from './TaskProvider';
 
 export class TaskQueue {
     private provider: TaskProvider;
diff --git a/src/ResourceTransfer.ts b/src/ResourceTransfer.ts
index 1c7e3f6..928ac23 100644
--- a/src/ResourceTransfer.ts
+++ b/src/ResourceTransfer.ts
@@ -22,7 +22,9 @@ export class ResourceTransferCalculator {
         const recipientController = this.factory.createController(toVillageId);
 
         const multiplier = senderState.settings.sendResourcesMultiplier;
-        const senderReadyResources = senderController.getAvailableForSendResources().downTo(multiplier);
+        const senderReadyResources = senderController
+            .getAvailableForSendResources()
+            .downTo(multiplier);
         const recipientNeedResources = recipientController.getRequiredResources().upTo(multiplier);
         const contractResources = senderReadyResources.min(recipientNeedResources);
 
@@ -44,6 +46,11 @@ export class ResourceTransferCalculator {
             { name: 'Ready to transfer', ...readyToTransfer },
         ]);
 
-        return { fromVillageId, toVillageId, resources: readyToTransfer, score: readyToTransfer.amount() };
+        return {
+            fromVillageId,
+            toVillageId,
+            resources: readyToTransfer,
+            score: readyToTransfer.amount(),
+        };
     }
 }
diff --git a/src/Scheduler.ts b/src/Scheduler.ts
index d373913..3398018 100644
--- a/src/Scheduler.ts
+++ b/src/Scheduler.ts
@@ -1,6 +1,5 @@
 import { around, timestamp } from './utils';
 import { TaskQueue } from './Queue/TaskQueue';
-import { SendOnAdventureTask } from './Task/SendOnAdventureTask';
 import { BalanceHeroResourcesTask } from './Task/BalanceHeroResourcesTask';
 import { Logger } from './Logger';
 import { GrabVillageState } from './Task/GrabVillageState';
@@ -9,12 +8,10 @@ import { UpdateResourceContracts } from './Task/UpdateResourceContracts';
 import { SendResourcesTask } from './Task/SendResourcesTask';
 import { Args } from './Queue/Args';
 import { ImmutableTaskList, Task, TaskId, uniqTaskId, withTime } from './Queue/TaskProvider';
-import { MARKET_ID } from './Core/Buildings';
 import { VillageRepositoryInterface } from './VillageRepository';
 import { isProductionTask } from './Core/ProductionQueue';
 import { VillageFactory } from './VillageFactory';
 import { RunVillageProductionTask } from './Task/RunVillageProductionTask';
-import { VillageNotFound } from './Errors';
 
 export interface NextExecution {
     task?: Task;
@@ -47,7 +44,9 @@ export class Scheduler {
 
         const villages = this.villageRepository.all();
         for (let village of villages) {
-            this.createUniqTaskTimer(5 * 60, RunVillageProductionTask.name, { villageId: village.id });
+            this.createUniqTaskTimer(5 * 60, RunVillageProductionTask.name, {
+                villageId: village.id,
+            });
         }
 
         this.createUniqTaskTimer(5 * 60, GrabVillageState.name);
@@ -127,7 +126,9 @@ export class Scheduler {
     scheduleUniqTask(name: string, args: Args, ts?: number | undefined): void {
         let alreadyHasTask;
         if (args.villageId) {
-            alreadyHasTask = this.taskQueue.has(t => t.name === name && t.args.villageId === args.villageId);
+            alreadyHasTask = this.taskQueue.has(
+                t => t.name === name && t.args.villageId === args.villageId
+            );
         } else {
             alreadyHasTask = this.taskQueue.has(t => t.name === name);
         }
diff --git a/src/Storage/VillageStorage.ts b/src/Storage/VillageStorage.ts
index 0a4a6a4..a3ab352 100644
--- a/src/Storage/VillageStorage.ts
+++ b/src/Storage/VillageStorage.ts
@@ -82,7 +82,9 @@ export class VillageStorage {
     }
 
     getIncomingMerchants(): ReadonlyArray<IncomingMerchant> {
-        const objects = this.storage.getTypedList<object>(INCOMING_MERCHANTS_KEY, { factory: () => ({}) });
+        const objects = this.storage.getTypedList<object>(INCOMING_MERCHANTS_KEY, {
+            factory: () => ({}),
+        });
         return objects.map((plain: object) => {
             const m = new IncomingMerchant(new Resources(0, 0, 0, 0), 0);
             if (typeof plain !== 'object') {
diff --git a/src/Task/BuildBuildingTask.ts b/src/Task/BuildBuildingTask.ts
index c76a0e9..341ec96 100644
--- a/src/Task/BuildBuildingTask.ts
+++ b/src/Task/BuildBuildingTask.ts
@@ -19,7 +19,11 @@ export class BuildBuildingTask extends TaskController {
             [
                 GoToPageAction.name,
                 {
-                    path: path('/build.php', { newdid: args.villageId, id: args.buildId, category: args.categoryId }),
+                    path: path('/build.php', {
+                        newdid: args.villageId,
+                        id: args.buildId,
+                        category: args.categoryId,
+                    }),
                 },
             ],
             [BuildBuildingAction.name],
diff --git a/src/Task/CelebrationTask.ts b/src/Task/CelebrationTask.ts
index e2cc28a..2b4f84e 100644
--- a/src/Task/CelebrationTask.ts
+++ b/src/Task/CelebrationTask.ts
@@ -17,6 +17,9 @@ export class CelebrationTask extends TaskController {
             id: args.buildId || undefined,
         };
 
-        return [[GoToPageAction.name, { path: path('/build.php', pathArgs) }], [CelebrationAction.name]];
+        return [
+            [GoToPageAction.name, { path: path('/build.php', pathArgs) }],
+            [CelebrationAction.name],
+        ];
     }
 }
diff --git a/src/Task/ForgeImprovementTask.ts b/src/Task/ForgeImprovementTask.ts
index 3f85b3a..9688efc 100644
--- a/src/Task/ForgeImprovementTask.ts
+++ b/src/Task/ForgeImprovementTask.ts
@@ -17,6 +17,9 @@ export class ForgeImprovementTask extends TaskController {
             id: args.buildId || undefined,
         };
 
-        return [[GoToPageAction.name, { path: path('/build.php', pathArgs) }], [ForgeImprovementAction.name]];
+        return [
+            [GoToPageAction.name, { path: path('/build.php', pathArgs) }],
+            [ForgeImprovementAction.name],
+        ];
     }
 }
diff --git a/src/Task/UpdateResourceContracts.ts b/src/Task/UpdateResourceContracts.ts
index 9367802..4b3c8fb 100644
--- a/src/Task/UpdateResourceContracts.ts
+++ b/src/Task/UpdateResourceContracts.ts
@@ -15,7 +15,10 @@ export class UpdateResourceContracts extends TaskController {
             .map(v => this.factory.createTaskCollection(v.id).getTasks())
             .reduce((acc, tasks) => acc.concat(tasks), []);
 
-        const paths = uniqPaths([...this.walkUpgradeTasks(tasks), ...this.walkImprovementTask(tasks)]);
+        const paths = uniqPaths([
+            ...this.walkUpgradeTasks(tasks),
+            ...this.walkImprovementTask(tasks),
+        ]);
 
         return paths.map(p => [GoToPageAction.name, { path: path(p.name, p.query) }]);
     }
diff --git a/src/TaskQueueRenderer.ts b/src/TaskQueueRenderer.ts
index 8546484..e4e9f02 100644
--- a/src/TaskQueueRenderer.ts
+++ b/src/TaskQueueRenderer.ts
@@ -23,7 +23,9 @@ export class TaskQueueRenderer {
                 'padding': '8px 6px',
             });
         tasks.forEach(task => {
-            ul.append(jQuery('<li></li>').text(formatDate(task.ts) + ' ' + task.name + ' ' + task.id));
+            ul.append(
+                jQuery('<li></li>').text(formatDate(task.ts) + ' ' + task.name + ' ' + task.id)
+            );
         });
 
         const el = jQuery(`#${ID}`);
diff --git a/src/VillageFactory.ts b/src/VillageFactory.ts
index ec31c1b..9690482 100644
--- a/src/VillageFactory.ts
+++ b/src/VillageFactory.ts
@@ -61,6 +61,10 @@ export class VillageFactory {
 
     createController(villageId: number): VillageController {
         const village = this.villageRepository.get(villageId);
-        return new VillageController(village.id, this.createTaskCollection(village.id), this.createState(village.id));
+        return new VillageController(
+            village.id,
+            this.createTaskCollection(village.id),
+            this.createState(village.id)
+        );
     }
 }
diff --git a/src/VillageState.ts b/src/VillageState.ts
index d205736..6a03bcc 100644
--- a/src/VillageState.ts
+++ b/src/VillageState.ts
@@ -90,7 +90,11 @@ export interface VillageState extends VillageOwnState {
     commitments: Resources;
 }
 
-function calcResourceBalance(resources: Resources, current: Resources, performance: Resources): ResourceLineState {
+function calcResourceBalance(
+    resources: Resources,
+    current: Resources,
+    performance: Resources
+): ResourceLineState {
     return {
         resources,
         balance: current.sub(resources),
@@ -98,7 +102,11 @@ function calcResourceBalance(resources: Resources, current: Resources, performan
     };
 }
 
-function calcStorageBalance(resources: Resources, storage: Resources, performance: Resources): VillageStorageState {
+function calcStorageBalance(
+    resources: Resources,
+    storage: Resources,
+    performance: Resources
+): VillageStorageState {
     return {
         resources,
         capacity: storage,
@@ -109,12 +117,20 @@ function calcStorageBalance(resources: Resources, storage: Resources, performanc
     };
 }
 
-function timeToAllResources(current: Resources, desired: Resources, performance: Resources): GatheringTime {
+function timeToAllResources(
+    current: Resources,
+    desired: Resources,
+    performance: Resources
+): GatheringTime {
     const timings = calcGatheringTimings(current, desired, performance);
     return timings.slowest;
 }
 
-function timeToFastestResource(current: Resources, desired: Resources, performance: Resources): GatheringTime {
+function timeToFastestResource(
+    current: Resources,
+    desired: Resources,
+    performance: Resources
+): GatheringTime {
     const timings = calcGatheringTimings(current, desired, performance);
     return timings.fastest;
 }
@@ -124,7 +140,9 @@ function calcIncomingResources(storage: VillageStorage): Resources {
 }
 
 function taskResourceReducer(resources: Resources, task: Task) {
-    return task.args.resources ? resources.add(Resources.fromObject(task.args.resources)) : resources;
+    return task.args.resources
+        ? resources.add(Resources.fromObject(task.args.resources))
+        : resources;
 }
 
 function createProductionQueueState(
@@ -144,14 +162,20 @@ function createProductionQueueState(
         queue,
         isActive: tasks.length !== 0 || taskEndingTimestamp > timestamp(),
         currentTaskFinishTimestamp: taskEndingTimestamp,
-        currentTaskFinishSeconds: Math.max(taskEndingTimestamp ? taskEndingTimestamp - timestamp() : 0, 0),
+        currentTaskFinishSeconds: Math.max(
+            taskEndingTimestamp ? taskEndingTimestamp - timestamp() : 0,
+            0
+        ),
         firstTask: calcResourceBalance(firstTaskResources, resources, performance),
         allTasks: calcResourceBalance(allTaskResources, resources, performance),
         taskCount: tasks.length,
     };
 }
 
-function createAllProductionQueueStates(storage: VillageStorage, taskCollection: VillageTaskCollection) {
+function createAllProductionQueueStates(
+    storage: VillageStorage,
+    taskCollection: VillageTaskCollection
+) {
     let result: { [queue: string]: VillageProductionQueueState } = {};
     for (let queue of OrderedProductionQueues) {
         result[queue] = createProductionQueueState(queue, storage, taskCollection);
@@ -204,13 +228,18 @@ function createVillageOwnStates(
     return result;
 }
 
-function createVillageState(state: VillageOwnState, ownStates: VillageOwnStateDictionary): VillageState {
+function createVillageState(
+    state: VillageOwnState,
+    ownStates: VillageOwnStateDictionary
+): VillageState {
     const villageIds = Object.keys(ownStates).map(k => +k);
     const commitments = villageIds.reduce((memo, shipmentVillageId) => {
         const shipmentVillageState = ownStates[shipmentVillageId];
         const shipmentVillageRequired = shipmentVillageState.required;
         const shipmentVillageIncoming = shipmentVillageState.incomingResources;
-        const targetVillageMissing = shipmentVillageRequired.balance.add(shipmentVillageIncoming).min(Resources.zero());
+        const targetVillageMissing = shipmentVillageRequired.balance
+            .add(shipmentVillageIncoming)
+            .min(Resources.zero());
         return memo.add(targetVillageMissing);
     }, Resources.zero());
     return { ...state, commitments };
@@ -249,11 +278,19 @@ export class VillageStateFactory {
     }
 
     getAllVillageStates(): Array<VillageState> {
-        return getVillageStates(this.villageRepository.all(), this.storageFactory, this.taskCollectionFactory);
+        return getVillageStates(
+            this.villageRepository.all(),
+            this.storageFactory,
+            this.taskCollectionFactory
+        );
     }
 
     getVillageState(villageId: number): VillageState {
-        const states = getVillageStates(this.villageRepository.all(), this.storageFactory, this.taskCollectionFactory);
+        const states = getVillageStates(
+            this.villageRepository.all(),
+            this.storageFactory,
+            this.taskCollectionFactory
+        );
         const needle = states.find(s => s.id === villageId);
         if (!needle) {
             throw new VillageNotFound(`Village ${villageId} not found`);
diff --git a/src/VillageTaskCollection.ts b/src/VillageTaskCollection.ts
index 243ede1..aa91b3f 100644
--- a/src/VillageTaskCollection.ts
+++ b/src/VillageTaskCollection.ts
@@ -45,7 +45,9 @@ export class VillageTaskCollection {
             throw new Error(`Task "${name}" is not production task`);
         }
         if (args.villageId !== this.villageId) {
-            throw new Error(`Task village id (${args.villageId}) not equal controller village id (${this.villageId}`);
+            throw new Error(
+                `Task village id (${args.villageId}) not equal controller village id (${this.villageId}`
+            );
         }
         const task = new Task(uniqTaskId(), 0, name, { villageId: this.villageId, ...args });
 
@@ -86,7 +88,9 @@ export class VillageTaskCollection {
         const maxCapacity = Resources.fromStorage(this.storage.getResourceStorage());
 
         return firstReadyGroup.tasks.find(
-            t => !t.args.resources || maxCapacity.allGreaterOrEqual(Resources.fromObject(t.args.resources))
+            t =>
+                !t.args.resources ||
+                maxCapacity.allGreaterOrEqual(Resources.fromObject(t.args.resources))
         );
     }
 
@@ -97,7 +101,8 @@ export class VillageTaskCollection {
 
     updateResources(resources: Resources, attr: ContractAttributes): void {
         if (attr.type === ContractType.UpgradeBuilding && attr.buildId) {
-            const predicate = (t: Task) => t.name === UpgradeBuildingTask.name && t.args.buildId === attr.buildId;
+            const predicate = (t: Task) =>
+                t.name === UpgradeBuildingTask.name && t.args.buildId === attr.buildId;
             this.modifyTasks(predicate, withResources(resources));
         }
         if (attr.type === ContractType.ImproveTrooper && attr.buildId && attr.unitId) {
diff --git a/tests/Queue/StatisticsTest.js.ts b/tests/Queue/StatisticsTest.js.ts
index c2fdbb7..adc34c4 100644
--- a/tests/Queue/StatisticsTest.js.ts
+++ b/tests/Queue/StatisticsTest.js.ts
@@ -30,6 +30,8 @@ describe('Statistics', function() {
         for (let i = 0; i < 120; ++i) {
             statistics.incrementAction(baseTime + 3600 * i);
         }
-        expect(Object.keys(statistics.getActionStatistics())).to.has.lengthOf(Statistics.keepRecords);
+        expect(Object.keys(statistics.getActionStatistics())).to.has.lengthOf(
+            Statistics.keepRecords
+        );
     });
 });
diff --git a/tests/Queue/TaskQueueTest.js.ts b/tests/Queue/TaskQueueTest.js.ts
index f223486..a9948b6 100644
--- a/tests/Queue/TaskQueueTest.js.ts
+++ b/tests/Queue/TaskQueueTest.js.ts
@@ -22,7 +22,10 @@ describe('Task Queue', function() {
     });
 
     it('Can remove task by id', function() {
-        const provider = new ArrayTaskProvider([new Task('id1', 1, 'task1', {}), new Task('id2', 2, 'task2', {})]);
+        const provider = new ArrayTaskProvider([
+            new Task('id1', 1, 'task1', {}),
+            new Task('id2', 2, 'task2', {}),
+        ]);
         const queue = new TaskQueue(provider, new NullLogger());
         queue.remove(t => t.id === 'id1');
         const tasks = provider.getTasks();