X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcreature%2Fgoal.cpp;h=c7a7b66ac5f9be93024f8ab8f486edf11aa1b8ca;hb=7159e493b63552ec7de1fceec4abcb7e0e099ec0;hp=e65a4dbf484ad743c23624c5fea28f225b9595ae;hpb=628b6dfe0b4bd98bd8438f70ec686fe2df464550;p=blobs.git

diff --git a/src/creature/goal.cpp b/src/creature/goal.cpp
index e65a4db..c7a7b66 100644
--- a/src/creature/goal.cpp
+++ b/src/creature/goal.cpp
@@ -1,24 +1,105 @@
+#include "AttackGoal.hpp"
 #include "BlobBackgroundTask.hpp"
 #include "Goal.hpp"
 #include "IdleGoal.hpp"
+#include "IngestGoal.hpp"
 #include "LocateResourceGoal.hpp"
+#include "StrollGoal.hpp"
 
 #include "Creature.hpp"
 #include "../app/Assets.hpp"
+#include "../ui/string.hpp"
 #include "../world/Planet.hpp"
 #include "../world/Resource.hpp"
 #include "../world/Simulation.hpp"
 #include "../world/TileType.hpp"
 
+#include <cstring>
 #include <iostream>
+#include <sstream>
 #include <glm/gtx/io.hpp>
 
 
 namespace blobs {
 namespace creature {
 
+AttackGoal::AttackGoal(Creature &self, Creature &target)
+: Goal(self)
+, target(target)
+, damage_target(0.25)
+, damage_dealt(0.0)
+, cooldown(0.0) {
+}
+
+AttackGoal::~AttackGoal() {
+}
+
+std::string AttackGoal::Describe() const {
+	return "attack " + target.Name();
+}
+
+void AttackGoal::Tick(double dt) {
+	cooldown -= dt;
+}
+
+void AttackGoal::Action() {
+	if (target.Dead() || !GetCreature().PerceptionTest(target.GetSituation().Position())) {
+		SetComplete();
+		return;
+	}
+	const glm::dvec3 diff(GetSituation().Position() - target.GetSituation().Position());
+	const double hit_range = GetCreature().Size() * 0.5 * GetCreature().DexertyFactor();
+	const double hit_dist = hit_range + (0.5 * GetCreature().Size()) + 0.5 * (target.Size());
+	if (GetStats().Damage().Critical()) {
+		// flee
+		GetSteering().Pass(diff * 5.0);
+		GetSteering().DontSeparate();
+		GetSteering().Haste(1.0);
+	} else if (glm::length2(diff) > hit_dist * hit_dist) {
+		// full throttle chase
+		GetSteering().Pass(target.GetSituation().Position());
+		GetSteering().DontSeparate();
+		GetSteering().Haste(1.0);
+	} else {
+		// attack
+		GetSteering().Halt();
+		GetSteering().DontSeparate();
+		GetSteering().Haste(1.0);
+		if (cooldown <= 0.0) {
+			constexpr double impulse = 0.05;
+			const double force = GetCreature().Strength();
+			const double damage =
+				force * impulse
+				* (GetCreature().GetComposition().TotalDensity() / target.GetComposition().TotalDensity())
+				* (GetCreature().Mass() / target.Mass())
+				/ target.Mass();
+			GetCreature().DoWork(force * impulse * glm::length(diff));
+			target.Hurt(damage);
+			target.GetSituation().Accelerate(glm::normalize(diff) * force * -impulse);
+			damage_dealt += damage;
+			if (damage_dealt >= damage_target || target.Dead()) {
+				SetComplete();
+				if (target.Dead()) {
+					GetCreature().GetSimulation().Log() << GetCreature().Name()
+						<< " killed " << target.Name() << std::endl;
+				}
+			}
+			cooldown = 1.0 + (4.0 * (1.0 - GetCreature().DexertyFactor()));
+		}
+	}
+}
+
+void AttackGoal::OnBackground() {
+	// abort if something more important comes up
+	SetComplete();
+}
+
+
 BlobBackgroundTask::BlobBackgroundTask(Creature &c)
-: Goal(c) {
+: Goal(c)
+, breathing(false)
+, drink_subtask(nullptr)
+, eat_subtask(nullptr) {
 }
 
 BlobBackgroundTask::~BlobBackgroundTask() {
@@ -29,54 +110,90 @@ std::string BlobBackgroundTask::Describe() const {
 }
 
 void BlobBackgroundTask::Tick(double dt) {
+	if (breathing) {
+		// TODO: derive breathing ability
+		int gas = Assets().data.resources["air"].id;
+		// TODO: check if in compatible atmosphere
+		double amount = GetStats().Breath().gain * -(1.0 + GetCreature().ExhaustionFactor());
+		GetStats().Breath().Add(amount * dt);
+		// maintain ~1% gas composition
+		double gas_amount = GetCreature().GetComposition().Get(gas);
+		if (gas_amount < GetCreature().GetComposition().TotalMass() * 0.01) {
+			double add = std::min(GetCreature().GetComposition().TotalMass() * 0.025 - gas_amount, -amount * dt);
+			GetCreature().Ingest(gas, add);
+		}
+		if (GetStats().Breath().Empty()) {
+			breathing = false;
+		}
+	}
 }
 
 void BlobBackgroundTask::Action() {
-	// check if eligible to split
-	if (GetCreature().Mass() > GetCreature().GetProperties().Birth().mass * 1.8) {
-		double fert = GetCreature().Fertility();
-		double rand = Assets().random.UNorm();
-		if (fert > rand) {
-			std::cout << "[" << int(GetCreature().GetSimulation().Time())
-				<< "s] " << GetCreature().Name() << " split" << std::endl;
-			Split(GetCreature());
-			return;
-		}
+	CheckStats();
+	CheckSplit();
+	CheckMutate();
+}
+
+void BlobBackgroundTask::CheckStats() {
+	Creature::Stats &stats = GetStats();
+
+	if (!breathing && stats.Breath().Bad()) {
+		breathing = true;
 	}
-	// check for random property mutation
-	if (GetCreature().Mutability() > Assets().random.UNorm()) {
-		double amount = 1.0 + (Assets().random.SNorm() * 0.05);
-		auto &props = GetCreature().GetGenome().properties;
-		double r = Assets().random.UNorm();
-		math::Distribution *d = nullptr;
-		if (Assets().random.UNorm() < 0.5) {
-			auto &set = props.props[(int(Assets().random.UNorm() * 4.0) % 4) + 1];
-			if (r < 0.25) {
-				d = &set.age;
-			} else if (r < 0.5) {
-				d = &set.mass;
-			} else if (r < 0.75) {
-				d = &set.fertility;
-			} else {
-				d = &set.highlight;
+
+	if (!drink_subtask && stats.Thirst().Bad()) {
+		drink_subtask = new IngestGoal(GetCreature(), stats.Thirst());
+		for (const auto &cmp : GetCreature().GetComposition()) {
+			if (Assets().data.resources[cmp.resource].state == world::Resource::LIQUID) {
+				double value = cmp.value / GetCreature().GetComposition().TotalMass();
+				drink_subtask->Accept(cmp.resource, value);
+				for (const auto &compat : Assets().data.resources[cmp.resource].compatibility) {
+					if (Assets().data.resources[compat.first].state == world::Resource::LIQUID) {
+						drink_subtask->Accept(compat.first, value * compat.second);
+					}
+				}
 			}
-		} else {
-			if (r < 0.2) {
-				d = &props.strength;
-			} else if (r < 0.4) {
-				d = &props.stamina;
-			} else if (r < 0.6) {
-				d = &props.dexerty;
-			} else if (r < 0.8) {
-				d = &props.intelligence;
-			} else {
-				d = &props.mutability;
+		}
+		drink_subtask->WhenComplete([&](Goal &) { drink_subtask = nullptr; });
+		GetCreature().AddGoal(std::unique_ptr<Goal>(drink_subtask));
+	}
+
+	if (!eat_subtask && stats.Hunger().Bad()) {
+		eat_subtask = new IngestGoal(GetCreature(), stats.Hunger());
+		for (const auto &cmp : GetCreature().GetComposition()) {
+			if (Assets().data.resources[cmp.resource].state == world::Resource::SOLID) {
+				double value = cmp.value / GetCreature().GetComposition().TotalMass();
+				eat_subtask->Accept(cmp.resource, value);
+				for (const auto &compat : Assets().data.resources[cmp.resource].compatibility) {
+					if (Assets().data.resources[compat.first].state == world::Resource::SOLID) {
+						eat_subtask->Accept(compat.first, value * compat.second);
+					}
+				}
 			}
 		}
-		if (Assets().random.UNorm() < 0.5) {
-			d->Mean(d->Mean() * amount);
+		eat_subtask->WhenComplete([&](Goal &) { eat_subtask = nullptr; });
+		GetCreature().AddGoal(std::unique_ptr<Goal>(eat_subtask));
+	}
+}
+
+void BlobBackgroundTask::CheckSplit() {
+	if (GetCreature().Mass() > GetCreature().OffspringMass() * 2.0
+		&& GetCreature().OffspringChance() > Random().UNorm()) {
+		GetCreature().GetSimulation().Log() << GetCreature().Name() << " split" << std::endl;
+		Split(GetCreature());
+		return;
+	}
+}
+
+void BlobBackgroundTask::CheckMutate() {
+	// check for random property mutation
+	if (GetCreature().MutateChance() > Random().UNorm()) {
+		double amount = 1.0 + (Random().SNorm() * 0.05);
+		math::Distribution &d = GetCreature().GetGenome().properties.props[Random().UInt(9)];
+		if (Random().UNorm() < 0.5) {
+			d.Mean(d.Mean() * amount);
 		} else {
-			d->StandardDeviation(d->StandardDeviation() * amount);
+			d.StandardDeviation(d.StandardDeviation() * amount);
 		}
 	}
 }
@@ -85,6 +202,8 @@ void BlobBackgroundTask::Action() {
 Goal::Goal(Creature &c)
 : c(c)
 , on_complete()
+, on_foreground()
+, on_background()
 , urgency(0.0)
 , interruptible(true)
 , complete(false) {
@@ -93,22 +212,6 @@ Goal::Goal(Creature &c)
 Goal::~Goal() noexcept {
 }
 
-Situation &Goal::GetSituation() noexcept {
-	return c.GetSituation();
-}
-
-const Situation &Goal::GetSituation() const noexcept {
-	return c.GetSituation();
-}
-
-Steering &Goal::GetSteering() noexcept {
-	return c.GetSteering();
-}
-
-const Steering &Goal::GetSteering() const noexcept {
-	return c.GetSteering();
-}
-
 app::Assets &Goal::Assets() noexcept {
 	return c.GetSimulation().Assets();
 }
@@ -117,22 +220,49 @@ const app::Assets &Goal::Assets() const noexcept {
 	return c.GetSimulation().Assets();
 }
 
-void Goal::SetComplete() noexcept {
+math::GaloisLFSR &Goal::Random() noexcept {
+	return Assets().random;
+}
+
+void Goal::SetComplete() {
 	if (!complete) {
 		complete = true;
+		OnComplete();
 		if (on_complete) {
 			on_complete(*this);
 		}
 	}
 }
 
-void Goal::OnComplete(std::function<void(Goal &)> cb) noexcept {
+void Goal::SetForeground() {
+	OnForeground();
+	if (on_foreground) {
+		on_foreground(*this);
+	}
+}
+
+void Goal::SetBackground() {
+	OnBackground();
+	if (on_background) {
+		on_background(*this);
+	}
+}
+
+void Goal::WhenComplete(std::function<void(Goal &)> cb) noexcept {
 	on_complete = cb;
 	if (complete) {
 		on_complete(*this);
 	}
 }
 
+void Goal::WhenForeground(std::function<void(Goal &)> cb) noexcept {
+	on_foreground = cb;
+}
+
+void Goal::WhenBackground(std::function<void(Goal &)> cb) noexcept {
+	on_background = cb;
+}
+
 
 IdleGoal::IdleGoal(Creature &c)
 : Goal(c) {
@@ -147,32 +277,161 @@ std::string IdleGoal::Describe() const {
 	return "idle";
 }
 
-void IdleGoal::Enable() {
+void IdleGoal::Action() {
+	// when in bad shape, don't make much effort
+	if (GetStats().Damage().Bad() || GetStats().Exhaustion().Bad() || GetStats().Fatigue().Critical()) {
+		GetSteering().DontSeparate();
+	} else {
+		GetSteering().ResumeSeparate();
+	}
+
+	// use boredom as chance per 30s
+	if (Random().UNorm() < GetStats().Boredom().value * (1.0 / 1800.0)) {
+		PickActivity();
+	}
 }
 
-void IdleGoal::Tick(double dt) {
+void IdleGoal::PickActivity() {
+	GetCreature().AddGoal(std::unique_ptr<Goal>(new StrollGoal(GetCreature())));
 }
 
-void IdleGoal::Action() {
+
+namespace {
+
+std::string summarize(const Composition &comp, const app::Assets &assets) {
+	std::stringstream s;
+	bool first = true;
+	for (const auto &c : comp) {
+		if (first) {
+			first = false;
+		} else {
+			s << " or ";
+		}
+		s << assets.data.resources[c.resource].label;
+	}
+	return s.str();
 }
 
+}
+
+IngestGoal::IngestGoal(Creature &c, Creature::Stat &stat)
+: Goal(c)
+, stat(stat)
+, accept(Assets().data.resources)
+, locate_subtask(nullptr)
+, ingesting(false)
+, resource(-1)
+, yield(0.0) {
+	Urgency(stat.value);
+}
+
+IngestGoal::~IngestGoal() {
+}
+
+void IngestGoal::Accept(int resource, double value) {
+	accept.Add(resource, value);
+}
+
+std::string IngestGoal::Describe() const {
+	if (resource == -1) {
+		return "ingest " + summarize(accept, Assets());
+	} else {
+		const world::Resource &r = Assets().data.resources[resource];
+		if (r.state == world::Resource::SOLID) {
+			return "eat " + r.label;
+		} else {
+			return "drink " + r.label;
+		}
+	}
+}
+
+void IngestGoal::Enable() {
+}
+
+void IngestGoal::Tick(double dt) {
+	Urgency(stat.value);
+	if (locate_subtask) {
+		locate_subtask->Urgency(Urgency() + 0.1);
+	}
+	if (ingesting) {
+		if (OnSuitableTile() && !GetSituation().Moving()) {
+			GetCreature().Ingest(resource, yield * dt);
+			stat.Add(-1.0 * yield * GetCreature().GetComposition().Compatibility(resource) * dt);
+			if (stat.Empty()) {
+				SetComplete();
+			}
+		} else {
+			// left tile somehow, some idiot probably pushed us off
+			ingesting = false;
+			Interruptible(true);
+		}
+	}
+}
+
+void IngestGoal::Action() {
+	if (ingesting) {
+		// all good
+		return;
+	}
+	if (OnSuitableTile()) {
+		if (GetSituation().Moving()) {
+			// break with maximum force
+			GetSteering().Haste(1.0);
+			GetSteering().Halt();
+		} else {
+			// finally
+			// TODO: somehow this still gets interrupted
+			Interruptible(false);
+			ingesting = true;
+		}
+	} else {
+		locate_subtask = new LocateResourceGoal(GetCreature());
+		for (const auto &c : accept) {
+			locate_subtask->Accept(c.resource, c.value);
+		}
+		locate_subtask->SetMinimum(stat.gain * -1.1);
+		locate_subtask->Urgency(Urgency() + 0.1);
+		locate_subtask->WhenComplete([&](Goal &){ locate_subtask = nullptr; });
+		GetCreature().AddGoal(std::unique_ptr<Goal>(locate_subtask));
+	}
+}
+
+bool IngestGoal::OnSuitableTile() {
+	if (!GetSituation().OnGround()) {
+		return false;
+	}
+	const world::TileType &t = GetSituation().GetTileType();
+	auto found = t.FindBestResource(accept);
+	if (found != t.resources.end()) {
+		resource = found->resource;
+		yield = found->ubiquity;
+		return true;
+	} else {
+		resource = -1;
+		return false;
+	}
+}
 
-LocateResourceGoal::LocateResourceGoal(Creature &c, int res)
+
+LocateResourceGoal::LocateResourceGoal(Creature &c)
 : Goal(c)
-, res(res)
+, accept(Assets().data.resources)
 , found(false)
 , target_pos(0.0)
-, target_srf(0)
-, target_tile(0)
 , searching(false)
-, reevaluate(0.0) {
+, reevaluate(0.0)
+, minimum(0.0) {
 }
 
 LocateResourceGoal::~LocateResourceGoal() noexcept {
 }
 
+void LocateResourceGoal::Accept(int resource, double value) {
+	accept.Add(resource, value);
+}
+
 std::string LocateResourceGoal::Describe() const {
-	return "locate " + GetCreature().GetSimulation().Resources()[res].name;
+	return "locate " + summarize(accept, Assets());
 }
 
 void LocateResourceGoal::Enable() {
@@ -191,14 +450,14 @@ void LocateResourceGoal::Action() {
 		if (!searching) {
 			LocateResource();
 		} else {
-			double dist = glm::length2(GetSituation().Position() - target_pos);
-			if (dist < 0.0001) {
+			if (OnTarget()) {
+				searching = false;
 				LocateResource();
 			} else {
 				GetSteering().GoTo(target_pos);
 			}
 		}
-	} else if (OnTargetTile()) {
+	} else if (OnTarget()) {
 		GetSteering().Halt();
 		if (!GetSituation().Moving()) {
 			SetComplete();
@@ -212,99 +471,169 @@ void LocateResourceGoal::Action() {
 void LocateResourceGoal::LocateResource() {
 	if (GetSituation().OnSurface()) {
 		const world::TileType &t = GetSituation().GetTileType();
-		auto yield = t.FindResource(res);
+		auto yield = t.FindBestResource(accept);
 		if (yield != t.resources.cend()) {
 			// hoooray
 			GetSteering().Halt();
 			found = true;
 			searching = false;
 			target_pos = GetSituation().Position();
-			target_srf = GetSituation().Surface();
-			target_tile = GetSituation().GetPlanet().SurfacePosition(target_srf, target_pos);
 		} else {
 			// go find somewhere else
 			SearchVicinity();
+			if (!found) {
+				Remember();
+				if (!found) {
+					RandomWalk();
+				}
+			}
 		}
 	} else {
 		// well, what now?
+		found = false;
+		searching = false;
 	}
 }
 
 void LocateResourceGoal::SearchVicinity() {
 	const world::Planet &planet = GetSituation().GetPlanet();
-	int srf = GetSituation().Surface();
 	const glm::dvec3 &pos = GetSituation().Position();
+	const glm::dvec3 normal(planet.NormalAt(pos));
+	const glm::dvec3 step_x(glm::normalize(glm::cross(normal, glm::dvec3(normal.z, normal.x, normal.y))) * (GetCreature().PerceptionOmniRange() * 0.7));
+	const glm::dvec3 step_y(glm::normalize(glm::cross(step_x, normal)) * (GetCreature().PerceptionOmniRange() * 0.7));
 
-	glm::ivec2 loc = planet.SurfacePosition(srf, pos);
-	glm::ivec2 seek_radius(2);
-	glm::ivec2 begin(glm::max(glm::ivec2(0), loc - seek_radius));
-	glm::ivec2 end(glm::min(glm::ivec2(planet.SideLength()), loc + seek_radius + glm::ivec2(1)));
-
-	double rating[end.y - begin.y][end.x - begin.x];
-	std::memset(rating, 0, sizeof(double) * (end.y - begin.y) * (end.x - begin.x))
+	const int search_radius = int(GetCreature().PerceptionRange() / (GetCreature().PerceptionOmniRange() * 0.7));
+	double rating[2 * search_radius + 1][2 * search_radius + 1];
+	std::memset(rating, '\0', (2 * search_radius + 1) * (2 * search_radius + 1) * sizeof(double));
 
 	// find close and rich field
-	for (int y = begin.y; y < end.y; ++y) {
-		for (int x = begin.x; x < end.x; ++x) {
-			const world::TileType &type = planet.TypeAt(srf, x, y);
-			auto yield = type.FindResource(res);
+	for (int y = -search_radius; y < search_radius + 1; ++y) {
+		for (int x = -search_radius; x < search_radius + 1; ++x) {
+			const glm::dvec3 tpos(pos + (double(x) * step_x) + (double(y) * step_y));
+			if (!GetCreature().PerceptionTest(tpos)) continue;
+			const world::TileType &type = planet.TileTypeAt(tpos);
+			auto yield = type.FindBestResource(accept);
 			if (yield != type.resources.cend()) {
-				// TODO: subtract minimum yield
-				rating[y - begin.y][x - begin.x] = yield->ubiquity;
-				double dist = std::max(0.125, 0.25 * glm::length(planet.TileCenter(srf, x, y) - pos));
-				rating[y - begin.y][x - begin.x] /= dist;
+				rating[y + search_radius][x + search_radius] = yield->ubiquity * accept.Get(yield->resource);
+				// penalize distance
+				double dist = std::max(0.125, 0.25 * glm::length2(tpos - pos));
+				rating[y + search_radius][x + search_radius] /= dist;
 			}
 		}
 	}
 
-	// demote crowded tiles
+	// penalize crowding
 	for (auto &c : planet.Creatures()) {
 		if (&*c == &GetCreature()) continue;
-		if (c->GetSituation().Surface() != srf) continue;
-		glm::ivec2 coords(c->GetSituation().SurfacePosition());
-		if (coords.x < begin.x || coords.x >= end.x) continue;
-		if (coords.y < begin.y || coords.y >= end.y) continue;
-		rating[coords.y - begin.y][coords.x - begin.x] *= 0.9;
+		for (int y = -search_radius; y < search_radius + 1; ++y) {
+			for (int x = -search_radius; x < search_radius + 1; ++x) {
+				const glm::dvec3 tpos(pos + (double(x) * step_x) + (double(y) * step_y));
+				if (glm::length2(tpos - c->GetSituation().Position()) < 1.0) {
+					rating[y + search_radius][x + search_radius] *= 0.8;
+				}
+			}
+		}
 	}
 
 	glm::ivec2 best_pos(0);
 	double best_rating = -1.0;
 
-	for (int y = begin.y; y < end.y; ++y) {
-		for (int x = begin.x; x < end.x; ++x) {
-			if (rating[y - begin.y][x - begin.x] > best_rating) {
+	for (int y = -search_radius; y < search_radius + 1; ++y) {
+		for (int x = -search_radius; x < search_radius + 1; ++x) {
+			if (rating[y + search_radius][x + search_radius] > best_rating) {
 				best_pos = glm::ivec2(x, y);
-				best_rating = rating[y - begin.y][x - begin.x];
+				best_rating = rating[y + search_radius][x + search_radius];
 			}
 		}
 	}
 
-	if (best_rating) {
+	if (best_rating > minimum) {
 		found = true;
 		searching = false;
-		target_pos = planet.TileCenter(srf, best_pos.x, best_pos.y);
-		target_srf = srf;
-		target_tile = best_pos;
+		target_pos = glm::normalize(pos + (double(best_pos.x) * step_x) + (double(best_pos.y) * step_y)) * planet.Radius();
 		GetSteering().GoTo(target_pos);
-	} else if (!searching) {
-		found = false;
-		searching = true;
-		target_pos = GetSituation().Position();
-		target_pos[(srf + 0) % 3] += Assets().random.SNorm();
-		target_pos[(srf + 1) % 3] += Assets().random.SNorm();
-		// bias towards current direction
-		target_pos += glm::normalize(GetSituation().Velocity()) * 0.5;
-		target_pos = clamp(target_pos, -planet.Radius(), planet.Radius());
+	}
+}
+
+void LocateResourceGoal::Remember() {
+	glm::dvec3 pos(0.0);
+	if (GetCreature().GetMemory().RememberLocation(accept, pos)) {
+		found = true;
+		searching = false;
+		target_pos = pos;
 		GetSteering().GoTo(target_pos);
 	}
 }
 
-bool LocateResourceGoal::OnTargetTile() const noexcept {
+void LocateResourceGoal::RandomWalk() {
+	if (searching) {
+		return;
+	}
+
+	const world::Planet &planet = GetSituation().GetPlanet();
+	const glm::dvec3 &pos = GetSituation().Position();
+	const glm::dvec3 normal(planet.NormalAt(pos));
+	const glm::dvec3 step_x(glm::normalize(glm::cross(normal, glm::dvec3(normal.z, normal.x, normal.y))));
+	const glm::dvec3 step_y(glm::normalize(glm::cross(step_x, normal)));
+
+	found = false;
+	searching = true;
+	target_pos = GetSituation().Position();
+	target_pos += Random().SNorm() * 3.0 * step_x;
+	target_pos += Random().SNorm() * 3.0 * step_y;
+	// bias towards current heading
+	target_pos += GetSituation().Heading() * 1.5;
+	target_pos = glm::normalize(target_pos) * planet.Radius();
+	GetSteering().GoTo(target_pos);
+}
+
+bool LocateResourceGoal::OnTarget() const noexcept {
 	const Situation &s = GetSituation();
-	return s.OnSurface()
-		&& s.Surface() == target_srf
-		&& s.OnTile()
-		&& s.SurfacePosition() == target_tile;
+	return s.OnGround() && glm::length2(s.Position() - target_pos) < 0.0001;
+}
+
+
+StrollGoal::StrollGoal(Creature &c)
+: Goal(c)
+, last(GetSituation().Position())
+, next(last) {
+}
+
+StrollGoal::~StrollGoal() {
+}
+
+std::string StrollGoal::Describe() const {
+	return "take a walk";
+}
+
+void StrollGoal::Enable() {
+	last = GetSituation().Position();
+	GetSteering().Haste(0.0);
+	PickTarget();
+}
+
+void StrollGoal::Action() {
+	if (glm::length2(next - GetSituation().Position()) < 0.0001) {
+		PickTarget();
+	}
+}
+
+void StrollGoal::OnBackground() {
+	SetComplete();
+}
+
+void StrollGoal::PickTarget() noexcept {
+	last = next;
+	next += GetSituation().Heading() * 1.5;
+	const glm::dvec3 normal(GetSituation().GetPlanet().NormalAt(GetSituation().Position()));
+	glm::dvec3 rand_x(GetSituation().Heading());
+	if (std::abs(glm::dot(normal, rand_x)) > 0.999) {
+		rand_x = glm::dvec3(normal.z, normal.x, normal.y);
+	}
+	glm::dvec3 rand_y = glm::cross(normal, rand_x);
+	next += ((rand_x * Random().SNorm()) + (rand_y * Random().SNorm())) * 1.5;
+	next = glm::normalize(next) * GetSituation().GetPlanet().Radius();
+	GetSteering().GoTo(next);
 }
 
 }