Remove village send resources timeout

This commit is contained in:
Anton Vakhrushev 2020-06-06 18:34:16 +03:00
parent 26c7065a2c
commit 9240362876
4 changed files with 1 additions and 23 deletions

View File

@ -39,12 +39,10 @@ export type VillageList = Array<Village>;
export interface VillageSettings { export interface VillageSettings {
sendResourcesThreshold: number; sendResourcesThreshold: number;
sendResourcesTimeout: number;
sendResourcesMultiplier: number; sendResourcesMultiplier: number;
} }
export const VillageSettingsDefaults: VillageSettings = { export const VillageSettingsDefaults: VillageSettings = {
sendResourcesTimeout: 15,
sendResourcesThreshold: 100, sendResourcesThreshold: 100,
sendResourcesMultiplier: 10, sendResourcesMultiplier: 10,
} as const; } as const;

View File

@ -66,9 +66,6 @@ export function createStore(villageFactory: VillageFactory) {
[Mutations.UpdateVillageSendResourceThreshold](state, value) { [Mutations.UpdateVillageSendResourceThreshold](state, value) {
state.villageSettings.sendResourcesThreshold = getNumber(value); state.villageSettings.sendResourcesThreshold = getNumber(value);
}, },
[Mutations.UpdateVillageSendResourceTimeout](state, value) {
state.villageSettings.sendResourcesTimeout = getNumber(value);
},
[Mutations.UpdateVillageSendResourcesMultiplier](state, value) { [Mutations.UpdateVillageSendResourcesMultiplier](state, value) {
state.villageSettings.sendResourcesMultiplier = getNumber(value); state.villageSettings.sendResourcesMultiplier = getNumber(value);
}, },
@ -81,7 +78,6 @@ export function createStore(villageFactory: VillageFactory) {
villageId: state.id, villageId: state.id,
villageName: state.village.name, villageName: state.village.name,
sendResourcesThreshold: settings.sendResourcesThreshold, sendResourcesThreshold: settings.sendResourcesThreshold,
sendResourcesTimeout: settings.sendResourcesTimeout,
sendResourcesMultiplier: settings.sendResourcesMultiplier, sendResourcesMultiplier: settings.sendResourcesMultiplier,
}); });
commit(Mutations.ToggleVillageEditor, true); commit(Mutations.ToggleVillageEditor, true);
@ -93,9 +89,6 @@ export function createStore(villageFactory: VillageFactory) {
sendResourcesThreshold: sendResourcesThreshold:
state.villageSettings.sendResourcesThreshold || state.villageSettings.sendResourcesThreshold ||
VillageSettingsDefaults.sendResourcesThreshold, VillageSettingsDefaults.sendResourcesThreshold,
sendResourcesTimeout:
state.villageSettings.sendResourcesTimeout ||
VillageSettingsDefaults.sendResourcesTimeout,
sendResourcesMultiplier: sendResourcesMultiplier:
state.villageSettings.sendResourcesMultiplier || state.villageSettings.sendResourcesMultiplier ||
VillageSettingsDefaults.sendResourcesMultiplier, VillageSettingsDefaults.sendResourcesMultiplier,

View File

@ -9,10 +9,6 @@
<label class="label" title="Порог отправки (сумма)">Порог отправки (сумма)</label> <label class="label" title="Порог отправки (сумма)">Порог отправки (сумма)</label>
<input class="input" type="text" v-model="sendResourcesThreshold" /> <input class="input" type="text" v-model="sendResourcesThreshold" />
</div> </div>
<div class="form-input">
<label class="label" title="Таймаут отправки (мин)">Таймаут отправки (мин)</label>
<input class="input" type="text" v-model="sendResourcesTimeout" />
</div>
<div class="form-input"> <div class="form-input">
<label class="label" title="Множитель отправки (up to)">Множитель отправки (up to)</label> <label class="label" title="Множитель отправки (up to)">Множитель отправки (up to)</label>
<input class="input" type="text" v-model="sendResourcesMultiplier" /> <input class="input" type="text" v-model="sendResourcesMultiplier" />
@ -41,14 +37,6 @@ export default {
this.$store.commit(Mutations.UpdateVillageSendResourceThreshold, value); this.$store.commit(Mutations.UpdateVillageSendResourceThreshold, value);
}, },
}, },
sendResourcesTimeout: {
get() {
return this.$store.state.villageSettings.sendResourcesTimeout;
},
set(value) {
this.$store.commit(Mutations.UpdateVillageSendResourceTimeout, value);
},
},
sendResourcesMultiplier: { sendResourcesMultiplier: {
get() { get() {
return this.$store.state.villageSettings.sendResourcesMultiplier; return this.$store.state.villageSettings.sendResourcesMultiplier;

View File

@ -226,10 +226,9 @@ export default {
return `${name}, ${id}`; return `${name}, ${id}`;
}, },
villageStatus(villageState) { villageStatus(villageState) {
const timeout = villageState.settings.sendResourcesTimeout;
const threshold = villageState.settings.sendResourcesThreshold; const threshold = villageState.settings.sendResourcesThreshold;
const multiplier = villageState.settings.sendResourcesMultiplier; const multiplier = villageState.settings.sendResourcesMultiplier;
return `отправка ${timeout} мин, порог ${threshold}, множ. ${multiplier}`; return `порог ${threshold}, множ. ${multiplier}`;
}, },
path(name, args) { path(name, args) {
return path(name, args); return path(name, args);