From 23f37435998d9e930ec8d7ae0e3d0fe7fe163779 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Thu, 2 Apr 2020 11:08:32 +0300
Subject: [PATCH] Remove got to building action

---
 src/Action/GoToBuildingAction.ts | 12 ------------
 src/Scheduler.ts                 |  4 ----
 src/Task/UpgradeBuildingTask.ts  | 10 ++++++----
 src/index.js                     |  2 ++
 4 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 src/Action/GoToBuildingAction.ts

diff --git a/src/Action/GoToBuildingAction.ts b/src/Action/GoToBuildingAction.ts
deleted file mode 100644
index 5355d72..0000000
--- a/src/Action/GoToBuildingAction.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import ActionController from './ActionController';
-import { Args } from '../Common';
-import { Task } from '../Storage/TaskQueue';
-
-export default class GoToBuildingAction extends ActionController {
-    static NAME = 'go_to_building';
-
-    async run(args: Args, task: Task): Promise<any> {
-        window.location.assign('/build.php?id=' + args.id);
-        return null;
-    }
-}
diff --git a/src/Scheduler.ts b/src/Scheduler.ts
index 64602ae..ead8030 100644
--- a/src/Scheduler.ts
+++ b/src/Scheduler.ts
@@ -1,6 +1,5 @@
 import { markPage, sleepShort, timestamp } from './utils';
 import UpgradeBuildingTask from './Task/UpgradeBuildingTask';
-import GoToBuildingAction from './Action/GoToBuildingAction';
 import UpgradeBuildingAction from './Action/UpgradeBuildingAction';
 import { TryLaterError } from './Errors';
 import { TaskQueue, TaskList, Task, TaskId } from './Storage/TaskQueue';
@@ -120,9 +119,6 @@ export default class Scheduler {
     private createActionControllerByName(
         actonName: string
     ): ActionController | undefined {
-        if (actonName === GoToBuildingAction.NAME) {
-            return new GoToBuildingAction();
-        }
         if (actonName === UpgradeBuildingAction.NAME) {
             return new UpgradeBuildingAction(this);
         }
diff --git a/src/Task/UpgradeBuildingTask.ts b/src/Task/UpgradeBuildingTask.ts
index 44673f4..513defc 100644
--- a/src/Task/UpgradeBuildingTask.ts
+++ b/src/Task/UpgradeBuildingTask.ts
@@ -1,7 +1,6 @@
 import Scheduler from '../Scheduler';
-import GoToBuildingAction from '../Action/GoToBuildingAction';
 import UpgradeBuildingAction from '../Action/UpgradeBuildingAction';
-import { Command } from '../Common';
+import { Args, Command } from '../Common';
 import { Task } from '../Storage/TaskQueue';
 import TaskController from './TaskController';
 import GoToPageAction from '../Action/GoToPageAction';
@@ -18,11 +17,14 @@ export default class UpgradeBuildingTask extends TaskController {
 
     run(task: Task) {
         console.log('RUN', UpgradeBuildingTask.NAME, 'with', task);
-        const args = { ...task.cmd.args, taskId: task.id };
+        const args: Args = { ...task.cmd.args, taskId: task.id };
         this.scheduler.scheduleActions([
             new Command(GoToPageAction.NAME, { ...args, path: '/dorf1.php' }),
             new Command(CheckBuildingRemainingTimeAction.NAME, args),
-            new Command(GoToBuildingAction.NAME, args),
+            new Command(GoToPageAction.NAME, {
+                ...args,
+                path: '/build.php?id=' + args.id,
+            }),
             new Command(UpgradeBuildingAction.NAME, args),
         ]);
     }
diff --git a/src/index.js b/src/index.js
index ce74ab3..8f05103 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,6 +3,8 @@ import Scheduler from './Scheduler';
 import Dashboard from './Dashboard';
 import TxtVersion from '!!raw-loader!./version.txt';
 
+console.log('TRAVIAN AUTOMATION', TxtVersion);
+
 const md = new ModeDetector();
 if (md.isAuto()) {
     md.setAuto();