From 88394151d8b4aba3530bf551a1d8c7c962c4a32b Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 12 May 2020 14:22:05 -0400 Subject: [PATCH 1/4] Update research.dm --- code/controllers/subsystem/research.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index f158574763..d9dc45fece 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -306,7 +306,11 @@ SUBSYSTEM_DEF(research) for(var/A in subtypesof(/obj/item/seeds)) var/obj/item/seeds/S = A var/list/L = list() - L[TECHWEB_POINT_TYPE_GENERIC] = 50 + initial(S.rarity) * 2 + //First we get are yield and rarity and times it by two + //Then we subtract production and maturation, making it so faster growing plants are better for RnD + //Then we add in lifespan and potency, + //A basic seed can be worth 248 points if its the best it can be. + L[TECHWEB_POINT_TYPE_GENERIC] = 50 + initial(((S.rarity + S.yield) * 2) - S.maturation - S.production + S.lifespan + S.potency) techweb_point_items[S] = L return ..() From 72fbd8ec87288e762e3d0db23bb608eb6456285b Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 12 May 2020 14:27:32 -0400 Subject: [PATCH 2/4] 6 rather the 4 miss-keyed --- 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 d9dc45fece..2515fd8dc4 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -309,7 +309,7 @@ SUBSYSTEM_DEF(research) //First we get are yield and rarity and times it by two //Then we subtract production and maturation, making it so faster growing plants are better for RnD //Then we add in lifespan and potency, - //A basic seed can be worth 248 points if its the best it can be. + //A basic seed can be worth 268 points if its the best it can be. L[TECHWEB_POINT_TYPE_GENERIC] = 50 + initial(((S.rarity + S.yield) * 2) - S.maturation - S.production + S.lifespan + S.potency) techweb_point_items[S] = L From c5c11a79378d765891138c4e636357d474477b25 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 12 May 2020 14:53:06 -0400 Subject: [PATCH 3/4] i hope we use PENDAS --- 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 2515fd8dc4..3620be35e9 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -310,7 +310,7 @@ SUBSYSTEM_DEF(research) //Then we subtract production and maturation, making it so faster growing plants are better for RnD //Then we add in lifespan and potency, //A basic seed can be worth 268 points if its the best it can be. - L[TECHWEB_POINT_TYPE_GENERIC] = 50 + initial(((S.rarity + S.yield) * 2) - S.maturation - S.production + S.lifespan + S.potency) + L[TECHWEB_POINT_TYPE_GENERIC] = 50 + initial(S.rarity * 2 + S.yield * 2 - S.maturation - S.production + S.lifespan + S.potency) techweb_point_items[S] = L return ..() From 11f3d19edfbb6d2dfda51bd30b943b728a56d77a Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 12 May 2020 15:02:37 -0400 Subject: [PATCH 4/4] brute force --- 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 3620be35e9..a32dc4b09b 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -310,7 +310,7 @@ SUBSYSTEM_DEF(research) //Then we subtract production and maturation, making it so faster growing plants are better for RnD //Then we add in lifespan and potency, //A basic seed can be worth 268 points if its the best it can be. - L[TECHWEB_POINT_TYPE_GENERIC] = 50 + initial(S.rarity * 2 + S.yield * 2 - S.maturation - S.production + S.lifespan + S.potency) + L[TECHWEB_POINT_TYPE_GENERIC] = 50 + initial(S.rarity) * 2 + initial(S.yield) * 2 - initial(S.maturation) - initial(S.production) + initial(S.lifespan) + initial(S.potency) techweb_point_items[S] = L return ..()