Exobiology improvements

Cargo.toml

@@ -30,6 +30,7 @@ directories = "5.0.1"
 
 [dev-dependencies]
 tokio-test = "0.4.4"
+csv = "1.3.0"
 
 [features]
 default = ["asynchronous", "strict"]

src/lib.rs

@@ -70,14 +70,12 @@ mod tests {
         let mut entry_count = 0;
 
         for journal in &logs {
-            let mut found_file_header = false;
             let reader = journal.create_blocking_reader().unwrap();
 
             for entry in reader {
                 entry_count += 1;
 
                 if let LogEventContent::FileHeader(_) = entry.unwrap().content {
-                    found_file_header = true;
                     file_header_count += 1;
                 }
             }

src/modules/exobiology/models/spawn_condition.rs

@@ -1,3 +1,4 @@
+use crate::galaxy::Region;
 use crate::materials::Material;
 use crate::modules::galaxy::{
     AtmosphereType, PlanetClass, StarClass, StarLuminosity, VolcanismType,
@@ -15,6 +16,7 @@ pub enum SpawnCondition {
     /// The maximum gravity the planet must have, in G
     MaxGravity(f32),
     PlanetClass(PlanetClass),
+    MainStarClass(StarClass),
     ParentStarClass(StarClass),
     ParentStarLuminosity(StarLuminosity),
     MinOrEqualParentStarLuminosity(StarLuminosity),
@@ -24,6 +26,9 @@ pub enum SpawnCondition {
     MinDistanceFromParentSun(f32),
     AnyVolcanism,
 
+    MinPressure(f32),
+    MaxPressure(f32),
+
     /// The maximum distance the planet needs to be from the center of a nebula in Ly
     WithinNebulaRange(f32),
 
@@ -36,6 +41,8 @@ pub enum SpawnCondition {
     IcyComposition,
     MetalComposition,
 
+    Region(Region),
+
     Special,
 
     Any(Vec<SpawnCondition>),

src/modules/exobiology/models/spawn_source.rs

@@ -8,7 +8,7 @@ use crate::exobiology::models::spawn_source::spawn_source_star::SpawnSourceStar;
 use crate::exobiology::models::spawn_source::target_planet::TargetPlanet;
 use crate::exobiology::models::spawn_source::target_system::TargetSystem;
 use crate::exobiology::{SpawnCondition, Species};
-use crate::galaxy::{AtmosphereDensity, AtmosphereType, Nebula, VolcanismType};
+use crate::galaxy::{AtmosphereDensity, AtmosphereType, Nebula, Region, VolcanismType};
 use crate::logs::scan_event::ScanEventParent;
 
 #[derive(Debug)]
@@ -27,14 +27,19 @@ impl<'a> SpawnSource<'a> {
 
     /// Checks if the given species can spawn on this spawn source.
     pub fn can_spawn_species(&self, species: &Species) -> bool {
-        species
-            .spawn_conditions()
-            .iter()
-            .all(|condition| self.satisfies_spawn_condition(condition))
+        if !self.target_planet.is_landable {
+            return false;
+        }
+
+        self.satisfies_spawn_condition(species.spawn_conditions())
     }
 
     /// Checks if the spawn source satisfies the given condition.
     pub fn satisfies_spawn_condition(&self, condition: &SpawnCondition) -> bool {
+        if !self.target_planet.is_landable {
+            return false;
+        }
+
         match condition {
             SpawnCondition::MinMeanTemperature(min_temp) => {
                 &self.target_planet.surface_temperature >= min_temp
@@ -59,6 +64,9 @@ impl<'a> SpawnSource<'a> {
                 &self.target_planet.gravity.as_g() <= max_gravity
             }
             SpawnCondition::PlanetClass(planet_class) => &self.target_planet.class == planet_class,
+            SpawnCondition::MainStarClass(star_class) => {
+                &self.target_system.stars_in_system[&0].class == star_class
+            }
             SpawnCondition::ParentStarClass(star_class) => {
                 self.parent_stars().any(|star| &star.class == star_class)
             }
@@ -77,7 +85,7 @@ impl<'a> SpawnSource<'a> {
             }
             SpawnCondition::MinDistanceFromParentSun(min_distance) => {
                 // TODO not sure, but Eccentricity might need to be taken into account as well
-                &(self.target_planet.semi_major_axis / 149597870700.0) >= min_distance
+                &(self.target_planet.semi_major_axis.as_au()) >= min_distance
             }
             SpawnCondition::AnyVolcanism => {
                 self.target_planet.volcanism.kind != VolcanismType::None
@@ -94,28 +102,32 @@ impl<'a> SpawnSource<'a> {
             SpawnCondition::MaterialPresence(material) => {
                 self.target_planet.materials.contains(material)
             }
-            SpawnCondition::RockyComposition => {
-                let Some(composition) = &self.target_planet.composition else {
-                    return false;
-                };
-
-                composition.rock > 0.0
+            SpawnCondition::RockyComposition => self
+                .target_planet
+                .composition
+                .as_ref()
+                .is_some_and(|composition| composition.rock > 0.0),
+            SpawnCondition::IcyComposition => self
+                .target_planet
+                .composition
+                .as_ref()
+                .is_some_and(|composition| composition.ice > 0.0),
+            SpawnCondition::MetalComposition => self
+                .target_planet
+                .composition
+                .as_ref()
+                .is_some_and(|composition| composition.metal > 0.0),
+            SpawnCondition::MinPressure(min_pressure) => {
+                &self.target_planet.pressure >= min_pressure
+            }
+            SpawnCondition::MaxPressure(max_pressure) => {
+                &self.target_planet.pressure <= max_pressure
+            }
+            SpawnCondition::Region(region) => {
+                Region::from_pos(self.target_system.star_system_position).is_some_and(
+                    |actual_region| &actual_region == region || actual_region == Region::Unknown,
+                )
             }
-            SpawnCondition::IcyComposition => {
-                let Some(composition) = &self.target_planet.composition else {
-                    return false;
-                };
-
-                composition.ice > 0.0
-            }
-            SpawnCondition::MetalComposition => {
-                let Some(composition) = &self.target_planet.composition else {
-                    return false;
-                };
-
-                composition.metal > 0.0
-            }
-
             SpawnCondition::Special => false,
 
             SpawnCondition::Any(conditions) => conditions

src/modules/exobiology/models/spawn_source/target_planet.rs

@@ -1,11 +1,14 @@
-use crate::galaxy::{Atmosphere, Gravity, PlanetClass, PlanetComposition, Volcanism};
+use crate::galaxy::{
+    Atmosphere, Gravity, LocalDistance, PlanetClass, PlanetComposition, Volcanism,
+};
 use crate::logs::scan_event::ScanEventParent;
 use crate::materials::Material;
 use serde::Serialize;
 use std::collections::HashSet;
 
 #[derive(Debug, Serialize)]
 pub struct TargetPlanet {
+    pub is_landable: bool,
     pub atmosphere: Atmosphere,
     pub gravity: Gravity,
     pub class: PlanetClass,
@@ -14,6 +17,7 @@ pub struct TargetPlanet {
     pub materials: HashSet<Material>,
     pub composition: Option<PlanetComposition>,
     pub parents: Vec<ScanEventParent>,
-    pub semi_major_axis: f32,
+    pub semi_major_axis: LocalDistance,
     pub geological_signals_present: bool,
+    pub pressure: f32,
 }

src/modules/exobiology/models/species.rs

@@ -32,35 +32,27 @@ pub enum Species {
     AmphoraPlant,
 
     // Anemones
-    // TODO needs to be verified
     #[serde(rename = "$Codex_Ent_Sphere_Name;")]
     AnemoneLuteolum,
 
-    // TODO needs to be verified
     #[serde(rename = "$Codex_Ent_SphereABCD_01_Name;")]
     AnemoneCroceum,
 
-    // TODO needs to be verified
     #[serde(rename = "$Codex_Ent_SphereABCD_02_Name;")]
     AnemonePuniceum,
 
-    // TODO needs to be verified
     #[serde(rename = "$Codex_Ent_SphereABCD_03_Name;")]
     AnemoneRoseum,
 
-    // TODO needs to be verified
     #[serde(rename = "$Codex_Ent_SphereEFGH_Name;")]
     AnemoneBlatteumBioluminescent,
 
-    // TODO needs to be verified
     #[serde(rename = "$Codex_Ent_SphereEFGH_01_Name;")]
     AnemoneRubeumBioluminescent,
 
-    // TODO needs to be verified
     #[serde(rename = "$Codex_Ent_SphereEFGH_02_Name;")]
     AnemonePrasinumBioluminescent,
 
-    // TODO needs to be verified
     #[serde(rename = "$Codex_Ent_SphereEFGH_03_Name;")]
     AnemoneRoseumBioluminescent,
 
@@ -475,14 +467,14 @@ impl Display for Species {
                 Species::BacteriumVesicula => "Bacterium Vesicula",
                 Species::BacteriumVolu => "Bacterium Volu",
 
-                Species::BrainTreeAureum => "Aureum Brain Tree ",
-                Species::BrainTreeGypseeum => "Gypseeum Brain Tree ",
-                Species::BrainTreeLindigoticum => "Lindigoticum Brain Tree ",
+                Species::BrainTreeAureum => "Aureum Brain Tree",
+                Species::BrainTreeGypseeum => "Gypseeum Brain Tree",
+                Species::BrainTreeLindigoticum => "Lindigoticum Brain Tree",
                 Species::BrainTreeLividum => "Lividum Brain Tree ",
-                Species::BrainTreeOstrinum => "Ostrinum Brain Tree ",
-                Species::BrainTreePuniceum => "Puniceum Brain Tree ",
-                Species::BrainTreeRoseum => "Roseum Brain Tree ",
-                Species::BrainTreeViride => "Viride Brain Tree ",
+                Species::BrainTreeOstrinum => "Ostrinum Brain Tree",
+                Species::BrainTreePuniceum => "Puniceum Brain Tree",
+                Species::BrainTreeRoseum => "Roseum Brain Tree",
+                Species::BrainTreeViride => "Viride Brain Tree",
 
                 Species::CactoidaCortexum => "Cactoida Cortexum",
                 Species::CactoidaLapis => "Cactoida Lapis",
@@ -591,7 +583,7 @@ impl Display for Species {
 }
 
 impl Species {
-    pub fn spawn_conditions(&self) -> &Vec<SpawnCondition> {
+    pub fn spawn_conditions(&self) -> &SpawnCondition {
         &SPECIES_SPAWN_CONDITIONS
             .iter()
             .find(|(species, _)| species == self)
@@ -611,21 +603,18 @@ impl Species {
             Species::AleoidaLaminiae => 3_385_200,
             Species::AleoidaGravis => 12_934_900,
 
-            // TODO this needs a value
-            Species::AmphoraPlant => 0,
+            Species::AmphoraPlant => 1_628_800,
 
-            // TODO these need values
-            Species::AnemoneLuteolum => 0,
-            Species::AnemoneCroceum => 0,
-            Species::AnemonePuniceum => 0,
-            Species::AnemoneRoseum => 0,
-            Species::AnemoneBlatteumBioluminescent => 0,
-            Species::AnemoneRubeumBioluminescent => 0,
-            Species::AnemonePrasinumBioluminescent => 0,
-            Species::AnemoneRoseumBioluminescent => 0,
-
-            // TODO this needs a value
-            Species::BarkMound => 0,
+            Species::AnemoneLuteolum => 1_499_900,
+            Species::AnemoneCroceum => 1_499_900,
+            Species::AnemonePuniceum => 1_499_900,
+            Species::AnemoneRoseum => 1_499_900,
+            Species::AnemoneBlatteumBioluminescent => 1_499_900,
+            Species::AnemoneRubeumBioluminescent => 1_499_900,
+            Species::AnemonePrasinumBioluminescent => 1_499_900,
+            Species::AnemoneRoseumBioluminescent => 1_499_900,
+
+            Species::BarkMound => 1_471_900,
 
             Species::BacteriumAurasus => 1_000_000,
             Species::BacteriumNebulus => 5_289_900,
@@ -642,14 +631,14 @@ impl Species {
             Species::BacteriumVerrata => 3_897_000,
 
             // TODO these need values
-            Species::BrainTreeRoseum => 0,
-            Species::BrainTreeGypseeum => 0,
-            Species::BrainTreeOstrinum => 0,
-            Species::BrainTreeViride => 0,
-            Species::BrainTreeLividum => 0,
-            Species::BrainTreeAureum => 0,
-            Species::BrainTreePuniceum => 0,
-            Species::BrainTreeLindigoticum => 0,
+            Species::BrainTreeRoseum => 1_593_700,
+            Species::BrainTreeGypseeum => 1_593_700,
+            Species::BrainTreeOstrinum => 1_593_700,
+            Species::BrainTreeViride => 1_593_700,
+            Species::BrainTreeLividum => 1_593_700,
+            Species::BrainTreeAureum => 1_593_700,
+            Species::BrainTreePuniceum => 1_593_700,
+            Species::BrainTreeLindigoticum => 1_593_700,
 
             Species::CactoidaCortexum => 3_667_600,
             Species::CactoidaLapis => 2_483_600,
@@ -745,15 +734,14 @@ impl Species {
             Species::ThargoidBarnacleMatrixSubmerged => 0,
             Species::ThargoidBarnacleMatrix => 2_313_500,
 
-            // TODO these need values
-            Species::SinuousTubersRoseum => 0,
-            Species::SinuousTubersPrasinum => 0,
-            Species::SinuousTubersAlbidum => 0,
-            Species::SinuousTubersCaeruleum => 0,
-            Species::SinuousTubersBlatteum => 0,
-            Species::SinuousTubersLindigoticum => 0,
-            Species::SinuousTubersViolaceum => 0,
-            Species::SinuousTubersViride => 0,
+            Species::SinuousTubersRoseum => 1_514_500,
+            Species::SinuousTubersPrasinum => 1_514_500,
+            Species::SinuousTubersAlbidum => 1_514_500,
+            Species::SinuousTubersCaeruleum => 1_514_500,
+            Species::SinuousTubersBlatteum => 1_514_500,
+            Species::SinuousTubersLindigoticum => 1_514_500,
+            Species::SinuousTubersViolaceum => 1_514_500,
+            Species::SinuousTubersViride => 1_514_500,
         }
     }
 }
@@ -762,12 +750,15 @@ impl Species {
 mod tests {
     use strum::IntoEnumIterator;
 
-    use crate::modules::exobiology::Species;
+    use crate::{
+        exobiology::r#static::species_spawn_conditions::SPECIES_SPAWN_CONDITIONS,
+        modules::exobiology::Species,
+    };
 
     #[test]
     fn all_species_have_matching_spawn_conditions() {
         for species in Species::iter() {
-            assert!(!species.spawn_conditions().is_empty());
+            assert!(SPECIES_SPAWN_CONDITIONS.iter().any(|(s, _)| *s == species));
         }
     }
 }