Oxygen and Carbon Dioxide Rebalance

simulation_parameters/Constants.cs

@@ -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;

src/auto-evo/AutoEvoGlobalCache.cs

@@ -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);

src/general/world_effects/CompoundDiffusionEffect.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Godot;
 using Newtonsoft.Json;
 
@@ -33,8 +32,7 @@ private static (float Ambient, float Density) CalculateWantedMoveAmounts(Patch s
         // Apply patch distance to diminish how much to move (to make ocean bottoms receive less surface
         // resources like oxygen)
         // 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;
 
         adjacent.Biome.TryGetCompound(compound.Key, CompoundAmountType.Biome,
             out var destinationAmount);

src/general/world_effects/PhotosynthesisProductionEffect.cs

@@ -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>();
@@ -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)
             {
@@ -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;
                         }
                     }
 
@@ -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
+                    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;
+                co2Target = co2Out / (oxygenIn + co2In) * total;
+            }
 
-            if (co2Balance != 0)
-                changesToApply[Compound.Carbondioxide] = co2Balance;
+            changesToApply[Compound.Oxygen] = (oxygenTarget - existingOxygen.Ambient) / 2.0f;
+            changesToApply[Compound.Carbondioxide] = (co2Target - existingCo2.Ambient) / 2.0f;
 
             if (changesToApply.Count > 0)
                 patch.Biome.ApplyLongTermCompoundChanges(patch.BiomeTemplate, changesToApply, cloudSizes);

src/general/world_effects/VolcanismEffect.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Godot;
 using Newtonsoft.Json;
 
 /// <summary>
@@ -32,6 +33,8 @@ private void ApplyVolcanism()
     {
         foreach (var patchKeyValue in targetWorld.Map.Patches)
         {
+            GD.Print(patchKeyValue.Value + " volcanism");
+
             // TODO: make these configured by the biomes.json file
             if (patchKeyValue.Value.BiomeType == BiomeType.Vents)
             {
@@ -72,7 +75,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);
 
         patch.Biome.ApplyLongTermCompoundChanges(patch.BiomeTemplate, addedCo2, cloudSizesDummy);
     }