Oxygen and Carbon Dioxide Rebalance #5693

adQuid · 2024-11-18T12:12:45Z

Brief Description of What This PR Does

Balances O2 and CO2 more tightly in the special case of that (mostly) closed loop between them. Also simplifies the diffusion simulation to let those compounds spread a little more, and modifies the auto-evo to make photosynthesisers more common to allow for more oxygen in the first place.

Related Issues

Progress Checklist

Note: before starting this checklist the PR should be marked as non-draft.

PR author has checked that this PR works as intended and doesn't
break existing features:
https://wiki.revolutionarygamesstudio.com/wiki/Testing_Checklist
(this is important as to not waste the time of Thrive team
members reviewing this PR)
Initial code review passed (this and further items should not be checked by the PR author)
Functionality is confirmed working by another person (see above checklist link)
Final code review is passed and code conforms to the
styleguide.

Before merging all CI jobs should finish on this PR without errors, if
there are automatically detected style issues they should be fixed by
the PR author. Merging must follow our
styleguide.

hhyyrylainen · 2024-11-18T12:34:44Z

src/general/world_effects/VolcanismEffect.cs

@@ -32,6 +33,8 @@ private void ApplyVolcanism()
    {
        foreach (var patchKeyValue in targetWorld.Map.Patches)
        {
+            GD.Print(patchKeyValue.Value + " volcanism");


This looks like leftover debugging code.

I knew I forgot something!

adQuid · 2024-11-21T01:13:56Z

I want to make a future PR doing the diffusion better, but right now I think this is good enough for surface patches. Would appreciate lots of testing, since that gets very time-intensive.

src/general/world_effects/VolcanismEffect.cs

hhyyrylainen · 2024-11-21T08:34:41Z

src/general/world_effects/CompoundDiffusionEffect.cs

@@ -27,14 +26,12 @@ public void OnTimePassed(double elapsed, double totalTimePassed)
        HandlePatchCompoundDiffusion();
    }

-    private static (float Ambient, float Density) CalculateWantedMoveAmounts(Patch sourcePatch, Patch adjacent,
+    private static (float Ambient, float Density) CalculateWantedMoveAmounts(Patch adjacent,
        KeyValuePair<Compound, BiomeCompoundProperties> compound)
    {
        // Apply patch distance to diminish how much to move (to make ocean bottoms receive less surface
        // resources like oxygen)


Isn't this comment now incorrect?

hhyyrylainen · 2024-11-21T08:35:44Z

src/general/world_effects/CompoundDiffusionEffect.cs

-        // TODO: improve the formula here as sqrt isn't the best
-        float moveModifier = Constants.COMPOUND_DIFFUSE_BASE_MOVE_AMOUNT /
-            MathF.Sqrt(Constants.COMPOUND_DIFFUSE_BASE_DISTANCE + Math.Abs(sourcePatch.Depth[0] - adjacent.Depth[0]));
+        float moveModifier = Constants.COMPOUND_DIFFUSE_BASE_MOVE_AMOUNT;


Just using a flat modifier here makes it so that there's nothing preventing oxygen from going to the deepest ocean very fast now, which is one of the major reasons I added the distance modifier. Maybe instead we could rewrite the code to only use the distance modifier if the distance is like at least 500?

The number of patches between the epipelagic and sea floor already do that pretty well, but based on my quick research even that isn't accurate. As Buckly mentioned in the last Thrivestream, oxygen is actually pretty well spread in the modern oceans: https://en.wikipedia.org/wiki/Oxygen_minimum_zone

Based on what I'm seeing, Oxygen in the bathypelagic or abyssopelagic should be around a third of the surface, while in this current code it's more like a tenth at best

I guess I have to accept that as much as I think that will lead to players submitting bug reports I have to then read (as I'm almost the only one dealing with bug reports)... Though the comment that was left above is then obviously incorrect as it no longer related to the changed code.

Based on what I'm seeing, Oxygen in the bathypelagic or abyssopelagic should be around a third of the surface, while in this current code it's more like a tenth at best

That's probably a fair compromise to try to aim for that with the algorithm. I'm not good at coming up with math functions that do what I want so I had to settle on the square root usage here and call it good enough.

hhyyrylainen · 2024-11-21T08:36:43Z

src/general/world_effects/PhotosynthesisProductionEffect.cs

+            {
+                if (co2Out == 0)
+                {
+                    // in the rare event we aren't making either compound, do nothing


But now consuming the compounds also doesn't do anything? I think this is a wrong conclusion to make in the code.

You are correct. If microbes had only bio processes that destroyed O2 or CO2 without producing anything in return, this code doesn't account for that. Right now the PhotosynthesisProductionEffect class is dependent on the special case of conservation of mass (and that CO2 and O2 are only being converted into each other)

The code shouldn't depend on that then as someone will make a mod eventually that breaks the laws of physics and will get confused why it doesn't do things correctly.

alright, I've modified the code to handle matter sinks, and while a matter generator will result in absurd numbers, I've protected against divide-by-zero exceptions.

hhyyrylainen · 2024-11-21T08:37:27Z

src/general/world_effects/PhotosynthesisProductionEffect.cs


-            if (co2Balance != 0)
-                changesToApply[Compound.Carbondioxide] = co2Balance;
+            changesToApply[Compound.Oxygen] = (oxygenTarget - existingOxygen.Ambient) / 2.0f;


It's more efficient to multiply by 0.5f than to do a float division.

hhyyrylainen · 2024-11-21T08:40:13Z

src/general/world_effects/PhotosynthesisProductionEffect.cs

+            }
+            else
+            {
+                oxygenTarget = oxygenOut / (oxygenIn + co2In) * total;


Could you add a comment here explaining the logic? I don't really understand this kind of scaling because ApplyLongTermCompoundChanges already does a relative applying of gases. So higher oxygen output reduces the effect of the co2 adding and vice versa. So to me it looks like this is now doing the same effect twice, which doesn't logically make a ton of sense as ApplyLongTermCompoundChanges needs to be given the absolute change wanted and then it automatically makes gases related to each other and caps it to a 100%.

Fair. Rather than explain here, I will add the comment and see if the explanation makes sense to you.

adQuid added 5 commits November 10, 2024 08:58

make compound changes work on targets instead of raw additions

6d66165

rebalance world effects

01a1eed

fix return statement

eb051d6

more trimming

e887839

remove unneeded import

c87d669

hhyyrylainen added this to the Release 0.8.0 milestone Nov 18, 2024

hhyyrylainen reviewed Nov 18, 2024

View reviewed changes

adQuid added 4 commits November 18, 2024 08:02

remove debugging code

d773d72

remove unused parameter (might add back later)

7858768

Merge branch 'master' into compound_gen_rebalance

004a17a

Merge branch 'master' into compound_gen_rebalance

6f2277c

adQuid marked this pull request as ready for review November 21, 2024 01:13

adQuid added the review label Nov 21, 2024

hhyyrylainen reviewed Nov 21, 2024

View reviewed changes

src/general/world_effects/VolcanismEffect.cs Show resolved Hide resolved

hhyyrylainen requested changes Nov 21, 2024

View reviewed changes

adQuid added 5 commits November 23, 2024 18:24

minor review corrections

eee7449

rework equilibrium equations

47c6b9a

whoops

f505fdb

drop unneeded import

497880f

Merge branch 'master' into compound_gen_rebalance

7de5758

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Oxygen and Carbon Dioxide Rebalance #5693

Oxygen and Carbon Dioxide Rebalance #5693

adQuid commented Nov 18, 2024

hhyyrylainen Nov 18, 2024

adQuid Nov 18, 2024

adQuid commented Nov 21, 2024

hhyyrylainen Nov 21, 2024

hhyyrylainen Nov 21, 2024

adQuid Nov 21, 2024

adQuid Nov 21, 2024

hhyyrylainen Nov 21, 2024

hhyyrylainen Nov 21, 2024

hhyyrylainen Nov 21, 2024

adQuid Nov 21, 2024

hhyyrylainen Nov 21, 2024

adQuid Nov 24, 2024

hhyyrylainen Nov 21, 2024

hhyyrylainen Nov 21, 2024

adQuid Nov 21, 2024

Oxygen and Carbon Dioxide Rebalance #5693

Are you sure you want to change the base?

Oxygen and Carbon Dioxide Rebalance #5693

Conversation

adQuid commented Nov 18, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

adQuid commented Nov 21, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment