[Re-open] Botany Rework Part 2: GrowthComponents #39311

Pok27 · 2025-08-01T08:02:24Z

About the PR

Attempting to resurrect and finalize (to the best of my ability) #31461, by design document Botany Rewrite proposal

Thank you for your contribution @drakewill-CRL

Technical details

«‎
This includes making components and systems for the logic around water, nutrients, toxins, pests, gases consumed or exuded, tolerance for light/pressure/ heat, and auto-harvesting.

In the future, plants will be able to have different needs for growth, (EX: a cactus may not check for water, or space-plants may be dependent on special chemicals being present) and different effects can happen on a growth tick without hard-coding more checks into PlantHolderSystem. This also opens up possibilities to mutate these needs off of, or onto, other plants. In particular, a future-state plan for mutations requires plants to be able to consume plasma gas to start acquiring stronger mutations, and that will be its own growth component to trigger that change.

In the process of coding this, the following stats were removed: LightTolerance/Ideal Light (Unused and possibly unmeasureable).
»‎

Requirements

I have read and am following the Pull Request and Changelog Guidelines.
I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changelog

Shouldn't affect gameplay in any way!

Princess-Cheeseballs

Partial review.

Princess-Cheeseballs · 2025-10-15T20:13:34Z

Content.Server/Botany/Components/BotanySwabComponent.cs

+    [DataField]
+    public float SwabDelay = 2f;


timespan pls.

Content.Server/Botany/Components/GrowthComponentsHolder.cs

Princess-Cheeseballs · 2025-10-15T20:21:51Z

Content.Server/Botany/Systems/AtmosphericGrowthSystem.cs

