X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcreature%2Fcreature.cpp;h=72d0b3f348e3c548ba55f6dcc00c52c6694408af;hb=00f55d5b55ff993d2516f00f8d635887562983c7;hp=deb5a10e4173376ca27e3e9434459f570350367f;hpb=76c09039792065ca1c259fb4b681c84c29a9dbd8;p=blobs.git

diff --git a/src/creature/creature.cpp b/src/creature/creature.cpp
index deb5a10..72d0b3f 100644
--- a/src/creature/creature.cpp
+++ b/src/creature/creature.cpp
@@ -29,9 +29,11 @@
 namespace blobs {
 namespace creature {
 
-Composition::Composition()
-: components()
-, total_mass(0.0) {
+Composition::Composition(const world::Set<world::Resource> &resources)
+: resources(resources)
+, components()
+, total_mass(0.0)
+, state_mass{0.0} {
 }
 
 Composition::~Composition() {
@@ -49,6 +51,7 @@ void Composition::Add(int res, double amount) {
 		if (c->resource == res) {
 			c->value += amount;
 			if (c->value <= 0.0) {
+				amount += c->value;
 				components.erase(c);
 			}
 			found = true;
@@ -59,6 +62,7 @@ void Composition::Add(int res, double amount) {
 		components.emplace_back(res, amount);
 	}
 	std::sort(components.begin(), components.end(), CompositionCompare);
+	state_mass[resources[res].state] += amount;
 	total_mass += amount;
 }
 
@@ -80,13 +84,46 @@ double Composition::Get(int res) const noexcept {
 	return 0.0;
 }
 
+double Composition::Proportion(int res) const noexcept {
+	return Get(res) / TotalMass();
+}
+
+double Composition::StateProportion(int res) const noexcept {
+	return Get(res) / StateMass(resources[res].state);
+}
+
+double Composition::Compatibility(int res) const noexcept {
+	if (Has(res)) {
+		return StateProportion(res);
+	}
+	double max_compat = -1.0;
+	double min_compat = 1.0;
+	for (const auto &c : components) {
+		double prop = c.value / StateMass(resources[res].state);
+		for (const auto &compat : resources[c.resource].compatibility) {
+			double value = compat.second * prop;
+			if (value > max_compat) {
+				max_compat = value;
+			}
+			if (value < min_compat) {
+				min_compat = value;
+			}
+		}
+	}
+	if (min_compat < 0.0) {
+		return min_compat;
+	} else {
+		return max_compat;
+	}
+}
+
 
 Creature::Creature(world::Simulation &sim)
 : sim(sim)
 , name()
 , genome()
 , properties()
-, composition()
+, composition(sim.Resources())
 , base_color(1.0)
 , highlight_color(0.0, 0.0, 0.0, 1.0)
 , mass(1.0)
@@ -116,8 +153,8 @@ void Creature::AddMass(int res, double amount) {
 	double nonsolid = 0.0;
 	double volume = 0.0;
 	for (const auto &c : composition) {
-		volume += c.value / sim.Assets().data.resources[c.resource].density;
-		if (sim.Assets().data.resources[c.resource].state != world::Resource::SOLID) {
+		volume += c.value / sim.Resources()[c.resource].density;
+		if (sim.Resources()[c.resource].state != world::Resource::SOLID) {
 			nonsolid += c.value;
 		}
 	}
@@ -131,13 +168,12 @@ void Creature::HighlightColor(const glm::dvec3 &c) noexcept {
 }
 
 void Creature::Ingest(int res, double amount) noexcept {
-	// TODO: check foreign materials
 	if (sim.Resources()[res].state == world::Resource::SOLID) {
-		// 15% of solids stays in body
-		AddMass(res, amount * 0.15);
+		// 30% of solids stays in body
+		AddMass(res, amount * 0.3 * composition.Compatibility(res));
 	} else {
-		// 10% of fluids stays in body
-		AddMass(res, amount * 0.05);
+		// 5% of fluids stays in body
+		AddMass(res, amount * 0.05 * composition.Compatibility(res));
 	}
 	math::GaloisLFSR &random = sim.Assets().random;
 	if (random.UNorm() < AdaptChance()) {
@@ -266,7 +302,7 @@ void Creature::AddParent(Creature &p) {
 }
 
 double Creature::Age() const noexcept {
-	return sim.Time() - birth;
+	return Dead() ? death - birth : sim.Time() - birth;
 }
 
 double Creature::AgeFactor(double peak) const noexcept {
@@ -756,7 +792,7 @@ void Split(Creature &c) {
 	// TODO: duplicate situation somehow
 	a->GetSituation().SetPlanetSurface(
 		s.GetPlanet(),
-		s.Position() + glm::dvec3(0.0, 0.55 * a->Size(), 0.0));
+		s.Position() + glm::rotate(s.Heading() * a->Size() * 0.6, PI * 0.5, s.SurfaceNormal()));
 	a->BuildVAO();
 	c.GetSimulation().Log() << a->Name() << " was born" << std::endl;
 
@@ -770,7 +806,7 @@ void Split(Creature &c) {
 	s.GetPlanet().AddCreature(b);
 	b->GetSituation().SetPlanetSurface(
 		s.GetPlanet(),
-		s.Position() - glm::dvec3(0.0, 0.55 * b->Size(), 0.0));
+		s.Position() + glm::rotate(s.Heading() * b->Size() * 0.6, PI * -0.5, s.SurfaceNormal()));
 	b->BuildVAO();
 	c.GetSimulation().Log() << b->Name() << " was born" << std::endl;
 
@@ -891,6 +927,10 @@ bool Situation::OnSurface() const noexcept {
 	return type == PLANET_SURFACE;
 }
 
+glm::dvec3 Situation::SurfaceNormal() const noexcept {
+	return planet->NormalAt(state.pos);
+}
+
 world::Tile &Situation::GetTile() const noexcept {
 	return planet->TileAt(state.pos);
 }
@@ -1003,8 +1043,8 @@ glm::dvec3 Steering::Force(const Situation::State &s) const noexcept {
 		result += repulse;
 	}
 	if (halting) {
-		// break twice as hard
-		result += -2.0 * s.vel * force;
+		// brake hard
+		result += -5.0 * s.vel * force;
 	}
 	if (seeking) {
 		glm::dvec3 diff = target - s.pos;