From 9240362876f106071efe5667a2135f4b4185b5fa Mon Sep 17 00:00:00 2001 From: Anton Vakhrushev Date: Sat, 6 Jun 2020 18:34:16 +0300 Subject: [PATCH] Remove village send resources timeout --- src/Core/Village.ts | 2 -- src/DashboardView/Store.ts | 7 ------- src/DashboardView/VillageEditor.vue | 12 ------------ src/DashboardView/VillageStateList.vue | 3 +-- 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/Core/Village.ts b/src/Core/Village.ts index 95619f0..2df43a4 100644 --- a/src/Core/Village.ts +++ b/src/Core/Village.ts @@ -39,12 +39,10 @@ export type VillageList = Array; export interface VillageSettings { sendResourcesThreshold: number; - sendResourcesTimeout: number; sendResourcesMultiplier: number; } export const VillageSettingsDefaults: VillageSettings = { - sendResourcesTimeout: 15, sendResourcesThreshold: 100, sendResourcesMultiplier: 10, } as const; diff --git a/src/DashboardView/Store.ts b/src/DashboardView/Store.ts index ed6726a..10032d3 100644 --- a/src/DashboardView/Store.ts +++ b/src/DashboardView/Store.ts @@ -66,9 +66,6 @@ export function createStore(villageFactory: VillageFactory) { [Mutations.UpdateVillageSendResourceThreshold](state, value) { state.villageSettings.sendResourcesThreshold = getNumber(value); }, - [Mutations.UpdateVillageSendResourceTimeout](state, value) { - state.villageSettings.sendResourcesTimeout = getNumber(value); - }, [Mutations.UpdateVillageSendResourcesMultiplier](state, value) { state.villageSettings.sendResourcesMultiplier = getNumber(value); }, @@ -81,7 +78,6 @@ export function createStore(villageFactory: VillageFactory) { villageId: state.id, villageName: state.village.name, sendResourcesThreshold: settings.sendResourcesThreshold, - sendResourcesTimeout: settings.sendResourcesTimeout, sendResourcesMultiplier: settings.sendResourcesMultiplier, }); commit(Mutations.ToggleVillageEditor, true); @@ -93,9 +89,6 @@ export function createStore(villageFactory: VillageFactory) { sendResourcesThreshold: state.villageSettings.sendResourcesThreshold || VillageSettingsDefaults.sendResourcesThreshold, - sendResourcesTimeout: - state.villageSettings.sendResourcesTimeout || - VillageSettingsDefaults.sendResourcesTimeout, sendResourcesMultiplier: state.villageSettings.sendResourcesMultiplier || VillageSettingsDefaults.sendResourcesMultiplier, diff --git a/src/DashboardView/VillageEditor.vue b/src/DashboardView/VillageEditor.vue index 786abfd..d4075f3 100644 --- a/src/DashboardView/VillageEditor.vue +++ b/src/DashboardView/VillageEditor.vue @@ -9,10 +9,6 @@ -
- - -
@@ -41,14 +37,6 @@ export default { this.$store.commit(Mutations.UpdateVillageSendResourceThreshold, value); }, }, - sendResourcesTimeout: { - get() { - return this.$store.state.villageSettings.sendResourcesTimeout; - }, - set(value) { - this.$store.commit(Mutations.UpdateVillageSendResourceTimeout, value); - }, - }, sendResourcesMultiplier: { get() { return this.$store.state.villageSettings.sendResourcesMultiplier; diff --git a/src/DashboardView/VillageStateList.vue b/src/DashboardView/VillageStateList.vue index dc86ca2..5b1680d 100644 --- a/src/DashboardView/VillageStateList.vue +++ b/src/DashboardView/VillageStateList.vue @@ -226,10 +226,9 @@ export default { return `${name}, ${id}`; }, villageStatus(villageState) { - const timeout = villageState.settings.sendResourcesTimeout; const threshold = villageState.settings.sendResourcesThreshold; const multiplier = villageState.settings.sendResourcesMultiplier; - return `отправка ${timeout} мин, порог ${threshold}, множ. ${multiplier}`; + return `порог ${threshold}, множ. ${multiplier}`; }, path(name, args) { return path(name, args);