From 664b14064105c04594d454d1bac5fd653460a09a Mon Sep 17 00:00:00 2001
From: Dalo Lorn <nevenp.isi@gmail.com>
Date: Thu, 13 Feb 2020 08:30:52 +0100
Subject: [PATCH] Fixed an inconsistency in how research efficiency decay was
 computed.

---
 .gitignore                                             | 3 ++-
 Rising Stars/scripts/definitions/ABEM_version.as       | 2 +-
 Rising Stars/scripts/server/components/ResearchGrid.as | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9b97ec7b..654e2d5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.db
 .steam
 modinfo.*
-*.bat
\ No newline at end of file
+*.bat
+*.code-workspace
\ No newline at end of file
diff --git a/Rising Stars/scripts/definitions/ABEM_version.as b/Rising Stars/scripts/definitions/ABEM_version.as
index a5c6b72f..1f3b3056 100644
--- a/Rising Stars/scripts/definitions/ABEM_version.as	
+++ b/Rising Stars/scripts/definitions/ABEM_version.as	
@@ -1,7 +1,7 @@
 import version;
 
 // ABEMMOD's last revision was 724.
-const string MOD_REVISION = "935"; 
+const string MOD_REVISION = "936"; 
 const array<string> VERSIONS = {
 	"v2.0.3",
 };
diff --git a/Rising Stars/scripts/server/components/ResearchGrid.as b/Rising Stars/scripts/server/components/ResearchGrid.as
index b5884906..407741fd 100644
--- a/Rising Stars/scripts/server/components/ResearchGrid.as	
+++ b/Rising Stars/scripts/server/components/ResearchGrid.as	
@@ -121,7 +121,7 @@ class ResearchGrid : Component_ResearchGrid, Savable {
 			genPts *= ResearchEfficiency;
 		points += genPts;
 		if(penalized)
-			totalGenerated += genPts;
+			totalGenerated += genPts * emp.ResearchDecaySpeed * config::RESEARCH_EFFICIENCY_DECAY_MULT;
 	}
 
 	bool consumeResearchPoints(int amount) {
@@ -137,9 +137,9 @@ class ResearchGrid : Component_ResearchGrid, Savable {
 		points += amount;
 	}
 
-	void reduceResearchPenalty(int points) {
+	void reduceResearchPenalty(Empire& emp, int points) {
 		WriteLock lock(mtx);
-		totalGenerated = max(0.0, totalGenerated - points);
+		totalGenerated = max(0.0, totalGenerated - points * emp.ResearchDecaySpeed * config::RESEARCH_EFFICIENCY_DECAY_MULT);
 	}
 
 	void initResearch(Empire& emp) {
@@ -268,7 +268,7 @@ class ResearchGrid : Component_ResearchGrid, Savable {
 			if(!node.consumeSecondary(emp))
 				return;
 			node.secondaryUnlock = true;
-			totalGenerated += node.getPointCost(emp);
+			totalGenerated += node.getPointCost(emp) * emp.ResearchDecaySpeed * config::RESEARCH_EFFICIENCY_DECAY_MULT;
 		}
 		else {
 			if(cost == 0)