+    private void OnPlantGrow(EntityUid uid, AtmosphericGrowthComponent component, OnPlantGrowEvent args)
+    {


Use Entity<T> typing

Princess-Cheeseballs · 2025-10-15T20:22:04Z

Content.Server/Botany/Systems/BasicGrowthSystem.cs

+    private void OnSwab(EntityUid uid, BasicGrowthComponent component, BotanySwabDoAfterEvent args)
+    {


Princess-Cheeseballs · 2025-10-15T20:22:19Z

Content.Server/Botany/Systems/BasicGrowthSystem.cs

+    private void OnPlantGrow(EntityUid uid, BasicGrowthComponent component, OnPlantGrowEvent args)
+    {


Princess-Cheeseballs · 2025-10-15T20:25:54Z

Content.Server/Botany/Systems/ToxinsSystem.cs

+    private void OnPlantGrow(EntityUid uid, ToxinsComponent component, OnPlantGrowEvent args)
+    {


Princess-Cheeseballs · 2025-10-15T20:26:05Z

Content.Server/Botany/Systems/UnviableGrowthSystem.cs

+    private void OnPlantGrow(EntityUid uid, UnviableGrowthComponent component, OnPlantGrowEvent args)
+    {


Princess-Cheeseballs · 2025-10-15T20:26:18Z

Content.Server/Botany/Systems/WeedPestGrowthSystem.cs

+    private void OnPlantGrow(EntityUid uid, WeedPestGrowthComponent component, OnPlantGrowEvent args)
+    {


Princess-Cheeseballs · 2025-10-15T20:26:26Z

Content.Server/Botany/Systems/WeedPestGrowthSystem.cs

+    private void OnTrayUpdate(EntityUid uid, PlantHolderComponent component, OnPlantGrowEvent args)
+    {


Here as well.

Princess-Cheeseballs · 2025-10-15T20:27:21Z

....Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustPotencyEntityEffectSystem.cs

+        if (!TryComp<PlantTraitsComponent>(entity, out var traits))
+            return;
+
+        traits.Potency = Math.Max(traits.Potency + args.Effect.Amount, 1);


Should probably be tied to an API method rather than having the data in here.

Pok27 · 2025-10-16T12:29:29Z

Do not do this. I'd just delete this entire file and take a completely different approach, this is an evil approach. Use prototypes or entities for storing this kind of data.

After thinking about it and referring to the author's original design (space-wizards/docs#284), I think that fixing it now will only make the situation worse in the future or require a much larger refractor than planned in this PR.

When plants become independent entities, all this will no longer be necessary, the components will simply be located in their id: Plant*, and SeedPrototype will simply indicate to the seed which entity to take the characteristics from (see #31941, but it was not finished).

Pok27 · 2025-10-16T12:36:02Z

If this PR is merged, I will finish refactoring the rest of it in other PR.

Princess-Cheeseballs · 2025-10-17T00:40:14Z

Do not do this. I'd just delete this entire file and take a completely different approach, this is an evil approach. Use prototypes or entities for storing this kind of data.

After thinking about it and referring to the author's original design (space-wizards/docs#284), I think that fixing it now will only make the situation worse in the future or require a much larger refractor than planned in this PR.

When plants become independent entities, all this will no longer be necessary, the components will simply be located in their id: Plant*, and SeedPrototype will simply indicate to the seed which entity to take the characteristics from (see #31941, but it was not finished).

Leave some remarks in the file then explaining your reasoning as to why it exists, as well as a TODO that properly explains what needs to change before the file can be deleted.

Princess-Cheeseballs

One small step towards usable botany code. Still needs another approval, and I'd also give this a full 2 weeks of testing due to size.

Pok27 · 2025-10-23T13:57:13Z

By the way, regarding testing, the growth was a little broken, but it should be back to normal now. Everything else seems to be working as before. 😅

PraxisMapper and others added 17 commits November 1, 2024 14:19

Restarting files from scratch

dfc54ce

reduce file count, more progress

918932f

Additional partial work

7dad2c3

drakewill-CRL-growthRework

07df103

update 1

86f4cb1

update 2

85c25ff

TODO execution

5446141

fix

6a2bf63

Update PlantGrowthComponent.cs

2785cc6

fix 1

a4ab02e

growth correction

d9ff9d5

PlantGrowthComponent

e5d53f0

update 99

8cfc2d8

last update

731e861

oops

4c3e99d

Update vegan-meatball.yml

a67b68d

Data loss

5416c43

PJBot added size/L Denotes a PR that changes 1000-4999 lines. Changes: Map Changes: Might require knowledge of mapping. labels Aug 1, 2025

ToxinsComponent

2e3db2c

PJBot removed the size/L Denotes a PR that changes 1000-4999 lines. label Aug 1, 2025

Default components

e556880

PJBot added the size/L Denotes a PR that changes 1000-4999 lines. label Aug 1, 2025

minor fix

b44239d

PJBot removed the size/L Denotes a PR that changes 1000-4999 lines. label Aug 1, 2025

PlantTraitsComponent

59e033f

PJBot added the size/L Denotes a PR that changes 1000-4999 lines. label Aug 2, 2025

fix error

0f8c335

PJBot removed the size/L Denotes a PR that changes 1000-4999 lines. label Aug 2, 2025

fix error 2

6d852bf

github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Oct 12, 2025

Pok27 added 2 commits October 13, 2025 15:15

Merge branch 'master' into CRL-growthRework

68aa315

merge update

5748b1f

Pok27 requested review from Princess-Cheeseballs, sowelipililimute and spanky-spanky as code owners October 13, 2025 12:28

github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Oct 13, 2025

fix

ab2f933

Princess-Cheeseballs requested changes Oct 15, 2025

View reviewed changes

PJBot added S: Awaiting Changes Status: Changes are required before another review can happen and removed S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. labels Oct 15, 2025

Pok27 added 2 commits October 16, 2025 01:45

code cleanup

c0a95d3

TODO

789f3a0

Pok27 added 3 commits October 16, 2025 16:21

fix

b6a2ee6

oops

4f3a8a9

oops 2

929d2b6

Pok27 added 3 commits October 17, 2025 11:58

more TODO

ac2e23d

fix names

b51a752

fix names oops

78e7d43

Pok27 requested a review from Princess-Cheeseballs October 17, 2025 09:30

PJBot added S: Needs Review Status: Requires additional reviews before being fully accepted. Not to be replaced by S: Approved. and removed S: Awaiting Changes Status: Changes are required before another review can happen labels Oct 17, 2025

Princess-Cheeseballs approved these changes Oct 23, 2025

View reviewed changes

PJBot added the S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. label Oct 23, 2025

Harvest bug fixes

8f446df

fix tests

fac0feb

		private void OnPlantGrow(EntityUid uid, AtmosphericGrowthComponent component, OnPlantGrowEvent args)
		{

		private void OnSwab(EntityUid uid, BasicGrowthComponent component, BotanySwabDoAfterEvent args)
		{

		private void OnTrayUpdate(EntityUid uid, PlantHolderComponent component, OnPlantGrowEvent args)
		{

Uh oh!

[Re-open] Botany Rework Part 2: GrowthComponents #39311

Are you sure you want to change the base?

[Re-open] Botany Rework Part 2: GrowthComponents #39311

Uh oh!

Conversation

Pok27 commented Aug 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

About the PR

Technical details

Requirements

Breaking changes

Uh oh!

Princess-Cheeseballs left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Pok27 commented Oct 16, 2025

Uh oh!

Pok27 commented Oct 16, 2025

Uh oh!

Princess-Cheeseballs commented Oct 17, 2025

Uh oh!

Princess-Cheeseballs left a comment

Choose a reason for hiding this comment

Uh oh!

Pok27 commented Oct 23, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Pok27 commented Aug 1, 2025 •

edited

Loading