Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Partial Revert #14410; Glowshrooms now have much higher base integrity & altered math #15624

Closed
VaelophisNyx wants to merge 3 commits into from
Closed

Partial Revert #14410; Glowshrooms now have much higher base integrity & altered math #15624

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e581759
Update glowshroom.dm
VaelophisNyx Sep 4, 2022
c95bf51
Merge remote-tracking branch 'upstream/master' into glowshroomsfix
VaelophisNyx Sep 8, 2022
a27abdd
Update glowshroom.dm
VaelophisNyx Sep 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/game/objects/effects/glowshroom.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#define GLOWSHROOM_SPREAD_BASE_DIMINISH_FACTOR 10
#define GLOWSHROOM_SPREAD_DIMINISH_FACTOR_PER_GLOWSHROOM 0.2
#define GLOWSHROOM_BASE_INTEGRITY 60
#define GLOWSHROOM_BASE_INTEGRITY 150

GLOBAL_VAR_INIT(glowshrooms, 0)

Expand Down Expand Up @@ -78,7 +78,7 @@ GLOBAL_VAR_INIT(glowshrooms, 0)
else
myseed = new myseed(src)

modify_max_integrity(GLOWSHROOM_BASE_INTEGRITY + ((100 - GLOWSHROOM_BASE_INTEGRITY) / 100 * myseed.endurance)) //goes up to 100 with peak endurance
modify_max_integrity(GLOWSHROOM_BASE_INTEGRITY + ((250 - GLOWSHROOM_BASE_INTEGRITY) / 100 * myseed.endurance))

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
Expand Down