void Composition::Add(int res, double amount) {
bool found = false;
- for (auto &c : components) {
- if (c.resource == res) {
- c.value += amount;
+ for (auto c = components.begin(); c != components.end(); ++c) {
+ if (c->resource == res) {
+ c->value += amount;
+ if (c->value <= 0.0) {
+ components.erase(c);
+ }
found = true;
break;
}
}
- if (!found) {
+ if (!found && amount > 0.0) {
components.emplace_back(res, amount);
}
std::sort(components.begin(), components.end(), CompositionCompare);
// 10% of fluids stays in body
AddMass(res, amount * 0.05);
}
+ math::GaloisLFSR &random = sim.Assets().random;
+ if (random.UNorm() < AdaptChance()) {
+ // change color to be slightly more like resource
+ glm::dvec3 color(rgb2hsl(sim.Resources()[res].base_color));
+ // solids affect base color, others highlight
+ double p = sim.Resources()[res].state == world::Resource::SOLID ? 0 : 1;
+ double q = random.UInt(3); // hue, sat, or val
+ double r = random.UInt(2); // mean or deviation
+ math::Distribution *d = nullptr;
+ double ref = 0.0;
+ if (p == 0) {
+ if (q == 0) {
+ d = &genome.base_hue;
+ ref = color.x;
+ } else if (q == 1) {
+ d = &genome.base_saturation;
+ ref = color.y;
+ } else {
+ d = &genome.base_lightness;
+ ref = color.z;
+ }
+ } else {
+ if (q == 0) {
+ d = &genome.highlight_hue;
+ ref = color.x;
+ } else if (q == 1) {
+ d = &genome.highlight_saturation;
+ ref = color.y;
+ } else {
+ d = &genome.highlight_lightness;
+ ref = color.z;
+ }
+ }
+ if (r == 0) {
+ double diff = ref - d->Mean();
+ if (q == 0) {
+ if (diff < -0.5) {
+ diff += 1.0;
+ } else if (diff > 0.5) {
+ diff -= 1.0;
+ }
+ // move ±15% of distance
+ d->Mean(std::fmod(d->Mean() + diff * random.SNorm() * 0.15, 1.0));
+ } else {
+ d->Mean(glm::clamp(d->Mean() + diff * random.SNorm() * 0.15, 0.0, 1.0));
+ }
+ } else {
+ // scale by ±15%, enforce bounds
+ d->StandardDeviation(glm::clamp(d->StandardDeviation() * (1.0 + random.SNorm() * 0.15), 0.0001, 0.5));
+ }
+ }
+}
+
+void Creature::DoWork(double amount) noexcept {
+ stats.Exhaustion().Add(amount / Stamina());
+ // burn resources proportional to composition
+ // factor = 1/total * 1/efficiency * amount * -1
+ double factor = -amount / (composition.TotalMass() * EnergyEfficiency());
+ // make a copy to total remains constant and
+ // no entries disappear during iteration
+ Composition comp(composition);
+ for (auto &cmp : comp) {
+ double value = cmp.value * factor * sim.Resources()[cmp.resource].inverse_energy;
+ AddMass(cmp.resource, value);
+ }
}
void Creature::Hurt(double amount) noexcept {
// shifted inverse hermite, y = 1 - (3t² - 2t³) with t = normalized age - peak
// goes negative below -0.5 and starts to rise again above 1.0
double t = glm::clamp((Age() / properties.Lifetime()) - peak, -0.5, 1.0);
- return 1.0 - (3.0 * t * t) + (2.0 * t * t * t);
+ // guarantee at least 1%
+ return std::max(0.01, 1.0 - (3.0 * t * t) + (2.0 * t * t * t));
+}
+
+double Creature::EnergyEfficiency() const noexcept {
+ return 0.25 * AgeFactor(0.05);
}
double Creature::ExhaustionFactor() const noexcept {
return properties.Mutability();
}
+double Creature::Adaptability() const noexcept {
+ return properties.Adaptability();
+}
+
double Creature::OffspringMass() const noexcept {
return properties.OffspringMass();
}
return GetProperties().Mutability() * (1.0 / 3600.0);
}
+double Creature::AdaptChance() const noexcept {
+ return GetProperties().Adaptability() * (1.0 / 120.0);
+}
+
void Creature::AddGoal(std::unique_ptr<Goal> &&g) {
g->Enable();
goals.emplace_back(std::move(g));
}
}
situation.SetState(state);
- stats.Exhaustion().Add(length(f.acc) * Mass() / Stamina() * 0.5 * dt);
+ // work is force times distance
+ DoWork(length(f.acc) * Mass() * length(f.vel) * dt);
}
Situation::Derivative Creature::Step(const Situation::Derivative &ds, double dt) const noexcept {
genome.properties.Intelligence() = { 1.0, 0.1 };
genome.properties.Lifetime() = { 480.0, 60.0 };
genome.properties.Fertility() = { 0.5, 0.03 };
- genome.properties.Mutability() = { 1.0, 0.1 };
+ genome.properties.Mutability() = { 0.9, 0.1 };
+ genome.properties.Adaptability() = { 0.9, 0.1 };
genome.properties.OffspringMass() = { 0.3, 0.02 };
glm::dvec3 color_avg(0.0);
genome.base_hue = { hsl.x, 0.01 };
genome.base_saturation = { hsl.y, 0.01 };
genome.base_lightness = { hsl.z, 0.01 };
+ // use opposite color as start highlight
+ genome.highlight_hue = { std::fmod(hsl.x + 0.5, 1.0), 0.01 };
+ genome.highlight_saturation = { 1.0 - hsl.y, 0.01 };
+ genome.highlight_lightness = { 1.0 - hsl.z, 0.01 };
genome.Configure(c);
}
glm::clamp(base_lightness.FakeNormal(random.SNorm()), 0.0, 1.0)
);
glm::dvec3 highlight_color(
- std::fmod(base_color.x + 0.5, 1.0),
- 1.0 - base_color.y,
- 1.0 - base_color.z
+ std::fmod(highlight_hue.FakeNormal(random.SNorm()) + 1.0, 1.0),
+ glm::clamp(highlight_saturation.FakeNormal(random.SNorm()), 0.0, 1.0),
+ glm::clamp(highlight_lightness.FakeNormal(random.SNorm()), 0.0, 1.0)
);
c.BaseColor(hsl2rgb(base_color));
c.HighlightColor(hsl2rgb(highlight_color));
}
bool Situation::OnTile() const noexcept {
+ if (type != PLANET_SURFACE) return false;
glm::ivec2 t(planet->SurfacePosition(surface, state.pos));
- return type == PLANET_SURFACE
- && t.x >= 0 && t.x < planet->SideLength()
+ return t.x >= 0 && t.x < planet->SideLength()
&& t.y >= 0 && t.y < planet->SideLength();
}
SumForce(result, repulse, force);
}
if (halting) {
- SumForce(result, s.vel * -force, force);
+ // break twice as hard
+ SumForce(result, s.vel * force * -2.0, force);
}
if (seeking) {
glm::dvec3 diff = target - s.pos;
projects / blobs.git / blobdiff