av/travian
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add separate village module

Browse Source
This commit is contained in:
Anton Vakhrushev 2020-07-18 17:44:10 +03:00
parent 349835bdb7
commit 66e299061d
20 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Action/ActionController.ts
View File

@ -4,7 +4,7 @@ import { grabActiveVillageId } from '../Page/VillageBlock';
import { Args } from '../Queue/Args'; import { Args } from '../Queue/Args';
import { Task } from '../Queue/TaskProvider'; import { Task } from '../Queue/TaskProvider';
import { VillageStorage } from '../Storage/VillageStorage'; import { VillageStorage } from '../Storage/VillageStorage';
import { VillageFactory } from '../VillageFactory'; import { VillageFactory } from '../Village/VillageFactory';
import { aroundMinutes } from '../Helpers/Time'; import { aroundMinutes } from '../Helpers/Time';
const actionMap: { [name: string]: Function | undefined } = {}; const actionMap: { [name: string]: Function | undefined } = {};

4
src/Action/FindSendResourcesPath.ts
View File

@ -5,14 +5,14 @@ import { Coordinates } from '../Core/Village';
import { Args } from '../Queue/Args'; import { Args } from '../Queue/Args';
import { Task } from '../Queue/TaskProvider'; import { Task } from '../Queue/TaskProvider';
import { clickSendButton, fillSendResourcesForm } from '../Page/BuildingPage/MarketPage'; import { clickSendButton, fillSendResourcesForm } from '../Page/BuildingPage/MarketPage';
import { VillageState } from '../VillageState'; import { VillageState } from '../Village/VillageState';
import { MerchantsInfo } from '../Core/Market'; import { MerchantsInfo } from '../Core/Market';
import { goToMarketSendResourcesPage, goToResourceViewPage } from '../Task/ActionBundles'; import { goToMarketSendResourcesPage, goToResourceViewPage } from '../Task/ActionBundles';
import { import {
compareReports, compareReports,
ResourceTransferCalculator, ResourceTransferCalculator,
ResourceTransferReport, ResourceTransferReport,
} from '../ResourceTransfer'; } from '../Village/ResourceTransfer';
import { ResourceTransferStorage } from '../Storage/ResourceTransferStorage'; import { ResourceTransferStorage } from '../Storage/ResourceTransferStorage';
import { path } from '../Helpers/Path'; import { path } from '../Helpers/Path';
import { MARKET_ID } from '../Core/Buildings'; import { MARKET_ID } from '../Core/Buildings';

2
src/Action/SendResourcesAction.ts
View File

@ -2,7 +2,7 @@ import { ActionController, registerAction } from './ActionController';
import { Args } from '../Queue/Args'; import { Args } from '../Queue/Args';
import { Task } from '../Queue/TaskProvider'; import { Task } from '../Queue/TaskProvider';
import { clickSendButton, fillSendResourcesForm } from '../Page/BuildingPage/MarketPage'; import { clickSendButton, fillSendResourcesForm } from '../Page/BuildingPage/MarketPage';
import { ResourceTransferCalculator } from '../ResourceTransfer'; import { ResourceTransferCalculator } from '../Village/ResourceTransfer';
import { ResourceTransferStorage } from '../Storage/ResourceTransferStorage'; import { ResourceTransferStorage } from '../Storage/ResourceTransferStorage';
import { Resources } from '../Core/Resources'; import { Resources } from '../Core/Resources';
import { AbortTaskError } from '../Errors'; import { AbortTaskError } from '../Errors';

4
src/Container.ts
View File

@ -6,8 +6,8 @@ import { Executor } from './Executor';
import { ControlPanel } from './ControlPanel'; import { ControlPanel } from './ControlPanel';
import { DataStorageTaskProvider } from './Queue/DataStorageTaskProvider'; import { DataStorageTaskProvider } from './Queue/DataStorageTaskProvider';
import { Statistics } from './Statistics'; import { Statistics } from './Statistics';
import { VillageRepository } from './VillageRepository'; import { VillageRepository } from './Village/VillageRepository';
import { VillageFactory } from './VillageFactory'; import { VillageFactory } from './Village/VillageFactory';
import { GrabberManager } from './Grabber/GrabberManager'; import { GrabberManager } from './Grabber/GrabberManager';
import { StorageContainer } from './Storage/StorageContainer'; import { StorageContainer } from './Storage/StorageContainer';

6
src/ControlPanel.ts
View File

