avoid others when steering

[blobs.git] / src / creature / goal.cpp

diff --git a/src/creature/goal.cpp b/src/creature/goal.cpp
index 18714e49cb195637d82ae1abfc0824e756b962ea..77a0dece1a261b55cdf9318529ea6682d947accf 100644 (file)
--- a/src/creature/goal.cpp
+++ b/src/creature/goal.cpp
@@ -1,7 +1,9 @@
 #include "Goal.hpp"
+#include "IdleGoal.hpp"
 #include "LocateResourceGoal.hpp"
 
 #include "Creature.hpp"
+#include "../app/Assets.hpp"
 #include "../world/Planet.hpp"
 #include "../world/Resource.hpp"
 #include "../world/Simulation.hpp"
@@ -41,6 +43,14 @@ const Steering &Goal::GetSteering() const noexcept {
        return c.GetSteering();
 }
 
+app::Assets &Goal::Assets() noexcept {
+       return c.GetSimulation().Assets();
+}
+
+const app::Assets &Goal::Assets() const noexcept {
+       return c.GetSimulation().Assets();
+}
+
 void Goal::SetComplete() noexcept {
        if (!complete) {
                complete = true;
@@ -58,13 +68,44 @@ void Goal::OnComplete(std::function<void(Goal &)> cb) noexcept {
 }
 
 
+IdleGoal::IdleGoal(Creature &c)
+: Goal(c) {
+       Urgency(-1.0);
+       Interruptible(true);
+}
+
+IdleGoal::~IdleGoal() {
+}
+
+std::string IdleGoal::Describe() const {
+       return "idle";
+}
+
+void IdleGoal::Enable() {
+}
+
+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] " << GetCreature().Name() << " split" << std::endl;
+               Split(GetCreature());
+       }
+}
+
+
 LocateResourceGoal::LocateResourceGoal(Creature &c, int res)
 : Goal(c)
 , res(res)
 , found(false)
 , target_pos(0.0)
 , target_srf(0)
-, target_tile(0) {
+, target_tile(0)
+, searching(false) {
 }
 
 LocateResourceGoal::~LocateResourceGoal() noexcept {
@@ -83,10 +124,19 @@ void LocateResourceGoal::Tick(double dt) {
 
 void LocateResourceGoal::Action() {
        if (!found) {
-               LocateResource();
+               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 {
@@ -102,6 +152,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);
@@ -122,14 +173,14 @@ 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() - 1), loc + seek_radius));
 
        const world::TileType::Yield *best = nullptr;
        glm::ivec2 best_pos;
        double best_distance;
 
-       for (int y = begin.y; y < end.y; ++y) {
-               for (int x = begin.x; x < end.x; ++x) {
+       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()) {
@@ -148,13 +199,20 @@ void LocateResourceGoal::SearchVicinity() {
        }
        if (best) {
                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);
-               std::cout << "found resource at " << target_pos << std::endl;
-       } 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;
+               GetSteering().GoTo(target_pos);
        }
 }
 
@@ -162,7 +220,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;
 }
 
 }