From c0e3af55bc795c020d9dd5522ab0f731cb26bba7 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 19 Jun 2021 06:59:26 -0700 Subject: [PATCH 1/3] Update glowshroom.dm --- code/game/objects/effects/glowshroom.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index 2d28d3a041..0d544f7a7d 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -73,6 +73,8 @@ myseed.adjust_yield(rand(-3,2)) myseed.adjust_production(rand(-3,3)) myseed.endurance = clamp(myseed.endurance + rand(-3,2), 0, 100) // adjust_endurance has a min value of 10, need to edit directly + // Scale health to endurance + max_integrity = integrity = 10 + endurance / 2 delay_spread = delay_spread - myseed.production * 100 //So the delay goes DOWN with better stats instead of up. :I var/datum/plant_gene/trait/glow/G = myseed.get_gene(/datum/plant_gene/trait/glow) if(ispath(G)) // Seeds were ported to initialize so their genes are still typepaths here, luckily their initializer is smart enough to handle us doing this From 8f3c1fe03a8fbddbb0e27d36afac0a1801a5841d Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sat, 19 Jun 2021 07:02:51 -0700 Subject: [PATCH 2/3] Update glowshroom.dm --- code/game/objects/effects/glowshroom.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index 0d544f7a7d..bba8f680e6 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -195,8 +195,14 @@ /obj/structure/glowshroom/proc/Decay(spread, amount) if (spread) // Decay due to spread myseed.endurance -= amount + max_integrity = min(max_integrity, 10 + myseed.endurance / 2) + if(integrity > max_integrity) + integrity = max_integrity else // Timed decay myseed.endurance -= 1 + max_integrity = min(max_integrity, 10 + myseed.endurance / 2) + if(integrity > max_integrity) + integrity = max_integrity if (myseed.endurance > 0) addtimer(CALLBACK(src, .proc/Decay), delay_decay, FALSE) // Recall decay timer return From 29604b939cd8083558efd34cfa1765fe37751e82 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 20 Jun 2021 13:18:54 -0700 Subject: [PATCH 3/3] Update glowshroom.dm --- code/game/objects/effects/glowshroom.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index bba8f680e6..22dd772ebe 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -74,7 +74,7 @@ myseed.adjust_production(rand(-3,3)) myseed.endurance = clamp(myseed.endurance + rand(-3,2), 0, 100) // adjust_endurance has a min value of 10, need to edit directly // Scale health to endurance - max_integrity = integrity = 10 + endurance / 2 + max_integrity = obj_integrity = 10 + myseed.endurance / 2 delay_spread = delay_spread - myseed.production * 100 //So the delay goes DOWN with better stats instead of up. :I var/datum/plant_gene/trait/glow/G = myseed.get_gene(/datum/plant_gene/trait/glow) if(ispath(G)) // Seeds were ported to initialize so their genes are still typepaths here, luckily their initializer is smart enough to handle us doing this @@ -196,13 +196,13 @@ if (spread) // Decay due to spread myseed.endurance -= amount max_integrity = min(max_integrity, 10 + myseed.endurance / 2) - if(integrity > max_integrity) - integrity = max_integrity + if(obj_integrity > max_integrity) + obj_integrity = max_integrity else // Timed decay myseed.endurance -= 1 max_integrity = min(max_integrity, 10 + myseed.endurance / 2) - if(integrity > max_integrity) - integrity = max_integrity + if(obj_integrity > max_integrity) + obj_integrity = max_integrity if (myseed.endurance > 0) addtimer(CALLBACK(src, .proc/Decay), delay_decay, FALSE) // Recall decay timer return