From db4c9c1b06dd2ae8e83bfc92d67fddc043178e25 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Tue, 7 Dec 2021 21:12:46 -0800 Subject: [PATCH 1/4] Makes science points show actual change --- code/controllers/subsystem/research.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index 410e21d419..ee8c511cde 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -343,10 +343,15 @@ SUBSYSTEM_DEF(research) break //Just need one to work. if (!isnull(last_income)) var/income_time_difference = world.time - last_income - science_tech.last_bitcoins = bitcoins // Doesn't take tick drift into account for(var/i in bitcoins) bitcoins[i] *= income_time_difference / 10 science_tech.add_point_list(bitcoins) + if(!length(last_bitcoins)) + last_bitcoins = science_tech.research_points + for(var/i in last_bitcoins) + var/old_weighted = last_bitcoins[i] * (1 MINUTE - income_time_difference) + var/new_weighted = science_tech.research_points[i] * income_time_difference + last_bitcoins[i] = (old_weighted + new_weighted) / (1 MINUTE) last_income = world.time /datum/controller/subsystem/research/proc/calculate_server_coefficient() //Diminishing returns. From 36c60830ddae19dfb49eed018367743cb23c61e0 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Tue, 7 Dec 2021 21:17:07 -0800 Subject: [PATCH 2/4] should be rounded --- code/controllers/subsystem/research.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index ee8c511cde..57eba5cd87 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -351,7 +351,7 @@ SUBSYSTEM_DEF(research) for(var/i in last_bitcoins) var/old_weighted = last_bitcoins[i] * (1 MINUTE - income_time_difference) var/new_weighted = science_tech.research_points[i] * income_time_difference - last_bitcoins[i] = (old_weighted + new_weighted) / (1 MINUTE) + last_bitcoins[i] = round((old_weighted + new_weighted) / (1 MINUTE)) last_income = world.time /datum/controller/subsystem/research/proc/calculate_server_coefficient() //Diminishing returns. From 5ff8d7c3567bd6438c585e82b4652ef09cb5ab07 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Wed, 8 Dec 2021 12:02:07 -0800 Subject: [PATCH 3/4] grammar unfix --- code/controllers/subsystem/research.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index 57eba5cd87..99f568998b 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -349,9 +349,9 @@ SUBSYSTEM_DEF(research) if(!length(last_bitcoins)) last_bitcoins = science_tech.research_points for(var/i in last_bitcoins) - var/old_weighted = last_bitcoins[i] * (1 MINUTE - income_time_difference) + var/old_weighted = last_bitcoins[i] * (1 MINUTES - income_time_difference) var/new_weighted = science_tech.research_points[i] * income_time_difference - last_bitcoins[i] = round((old_weighted + new_weighted) / (1 MINUTE)) + last_bitcoins[i] = round((old_weighted + new_weighted) / (1 MINUTES)) last_income = world.time /datum/controller/subsystem/research/proc/calculate_server_coefficient() //Diminishing returns. From f21be027d0b8c21044a2324efcdc2bfc60f77571 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Wed, 8 Dec 2021 16:26:34 -0800 Subject: [PATCH 4/4] am i just eternally wrong --- code/controllers/subsystem/research.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index 99f568998b..46fb232d6d 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -346,12 +346,12 @@ SUBSYSTEM_DEF(research) for(var/i in bitcoins) bitcoins[i] *= income_time_difference / 10 science_tech.add_point_list(bitcoins) - if(!length(last_bitcoins)) - last_bitcoins = science_tech.research_points - for(var/i in last_bitcoins) - var/old_weighted = last_bitcoins[i] * (1 MINUTES - income_time_difference) + if(!length(science_tech.last_bitcoins)) + science_tech.last_bitcoins = science_tech.research_points + for(var/i in science_tech.last_bitcoins) + var/old_weighted = science_tech.last_bitcoins[i] * (1 MINUTES - income_time_difference) var/new_weighted = science_tech.research_points[i] * income_time_difference - last_bitcoins[i] = round((old_weighted + new_weighted) / (1 MINUTES)) + science_tech.last_bitcoins[i] = round((old_weighted + new_weighted) / (1 MINUTES)) last_income = world.time /datum/controller/subsystem/research/proc/calculate_server_coefficient() //Diminishing returns.