From d48a824a69565ba8d049ff96c5cb960ef2f6fbcd Mon Sep 17 00:00:00 2001 From: TechnoStrife Date: Wed, 17 Jul 2019 00:31:15 +0300 Subject: [PATCH] Fix researchSync that it counts progress only from techs on same level --- sharedPlugins/researchSync/index.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sharedPlugins/researchSync/index.js b/sharedPlugins/researchSync/index.js index dbb563c0..d48f0565 100644 --- a/sharedPlugins/researchSync/index.js +++ b/sharedPlugins/researchSync/index.js @@ -154,11 +154,19 @@ class ResearchSync { for (let [name, research] of Object.entries(cluster_researches)) research.progress = this.research[name].contribution - for (let slave_data of slaves_data) - for (let [name, research] of Object.entries(slave_data.meta.research)) - if (cluster_researches[name] - && !isNaN(cluster_researches[name].progress) && !isNaN(research.contribution)) + for (let slave_data of slaves_data) { + for (let [name, research] of Object.entries(slave_data.meta.research)) { + if (!cluster_researches[name]) + continue + if (isNaN(cluster_researches[name].progress) + || isNaN(research.contribution) + || isNaN(research.level) + || isNaN(cluster_researches[name].level)) + continue + if (cluster_researches[name].level === research.level) cluster_researches[name].progress += research.contribution + } + } for (let [name, research] of Object.entries(cluster_researches)) { if (research.progress > 1) {