Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Oxygen and Carbon Dioxide Rebalance #5693

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
+56 −32
Open

Oxygen and Carbon Dioxide Rebalance #5693

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6d66165
make compound changes work on targets instead of raw additions
adQuid Nov 10, 2024
01a1eed
rebalance world effects
adQuid Nov 18, 2024
eb051d6
fix return statement
adQuid Nov 18, 2024
e887839
more trimming
adQuid Nov 18, 2024
c87d669
remove unneeded import
adQuid Nov 18, 2024
d773d72
remove debugging code
adQuid Nov 18, 2024
7858768
remove unused parameter (might add back later)
adQuid Nov 18, 2024
004a17a
Merge branch 'master' into compound_gen_rebalance
adQuid Nov 18, 2024
6f2277c
Merge branch 'master' into compound_gen_rebalance
adQuid Nov 20, 2024
eee7449
minor review corrections
adQuid Nov 23, 2024
47c6b9a
rework equilibrium equations
adQuid Nov 24, 2024
f505fdb
whoops
adQuid Nov 24, 2024
497880f
drop unneeded import
adQuid Nov 24, 2024
7de5758
Merge branch 'master' into compound_gen_rebalance
adQuid Nov 24, 2024
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
3 changes: 1 addition & 2 deletions simulation_parameters/Constants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,8 +1164,7 @@ public static class Constants
public const float GLUCOSE_MIN = 0.0f;

// Tweak variable for how fast compounds diffuse between patches
public const float COMPOUND_DIFFUSE_BASE_MOVE_AMOUNT = 1;
public const float COMPOUND_DIFFUSE_BASE_DISTANCE = 1;
public const float COMPOUND_DIFFUSE_BASE_MOVE_AMOUNT = 0.8f;

// Volcanism co2 production configuration
public const float VOLCANISM_VENTS_CO2_STRENGTH = 0.15f;
Expand Down
2 changes: 1 addition & 1 deletion src/auto-evo/AutoEvoGlobalCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public AutoEvoGlobalCache(WorldGenerationSettings worldSettings)

SunlightConversionEfficiencyPressure =
new CompoundConversionEfficiencyPressure(Compound.Sunlight, Compound.Glucose, 1.0f);
SunlightCompoundPressure = new EnvironmentalCompoundPressure(Compound.Sunlight, Compound.Glucose, 20000, 1.0f);
SunlightCompoundPressure = new EnvironmentalCompoundPressure(Compound.Sunlight, Compound.Glucose, 400000, 1.0f);

TemperatureConversionEfficiencyPressure =
new CompoundConversionEfficiencyPressure(Compound.Temperature, Compound.ATP, 1.0f);
Expand Down
13 changes: 5 additions & 8 deletions src/general/world_effects/CompoundDiffusionEffect.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using Godot;
using Newtonsoft.Json;

Expand Down Expand Up @@ -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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this comment now incorrect?

// 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;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.


adjacent.Biome.TryGetCompound(compound.Key, CompoundAmountType.Biome,
out var destinationAmount);
Expand Down Expand Up @@ -74,7 +71,7 @@ private void HandlePatchCompoundDiffusion()

