X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcreature%2Fgoal.cpp;h=daf8f901d7989b780cb067712eb65e4b5e14cd3c;hb=b03c2f42ba325ab909b159a4bc8e7568defdc4c5;hp=229dffc8f3e38e04510e13a82fa1141093bf9e32;hpb=42db7d9d2286e50896ad172e2e4a8fbe65c8a4a9;p=blobs.git

diff --git a/src/creature/goal.cpp b/src/creature/goal.cpp
index 229dffc..daf8f90 100644
--- a/src/creature/goal.cpp
+++ b/src/creature/goal.cpp
@@ -88,13 +88,15 @@ void IdleGoal::Tick(double dt) {
 }
 
 void IdleGoal::Action() {
-	double fert = GetCreature().Fertility();
-	double rand = Assets().random.UNorm();
-	if (fert > rand) {
-		std::cout << "[" << int(GetCreature().GetSimulation().Time())
-			<< "s] splitting " << GetCreature().Name()
-			<< " because " << fert << " > " << rand << std::endl;
-		Split(GetCreature());
+	// 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());
+		}
 	}
 }
 
@@ -105,7 +107,9 @@ LocateResourceGoal::LocateResourceGoal(Creature &c, int res)
 , found(false)
 , target_pos(0.0)
 , target_srf(0)
-, target_tile(0) {
+, target_tile(0)
+, searching(false)
+, reevaluate(0.0) {
 }
 
 LocateResourceGoal::~LocateResourceGoal() noexcept {
@@ -116,23 +120,37 @@ std::string LocateResourceGoal::Describe() const {
 }
 
 void LocateResourceGoal::Enable() {
-	LocateResource();
+
 }
 
 void LocateResourceGoal::Tick(double dt) {
+	reevaluate -= dt;
 }
 
 void LocateResourceGoal::Action() {
-	if (!found) {
+	if (reevaluate < 0.0) {
 		LocateResource();
+		reevaluate = 3.0;
+	} else if (!found) {
+		if (!searching) {
+			LocateResource();
+		} else {
+			double dist = glm::length2(GetSituation().Position() - target_pos);
+			if (dist < 0.0001) {
+				LocateResource();
+			} else {
+				GetSteering().GoTo(target_pos);
+			}
+		}
 	} else if (OnTargetTile()) {
 		GetSteering().Halt();
-		if (!GetCreature().Moving()) {
+		if (!GetSituation().Moving()) {
 			SetComplete();
 		}
 	} else {
 		GetSteering().GoTo(target_pos);
 	}
+	GetSteering().Haste(Urgency());
 }
 
 void LocateResourceGoal::LocateResource() {
@@ -143,6 +161,7 @@ void LocateResourceGoal::LocateResource() {
 			// hoooray
 			GetSteering().Halt();
 			found = true;
+			searching = false;
 			target_pos = GetSituation().Position();
 			target_srf = GetSituation().Surface();
 			target_tile = GetSituation().GetPlanet().SurfacePosition(target_srf, target_pos);
@@ -163,38 +182,63 @@ void LocateResourceGoal::SearchVicinity() {
 	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 end(glm::min(glm::ivec2(planet.SideLength()), loc + seek_radius + glm::ivec2(1)));
 
-	const world::TileType::Yield *best = nullptr;
-	glm::ivec2 best_pos;
-	double best_distance;
+	double rating[end.y - begin.y][end.x - begin.x] { 0.0 };
 
+	// 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);
 			if (yield != type.resources.cend()) {
-				double dist = glm::length2(planet.TileCenter(srf, x, y) - pos);
-				if (!best) {
-					best = &*yield;
-					best_pos = glm::ivec2(x, y);
-					best_distance = dist;
-				} else if (yield->ubiquity - (dist * 0.125) > best->ubiquity - (best_distance * 0.125)) {
-					best = &*yield;
-					best_pos = glm::ivec2(x, y);
-					best_distance = dist;
-				}
+				// 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;
 			}
 		}
 	}
-	if (best) {
+
+	// demote crowded tiles
+	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;
+	}
+
+	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) {
+				best_pos = glm::ivec2(x, y);
+				best_rating = rating[y - begin.y][x - begin.x];
+			}
+		}
+	}
+
+	if (best_rating) {
 		found = true;
+		searching = false;
 		target_pos = planet.TileCenter(srf, best_pos.x, best_pos.y);
 		target_srf = srf;
 		target_tile = best_pos;
 		GetSteering().GoTo(target_pos);
-	} else {
-		// oh crap
+	} 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());
+		GetSteering().GoTo(target_pos);
 	}
 }
 
@@ -202,7 +246,8 @@ bool LocateResourceGoal::OnTargetTile() const noexcept {
 	const Situation &s = GetSituation();
 	return s.OnSurface()
 		&& s.Surface() == target_srf
-		&& s.GetPlanet().SurfacePosition(s.Surface(), s.Position()) == target_tile;
+		&& s.OnTile()
+		&& s.SurfacePosition() == target_tile;
 }
 
 }