Args refactoring

src/Action/ActionController.ts

@@ -3,7 +3,7 @@ import { Scheduler } from '../Scheduler';
 import { ActionError, TryLaterError } from '../Errors';
 import { grabActiveVillageId } from '../Page/VillageBlock';
 import { aroundMinutes } from '../utils';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 const actionMap: { [name: string]: Function | undefined } = {};
 

src/Action/BalanceHeroResourcesAction.ts

@@ -6,7 +6,7 @@ import { grabActiveVillageId } from '../Page/VillageBlock';
 import { HeroState } from '../State/HeroState';
 import { calcHeroResource } from '../Core/HeroBalance';
 import { HeroAllResources } from '../Core/Hero';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerAction
 export class BalanceHeroResourcesAction extends ActionController {

src/Action/BuildBuildingAction.ts

@@ -3,7 +3,7 @@ import { ActionError, GrabError, TryLaterError } from '../Errors';
 import { Task } from '../Queue/TaskQueue';
 import { clickBuildButton } from '../Page/BuildingPage';
 import { aroundMinutes } from '../utils';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerAction
 export class BuildBuildingAction extends ActionController {

src/Action/CheckBuildingRemainingTimeAction.ts

@@ -3,7 +3,7 @@ import { Task } from '../Queue/TaskQueue';
 import { GrabError, TryLaterError } from '../Errors';
 import { grabBuildingQueueInfo } from '../Page/VillageBlock';
 import { BuildingQueueInfo } from '../Game';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerAction
 export class CheckBuildingRemainingTimeAction extends ActionController {

src/Action/ClickButtonAction.ts

@@ -1,7 +1,7 @@
 import { ActionController, registerAction } from './ActionController';
 import { Task } from '../Queue/TaskQueue';
 import { AbortTaskError } from '../Errors';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerAction
 export class ClickButtonAction extends ActionController {

src/Action/CompleteTaskAction.ts

@@ -1,6 +1,6 @@
 import { ActionController, registerAction } from './ActionController';
 import { Task } from '../Queue/TaskQueue';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerAction
 export class CompleteTaskAction extends ActionController {

src/Action/GoToHeroVillageAction.ts

@@ -4,7 +4,7 @@ import { grabVillageList } from '../Page/VillageBlock';
 import { grabHeroVillage } from '../Page/HeroPage';
 import { path } from '../utils';
 import { HeroState } from '../State/HeroState';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerAction
 export class GoToHeroVillageAction extends ActionController {

src/Action/GoToPageAction.ts

@@ -1,7 +1,7 @@
 import { ActionController, registerAction } from './ActionController';
 import { Task } from '../Queue/TaskQueue';
 import { AbortTaskError } from '../Errors';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerAction
 export class GoToPageAction extends ActionController {

src/Action/SendOnAdventureAction.ts

@@ -2,7 +2,7 @@ import { ActionController, registerAction } from './ActionController';
 import { Task } from '../Queue/TaskQueue';
 import { trimPrefix } from '../utils';
 import { AbortTaskError } from '../Errors';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 const CONFIG = [
     { level: 0, health: 60 },

src/Action/SendResourcesAction.ts

@@ -9,7 +9,7 @@ import { grabActiveVillageId, grabVillageList } from '../Page/VillageBlock';
 import { SendResourcesTask } from '../Task/SendResourcesTask';
 import { aroundMinutes, timestamp } from '../utils';
 import { VillageState } from '../State/VillageState';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 function err(msg): never {
     throw new ActionError(msg);

src/Action/TrainTrooperAction.ts

@@ -2,7 +2,7 @@ import { ActionController, registerAction } from './ActionController';
 import { ActionError, TryLaterError } from '../Errors';
 import { Task } from '../Queue/TaskQueue';
 import { getNumber, toNumber } from '../utils';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerAction
 export class TrainTrooperAction extends ActionController {

src/Action/UpdateBuildingTaskResourcesAction.ts

@@ -1,7 +1,7 @@
 import { ActionController, registerAction } from './ActionController';
 import { Task } from '../Queue/TaskQueue';
 import { grabContractResources } from '../Page/BuildingPage';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerAction
 export class UpdateBuildingTaskResourcesAction extends ActionController {

src/Action/UpgradeBuildingAction.ts

@@ -3,7 +3,7 @@ import { GrabError, TryLaterError } from '../Errors';
 import { Task } from '../Queue/TaskQueue';
 import { clickUpgradeButton } from '../Page/BuildingPage';
 import { aroundMinutes } from '../utils';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerAction
 export class UpgradeBuildingAction extends ActionController {

src/Action/UpgradeResourceToLevel.ts

@@ -5,7 +5,7 @@ import { grabResourceDeposits } from '../Page/SlotBlock';
 import { UpgradeBuildingTask } from '../Task/UpgradeBuildingTask';
 import { ResourceDeposit } from '../Game';
 import { aroundMinutes, getNumber } from '../utils';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerAction
 export class UpgradeResourceToLevel extends ActionController {

src/Queue/ActionQueue.ts

@@ -1,6 +1,6 @@
 import { ConsoleLogger, Logger } from '../Logger';
 import { DataStorage } from '../DataStorage';
-import { Args } from '../Args';
+import { Args } from './Args';
 
 const NAMESPACE = 'actions.v1';
 const QUEUE_NAME = 'queue';

src/Queue/Args.ts

@@ -1,6 +1,6 @@
-import { TaskId } from './Queue/TaskQueue';
-import { ResourcesInterface } from './Core/Resources';
-import { CoordinatesInterface } from './Core/Village';
+import { TaskId } from './TaskQueue';
+import { ResourcesInterface } from '../Core/Resources';
+import { CoordinatesInterface } from '../Core/Village';
 
 export interface Args {
     taskId?: TaskId;

src/Queue/TaskQueue.ts

@@ -1,7 +1,7 @@
 import { uniqId } from '../utils';
 import { ConsoleLogger, Logger } from '../Logger';
 import { DataStorage } from '../DataStorage';
-import { Args } from '../Args';
+import { Args } from './Args';
 
 const NAMESPACE = 'tasks:v1';
 const QUEUE_NAME = 'queue';

src/Scheduler.ts

@@ -11,7 +11,7 @@ import { UpdateResourceContracts } from './Task/UpdateResourceContracts';
 import { TrainTroopTask } from './Task/TrainTroopTask';
 import { Resources, ResourcesInterface } from './Core/Resources';
 import { SendResourcesTask } from './Task/SendResourcesTask';
-import { Args } from './Args';
+import { Args } from './Queue/Args';
 
 export class Scheduler {
     private taskQueue: TaskQueue;

src/Task/BalanceHeroResourcesTask.ts

@@ -6,7 +6,7 @@ import { BalanceHeroResourcesAction } from '../Action/BalanceHeroResourcesAction
 import { path } from '../utils';
 import { GoToHeroVillageAction } from '../Action/GoToHeroVillageAction';
 import { Action } from '../Queue/ActionQueue';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerTask
 export class BalanceHeroResourcesTask extends TaskController {

src/Task/BuildBuildingTask.ts

@@ -6,7 +6,7 @@ import { path } from '../utils';
 import { Task } from '../Queue/TaskQueue';
 import { TaskController, registerTask } from './TaskController';
 import { Action } from '../Queue/ActionQueue';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerTask
 export class BuildBuildingTask extends TaskController {

src/Task/ResourcesToLevel.ts

@@ -5,7 +5,7 @@ import { CompleteTaskAction } from '../Action/CompleteTaskAction';
 import { path } from '../utils';
 import { UpgradeResourceToLevel } from '../Action/UpgradeResourceToLevel';
 import { Action } from '../Queue/ActionQueue';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerTask
 export class ResourcesToLevel extends TaskController {

src/Task/SendOnAdventureTask.ts

@@ -6,7 +6,7 @@ import { SendOnAdventureAction } from '../Action/SendOnAdventureAction';
 import { ClickButtonAction } from '../Action/ClickButtonAction';
 import { path } from '../utils';
 import { Action } from '../Queue/ActionQueue';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerTask
 export class SendOnAdventureTask extends TaskController {

src/Task/SendResourcesTask.ts

@@ -6,7 +6,7 @@ import { path } from '../utils';
 import { SendResourcesAction } from '../Action/SendResourcesAction';
 import { ClickButtonAction } from '../Action/ClickButtonAction';
 import { scanAllVillagesBundle } from './ActionBundles';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerTask
 export class SendResourcesTask extends TaskController {

src/Task/TaskController.ts

@@ -2,7 +2,7 @@ import { Task } from '../Queue/TaskQueue';
 import { Scheduler } from '../Scheduler';
 import { CompleteTaskAction } from '../Action/CompleteTaskAction';
 import { Action } from '../Queue/ActionQueue';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 const taskMap: { [name: string]: Function | undefined } = {};
 

src/Task/TrainTroopTask.ts

@@ -5,7 +5,7 @@ import { CompleteTaskAction } from '../Action/CompleteTaskAction';
 import { TrainTrooperAction } from '../Action/TrainTrooperAction';
 import { path } from '../utils';
 import { Action } from '../Queue/ActionQueue';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerTask
 export class TrainTroopTask extends TaskController {

src/Task/UpdateResourceContracts.ts

@@ -6,7 +6,7 @@ import { UpgradeBuildingTask } from './UpgradeBuildingTask';
 import { UpdateBuildingTaskResourcesAction } from '../Action/UpdateBuildingTaskResourcesAction';
 import { CompleteTaskAction } from '../Action/CompleteTaskAction';
 import { Action } from '../Queue/ActionQueue';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerTask
 export class UpdateResourceContracts extends TaskController {

src/Task/UpgradeBuildingTask.ts

@@ -6,7 +6,7 @@ import { CheckBuildingRemainingTimeAction } from '../Action/CheckBuildingRemaini
 import { CompleteTaskAction } from '../Action/CompleteTaskAction';
 import { path } from '../utils';
 import { Action } from '../Queue/ActionQueue';
-import { Args } from '../Args';
+import { Args } from '../Queue/Args';
 
 @registerTask
 export class UpgradeBuildingTask extends TaskController {