foreach (var adjacent in patch.Value.Adjacent)
{
var (ambient, density) = CalculateWantedMoveAmounts(patch.Value, adjacent, compound);
var (ambient, density) = CalculateWantedMoveAmounts(adjacent, compound);

// If there's nothing really to move, then skip (or if negative as those moves are added by the
// other patch)
Expand All @@ -95,7 +92,7 @@ private void HandlePatchCompoundDiffusion()

foreach (var adjacent in patch.Value.Adjacent)
{
var (ambient, density) = CalculateWantedMoveAmounts(patch.Value, adjacent, compound);
var (ambient, density) = CalculateWantedMoveAmounts(adjacent, compound);
if (ambient < MathUtils.EPSILON && density < MathUtils.EPSILON)
continue;

Expand Down
56 changes: 38 additions & 18 deletions src/general/world_effects/PhotosynthesisProductionEffect.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,9 @@ public void OnTimePassed(double elapsed, double totalTimePassed)
private void ApplyCompoundsAddition()
{
// These affect the final balance
var outputModifier = 1.5f;
var outputModifier = 1.0f;
var inputModifier = 1.0f;

// This affects how fast the conditions change, but also the final balance somewhat
var modifier = 0.00015f;

List<TweakedProcess> microbeProcesses = [];

var cloudSizes = new Dictionary<Compound, float>();
Expand All @@ -49,8 +46,10 @@ private void ApplyCompoundsAddition()
if (patch.SpeciesInPatch.Count < 1)
continue;

float oxygenBalance = 0;
float co2Balance = 0;
float oxygenIn = 0;
float oxygenOut = 0;
float co2In = 0;
float co2Out = 0;

foreach (var species in patch.SpeciesInPatch)
{
Expand Down Expand Up @@ -101,11 +100,11 @@ private void ApplyCompoundsAddition()
{
if (input.Key.ID is Compound.Oxygen)
{
oxygenBalance -= input.Value * inputModifier * effectiveSpeed * species.Value;
oxygenIn += input.Value * inputModifier * effectiveSpeed * species.Value;
}
else if (input.Key.ID is Compound.Carbondioxide)
{
co2Balance -= input.Value * inputModifier * effectiveSpeed * species.Value;
co2In += input.Value * inputModifier * effectiveSpeed * species.Value;
}
}

Expand All @@ -114,27 +113,48 @@ private void ApplyCompoundsAddition()
{
if (output.Key.ID is Compound.Oxygen)
{
oxygenBalance += output.Value * outputModifier * effectiveSpeed * species.Value;
oxygenOut += output.Value * outputModifier * effectiveSpeed * species.Value;
}
else if (output.Key.ID is Compound.Carbondioxide)
{
co2Balance += output.Value * outputModifier * effectiveSpeed * species.Value;
co2Out += output.Value * outputModifier * effectiveSpeed * species.Value;
}
}
}
}

// Scale the balances to make the changes less drastic
oxygenBalance *= modifier;
co2Balance *= modifier;
float oxygenTarget;
float co2Target;

patch.Biome.TryGetCompound(Compound.Oxygen, CompoundAmountType.Biome, out var existingOxygen);
patch.Biome.TryGetCompound(Compound.Carbondioxide, CompoundAmountType.Biome, out var existingCo2);

float total = existingOxygen.Ambient + existingCo2.Ambient;

changesToApply.Clear();
if (oxygenOut == 0)
{
if (co2Out == 0)
{
// in the rare event we aren't making either compound, do nothing
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

continue;
}

if (oxygenBalance != 0)
changesToApply[Compound.Oxygen] = oxygenBalance;
oxygenTarget = 0;
co2Target = total;
}
else if (co2Out == 0)
{
oxygenTarget = total;
co2Target = 0;
}
else
{
oxygenTarget = oxygenOut / (oxygenIn + co2In) * total;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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%.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

co2Target = co2Out / (oxygenIn + co2In) * total;
}

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

changesToApply[Compound.Carbondioxide] = (co2Target - existingCo2.Ambient) / 2.0f;

if (changesToApply.Count > 0)
patch.Biome.ApplyLongTermCompoundChanges(patch.BiomeTemplate, changesToApply, cloudSizes);
Expand Down
2 changes: 1 addition & 1 deletion src/general/world_effects/VolcanismEffect.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ private void ProduceCO2(Patch patch, float co2Strength, float threshold)
return;

// TODO: should this clamp or not?
addedCo2[Compound.Carbondioxide] = Math.Clamp(amount.Ambient + co2Strength, 0, threshold);
addedCo2[Compound.Carbondioxide] = Math.Clamp(co2Strength, 0, threshold);
hhyyrylainen marked this conversation as resolved.
Show resolved Hide resolved

patch.Biome.ApplyLongTermCompoundChanges(patch.BiomeTemplate, addedCo2, cloudSizesDummy);
}
Expand Down