X-Git-Url: http://git.localhorst.tv/?p=blobs.git;a=blobdiff_plain;f=src%2Fcreature%2Fcreature.cpp;h=468967887ee96a1d62b7547c2d7a2ad8cff04461;hp=a9c4dc73c613312e18da52b3a2ead77ddc827643;hb=75398ab9230c15215e7a378a26d2d55de67b47f0;hpb=cd80d7cfcac3c58d601db2ab4e0381dd77c06f44

diff --git a/src/creature/creature.cpp b/src/creature/creature.cpp
index a9c4dc7..4689678 100644
--- a/src/creature/creature.cpp
+++ b/src/creature/creature.cpp
@@ -193,7 +193,7 @@ void Creature::Ingest(int res, double amount) noexcept {
 }
 
 void Creature::DoWork(double amount) noexcept {
-	stats.Exhaustion().Add(amount / Stamina());
+	stats.Exhaustion().Add(amount / (Stamina() + 1.0));
 	// burn resources proportional to composition
 	// factor = 1/total * 1/efficiency * amount * -1
 	double factor = -amount / (composition.TotalMass() * EnergyEfficiency());
@@ -204,6 +204,8 @@ void Creature::DoWork(double amount) noexcept {
 		double value = cmp.value * factor * sim.Resources()[cmp.resource].inverse_energy;
 		AddMass(cmp.resource, value);
 	}
+	// doing work improves strength a little
+	properties.Strength() += amount * 0.0001;
 }
 
 void Creature::Hurt(double amount) noexcept {
@@ -360,6 +362,9 @@ double Creature::AdaptChance() const noexcept {
 
 void Creature::AddGoal(std::unique_ptr<Goal> &&g) {
 	g->Enable();
+	if (goals.empty()) {
+		g->SetForeground();
+	}
 	goals.emplace_back(std::move(g));
 }
 
@@ -470,10 +475,16 @@ void Creature::TickBrain(double dt) {
 	for (auto &goal : goals) {
 		goal->Tick(dt);
 	}
+	Goal *top = &*goals.front();
 	// if active goal can be interrupted, check priorities
 	if (goals.size() > 1 && goals[0]->Interruptible()) {
 		std::sort(goals.begin(), goals.end(), GoalCompare);
 	}
+	if (&*goals.front() != top) {
+		top->SetBackground();
+		goals.front()->SetForeground();
+		top = &*goals.front();
+	}
 	goals[0]->Action();
 	for (auto goal = goals.begin(); goal != goals.end();) {
 		if ((*goal)->Complete()) {
@@ -482,6 +493,9 @@ void Creature::TickBrain(double dt) {
 			++goal;
 		}
 	}
+	if (&*goals.front() != top) {
+		goals.front()->SetForeground();
+	}
 }
 
 math::AABB Creature::CollisionBox() const noexcept {
@@ -499,8 +513,9 @@ glm::dmat4 Creature::CollisionTransform() const noexcept {
 	}
 	orient[0] = normalize(cross(orient[1], orient[2]));
 	orient[2] = normalize(cross(orient[0], orient[1]));
-	return glm::translate(glm::dvec3(pos.x, pos.y, pos.z + half_size))
-		* glm::dmat4(orient);
+	return glm::translate(glm::dvec3(pos.x, pos.y, pos.z))
+		* glm::dmat4(orient)
+		* glm::translate(glm::dvec3(0.0, half_size, 0.0));
 }
 
 glm::dmat4 Creature::LocalTransform() noexcept {