Split utils functions into set of helper modules
This commit is contained in:
		@@ -1,11 +1,11 @@
 | 
			
		||||
import { Scheduler } from '../Scheduler';
 | 
			
		||||
import { taskError, TryLaterError } from '../Errors';
 | 
			
		||||
import { grabActiveVillageId } from '../Page/VillageBlock';
 | 
			
		||||
import { aroundMinutes } from '../utils';
 | 
			
		||||
import { Args } from '../Queue/Args';
 | 
			
		||||
import { Task } from '../Queue/TaskProvider';
 | 
			
		||||
import { VillageStorage } from '../Storage/VillageStorage';
 | 
			
		||||
import { VillageFactory } from '../VillageFactory';
 | 
			
		||||
import { aroundMinutes } from '../Helpers/Time';
 | 
			
		||||
 | 
			
		||||
const actionMap: { [name: string]: Function | undefined } = {};
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,9 +1,9 @@
 | 
			
		||||
import { ActionController, registerAction } from './ActionController';
 | 
			
		||||
import { GrabError, taskError, TryLaterError } from '../Errors';
 | 
			
		||||
import { clickBuildButton } from '../Page/BuildingPage/BuildingPage';
 | 
			
		||||
import { aroundMinutes } from '../utils';
 | 
			
		||||
import { Args } from '../Queue/Args';
 | 
			
		||||
import { Task } from '../Queue/TaskProvider';
 | 
			
		||||
import { aroundMinutes } from '../Helpers/Time';
 | 
			
		||||
 | 
			
		||||
@registerAction
 | 
			
		||||
export class BuildBuildingAction extends ActionController {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,9 +1,9 @@
 | 
			
		||||
import { ActionController, registerAction } from './ActionController';
 | 
			
		||||
import { GrabError, TryLaterError } from '../Errors';
 | 
			
		||||
import { aroundMinutes } from '../utils';
 | 
			
		||||
import { Args } from '../Queue/Args';
 | 
			
		||||
import { Task } from '../Queue/TaskProvider';
 | 
			
		||||
import { clickCelebrationButton } from '../Page/BuildingPage/GuildHallPage';
 | 
			
		||||
import { aroundMinutes } from '../Helpers/Time';
 | 
			
		||||
 | 
			
		||||
@registerAction
 | 
			
		||||
export class CelebrationAction extends ActionController {
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,6 @@ import { ActionController, registerAction } from './ActionController';
 | 
			
		||||
import { FailTaskError, taskError, TryLaterError } from '../Errors';
 | 
			
		||||
import { Resources } from '../Core/Resources';
 | 
			
		||||
import { Coordinates } from '../Core/Village';
 | 
			
		||||
import { aroundMinutes, timestamp } from '../utils';
 | 
			
		||||
import { Args } from '../Queue/Args';
 | 
			
		||||
import { Task } from '../Queue/TaskProvider';
 | 
			
		||||
import { clickSendButton, fillSendResourcesForm } from '../Page/BuildingPage/MarketPage';
 | 
			
		||||
@@ -17,6 +16,7 @@ import {
 | 
			
		||||
import { ResourceTransferStorage } from '../Storage/ResourceTransferStorage';
 | 
			
		||||
import { path } from '../Helpers/Path';
 | 
			
		||||
import { MARKET_ID } from '../Core/Buildings';
 | 
			
		||||
import { aroundMinutes, timestamp } from '../Helpers/Time';
 | 
			
		||||
 | 
			
		||||
@registerAction
 | 
			
		||||
export class FindSendResourcesPath extends ActionController {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,9 +1,9 @@
 | 
			
		||||
import { ActionController, registerAction } from './ActionController';
 | 
			
		||||
import { GrabError, taskError, TryLaterError } from '../Errors';
 | 
			
		||||
import { aroundMinutes } from '../utils';
 | 
			
		||||
import { Args } from '../Queue/Args';
 | 
			
		||||
import { Task } from '../Queue/TaskProvider';
 | 
			
		||||
import { clickResearchButton } from '../Page/BuildingPage/ForgePage';
 | 
			
		||||
import { aroundMinutes } from '../Helpers/Time';
 | 
			
		||||
 | 
			
		||||
@registerAction
 | 
			
		||||
export class ForgeImprovementAction extends ActionController {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,8 +1,8 @@
 | 
			
		||||
import { ActionController, registerAction } from './ActionController';
 | 
			
		||||
import { trimPrefix } from '../utils';
 | 
			
		||||
import { AbortTaskError } from '../Errors';
 | 
			
		||||
import { Args } from '../Queue/Args';
 | 
			
		||||
import { Task } from '../Queue/TaskProvider';
 | 
			
		||||
import { trimPrefix } from '../Helpers/Convert';
 | 
			
		||||
 | 
			
		||||
const CONFIG = [
 | 
			
		||||
    { level: 0, health: 60 },
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,5 @@
 | 
			
		||||
import { ActionController, registerAction } from './ActionController';
 | 
			
		||||
import { taskError, TryLaterError } from '../Errors';
 | 
			
		||||
import { aroundMinutes, randomInRange } from '../utils';
 | 
			
		||||
import { Args } from '../Queue/Args';
 | 
			
		||||
import { Task } from '../Queue/TaskProvider';
 | 
			
		||||
import {
 | 
			
		||||
@@ -10,6 +9,8 @@ import {
 | 
			
		||||
} from '../Page/BuildingPage/TrooperPage';
 | 
			
		||||
import { TrainTroopTask } from '../Task/TrainTroopTask';
 | 
			
		||||
import { Resources } from '../Core/Resources';
 | 
			
		||||
import { randomInRange } from '../Helpers/Random';
 | 
			
		||||
import { aroundMinutes } from '../Helpers/Time';
 | 
			
		||||
 | 
			
		||||
@registerAction
 | 
			
		||||
export class TrainTrooperAction extends ActionController {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,9 +1,9 @@
 | 
			
		||||
import { ActionController, registerAction } from './ActionController';
 | 
			
		||||
import { GrabError, TryLaterError } from '../Errors';
 | 
			
		||||
import { clickUpgradeButton } from '../Page/BuildingPage/BuildingPage';
 | 
			
		||||
import { aroundMinutes } from '../utils';
 | 
			
		||||
import { Args } from '../Queue/Args';
 | 
			
		||||
import { Task } from '../Queue/TaskProvider';
 | 
			
		||||
import { aroundMinutes } from '../Helpers/Time';
 | 
			
		||||
 | 
			
		||||
@registerAction
 | 
			
		||||
export class UpgradeBuildingAction extends ActionController {
 | 
			
		||||
 
 | 
			
		||||
@@ -2,10 +2,11 @@ import { ActionController, registerAction } from './ActionController';
 | 
			
		||||
import { ActionError, taskError, TryLaterError } from '../Errors';
 | 
			
		||||
import { grabResourceSlots } from '../Page/SlotBlock';
 | 
			
		||||
import { UpgradeBuildingTask } from '../Task/UpgradeBuildingTask';
 | 
			
		||||
import { aroundMinutes, getNumber } from '../utils';
 | 
			
		||||
import { Args } from '../Queue/Args';
 | 
			
		||||
import { Task } from '../Queue/TaskProvider';
 | 
			
		||||
import { ResourceSlot } from '../Core/Slot';
 | 
			
		||||
import { getNumber } from '../Helpers/Convert';
 | 
			
		||||
import { aroundMinutes } from '../Helpers/Time';
 | 
			
		||||
 | 
			
		||||
@registerAction
 | 
			
		||||
export class UpgradeResourceToLevel extends ActionController {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user