diff --git a/Makefile b/Makefile index c790423..4ec5152 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,9 @@ test: coverage: tools/npm run coverage +up-server: + docker-compose up --detach --remove-orphans + restart-server: docker-compose restart diff --git a/src/Scheduler.ts b/src/Scheduler.ts index 41a49d1..179a219 100644 --- a/src/Scheduler.ts +++ b/src/Scheduler.ts @@ -53,9 +53,11 @@ export class Scheduler { } this.createUniqTaskTimer(10 * 60, GrabVillageStateTask.name); - this.createUniqTaskTimer(10 * 60, SendResourcesTask.name); + // @todo Только если деревень больше одной + // this.createUniqTaskTimer(10 * 60, SendResourcesTask.name); this.createUniqTaskTimer(10 * 60, BalanceHeroResourcesTask.name); this.createUniqTaskTimer(20 * 60, UpdateResourceContractsTask.name); + // @todo Нужна отдельная настройка для запуска задачи // this.createUniqTaskTimer(60 * 60, SendOnAdventureTask.name); } diff --git a/src/Village/VillageController.ts b/src/Village/VillageController.ts index f56efd7..3129db8 100644 --- a/src/Village/VillageController.ts +++ b/src/Village/VillageController.ts @@ -164,7 +164,7 @@ export class VillageController { private planCropBuilding() { const performance = this.state.performance; - if (performance.crop >= 100) { + if (performance.crop >= 30) { return; } diff --git a/src/Village/VillageState.ts b/src/Village/VillageState.ts index 9a616ed..014d210 100644 --- a/src/Village/VillageState.ts +++ b/src/Village/VillageState.ts @@ -128,8 +128,12 @@ function makeStorageState( storage: Resources, performance: Resources ): VillageWarehouseState { - const optimumFullness = storage.sub(performance.scale(3)); - const criticalFullness = storage.sub(performance.scale(1)); + // @fixme Если у героя большая добыча ресурсов, а склад маленький, то значения получаются тож маленькими + // @fixme с одной деревней это не прокатывает, и даже не построить склад + // const optimumFullness = storage.sub(performance.scale(3)); + // const criticalFullness = storage.sub(performance.scale(1)); + const optimumFullness = storage.scale(0.9); + const criticalFullness = storage.scale(0.98); return { resources, capacity: storage,