@ -11,15 +11,15 @@ import {
import Vue from 'vue'; import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import DashboardApp from './DashboardView/Dashboard.vue'; import DashboardApp from './DashboardView/Dashboard.vue';
import { createStore } from './DashboardView/Store';
import { ConsoleLogger, Logger } from './Logger'; import { ConsoleLogger, Logger } from './Logger';
import { DataStorage } from './Storage/DataStorage'; import { DataStorage } from './Storage/DataStorage';
import { getBuildingPageAttributes, isBuildingPage } from './Page/PageDetector'; import { getBuildingPageAttributes, isBuildingPage } from './Page/PageDetector';
import { ExecutionStorage } from './Storage/ExecutionStorage'; import { ExecutionStorage } from './Storage/ExecutionStorage';
import { VillageState } from './VillageState'; import { VillageState } from './Village/VillageState';
import { Task } from './Queue/TaskProvider'; import { Task } from './Queue/TaskProvider';
import { Action } from './Queue/ActionQueue'; import { Action } from './Queue/ActionQueue';
import { createStore } from './DashboardView/Store'; import { VillageFactory } from './Village/VillageFactory';
import { VillageFactory } from './VillageFactory';
import { uniqId } from './Helpers/Identity'; import { uniqId } from './Helpers/Identity';
import { timestamp } from './Helpers/Time'; import { timestamp } from './Helpers/Time';
import { notify, parseLocation, waitForLoad } from './Helpers/Browser'; import { notify, parseLocation, waitForLoad } from './Helpers/Browser';

2
src/DashboardView/Store.ts
View File

@ -1,7 +1,7 @@
import Vuex from 'vuex'; import Vuex from 'vuex';
import { VillageSettings, VillageSettingsDefaults } from '../Core/Village'; import { VillageSettings, VillageSettingsDefaults } from '../Core/Village';
import { VillageStorage } from '../Storage/VillageStorage'; import { VillageStorage } from '../Storage/VillageStorage';
import { VillageFactory } from '../VillageFactory'; import { VillageFactory } from '../Village/VillageFactory';
import { StorageContainer } from '../Storage/StorageContainer'; import { StorageContainer } from '../Storage/StorageContainer';
import { getNumber } from '../Helpers/Convert'; import { getNumber } from '../Helpers/Convert';
import { notify } from '../Helpers/Browser'; import { notify } from '../Helpers/Browser';

2
src/Executor.ts
View File

@ -16,7 +16,7 @@ import { ExecutionStorage } from './Storage/ExecutionStorage';
import { Action } from './Queue/ActionQueue'; import { Action } from './Queue/ActionQueue';
import { Task } from './Queue/TaskProvider'; import { Task } from './Queue/TaskProvider';
import { createTaskHandler } from './Task/TaskMap'; import { createTaskHandler } from './Task/TaskMap';
import { VillageFactory } from './VillageFactory'; import { VillageFactory } from './Village/VillageFactory';
import { sleepMicro, timestamp } from './Helpers/Time'; import { sleepMicro, timestamp } from './Helpers/Time';
import { markPage, waitForLoad } from './Helpers/Browser'; import { markPage, waitForLoad } from './Helpers/Browser';

2
src/Grabber/Grabber.ts
View File

@ -1,4 +1,4 @@
import { VillageTaskCollection } from '../VillageTaskCollection'; import { VillageTaskCollection } from '../Village/VillageTaskCollection';
import { VillageStorage } from '../Storage/VillageStorage'; import { VillageStorage } from '../Storage/VillageStorage';
export abstract class Grabber { export abstract class Grabber {

2
src/Grabber/GrabberManager.ts
View File

@ -6,7 +6,7 @@ import { MarketPageGrabber } from './MarketPageGrabber';
import { BuildingContractGrabber } from './BuildingContractGrabber'; import { BuildingContractGrabber } from './BuildingContractGrabber';
import { ForgePageGrabber } from './ForgePageGrabber'; import { ForgePageGrabber } from './ForgePageGrabber';
import { GuildHallPageGrabber } from './GuildHallPageGrabber'; import { GuildHallPageGrabber } from './GuildHallPageGrabber';
import { VillageFactory } from '../VillageFactory'; import { VillageFactory } from '../Village/VillageFactory';
import { VillageBuildingsPageGrabber } from './VillageBuildingsPageGrabber'; import { VillageBuildingsPageGrabber } from './VillageBuildingsPageGrabber';
export class GrabberManager { export class GrabberManager {

2
src/Page/BuildingPageController.ts
View File

@ -21,7 +21,7 @@ import { createResearchButtons } from './BuildingPage/ForgePage';
import { ForgeImprovementTask } from '../Task/ForgeImprovementTask'; import { ForgeImprovementTask } from '../Task/ForgeImprovementTask';
import { createCelebrationButtons } from './BuildingPage/GuildHallPage'; import { createCelebrationButtons } from './BuildingPage/GuildHallPage';
import { CelebrationTask } from '../Task/CelebrationTask'; import { CelebrationTask } from '../Task/CelebrationTask';
import { VillageController } from '../VillageController'; import { VillageController } from '../Village/VillageController';
import { notify } from '../Helpers/Browser'; import { notify } from '../Helpers/Browser';
export class BuildingPageController { export class BuildingPageController {

4
src/Scheduler.ts
View File

@ -7,8 +7,8 @@ import { UpdateResourceContracts } from './Task/UpdateResourceContracts';
import { SendResourcesTask } from './Task/SendResourcesTask'; import { SendResourcesTask } from './Task/SendResourcesTask';
import { Args } from './Queue/Args'; import { Args } from './Queue/Args';
import { ImmutableTaskList, Task, TaskId, uniqTaskId, withTime } from './Queue/TaskProvider'; import { ImmutableTaskList, Task, TaskId, uniqTaskId, withTime } from './Queue/TaskProvider';
import { VillageRepositoryInterface } from './VillageRepository'; import { VillageRepositoryInterface } from './Village/VillageRepository';
import { VillageFactory } from './VillageFactory'; import { VillageFactory } from './Village/VillageFactory';
import { RunVillageProductionTask } from './Task/RunVillageProductionTask'; import { RunVillageProductionTask } from './Task/RunVillageProductionTask';
import { isProductionTask } from './Task/TaskMap'; import { isProductionTask } from './Task/TaskMap';
import { around } from './Helpers/Random'; import { around } from './Helpers/Random';

2
src/Storage/ResourceTransferStorage.ts
View File

@ -1,5 +1,5 @@
import { DataStorage } from './DataStorage'; import { DataStorage } from './DataStorage';
import { ResourceTransferReport } from '../ResourceTransfer'; import { ResourceTransferReport } from '../Village/ResourceTransfer';
const NAMESPACE = 'resource_transfer.v1'; const NAMESPACE = 'resource_transfer.v1';

2
src/Task/TaskController.ts
View File

@ -3,7 +3,7 @@ import { CompleteTaskAction } from '../Action/CompleteTaskAction';
import { Action } from '../Queue/ActionQueue'; import { Action } from '../Queue/ActionQueue';
import { Args } from '../Queue/Args'; import { Args } from '../Queue/Args';
import { Task } from '../Queue/TaskProvider'; import { Task } from '../Queue/TaskProvider';
import { VillageFactory } from '../VillageFactory'; import { VillageFactory } from '../Village/VillageFactory';
export interface ActionDefinition { export interface ActionDefinition {
name: string; name: string;

2
src/Task/TaskMap.ts
View File

@ -5,7 +5,7 @@ import {
ProductionQueue, ProductionQueue,
TaskNamePredicate, TaskNamePredicate,
} from '../Core/ProductionQueue'; } from '../Core/ProductionQueue';
import { VillageFactory } from '../VillageFactory'; import { VillageFactory } from '../Village/VillageFactory';
interface TaskOptions { interface TaskOptions {
queue?: ProductionQueue; queue?: ProductionQueue;

2
src/ResourceTransfer.ts → src/Village/ResourceTransfer.ts
View File

@ -1,5 +1,5 @@
import { VillageFactory } from './VillageFactory'; import { VillageFactory } from './VillageFactory';
import { Resources, ResourcesInterface } from './Core/Resources'; import { Resources, ResourcesInterface } from '../Core/Resources';
import { VillageController } from './VillageController'; import { VillageController } from './VillageController';
export interface ResourceTransferScore { export interface ResourceTransferScore {

20
src/VillageController.ts → src/Village/VillageController.ts
View File

@ -1,15 +1,15 @@
import { VillageTaskCollection } from './VillageTaskCollection'; import { VillageTaskCollection } from './VillageTaskCollection';
import { isBuildingPlanned, TaskId } from './Queue/TaskProvider'; import { isBuildingPlanned, TaskId } from '../Queue/TaskProvider';
import { Args } from './Queue/Args'; import { Args } from '../Queue/Args';
import { TaskState, VillageState } from './VillageState'; import { TaskState, VillageState } from './VillageState';
import { Resources } from './Core/Resources'; import { Resources } from '../Core/Resources';
import { MerchantsInfo } from './Core/Market'; import { MerchantsInfo } from '../Core/Market';
import { VillageStorage } from './Storage/VillageStorage'; import { VillageStorage } from '../Storage/VillageStorage';
import { ReceiveResourcesMode } from './Core/Village'; import { ReceiveResourcesMode } from '../Core/Village';
import { ResourceType } from './Core/ResourceType'; import { ResourceType } from '../Core/ResourceType';
import { UpgradeBuildingTask } from './Task/UpgradeBuildingTask'; import { UpgradeBuildingTask } from '../Task/UpgradeBuildingTask';
import { GARNER_ID, WAREHOUSE_ID } from './Core/Buildings'; import { GARNER_ID, WAREHOUSE_ID } from '../Core/Buildings';
import { first } from './Helpers/Collection'; import { first } from '../Helpers/Collection';
export class VillageController { export class VillageController {
private readonly villageId: number; private readonly villageId: number;

4
src/VillageFactory.ts → src/Village/VillageFactory.ts
View File

@ -1,9 +1,9 @@
import { VillageController } from './VillageController'; import { VillageController } from './VillageController';
import { VillageStorage } from './Storage/VillageStorage'; import { VillageStorage } from '../Storage/VillageStorage';
import { VillageRepository } from './VillageRepository'; import { VillageRepository } from './VillageRepository';
import { VillageTaskCollection } from './VillageTaskCollection'; import { VillageTaskCollection } from './VillageTaskCollection';
import { VillageState, VillageStateFactory } from './VillageState'; import { VillageState, VillageStateFactory } from './VillageState';
import { Village } from './Core/Village'; import { Village } from '../Core/Village';
export class VillageFactory { export class VillageFactory {
private readonly villageRepository: VillageRepository; private readonly villageRepository: VillageRepository;

6
src/VillageRepository.ts → src/Village/VillageRepository.ts
View File

@ -1,6 +1,6 @@
import { Coordinates, Village } from './Core/Village'; import { Coordinates, Village } from '../Core/Village';
import { grabVillageList } from './Page/VillageBlock'; import { grabVillageList } from '../Page/VillageBlock';
import { VillageNotFound } from './Errors'; import { VillageNotFound } from '../Errors';
export interface VillageRepositoryInterface { export interface VillageRepositoryInterface {
all(): Array<Village>; all(): Array<Village>;

20
src/VillageState.ts → src/Village/VillageState.ts
View File

@ -1,15 +1,15 @@
import { Village, VillageSettings } from './Core/Village'; import { Village, VillageSettings } from '../Core/Village';
import { Resources } from './Core/Resources'; import { Resources } from '../Core/Resources';
import { VillageStorage } from './Storage/VillageStorage'; import { VillageStorage } from '../Storage/VillageStorage';
import { calcGatheringTimings, GatheringTime } from './Core/GatheringTimings'; import { calcGatheringTimings, GatheringTime } from '../Core/GatheringTimings';
import { VillageRepositoryInterface } from './VillageRepository'; import { VillageRepositoryInterface } from './VillageRepository';
import { VillageNotFound } from './Errors'; import { VillageNotFound } from '../Errors';
import { OrderedProductionQueues, ProductionQueue } from './Core/ProductionQueue'; import { OrderedProductionQueues, ProductionQueue } from '../Core/ProductionQueue';
import { isInQueue, TaskCore, TaskId } from './Queue/TaskProvider'; import { isInQueue, TaskCore, TaskId } from '../Queue/TaskProvider';
import { VillageTaskCollection } from './VillageTaskCollection'; import { VillageTaskCollection } from './VillageTaskCollection';
import { TrainTroopTask } from './Task/TrainTroopTask'; import { TrainTroopTask } from '../Task/TrainTroopTask';
import { Args } from './Queue/Args'; import { Args } from '../Queue/Args';
import { timestamp } from './Helpers/Time'; import { timestamp } from '../Helpers/Time';
export interface TaskState { export interface TaskState {
id: TaskId; id: TaskId;

18
src/VillageTaskCollection.ts → src/Village/VillageTaskCollection.ts
View File

@ -1,12 +1,12 @@
import { VillageStorage } from './Storage/VillageStorage'; import { VillageStorage } from '../Storage/VillageStorage';
import { Task, TaskId, uniqTaskId, withResources, withTime } from './Queue/TaskProvider'; import { Task, TaskId, uniqTaskId, withResources, withTime } from '../Queue/TaskProvider';
import { Args } from './Queue/Args'; import { Args } from '../Queue/Args';
import { Resources } from './Core/Resources'; import { Resources } from '../Core/Resources';
import { ContractAttributes, ContractType } from './Core/Contract'; import { ContractAttributes, ContractType } from '../Core/Contract';
import { UpgradeBuildingTask } from './Task/UpgradeBuildingTask'; import { UpgradeBuildingTask } from '../Task/UpgradeBuildingTask';
import { ForgeImprovementTask } from './Task/ForgeImprovementTask'; import { ForgeImprovementTask } from '../Task/ForgeImprovementTask';
import { isProductionTask } from './Task/TaskMap'; import { isProductionTask } from '../Task/TaskMap';
import { timestamp } from './Helpers/Time'; import { timestamp } from '../Helpers/Time';
export class VillageTaskCollection { export class VillageTaskCollection {
private readonly storage: VillageStorage; private readonly storage: VillageStorage;